a.binder 5 år sedan
förälder
incheckning
41f2eb276e

+ 25 - 12
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_Protocol_CAN_struct.h

@@ -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("   "); 
 }

+ 3 - 1
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_Status_func.h

@@ -183,7 +183,9 @@
                             {
                             Exp_state_s.concat(Slave_Ports_Status_A[i].Exp_state & mask ? "1" : "0");//message2.concat(Slave_Ports_Status_A[i].Exp_state & mask ? "1" : "0");
                             }
-                    message2.concat(Exp_state_s.substring(5,8));
+//                    message2.concat(Exp_state_s.substring(5,8));
+                    message2.concat(Exp_state_s);
+
                    /*
                    if(Slave_Ports_Status_A[i].Exp_state & Exp_state_ERROR ) {
                     message2 = message  ;  message2.concat(" ERR ");//E:

+ 1 - 1
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_broadcast_func.h

@@ -135,7 +135,7 @@
                Serial.println("#135 deb CAN_broadcast_A8");
                      CAN_data_debug(CAN_broadcast_A8);
              Serial.println("#135 deb CAN_broadcast_A9");
-               byte CAN_broadcast_A9[8] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x07};
+               byte CAN_broadcast_A9[8] = {0xFF, 0x101, 0x02, 0x03, 0x04, 0x05, 0x07};
                  CAN_data_debug(CAN_broadcast_A9);
                  byte sndStat = CAN0.sendMsgBuf(Active_ControllerID, 0, 8, CAN_broadcast_A8);
               //    byte sndStat ;