a

SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_Protocol_CAN_struct.h

@@ -1,9 +1,20 @@
 
 
 
+typedef INT8U CAN_MSG8_BIT_T ; //JEDEN BIT WIADOMOSCI CAN
 
+typedef CAN_MSG8_BIT_T CAN_MSG8_BIT_1_T ;
+typedef CAN_MSG8_BIT_T CAN_MSG8_BIT_2_T ;
+typedef CAN_MSG8_BIT_T CAN_MSG8_BIT_3_T ;
+typedef CAN_MSG8_BIT_T CAN_MSG8_BIT_4_T ;
+typedef CAN_MSG8_BIT_T CAN_MSG8_BIT_5_T ;
+typedef CAN_MSG8_BIT_T CAN_MSG8_BIT_6_T ;
+typedef CAN_MSG8_BIT_T CAN_MSG8_BIT_7_T ;
+typedef CAN_MSG8_BIT_T CAN_MSG8_BIT_8_T ;
 
 
+typedef  CAN_MSG8_BIT_T CAN_MSG8_T[8] ;
+
 //typedef int _SENDER_T  ;
 
 const int _CAN_REMOTE_ID_BROADCAST = 0xFF ;
@@ -78,12 +89,24 @@ typedef  byte _Slave_Ports_Protocol_CAN_broadcast_AS[8]  ;
 
 
 
-char CAN_broadcast_to_data(_Slave_Ports_Protocol_CAN_broadcast_T 
-            &_Slave_Ports_Protocol_CAN_broadcast_A) {
+byte CAN_broadcast_to_data(_Slave_Ports_Protocol_CAN_broadcast_T 
+            &_Slave_Ports_Protocol_CAN_broadcast_A//,CAN_MSG8_T CAN_MSG8_A
+            ) {
         //_Slave_Ports_Protocol_CAN_broadcast_AS
+        
+            //CAN_MSG8_BIT_1_T
+            byte CAN_MSG8_BIT_1_A = _Slave_Ports_Protocol_CAN_broadcast_A._CAN_REMOTE_ID;
+            CAN_MSG8_BIT_2_T CAN_MSG8_BIT_2_A = _Slave_Ports_Protocol_CAN_broadcast_A._CAN_SENDER_ID ;
+            CAN_MSG8_BIT_3_T CAN_MSG8_BIT_3_A = _Slave_Ports_Protocol_CAN_broadcast_A.Port_ID;
+            CAN_MSG8_BIT_4_T CAN_MSG8_BIT_4_A = _Slave_Ports_Protocol_CAN_broadcast_A.PortTypes ;
+            CAN_MSG8_BIT_5_T CAN_MSG8_BIT_5_A = _Slave_Ports_Protocol_CAN_broadcast_A.Exp_state;
+            CAN_MSG8_BIT_6_T CAN_MSG8_BIT_6_A = _Slave_Ports_Protocol_CAN_broadcast_A.Exp_state_ttl ;
+            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(" "); Serial.print("2["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A._CAN_SENDER_ID); Serial.print("]  ");
+            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("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("]  ");
@@ -91,9 +114,11 @@ char CAN_broadcast_to_data(_Slave_Ports_Protocol_CAN_broadcast_T
             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
-                         _Slave_Ports_Protocol_CAN_broadcast_A._CAN_REMOTE_ID,
+                      // CAN_MSG8_BIT_1_A , // _Slave_Ports_Protocol_CAN_broadcast_A._CAN_REMOTE_ID,
+                       0xFF,
                          _Slave_Ports_Protocol_CAN_broadcast_A._CAN_SENDER_ID ,
                          _Slave_Ports_Protocol_CAN_broadcast_A.Port_ID,
                          _Slave_Ports_Protocol_CAN_broadcast_A.PortTypes,
@@ -110,11 +135,50 @@ char CAN_broadcast_to_data(_Slave_Ports_Protocol_CAN_broadcast_T
 
 
 
+
+void CAN_MSG8_A_ptr(_Slave_Ports_Protocol_CAN_broadcast_T 
+            &_Slave_Ports_Protocol_CAN_broadcast_A ,
+            byte* CAN_MSG8_A
+            ) {
+        //_Slave_Ports_Protocol_CAN_broadcast_AS
+        
+            //CAN_MSG8_BIT_1_T
+            byte CAN_MSG8_BIT_1_A = _Slave_Ports_Protocol_CAN_broadcast_A._CAN_REMOTE_ID;
+            CAN_MSG8_BIT_2_T CAN_MSG8_BIT_2_A = _Slave_Ports_Protocol_CAN_broadcast_A._CAN_SENDER_ID ;
+            CAN_MSG8_BIT_3_T CAN_MSG8_BIT_3_A = _Slave_Ports_Protocol_CAN_broadcast_A.Port_ID;
+            CAN_MSG8_BIT_4_T CAN_MSG8_BIT_4_A = _Slave_Ports_Protocol_CAN_broadcast_A.PortTypes ;
+            CAN_MSG8_BIT_5_T CAN_MSG8_BIT_5_A = _Slave_Ports_Protocol_CAN_broadcast_A.Exp_state;
+            CAN_MSG8_BIT_6_T CAN_MSG8_BIT_6_A = _Slave_Ports_Protocol_CAN_broadcast_A.Exp_state_ttl ;
+            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("#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(CAN_MSG8_BIT_1_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("   "); 
+         CAN_MSG8_A[0] = _Slave_Ports_Protocol_CAN_broadcast_A._CAN_SENDER_ID; // 0xFF;
+         CAN_MSG8_A[1] =_Slave_Ports_Protocol_CAN_broadcast_A.Port_ID ; //0xFF;
+          CAN_MSG8_A[3] = _Slave_Ports_Protocol_CAN_broadcast_A.PortTypes ;//0xFF;
+         CAN_MSG8_A[4] = _Slave_Ports_Protocol_CAN_broadcast_A.Exp_state; // 0xFF;
+          CAN_MSG8_A[5] =  _Slave_Ports_Protocol_CAN_broadcast_A.Exp_state_ttl ;// 0xFF;
+         CAN_MSG8_A[6] =  _Slave_Ports_Protocol_CAN_broadcast_A.Broadcast_state;// 0xFF;
+          CAN_MSG8_A[7] =  _Slave_Ports_Protocol_CAN_broadcast_A._CAN_8; // 0xFF;
+        
+}
+
+
+
 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]); Serial.print("]  "); 
+    for(i=0; i<=7; i++) {
+        Serial.print(" "); Serial.print(i+1); Serial.print("["); Serial.print(data[i]); Serial.print("."); Serial.print(data[i], HEX); Serial.print("] "); 
     }
     Serial.println("   "); 
 }

SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_Status_func.h

@@ -183,8 +183,8 @@
                             {
                             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);
+                    message2.concat(Exp_state_s.substring(1,8));
+                    //message2.concat(Exp_state_s);
 
                    /*
                    if(Slave_Ports_Status_A[i].Exp_state & Exp_state_ERROR ) {
@@ -216,14 +216,14 @@
                     }
                     
                      if(Slave_Ports_Status_A[i].IS_Local_A == IS_Local_TRUE) {
-                         message2.concat(" L ");// B:
+                         message2.concat("L ");// B:
                     } else if(Slave_Ports_Status_A[i].IS_Local_A == IS_Local_FALSE) {
-                         message2.concat(" R ");// B:
+                         message2.concat("R ");// B:
                     } 
                  //message2.concat(" ");
                  
                  if(Slave_Ports_Status_A[i].Exp_state & Exp_state_SET ) {
-                     message2.concat(" * ");//E:
+                     message2.concat("*");//E:
                    
                     }
                  

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

@@ -131,9 +131,19 @@
                 
              //    byte sndStat = CAN0.sendMsgBuf(Slave_Ports_Status_A[i].Port_ID, 0, 8, data);
                  //byte CAN_broadcast_A8[8];
-               byte    CAN_broadcast_A8 =  CAN_broadcast_to_data(CAN_broadcast_A);
+               byte  CAN_broadcast_A8 =  CAN_broadcast_to_data(CAN_broadcast_A);
+               
                Serial.println("#135 deb CAN_broadcast_A8");
                      CAN_data_debug(CAN_broadcast_A8);
+                 
+                  Serial.println("#139 deb CAN_MSG8_A_ptr");
+                     
+                byte CAN_MSG8_A[8];
+               CAN_MSG8_A_ptr(CAN_broadcast_A,CAN_MSG8_A);
+                CAN_data_debug(CAN_MSG8_A);
+
+                     
+                     
              Serial.println("#135 deb CAN_broadcast_A9");
                byte CAN_broadcast_A9[8] = {0xFF, 0x101, 0x02, 0x03, 0x04, 0x05, 0x07};
                  CAN_data_debug(CAN_broadcast_A9);