|
|
@@ -122,18 +122,18 @@ byte CAN_broadcast_to_data(_Slave_Ports_Protocol_CAN_broadcast_T
|
|
|
CAN_MSG8_BIT_7_T CAN_MSG8_BIT_7_A = _Slave_Ports_Protocol_CAN_broadcast_A.Broadcast_state;
|
|
|
CAN_MSG8_BIT_8_T CAN_MSG8_BIT_8_A = _Slave_Ports_Protocol_CAN_broadcast_A._CAN_8;
|
|
|
|
|
|
-
|
|
|
- Serial.print("#80 CAN_broadcast_to_data [ ");
|
|
|
- Serial.print(" "); Serial.print("1["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A._CAN_REMOTE_ID); Serial.print("."); Serial.print(CAN_MSG8_BIT_1_A); Serial.print("] ");
|
|
|
- Serial.print(" "); Serial.print("2["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A._CAN_SENDER_ID); Serial.print("."); Serial.print(CAN_MSG8_BIT_2_A); Serial.print("] ");
|
|
|
- Serial.print(" "); Serial.print("3["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A.Port_ID); Serial.print("] ");
|
|
|
- Serial.print(" "); Serial.print("4["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A.PortTypes); Serial.print("] ");
|
|
|
- Serial.print(" "); Serial.print("5["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A.Exp_state); Serial.print("] ");
|
|
|
- Serial.print(" "); Serial.print("6["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A.Exp_state_ttl); Serial.print("] ");
|
|
|
- Serial.print(" "); Serial.print("7["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A.Broadcast_state); Serial.print("] ");
|
|
|
- Serial.print(" "); Serial.print("8["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A._CAN_8); Serial.print("] ");
|
|
|
- Serial.println(" ");
|
|
|
-
|
|
|
+ #if not defined(DISABLE_ANY_PRINT)
|
|
|
+ Serial.print("#80 CAN_broadcast_to_data [ ");
|
|
|
+ Serial.print(" "); Serial.print("1["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A._CAN_REMOTE_ID); Serial.print("."); Serial.print(CAN_MSG8_BIT_1_A); Serial.print("] ");
|
|
|
+ Serial.print(" "); Serial.print("2["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A._CAN_SENDER_ID); Serial.print("."); Serial.print(CAN_MSG8_BIT_2_A); Serial.print("] ");
|
|
|
+ Serial.print(" "); Serial.print("3["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A.Port_ID); Serial.print("] ");
|
|
|
+ Serial.print(" "); Serial.print("4["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A.PortTypes); Serial.print("] ");
|
|
|
+ Serial.print(" "); Serial.print("5["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A.Exp_state); Serial.print("] ");
|
|
|
+ Serial.print(" "); Serial.print("6["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A.Exp_state_ttl); Serial.print("] ");
|
|
|
+ Serial.print(" "); Serial.print("7["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A.Broadcast_state); Serial.print("] ");
|
|
|
+ Serial.print(" "); Serial.print("8["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A._CAN_8); Serial.print("] ");
|
|
|
+ Serial.println(" ");
|
|
|
+ #endif
|
|
|
byte return_c[8] = {
|
|
|
// 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x07
|
|
|
// CAN_MSG8_BIT_1_A , // _Slave_Ports_Protocol_CAN_broadcast_A._CAN_REMOTE_ID,
|
|
|
@@ -164,6 +164,7 @@ void CAN_MSG8_A_ptr(_Slave_Ports_Protocol_CAN_broadcast_T
|
|
|
//CAN_MSG8_BIT_1_T
|
|
|
|
|
|
//#ifdef DEBUG_CAN
|
|
|
+ #if not defined(DISABLE_ANY_PRINT)
|
|
|
Serial.print("#155 CAN_broadcast_to_data_ptr [ ");
|
|
|
Serial.print(" "); Serial.print("1["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A._CAN_REMOTE_ID); Serial.print("] ");
|
|
|
Serial.print(" "); Serial.print("2["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A._CAN_SENDER_ID); Serial.print("] ");
|
|
|
@@ -173,7 +174,8 @@ void CAN_MSG8_A_ptr(_Slave_Ports_Protocol_CAN_broadcast_T
|
|
|
Serial.print(" "); Serial.print("6["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A.Exp_state_ttl); Serial.print("] ");
|
|
|
Serial.print(" "); Serial.print("7["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A.Broadcast_state); Serial.print("] ");
|
|
|
Serial.print(" "); Serial.print("8["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A._CAN_8); Serial.print("] ");
|
|
|
- Serial.println(" ");
|
|
|
+ Serial.println(" ");
|
|
|
+ #endif
|
|
|
// #endif
|
|
|
CAN_MSG8_A[0] = _Slave_Ports_Protocol_CAN_broadcast_A._CAN_REMOTE_ID; // 0xFF;
|
|
|
CAN_MSG8_A[1] = _Slave_Ports_Protocol_CAN_broadcast_A._CAN_SENDER_ID; // 0xFF;
|
|
|
@@ -198,6 +200,7 @@ void CAN_MSG8_A_Slave_Ports_Protocol_CAN_request_set_new_Exp_state_T(_Slave_Port
|
|
|
//CAN_MSG8_BIT_1_T
|
|
|
|
|
|
//#ifdef DEBUG_CAN
|
|
|
+ #if not defined(DISABLE_ANY_PRINT)
|
|
|
Serial.print("#155 CAN_broadcast_to_data_ptr [ ");
|
|
|
Serial.print(" "); Serial.print("1["); Serial.print(_Slave_Ports_Protocol_CAN_A._CAN_REMOTE_ID); Serial.print("] ");
|
|
|
Serial.print(" "); Serial.print("2["); Serial.print(_Slave_Ports_Protocol_CAN_A._CAN_SENDER_ID); Serial.print("] ");
|
|
|
@@ -208,6 +211,7 @@ void CAN_MSG8_A_Slave_Ports_Protocol_CAN_request_set_new_Exp_state_T(_Slave_Port
|
|
|
Serial.print(" "); Serial.print("7["); Serial.print(_Slave_Ports_Protocol_CAN_A.Exp_state_level_A); Serial.print("] ");
|
|
|
Serial.print(" "); Serial.print("8["); Serial.print(_Slave_Ports_Protocol_CAN_A._CAN_8); Serial.print("] ");
|
|
|
Serial.println(" ");
|
|
|
+ #endif
|
|
|
// #endif
|
|
|
CAN_MSG8_A[0] = _Slave_Ports_Protocol_CAN_A._CAN_REMOTE_ID; // 0xFF;
|
|
|
CAN_MSG8_A[1] = _Slave_Ports_Protocol_CAN_A._CAN_SENDER_ID; // 0xFF;
|
|
|
@@ -227,11 +231,13 @@ void CAN_MSG8_A_Slave_Ports_Protocol_CAN_request_set_new_Exp_state_T(_Slave_Port
|
|
|
|
|
|
void CAN_data_debug(byte data[8]) {
|
|
|
int i;
|
|
|
+ #if not defined(DISABLE_ANY_PRINT)
|
|
|
Serial.print("#102 CAN_data_debug [ ");
|
|
|
for(i=0; i<8; i++) {
|
|
|
Serial.print(" "); Serial.print(i+1); Serial.print("["); Serial.print(data[i]); Serial.print("."); Serial.print(data[i], HEX); Serial.print("] ");
|
|
|
}
|
|
|
- Serial.println(" ");
|
|
|
+ Serial.println(" ");
|
|
|
+ #endif
|
|
|
}
|
|
|
|
|
|
|