|
|
@@ -6,7 +6,7 @@
|
|
|
|
|
|
//typedef int _SENDER_T ;
|
|
|
|
|
|
-#define _CAN_REMOTE_ID_BROADCAST 0xFF
|
|
|
+const int _CAN_REMOTE_ID_BROADCAST = 0xFF ;
|
|
|
|
|
|
typedef int _REMOTE_Controller_ID_T ;
|
|
|
|
|
|
@@ -75,19 +75,32 @@ typedef int _CAN_SEND_2_T ; //2 byte = 8
|
|
|
|
|
|
typedef byte _Slave_Ports_Protocol_CAN_broadcast_AS[8] ;
|
|
|
|
|
|
-byte CAN_broadcast_to_data(_Slave_Ports_Protocol_CAN_broadcast_T
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+char CAN_broadcast_to_data(_Slave_Ports_Protocol_CAN_broadcast_T
|
|
|
&_Slave_Ports_Protocol_CAN_broadcast_A) {
|
|
|
//_Slave_Ports_Protocol_CAN_broadcast_AS
|
|
|
- _Slave_Ports_Protocol_CAN_broadcast_AS return_c[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(" "); Serial.print("2["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A._CAN_SENDER_ID); 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(" ");
|
|
|
+ byte return_c[8] = {
|
|
|
// 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x07
|
|
|
- byte(_Slave_Ports_Protocol_CAN_broadcast_A._CAN_SENDER_ID),
|
|
|
- byte(_Slave_Ports_Protocol_CAN_broadcast_A._CAN_REMOTE_ID),
|
|
|
- byte(_Slave_Ports_Protocol_CAN_broadcast_A.Port_ID),
|
|
|
- byte(_Slave_Ports_Protocol_CAN_broadcast_A.PortTypes),
|
|
|
- byte(_Slave_Ports_Protocol_CAN_broadcast_A.Exp_state),
|
|
|
- byte(_Slave_Ports_Protocol_CAN_broadcast_A.Exp_state_ttl),
|
|
|
- byte(_Slave_Ports_Protocol_CAN_broadcast_A.Broadcast_state),
|
|
|
- byte(_Slave_Ports_Protocol_CAN_broadcast_A._CAN_8)
|
|
|
+ _Slave_Ports_Protocol_CAN_broadcast_A._CAN_REMOTE_ID,
|
|
|
+ _Slave_Ports_Protocol_CAN_broadcast_A._CAN_SENDER_ID ,
|
|
|
+ _Slave_Ports_Protocol_CAN_broadcast_A.Port_ID,
|
|
|
+ _Slave_Ports_Protocol_CAN_broadcast_A.PortTypes,
|
|
|
+ _Slave_Ports_Protocol_CAN_broadcast_A.Exp_state,
|
|
|
+ _Slave_Ports_Protocol_CAN_broadcast_A.Exp_state_ttl,
|
|
|
+ _Slave_Ports_Protocol_CAN_broadcast_A.Broadcast_state,
|
|
|
+ _Slave_Ports_Protocol_CAN_broadcast_A._CAN_8
|
|
|
|
|
|
} ;
|
|
|
|
|
|
@@ -101,7 +114,7 @@ void CAN_data_debug(byte data[8]) {
|
|
|
int i;
|
|
|
Serial.print("#102 CAN_data_debug [ ");
|
|
|
for(i=1; i<=8; i++) {
|
|
|
- Serial.print(" "); Serial.print(i); Serial.print("["); Serial.print(data[i], HEX); Serial.print("] ");
|
|
|
+ Serial.print(" "); Serial.print(i); Serial.print("["); Serial.print(data[i]); Serial.print("] ");
|
|
|
}
|
|
|
Serial.println(" ");
|
|
|
}
|