u

SE/stuff/P5_Automation_can-dev-res/P5_Automation_can-dev-res.ino

@@ -241,6 +241,9 @@ ARDUINO_FUNCT_INIT_RESULT_T ARDUINO_FUNCT_INIT_RESULT__Slave_Ports_LOCAL_init =
          _Slave_Ports_LOCAL_init(
                  Slave_Ports_Status_A ,
                  Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A,
+                  Slave_Ports_Status_T_ARDUINO_ARRAY_INDEX_TABLE_A,
+                                    Slave_Ports_Status_T_ARDUINO_ARRAY_INDEX_T_TO_DELETE_A,
+                                    Slave_Ports_Status_T_ARDUINO_ARRAY_ASSOC_TABLE_S_Port_ID_A,
                  DISPLAY_A , DISPLAY_T_ARDUINO_ATTR_ARRAY_A
                  //, DISPLAY_PHYSICAL_CHAR_A
             );
@@ -334,7 +337,7 @@ void loop() {
              DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
              DISPLAY_PHYSICAL_CHAR_A, 
         DISPLAY_pos_seq_A_NEXT + DISPLAY_pos_seq_A_IMMEDIATE,
-        "336 DISPLAYDarray16_A  comment init",
+        "336 PORTS:",
         DISPLAY_TARGET_DISPLAY128,
        0,
         0

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

@@ -66,6 +66,7 @@ void DISPLAY__print_IMMEDIATE(
         
                     #if defined(HAS_TFT_ILI9163C)
                                 #if defined(DEBUG)
+                                            if(DEBUG > 6) {
                                                     String message(DISPLAY_array16_A);
                                                    Serial.print("#69A DISPLAY__print_IMMEDIATE [DEBUG] to HAS_TFT_ILI9163C  Len["); Serial.print( message.length());
                                                      Serial.print("] XM["); Serial.print( DISPLAY_PHYSICAL_CHAR_A.DISPLAY_PHYSICAL_X_CHARS_A);
@@ -73,6 +74,7 @@ void DISPLAY__print_IMMEDIATE(
                                                      Serial.print("] YC["); Serial.print( DISPLAY_PHYSICAL_CHAR_A.DISPLAY_CURSOR_Y_CHARS_A);
                                                     Serial.print("] YF["); Serial.print( DISPLAY_PHYSICAL_CHAR_A.DISPLAY_textsize_y_A);
                                                    Serial.println("]  ");
+                                                }
                                            #endif
                             DISPLAY_DEV_CTRL__println(DISPLAY_PHYSICAL_CHAR_A, DISPLAY_array16_A) ;
                     #else 
@@ -83,16 +85,20 @@ void DISPLAY__print_IMMEDIATE(
                              //   DISPLAY__print_ANY(DISPLAY_T_ARDUINO_ATTR_ARRAY_A, DISPLAY_PHYSICAL_CHAR_A, DISPLAY_pos_seq_A, DISPLAY_array16_A);     
           } else if(DISPLAY_TARGET_A | DISPLAY_TARGET_ANY){
                                         #if defined(DEBUG)
+                                                if(DEBUG > 6) {
                                                    Serial.print("#69B DISPLAY__print_IMMEDIATE [DEBUG] to DISPLAY__print_ANY  Seq["); Serial.print(DISPLAY_pos_seq_A , BIN);
                                                     Serial.print("] Target["); Serial.print(DISPLAY_TARGET_A , BIN);
                                                    Serial.println("]  ");
+                                                  }
                                            #endif
                                 DISPLAY__print_ANY(DISPLAY_T_ARDUINO_ATTR_ARRAY_A, DISPLAY_PHYSICAL_CHAR_A, DISPLAY_pos_seq_A, DISPLAY_array16_A);     
           } else {
                               #if defined(DEBUG)
+                                    if(DEBUG > 6) {
                                         Serial.print("#68 DISPLAY__print_IMMEDIATE [DEBUG]  else  Seq["); Serial.print(DISPLAY_pos_seq_A , BIN);
                                          Serial.print("] Target["); Serial.print(DISPLAY_TARGET_A , BIN);
                                         Serial.println("]  ");
+                                    }
                                 #endif  
           }
 
@@ -112,10 +118,12 @@ void DISPLAY__print_IMMEDIATE(
                 
                     if(DISPLAY_pos_seq_A | DISPLAY_pos_seq_A_IMMEDIATE){
                             #if defined(DEBUG)
+                                    if(DEBUG > 6) {
                                         Serial.print("#84 DISPLAY__print to DISPLAY__print_IMMEDIATE [DEBUG]  else  Seq["); Serial.print(DISPLAY_pos_seq_A , BIN);
                                         Serial.print("] Target["); Serial.print(DISPLAY_TARGET_A , BIN); 
                                         
                                         Serial.println("]  ");
+                                     }
                                 #endif  
                            DISPLAY__print_IMMEDIATE(DISPLAY_T_ARDUINO_ATTR_ARRAY_A, DISPLAY_PHYSICAL_CHAR_A, DISPLAY_pos_seq_A,  DISPLAY_array16_A,  DISPLAY_TARGET_A);
                                      // Serial.print("#28 running _Slave_Ports_ttl_decrement = ");

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

@@ -2,7 +2,9 @@
  void Slave_Ports_Status_add_port(
  Slave_Ports_Status_T* Slave_Ports_Status_A , 
  Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_T &Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A,
- 
+  Slave_Ports_Status_T_ARDUINO_ARRAY_INDEX_TABLE_T*            Slave_Ports_Status_T_ARDUINO_ARRAY_INDEX_TABLE_A,
+  Slave_Ports_Status_T_ARDUINO_ARRAY_INDEX_T_TO_DELETE_T*      Slave_Ports_Status_T_ARDUINO_ARRAY_INDEX_T_TO_DELETE_A,
+  Slave_Ports_Status_T_ARDUINO_ARRAY_ASSOC_TABLE_S_Port_ID_T*  Slave_Ports_Status_T_ARDUINO_ARRAY_ASSOC_TABLE_S_Port_ID_A,
                 int  Port_ID,
                 int  _Slave_ID,
                 PortTypes_T  PortTypes,
@@ -69,16 +71,26 @@
    
    
                 #if defined(DEBUG)
-                            Serial.print("#72 Port_Dspl[DEBUG] #C["); Serial.print(Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A);
-                             Serial.print("] XM["); Serial.print( DISPLAY_PHYSICAL_CHAR_A.DISPLAY_PHYSICAL_X_CHARS_A);
-                             Serial.print("] YM["); Serial.print( DISPLAY_PHYSICAL_CHAR_A.DISPLAY_PHYSICAL_Y_CHARS_A);
-                             Serial.print("] YC["); Serial.print( DISPLAY_PHYSICAL_CHAR_A.DISPLAY_CURSOR_Y_CHARS_A);
-                             Serial.print("] YF["); Serial.print( DISPLAY_PHYSICAL_CHAR_A.DISPLAY_textsize_y_A);
-                             
-                             
-                            Serial.println("]  ");
+                    // if(DEBUG > 6) {
+                                   Serial.print("#72 Port_Dspl[DEBUG] #C["); Serial.print(Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A);
+                                    Serial.print("] XM["); Serial.print( DISPLAY_PHYSICAL_CHAR_A.DISPLAY_PHYSICAL_X_CHARS_A);
+                                    Serial.print("] YM["); Serial.print( DISPLAY_PHYSICAL_CHAR_A.DISPLAY_PHYSICAL_Y_CHARS_A);
+                                    Serial.print("] YC["); Serial.print( DISPLAY_PHYSICAL_CHAR_A.DISPLAY_CURSOR_Y_CHARS_A);
+                                    Serial.print("] YF["); Serial.print( DISPLAY_PHYSICAL_CHAR_A.DISPLAY_textsize_y_A);
+                                   Serial.println("]  ");
+                             //      }
                     #endif    
    
+        String message_init = "" ;
+        DISPLAY_array16_T  DISPLAY_array16_AAT ;
+       // message_init.concat(DISPLAY_array16_A);
+        message_init.concat(" #C:");
+        message_init = message_init +  Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A ;
+        message_init = DISPLAY_array16_A + message_init ;
+        //message_init.concat(Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A , INT );
+        message_init.concat("     ");
+        message_init.toCharArray(DISPLAY_array16_AAT, message_init.length());
+        
         String message ;
         String message2 ;
              DISPLAY__print(
@@ -86,13 +98,13 @@
                           DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
                           DISPLAY_PHYSICAL_CHAR_A, 
                            DISPLAY_pos_seq_A,
-                            DISPLAY_array16_A,
+                            DISPLAY_array16_AAT,
                             DISPLAY_TARGET_A,
                            time_seq_id_A,
                            time_min_run_A
                           ); 
         int i;
-        for(i=ARDUINO_ARRAY_INDEX_FIRST ; i <= ARDUINO_ARRAY_INDEX_LIMIT_PORTS; i++) {
+        for(i=ARDUINO_ARRAY_INDEX_FIRST ; i < ARDUINO_ARRAY_INDEX_LIMIT_PORTS; i++) {//
            DISPLAY_array16_T  DISPLAY_array16_AA="" ;
            DISPLAY_array16_T  DISPLAY_array16_AB="" ;
         
@@ -103,13 +115,13 @@
                             Serial.println("]  ");
                     #endif    
                   message = "";
-                 message.concat("+P #")  ; 
+                 message.concat("#:")  ; 
                  message.concat(i);
-                 message.concat(" ID[");
+                 message.concat(" ID:");
                  message.concat(Slave_Ports_Status_A[i].Port_ID )  ; 
-                 message.concat(" ?");
-                  message.toCharArray(DISPLAY_array16_AA, message.length());
-                  DISPLAY__print(
+                 message.concat(" ");
+                 // message.toCharArray(DISPLAY_array16_AA, message.length());
+               /*   DISPLAY__print(
                    DISPLAY_A ,
                    DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
                    DISPLAY_PHYSICAL_CHAR_A, 
@@ -120,12 +132,12 @@
                     time_min_run_A
                    ); 
                    delay(100);
-                  // DISPLAY_array16_AA = 0 ;
-                   message2 = ""  ; message2.concat("   E:");
+                  // DISPLAY_array16_AA = 0 ;*/
+                   message2 = message  ; message2.concat("E:");
                  message2.concat(Slave_Ports_Status_A[i].Exp_state )  ;
-                 message2.concat(" T");
+                 message2.concat(" T:");
                  message2.concat(Slave_Ports_Status_A[i].Exp_state_ttl )  ;
-                 message2.concat(" B[");
+                 message2.concat(" B:");
                  message2.concat(Slave_Ports_Status_A[i].Broadcast_state )  ;
                  message2.concat(" ");
                  message2.toCharArray(DISPLAY_array16_AB, message2.length());             

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

@@ -67,9 +67,9 @@ typedef struct ARDUINO_ARRAY_ASSOC_TABLE_S         Slave_Ports_Status_T_ARDUINO_
 
 
 //void ARDUINO_ARRAY_INDEX_TABLE_INIT(
-    Slave_Ports_Status_T_ARDUINO_ARRAY_INDEX_TABLE_T        Slave_Ports_Status_T_ARDUINO_ARRAY_INDEX_TABLE_A[ARDUINO_ARRAY_INDEX_LIMIT_PORTS]        = {};
-    Slave_Ports_Status_T_ARDUINO_ARRAY_INDEX_T_TO_DELETE_T  Slave_Ports_Status_T_ARDUINO_ARRAY_INDEX_T_TO_DELETE_A[ARDUINO_ARRAY_INDEX_T_TO_DELETE_S_LIMIT]  = {};  
-   
+    Slave_Ports_Status_T_ARDUINO_ARRAY_INDEX_TABLE_T            Slave_Ports_Status_T_ARDUINO_ARRAY_INDEX_TABLE_A[ARDUINO_ARRAY_INDEX_LIMIT_PORTS]        = {};
+    Slave_Ports_Status_T_ARDUINO_ARRAY_INDEX_T_TO_DELETE_T      Slave_Ports_Status_T_ARDUINO_ARRAY_INDEX_T_TO_DELETE_A[ARDUINO_ARRAY_INDEX_T_TO_DELETE_S_LIMIT]  = {};  
+    Slave_Ports_Status_T_ARDUINO_ARRAY_ASSOC_TABLE_S_Port_ID_T  Slave_Ports_Status_T_ARDUINO_ARRAY_ASSOC_TABLE_S_Port_ID_A[ARDUINO_ARRAY_INDEX_LIMIT_PORTS] = {};
 //);
 
 

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

@@ -8,7 +8,7 @@
 DISPLAY_CURSOR_X_CHARS_T DISPLAY_CURSOR_X_CHARS_A = 0;
 DISPLAY_CURSOR_Y_CHARS_T DISPLAY_CURSOR_Y_CHARS_A = 0;
 
-    DISPLAY_textsize_x_T DISPLAY_textsize_x_A = 6.5; //5 nominal
+    DISPLAY_textsize_x_T DISPLAY_textsize_x_A = 6.3; //5 nominal
     DISPLAY_textsize_y_T DISPLAY_textsize_y_A = 10; //8 nominal
 
  DISPLAY_PHYSICAL_X_CHARS_T DISPLAY_PHYSICAL_X_CHARS_A = DISPLAY_PHYSICAL_X_PX_A /  DISPLAY_textsize_x_A ; //todo to test

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

@@ -1,6 +1,10 @@
 
 ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(Slave_Ports_Status_T* Slave_Ports_Status_A ,
                 Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_T &Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A ,
+                 Slave_Ports_Status_T_ARDUINO_ARRAY_INDEX_TABLE_T*            Slave_Ports_Status_T_ARDUINO_ARRAY_INDEX_TABLE_A,
+                 Slave_Ports_Status_T_ARDUINO_ARRAY_INDEX_T_TO_DELETE_T*      Slave_Ports_Status_T_ARDUINO_ARRAY_INDEX_T_TO_DELETE_A,
+                 Slave_Ports_Status_T_ARDUINO_ARRAY_ASSOC_TABLE_S_Port_ID_T*  Slave_Ports_Status_T_ARDUINO_ARRAY_ASSOC_TABLE_S_Port_ID_A,
+                
                 DISPLAY_T*  DISPLAY_A ,  DISPLAY_T_ARDUINO_ATTR_ARRAY_T* DISPLAY_T_ARDUINO_ATTR_ARRAY_A
                 //,*DISPLAY_PHYSICAL_CHAR_A //DISPLAY_PHYSICAL_CHAR_T 
                 ) {
@@ -15,6 +19,9 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(Slave_Ports_Status_T* Slave_
                   Slave_Ports_Status_add_port(
                                 Slave_Ports_Status_A ,
                                 Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A,
+                                    Slave_Ports_Status_T_ARDUINO_ARRAY_INDEX_TABLE_A,
+                                    Slave_Ports_Status_T_ARDUINO_ARRAY_INDEX_T_TO_DELETE_A,
+                                    Slave_Ports_Status_T_ARDUINO_ARRAY_ASSOC_TABLE_S_Port_ID_A,
                                 1,  // int  Port_ID,
                                 Active_ControllerID ,  //int  _Slave_ID,
                                 PortTypes_P2M_EXP_I2C , //int  PortTypes,