a

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

@@ -88,9 +88,9 @@ typedef struct ARDUINO_ARRAY_INDEX_TABLE_S         DISPLAY_ARDUINO_ARRAY_INDEX_T
 typedef struct ARDUINO_ARRAY_INDEX_T_TO_DELETE_S   DISPLAY_ARDUINO_ARRAY_INDEX_T_TO_DELETE_T;
  typedef ARDUINO_FUNCT_INIT_RESULT_T ARDUINO_FUNCT_INIT_RESULT_Slave_Ports_queue__add_DISPLAY_T ;
  
- 
+ const DISPLAY_CURSOR_Y_CHARS_T DISPLAY_CURSOR_Y_CHARS_CAN_DEBUG = 8 ; //todo 10 linia do debugu?? CAN
  const DISPLAY_CURSOR_Y_CHARS_T DISPLAY_CURSOR_Y_CHARS_DEBUG = 10 ; //todo 10 linia do debugu??
- const DISPLAY_CURSOR_Y_CHARS_T DISPLAY_CURSOR_Y_CHARS_CAN_DEBUG = 11 ; //todo 10 linia do debugu?? CAN
+ 
  
  
 

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

@@ -2,3 +2,6 @@
 typedef int Broadcast_state_T ; 
 
 const Broadcast_state_T  Broadcast_state_TO_REFRESH = 0x01 ;
+
+const Broadcast_state_T  Broadcast_state_FULL_FRESH = 0xFF ;
+

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

@@ -143,25 +143,18 @@ void CAN_MSG8_A_ptr(_Slave_Ports_Protocol_CAN_broadcast_T
         //_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("   "); 
+          
+        #ifdef DEBUG_CAN
+                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("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
          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;

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

@@ -222,7 +222,7 @@
                     } 
                  //message2.concat(" ");
                  
-                 if(Slave_Ports_Status_A[i].Exp_state & Exp_state_SET ) {
+                 if(Slave_Ports_Status_A[i].Exp_state | Exp_state_SET ) {
                      message2.concat("*");//E:
                    
                     }

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

@@ -59,7 +59,7 @@
                             DISPLAY_array16_I( "#53 BCAST  " + char( Slave_Ports_Status_A[i].Port_ID  ) , 2), //message,
                             DISPLAY_TARGET_DISPLAY128,
                            millis() , // time_seq_id_T time_seq_id_A;
-                           millis(), //time_min_run_T time_min_run_A;
+                           millis()+ARDUINO_time_seq_id_A_INCREMENT, //time_min_run_T time_min_run_A;
                           //queue
                          Slave_Ports_Status_QUEUE_A,
                          TASK_TYPE_T_Slave_Ports_broadcast____  ,  //TASK_TYPE_A,
@@ -67,24 +67,7 @@
                          
                          ); 
                      Serial.println("#66A Prepared data");
-                      /*  todo #if defined(HAS_LCD1602)                              
-                             String LCDarray1 = "L[";
-                             LCDarray1.concat(Slave_Ports_Status_A[i].IS_Local_A); LCDarray1.concat("] ID["); LCDarray1.concat(String(Slave_Ports_Status_A[i].Port_ID, HEX)); LCDarray1.concat("] T["); LCDarray1.concat(String(Slave_Ports_Status_A[i].PortTypes, HEX));
-                            // lcd.print(LCDarray1);
-                            String LCDarray2 = " >"; LCDarray2.concat(String(Slave_Ports_Status_A[i].Address, HEX)); LCDarray2.concat( "< {"); LCDarray2.concat( String(Slave_Ports_Status_A[i].LocalPort, HEX)); LCDarray2.concat( "} =[" ); LCDarray2.concat(String(Slave_Ports_Status_A[i].Exp_state, HEX) ); LCDarray2.concat("] ?[" ) ;
-                                 LCDarray2.concat(String(Slave_Ports_Status_A[i].Exp_state_ttl, HEX)) ; LCDarray2.concat("]") ;
-                                 LCD_print(LCDarray1, LCDarray2, LCDtim / 2 ) ;
-                        #endif
-                        */
-                        //                        (0)           (1)           (2)                       (3)                         (4)                         (5)                     (6)                   
-                      byte data[8] = {Slave_Ports_Status_A[i].Address,  0x04, Slave_Ports_Status_A[i].LocalPort, Slave_Ports_Status_A[i].PortTypes, Slave_Ports_Status_A[i].LocalPort, Slave_Ports_Status_A[i].Exp_state, Slave_Ports_Status_A[i].Exp_state_ttl, 0x07};
-                      CAN_data_debug(data);
-                     // byte data[8] = {element.Address,          0x04, element.LocalPort,          element.PortTypes,                element.LocalPort,         element.Exp_state,         element.Exp_state_ttl, 0x07};
-                  Serial.print("#303 byte data[8] 1[");   Serial.print(Slave_Ports_Status_A[i].Address);   Serial.print("] 2[");  Serial.print(0x04);   Serial.print("] 3["); 
-                       Serial.print(Slave_Ports_Status_A[i].LocalPort);   Serial.print("] 4[");    Serial.print(Slave_Ports_Status_A[i].PortTypes);   Serial.print("] 5[");  Serial.print(Slave_Ports_Status_A[i].Exp_state);   Serial.print("] 6[");
-                        Serial.print( Slave_Ports_Status_A[i].Exp_state_ttl);   Serial.print("] 7[");  Serial.print(0x07);   Serial.println("] ");
-                
-                
+                    
                 
                 DISPLAY__CURSOR_Y_CHARS__SET(DISPLAY_PHYSICAL_CHAR_A, 
                                 DISPLAY_CURSOR_Y_CHARS_CAN_DEBUG);
@@ -101,9 +84,7 @@
                 
                // CAN_broadcast_A._CAN_8 = _CAN_8_EMPTY ;
                 
-                  
-                
-          String message = "CAN BCAST "; message.concat(i); message.concat(".");  message.concat(Slave_Ports_Status_A[i].Port_ID);  message.concat(" >>>"); 
+                String message = "CAN BCAST "; message.concat(i); message.concat(".");  message.concat(Slave_Ports_Status_A[i].Port_ID);  message.concat(" >>>"); 
               
                   message.toCharArray(DISPLAY_array16_AA, message.length());
                      DISPLAY__print(
@@ -131,23 +112,24 @@
                 
              //    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);
-               
-               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);
+                
+                  #ifdef DEBUG_CAN
+                   Serial.println("#139 deb CAN_MSG8_A_ptr");    
+                    CAN_data_debug(CAN_MSG8_A);      
+                  #endif
 
                      
                      
-             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);
-                 byte sndStat = CAN0.sendMsgBuf(Active_ControllerID, 0, 8, CAN_broadcast_A8);
+                                         //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);
+                 byte sndStat = CAN0.sendMsgBuf(Active_ControllerID, 0, 8, CAN_MSG8_A);
               //    byte sndStat ;
                           if(sndStat == CAN_OK){
                             Serial.println("#921 Message Sent Successfully!");
@@ -168,6 +150,17 @@
                                               TASK_TYPE_T_Slave_Ports_broadcast____  ,  //TASK_TYPE_A,
                                               { Slave_Ports_Status_A[i].Port_ID } //TASK_PORT_ASSOC_A
                                               ); 
+                                              
+                                     #ifdef DEBUG_CAN
+                                        Serial.println("#155 after CAN_SEND update [Broadcast_state_FULL_FRESH]  [Exp_state_ttl_IS_ACTIVE]  ");    
+                                      #endif          
+                          // + Broadcast_state_FULL_FRESH
+                          //+Exp_state_ttl_IS_ACTIVE
+                                              
+                                Slave_Ports_Status_A[i].Exp_state_ttl = Exp_state_ttl_IS_ACTIVE ;
+                                Slave_Ports_Status_A[i].Broadcast_state =  Broadcast_state_FULL_FRESH ;
+                                              
+                                              
                           } else {
                             Serial.print("Error Sending Message...  [");    Serial.print(sndStat);  Serial.println("]   "); 
                             DISPLAY__print( DISPLAY_A ,