a.binder před 5 roky
rodič
revize
e5aa58f0a4

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

@@ -95,7 +95,7 @@
 //#define DEBUG_TASK_TYPE_T_DISPLAY_queue_pop________
 //#define DEBUG_TASK_TYPE_T_Slave_Ports_set_I2C______
 //#define DEBUG_QUEUE_ASSERT todo not working
-
+#define DISABLE_DISPLAY__add_record 
 #define DISPLAY_array16_T_is_DISPLAY_string_T 
 
 #define HAS__jm_Scheduler //to allow planned actions blink etc

+ 7 - 2
SE/stuff/P5_Automation_can-dev-res/_DISPLAY_add_record_func.h

@@ -1,5 +1,6 @@
-
-    void DISPLAY__add_record(
+#if  defined(DISABLE_DISPLAY__add_record)
+#else
+   void DISPLAY__add_record(
         DISPLAY_T* DISPLAY_A ,
         DISPLAY_T_ARDUINO_ATTR_ARRAY_T &DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
         DISPLAY_PHYSICAL_CHAR_T &DISPLAY_PHYSICAL_CHAR_A, 
@@ -157,4 +158,8 @@
                        
                 }
         
+
+#endif
+
+ 
         

+ 8 - 3
SE/stuff/P5_Automation_can-dev-res/_DISPLAY_func.h

@@ -241,15 +241,19 @@ void DISPLAY__print_IMMEDIATE(
                                      // Serial.print("#28 running _Slave_Ports_ttl_decrement = ");
                 
                     } else {
-                          #if defined(DEBUG)
+                         // #if defined(DEBUG)
                                  Serial.print("#88 DISPLAY__print [DEBUG]  else  "); Serial.print(DISPLAY_pos_seq_A , BIN);
                                  Serial.println("]  ");
-                         #endif    
+                        // #endif    
                          
                     #if defined(DISABLE_TASK_TYPE_T_DISPLAY_queue_pop________)
                      Serial.print("#167 DISABLE_TASK_TYPE_T_DISPLAY_queue_pop________");
                     #else     
-                      DISPLAY__add_record(  DISPLAY_A ,
+                      
+                       Serial.print("#253 TODO WHY ? BIN DISPLAY_pos_seq_A["); Serial.print(DISPLAY_pos_seq_A, BIN);
+                             Serial.print("]& IMM ["); Serial.print(DISPLAY_pos_seq_A_IMMEDIATE, BIN); Serial.print("] res[") ; Serial.print((DISPLAY_pos_seq_A & DISPLAY_pos_seq_A_IMMEDIATE) , BIN ) ;
+                              Serial.print(" ] String [") ; Serial.print(DISPLAY_string_A); Serial.print("] "); 
+                    /*  DISPLAY__add_record(  DISPLAY_A ,
                              DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
                              DISPLAY_PHYSICAL_CHAR_A, 
                              DISPLAY_pos_seq_A,
@@ -266,6 +270,7 @@ void DISPLAY__print_IMMEDIATE(
                              TASK_TYPE_A,
                              TASK_PORT_ASSOC_A
                          ) ;
+                         */
                       #endif 
                     }
 }

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

@@ -344,7 +344,7 @@ void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QU
                                              DISPLAY_A ,
                                              DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
                                              DISPLAY_PHYSICAL_CHAR_A, 
-                                                 DISPLAY_pos_seq_A_NEXT, //initial set
+                                                 DISPLAY_pos_seq_A_NEXT | DISPLAY_pos_seq_A_IMMEDIATE, //initial set
                                                  "#233 Setting I2C" , //DISPLAY_array16_A,
                                                   DISPLAY_TARGET_ANY , //DISPLAY_TARGET_A, - setting
                                                   Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].time_seq_id, 

+ 75 - 37
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_broadcast_func.h

@@ -134,7 +134,7 @@
                                         DISPLAY_A ,
                                         DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
                                         DISPLAY_PHYSICAL_CHAR_A, 
-                                         DISPLAY_pos_seq_A_NEXT,
+                                         DISPLAY_pos_seq_A_NEXT | DISPLAY_pos_seq_A_IMMEDIATE,
                                           message,
                                           DISPLAY_TARGET_DISPLAY128,
                                          time , // time_seq_id_T time_seq_id_A;
@@ -153,7 +153,7 @@
                                DISPLAY_A ,
                                DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
                                DISPLAY_PHYSICAL_CHAR_A, 
-                                DISPLAY_pos_seq_A_NEXT,
+                                DISPLAY_pos_seq_A_NEXT | DISPLAY_pos_seq_A_IMMEDIATE,
                                  DISPLAY_array16_AAA,
                                  DISPLAY_TARGET_DISPLAY128,
                                 time , // time_seq_id_T time_seq_id_A;
@@ -203,25 +203,45 @@
                              
                                  #if defined(DISABLE_TASK_TYPE_T_DISPLAY_queue_pop________)
                                           #else
-                                           DISPLAY_array16_T  DISPLAY_array16_AAAA="" ;
-                                          message = "3CAN SEND " ; message.concat(i); message.concat(".");  message.concat(Slave_Ports_Status_A[i].Port_ID);  message.concat(" >>>                        "); 
-                
-                                             message.toCharArray(DISPLAY_array16_AAAA, 16);
-                                           DISPLAY__CURSOR_Y_CHARS__SET(DISPLAY_PHYSICAL_CHAR_A, 
-                                             DISPLAY_CURSOR_Y_CHARS_CAN_DEBUG);
-                                           DISPLAY__print( DISPLAY_A ,
-                                                            DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
-                                                            DISPLAY_PHYSICAL_CHAR_A, 
-                                                             DISPLAY_pos_seq_A_NEXT | DISPLAY_pos_seq_A_IMMEDIATE, //TODO BITTEST
-                                                              DISPLAY_array16_AAAA, //message,
-                                                              DISPLAY_TARGET_DISPLAY128,
-                                                             time , // time_seq_id_T time_seq_id_A;
-                                                             time + 5000, //time_min_run_T time_min_run_A;
-                                                            //queue
-                                                           Slave_Ports_Status_QUEUE_A,  Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
-                                                           TASK_TYPE_T_Slave_Ports_broadcast____  ,  //TASK_TYPE_A,
-                                                           { Slave_Ports_Status_A[i].Port_ID } //TASK_PORT_ASSOC_A
-                                                           ); 
+                                                         #if defined(DISPLAY_array16_T_is_DISPLAY_string_T)
+                                                         message = "3CAN SEND " ; message.concat(i); message.concat(".");  message.concat(Slave_Ports_Status_A[i].Port_ID);  message.concat(" >>>");
+                                                          DISPLAY__CURSOR_Y_CHARS__SET(DISPLAY_PHYSICAL_CHAR_A, 
+                                                                 DISPLAY_CURSOR_Y_CHARS_CAN_DEBUG);
+                                                               DISPLAY__print( DISPLAY_A ,
+                                                                                DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
+                                                                                DISPLAY_PHYSICAL_CHAR_A, 
+                                                                                 DISPLAY_pos_seq_A_NEXT | DISPLAY_pos_seq_A_IMMEDIATE, //TODO BITTEST
+                                                                                  message, //message,
+                                                                                  DISPLAY_TARGET_DISPLAY128,
+                                                                                 time , // time_seq_id_T time_seq_id_A;
+                                                                                 time + 5000, //time_min_run_T time_min_run_A;
+                                                                                //queue
+                                                                               Slave_Ports_Status_QUEUE_A,  Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
+                                                                               TASK_TYPE_T_Slave_Ports_broadcast____  ,  //TASK_TYPE_A,
+                                                                               { Slave_Ports_Status_A[i].Port_ID } //TASK_PORT_ASSOC_A
+                                                                               ); 
+                                                         #else
+                                                              DISPLAY_array16_T  DISPLAY_array16_AAAA="" ;
+                                                              message = "3CAN SEND " ; message.concat(i); message.concat(".");  message.concat(Slave_Ports_Status_A[i].Port_ID);  message.concat(" >>>                        "); 
+                                    
+                                                                 message.toCharArray(DISPLAY_array16_AAAA, 16);
+                                                               DISPLAY__CURSOR_Y_CHARS__SET(DISPLAY_PHYSICAL_CHAR_A, 
+                                                                 DISPLAY_CURSOR_Y_CHARS_CAN_DEBUG);
+                                                               DISPLAY__print( DISPLAY_A ,
+                                                                                DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
+                                                                                DISPLAY_PHYSICAL_CHAR_A, 
+                                                                                 DISPLAY_pos_seq_A_NEXT | DISPLAY_pos_seq_A_IMMEDIATE, //TODO BITTEST
+                                                                                  DISPLAY_array16_AAAA, //message,
+                                                                                  DISPLAY_TARGET_DISPLAY128,
+                                                                                 time , // time_seq_id_T time_seq_id_A;
+                                                                                 time + 5000, //time_min_run_T time_min_run_A;
+                                                                                //queue
+                                                                               Slave_Ports_Status_QUEUE_A,  Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
+                                                                               TASK_TYPE_T_Slave_Ports_broadcast____  ,  //TASK_TYPE_A,
+                                                                               { Slave_Ports_Status_A[i].Port_ID } //TASK_PORT_ASSOC_A
+                                                                               ); 
+                                                         #endif
+                                      
                                              #endif 
                                      #ifdef DEBUG_CAN || defined(DEBUG_TASK_TYPE_T_Slave_Ports_broadcast____)
                                         Serial.print("#155 after CAN_SEND update  [Broadcast_state_FULL_FRESH]   for i[");
@@ -248,22 +268,40 @@
                             #endif  
                              #if defined(DISABLE_TASK_TYPE_T_DISPLAY_queue_pop________)
                                           #else
-                                          DISPLAY_array16_T  DISPLAY_array16_AAAAA="" ;
-                                          message =     "4CAN ERR " ; message.concat(i); message.concat(".");  message.concat(Slave_Ports_Status_A[i].Port_ID);  message.concat(" >>>                        "); 
-                                          message.toCharArray(DISPLAY_array16_AAAAA, 16);
-                                         DISPLAY__print( DISPLAY_A ,
-                                                            DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
-                                                            DISPLAY_PHYSICAL_CHAR_A, 
-                                                             DISPLAY_pos_seq_A_NEXT | DISPLAY_pos_seq_A_IMMEDIATE, //TODO BITTEST
-                                                              DISPLAY_array16_AAAAA,//DISPLAY_array16_I( "#107MSG ERROR " + char( Slave_Ports_Status_A[i].Port_ID  ) , 2), //message,
-                                                              DISPLAY_TARGET_DISPLAY128,
-                                                             time , // time_seq_id_T time_seq_id_A;
-                                                             time +5000, //time_min_run_T time_min_run_A;
-                                                            //queue
-                                                           Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
-                                                           TASK_TYPE_T_Slave_Ports_broadcast____  ,  //TASK_TYPE_A,
-                                                           { Slave_Ports_Status_A[i].Port_ID } //TASK_PORT_ASSOC_A
-                                                           ); 
+                                           #if defined(DISPLAY_array16_T_is_DISPLAY_string_T)
+                                            message =     "4CAN ERR " ; message.concat(i); message.concat(".");  message.concat(Slave_Ports_Status_A[i].Port_ID);  message.concat(" >>>");
+                                            DISPLAY__print( DISPLAY_A ,
+                                                                     DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
+                                                                     DISPLAY_PHYSICAL_CHAR_A, 
+                                                                      DISPLAY_pos_seq_A_NEXT | DISPLAY_pos_seq_A_IMMEDIATE, //TODO BITTEST
+                                                                       message,//DISPLAY_array16_I( "#107MSG ERROR " + char( Slave_Ports_Status_A[i].Port_ID  ) , 2), //message,
+                                                                       DISPLAY_TARGET_DISPLAY128,
+                                                                      time , // time_seq_id_T time_seq_id_A;
+                                                                      time +5000, //time_min_run_T time_min_run_A;
+                                                                     //queue
+                                                                    Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
+                                                                    TASK_TYPE_T_Slave_Ports_broadcast____  ,  //TASK_TYPE_A,
+                                                                    { Slave_Ports_Status_A[i].Port_ID } //TASK_PORT_ASSOC_A
+                                                                    ); 
+                                           #else
+                                                      DISPLAY_array16_T  DISPLAY_array16_AAAAA="" ;
+                                                  message =     "4CAN ERR " ; message.concat(i); message.concat(".");  message.concat(Slave_Ports_Status_A[i].Port_ID);  message.concat(" >>>                        "); 
+                                                  message.toCharArray(DISPLAY_array16_AAAAA, 16);
+                                                 DISPLAY__print( DISPLAY_A ,
+                                                                    DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
+                                                                    DISPLAY_PHYSICAL_CHAR_A, 
+                                                                     DISPLAY_pos_seq_A_NEXT | DISPLAY_pos_seq_A_IMMEDIATE, //TODO BITTEST
+                                                                      DISPLAY_array16_AAAAA,//DISPLAY_array16_I( "#107MSG ERROR " + char( Slave_Ports_Status_A[i].Port_ID  ) , 2), //message,
+                                                                      DISPLAY_TARGET_DISPLAY128,
+                                                                     time , // time_seq_id_T time_seq_id_A;
+                                                                     time +5000, //time_min_run_T time_min_run_A;
+                                                                    //queue
+                                                                   Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
+                                                                   TASK_TYPE_T_Slave_Ports_broadcast____  ,  //TASK_TYPE_A,
+                                                                   { Slave_Ports_Status_A[i].Port_ID } //TASK_PORT_ASSOC_A
+                                                                   ); 
+                                           #endif
+                                       
                             #endif
                             //String LCDarray1 = "Error Sending";
                             //String LCDarray2 = "Message...";

+ 3 - 2
SE/stuff/P5_Automation_can-dev-res/___CONFIG/0x101/config_Slave_Ports_LOCAL_0x101_init.h

@@ -91,7 +91,8 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                  // DISPLAY_array16_AA[16]= "#50 Added ports ";
                  
                  //DISPLAY_array16_AA.toCharArray(DISPLAY_array16_AA,16);
-                 
+               #if  defined(DISABLE_DISPLAY__add_record)
+               #else  
                  DISPLAY__add_record(
                        DISPLAY_A ,
                       DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
@@ -107,7 +108,7 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                             TASK_TYPE_T__EMPTY__JUST_PASSED_ARG__,
                             TASK_PORT_ASSOC_EMPTY
                  );
-     
+               #endif
                     
     return true ;
 

+ 3 - 2
SE/stuff/P5_Automation_can-dev-res/___CONFIG/0x103/config_Slave_Ports_LOCAL_0x103_init.h

@@ -90,7 +90,8 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                   // DISPLAY_array16_T DISPLAY_array16_AA ;
                   //DISPLAY_array16_AA[16]= "#50 Added ports ";
                  
-                 
+                  #if  defined(DISABLE_DISPLAY__add_record)
+               #else  
                  DISPLAY__add_record(
                        DISPLAY_A ,
                       DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
@@ -106,7 +107,7 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                             TASK_TYPE_T__EMPTY__JUST_PASSED_ARG__,
                             TASK_PORT_ASSOC_EMPTY
                  );
-     
+                #endif 
                     
     return true ;