a.binder пре 5 година
родитељ
комит
22f0a96ff7

+ 42 - 41
SE/stuff/P5_Automation_can-dev-res/_DISPLAY_func.h

@@ -142,51 +142,52 @@ void DISPLAY__print_IMMEDIATE(
 }
 
         
+#if defined(DISPLAY_array16_T_is_DISPLAY_string_T)
+    #else        
         
-        
-void DISPLAY__print_loop(DISPLAY_CURSOR_X_CHARS_T DISPLAY_CURSOR_X_CHARS_A,
-           DISPLAY_CURSOR_Y_CHARS_T DISPLAY_CURSOR_Y_CHARS_A ,
-    String message,
-    int message_len, 
-    DISPLAY__print_loop_ACTION_T DISPLAY__print_loop_ACTION_A
-) { //to print while in loop
-    const int DISPLAY__print_loop_INDEX_LIMIT_A = 5;
-    static int DISPLAY__print_loop_INDEX_CURRENT_A = 0 ;
-    static int DISPLAY__print_loop_QUEUE_PEEK_A = 0 ;
-    static  DISPLAY__print_loop_T  DISPLAY__print_loop_A[5]={} ;
-   
-    if(DISPLAY__print_loop_ACTION_A == DISPLAY__print_loop_ACTION_ADD) {
-        if((DISPLAY__print_loop_INDEX_CURRENT_A  + 1) <= DISPLAY__print_loop_INDEX_LIMIT_A) {
-            
-            DISPLAY__print_loop_INDEX_CURRENT_A ++ ;
-            if(DISPLAY__print_loop_QUEUE_PEEK_A == 0 ) {
-             DISPLAY__print_loop_QUEUE_PEEK_A = DISPLAY__print_loop_INDEX_CURRENT_A  ;
+    void DISPLAY__print_loop(DISPLAY_CURSOR_X_CHARS_T DISPLAY_CURSOR_X_CHARS_A,
+               DISPLAY_CURSOR_Y_CHARS_T DISPLAY_CURSOR_Y_CHARS_A ,
+        String message,
+        int message_len, 
+        DISPLAY__print_loop_ACTION_T DISPLAY__print_loop_ACTION_A
+    ) { //to print while in loop
+        const int DISPLAY__print_loop_INDEX_LIMIT_A = 5;
+        static int DISPLAY__print_loop_INDEX_CURRENT_A = 0 ;
+        static int DISPLAY__print_loop_QUEUE_PEEK_A = 0 ;
+        static  DISPLAY__print_loop_T  DISPLAY__print_loop_A[5]={} ;
+       
+        if(DISPLAY__print_loop_ACTION_A == DISPLAY__print_loop_ACTION_ADD) {
+            if((DISPLAY__print_loop_INDEX_CURRENT_A  + 1) <= DISPLAY__print_loop_INDEX_LIMIT_A) {
+                
+                DISPLAY__print_loop_INDEX_CURRENT_A ++ ;
+                if(DISPLAY__print_loop_QUEUE_PEEK_A == 0 ) {
+                 DISPLAY__print_loop_QUEUE_PEEK_A = DISPLAY__print_loop_INDEX_CURRENT_A  ;
+                }
+                DISPLAY__print_loop_A[DISPLAY__print_loop_INDEX_CURRENT_A].DISPLAY_CURSOR_X_CHARS_A = DISPLAY_CURSOR_X_CHARS_A ;
+                DISPLAY__print_loop_A[DISPLAY__print_loop_INDEX_CURRENT_A].DISPLAY_CURSOR_Y_CHARS_A = DISPLAY_CURSOR_Y_CHARS_A ;
+                DISPLAY__print_loop_A[DISPLAY__print_loop_INDEX_CURRENT_A].message_len = message_len ;
+                //strcpy(DISPLAY__print_loop_A[DISPLAY__print_loop_INDEX_CURRENT_A].message, message );
+                DISPLAY__print_loop_A[DISPLAY__print_loop_INDEX_CURRENT_A].message = message ;
             }
-            DISPLAY__print_loop_A[DISPLAY__print_loop_INDEX_CURRENT_A].DISPLAY_CURSOR_X_CHARS_A = DISPLAY_CURSOR_X_CHARS_A ;
-            DISPLAY__print_loop_A[DISPLAY__print_loop_INDEX_CURRENT_A].DISPLAY_CURSOR_Y_CHARS_A = DISPLAY_CURSOR_Y_CHARS_A ;
-            DISPLAY__print_loop_A[DISPLAY__print_loop_INDEX_CURRENT_A].message_len = message_len ;
-            //strcpy(DISPLAY__print_loop_A[DISPLAY__print_loop_INDEX_CURRENT_A].message, message );
-            DISPLAY__print_loop_A[DISPLAY__print_loop_INDEX_CURRENT_A].message = message ;
+              Serial.print("#137[DISPLAY__print_loop][ADD] [i][");Serial.print(DISPLAY__print_loop_INDEX_CURRENT_A); Serial.println("] ");
+        } else if(DISPLAY__print_loop_ACTION_A == DISPLAY__print_loop_ACTION_POP)  {
+            Serial.print("#137[DISPLAY__print_loop][POP] [i][");Serial.print(DISPLAY__print_loop_INDEX_CURRENT_A); Serial.print("] p[");Serial.print(DISPLAY__print_loop_QUEUE_PEEK_A); Serial.print("] ");
+              if(DISPLAY__print_loop_QUEUE_PEEK_A > 0 ) {
+                DISPLAY_DEV.setCursor(DISPLAY__print_loop_A[DISPLAY__print_loop_QUEUE_PEEK_A].DISPLAY_CURSOR_X_CHARS_A * DISPLAY_textsize_x_A,
+                   DISPLAY__print_loop_A[DISPLAY__print_loop_QUEUE_PEEK_A].DISPLAY_CURSOR_Y_CHARS_A * DISPLAY_textsize_y_A);
+                   DISPLAY_DEV.print(DISPLAY__print_loop_A[DISPLAY__print_loop_QUEUE_PEEK_A].message);
+                   Serial.print(" msg["); Serial.print(DISPLAY__print_loop_A[DISPLAY__print_loop_QUEUE_PEEK_A].message); Serial.print("] ");
+                   
+                   
+                   
+               } else {
+                Serial.print(" [PEEK][EMPTY] ");
+               }
+               Serial.println("] ");
         }
-          Serial.print("#137[DISPLAY__print_loop][ADD] [i][");Serial.print(DISPLAY__print_loop_INDEX_CURRENT_A); Serial.println("] ");
-    } else if(DISPLAY__print_loop_ACTION_A == DISPLAY__print_loop_ACTION_POP)  {
-        Serial.print("#137[DISPLAY__print_loop][POP] [i][");Serial.print(DISPLAY__print_loop_INDEX_CURRENT_A); Serial.print("] p[");Serial.print(DISPLAY__print_loop_QUEUE_PEEK_A); Serial.print("] ");
-          if(DISPLAY__print_loop_QUEUE_PEEK_A > 0 ) {
-            DISPLAY_DEV.setCursor(DISPLAY__print_loop_A[DISPLAY__print_loop_QUEUE_PEEK_A].DISPLAY_CURSOR_X_CHARS_A * DISPLAY_textsize_x_A,
-               DISPLAY__print_loop_A[DISPLAY__print_loop_QUEUE_PEEK_A].DISPLAY_CURSOR_Y_CHARS_A * DISPLAY_textsize_y_A);
-               DISPLAY_DEV.print(DISPLAY__print_loop_A[DISPLAY__print_loop_QUEUE_PEEK_A].message);
-               Serial.print(" msg["); Serial.print(DISPLAY__print_loop_A[DISPLAY__print_loop_QUEUE_PEEK_A].message); Serial.print("] ");
-               
-               
-               
-           } else {
-            Serial.print(" [PEEK][EMPTY] ");
-           }
-           Serial.println("] ");
+      
     }
-  
-}
-
+#endif
 
  void DISPLAY__print(
         DISPLAY_T* DISPLAY_A ,

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

@@ -304,6 +304,7 @@ void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QU
                                    Serial.print("#201 DELETED DISPLAY TASK_TYPE_A #[");     Serial.print( ARDUINO_ARRAY_INDEX_POP_LOCK_A);Serial.println("] ");
                                   #endif 
                                 #else
+                                Serial.println("3047[Display Text:["); Serial.print(DISPLAY_A[Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].DISPLAY_ARDUINO_ARRAY_INDEX_A].DISPLAY_string_A);Serial.print("] ");
                                     #if defined(DEBUG_TASK_TYPE_T_DISPLAY_queue_pop________)
                                         Serial.print(" DISPLAY_array16_A["); Serial.print(DISPLAY_A[Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].DISPLAY_ARDUINO_ARRAY_INDEX_A].DISPLAY_array16_A); Serial.print("] ");
                                         Serial.print("#201 DELETING DISPLAY TASK_TYPE_A #[");     Serial.print( ARDUINO_ARRAY_INDEX_POP_LOCK_A);Serial.println("] ");
@@ -311,8 +312,12 @@ void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QU
                                                     DISPLAY__print( DISPLAY_A ,
                                                     DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
                                                     DISPLAY_PHYSICAL_CHAR_A, 
-                                                    "1234567890123456",//DISPLAY_A[Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].DISPLAY_ARDUINO_ARRAY_INDEX_A].DISPLAY_pos_seq_A,
-                                                    DISPLAY_A[Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].DISPLAY_ARDUINO_ARRAY_INDEX_A].DISPLAY_array16_A,
+                                                    DISPLAY_A[Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].DISPLAY_ARDUINO_ARRAY_INDEX_A].DISPLAY_pos_seq_A,
+                                                    #if defined(DISPLAY_array16_T_is_DISPLAY_string_T)
+                                                        DISPLAY_A[Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].DISPLAY_ARDUINO_ARRAY_INDEX_A].DISPLAY_string_A ,
+                                                    #else
+                                                        DISPLAY_A[Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].DISPLAY_ARDUINO_ARRAY_INDEX_A].DISPLAY_array16_A,
+                                                    #endif
                                                     DISPLAY_A[Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].DISPLAY_ARDUINO_ARRAY_INDEX_A].DISPLAY_TARGET_A,
                                                     DISPLAY_A[Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].DISPLAY_ARDUINO_ARRAY_INDEX_A].time_seq_id_A,
                                                     DISPLAY_A[Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].DISPLAY_ARDUINO_ARRAY_INDEX_A].time_min_run_A,

+ 64 - 18
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_broadcast_func.h

@@ -54,27 +54,51 @@
                             
                            #if defined(DISABLE_TASK_TYPE_T_DISPLAY_queue_pop________)
                              #else
-                              
-                                   String message = "1CAN BCAST "; message.concat(i); message.concat(".");  message.concat( Slave_Ports_Status_A[i].Port_ID );  message.concat(" >>>                        "); 
+                             #if defined(DISPLAY_array16_T_is_DISPLAY_string_T)
+                             
+                                         String message = "1CAN BCAST "; 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 , // DISPLAY_array16_I( "#53 BCAST  " + char( Slave_Ports_Status_A[i].Port_ID  ) , 2), //message,
+                                                           DISPLAY_TARGET_DISPLAY128,
+                                                          time , // time_seq_id_T time_seq_id_A;
+                                                          time+ARDUINO_time_seq_id_A_INCREMENT, //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
+                                  String message = "1CAN BCAST "; message.concat(i); message.concat(".");  message.concat( Slave_Ports_Status_A[i].Port_ID );  message.concat(" >>>                        "); 
                                        DISPLAY_array16_T  DISPLAY_array16_AA="" ;
                                            message.toCharArray(DISPLAY_array16_AA, 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_AA , // DISPLAY_array16_I( "#53 BCAST  " + char( Slave_Ports_Status_A[i].Port_ID  ) , 2), //message,
-                                      DISPLAY_TARGET_DISPLAY128,
-                                     time , // time_seq_id_T time_seq_id_A;
-                                     time+ARDUINO_time_seq_id_A_INCREMENT, //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
-                                   
-                                   ); 
+                                     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_AA , // DISPLAY_array16_I( "#53 BCAST  " + char( Slave_Ports_Status_A[i].Port_ID  ) , 2), //message,
+                                               DISPLAY_TARGET_DISPLAY128,
+                                              time , // time_seq_id_T time_seq_id_A;
+                                              time+ARDUINO_time_seq_id_A_INCREMENT, //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
                   
                   #if defined(DEBUG_TASK_TYPE_T_Slave_Ports_broadcast____)
@@ -103,7 +127,26 @@
                   
                     #if defined(DISABLE_TASK_TYPE_T_DISPLAY_queue_pop________)
                              #else
-                             message = "2CAN BCAST "; message.concat(i); message.concat(".");  message.concat(Slave_Ports_Status_A[i].Port_ID);  message.concat(" >>>                        "); 
+                             
+                              #if defined(DISPLAY_array16_T_is_DISPLAY_string_T)
+                                    message = "2CAN BCAST "; 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,
+                                          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,
+                                       {  } //TASK_PORT_ASSOC_A Slave_Ports_Status_A[i].Port_ID
+                                       
+                                       ); 
+                              #else
+                                message = "2CAN BCAST "; message.concat(i); message.concat(".");  message.concat(Slave_Ports_Status_A[i].Port_ID);  message.concat(" >>>                        "); 
               
                                      message.toCharArray(DISPLAY_array16_AAA, 16);
                           DISPLAY__print(
@@ -121,6 +164,9 @@
                               {  } //TASK_PORT_ASSOC_A Slave_Ports_Status_A[i].Port_ID
                               
                               ); 
+                              #endif
+                             
+                           
                         #endif
                 
                 

+ 5 - 1
SE/stuff/P5_Automation_can-dev-res/_TFT_ILI9163C_func.h

@@ -146,7 +146,11 @@ void  DISPLAY_DEV_CTRL__println(DISPLAY_PHYSICAL_CHAR_T &DISPLAY_PHYSICAL_CHAR_A
                                                             
                                  
                                   #if defined(DISPLAY_array16_T_is_DISPLAY_string_T)
-                                        DISPLAY_DEV.print(DISPLAY_string_A);
+                                        if(DISPLAY_pos_seq_A & DISPLAY_pos_seq_A_CLEARSCREEN) DISPLAY_DEV__CURSOR__clearScreen(DISPLAY_PHYSICAL_CHAR_A) ;
+                                  
+                                            DISPLAY_DEV.print(DISPLAY_string_A);
+                                         // DISPLAY_DEV__CURSOR__NEWLINE(DISPLAY_PHYSICAL_CHAR_A) ;
+                                          
                                          #else
                                         
                                                 

+ 1 - 1
SE/stuff/P5_Automation_can-dev-res/___CONFIG/0x101/config_Active_ControllerID_0x101.h

@@ -7,7 +7,7 @@
 //#define DEBUG_I2C_driver_Adafruit_PWMServoDriver
 #define HAS__PCINT_setup //to allow interrupts
 
-#define DISABLE_TASK_TYPE_T_DISPLAY_queue_pop________
+//#define DISABLE_TASK_TYPE_T_DISPLAY_queue_pop________
 //#error
 //#define DEBUG 5 
 

+ 6 - 3
SE/stuff/P5_Automation_can-dev-res/___loop/__main_loop_top.h

@@ -44,9 +44,10 @@ if(ARDUINO_LOOP_LATENCY_COUNTER__MAIN(ARDUINO_LOOP_LATENCY__MAIN_A) <= ARDUINO_L
                                             }
                                           #endif
                                 //test
-                                
+                                  #if defined(DISPLAY_array16_T_is_DISPLAY_string_T)
+                                    #else
                             //    DISPLAY__print_loop(0,8,"t1234567890", 11 , DISPLAY__print_loop_ACTION_ADD);
-                                
+                                  #endif
                                 
                                 
                                         
@@ -82,8 +83,10 @@ if(ARDUINO_LOOP_LATENCY_COUNTER__MAIN(ARDUINO_LOOP_LATENCY__MAIN_A) <= ARDUINO_L
             //ARDUINO_FUNCT_INIT_RESULT_Slave_Ports_queue__add = _Slave_Ports_queue__add(  Slave_Ports_Status_QUEUE_A,   Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A , TASK_TYPE_T_DISPLAY_queue_pop________ ,TASK_PORT_ASSOC_EMPTY ,millis(), millis() + ARDUINO_time_seq_id_A_INCREMENT , ) ;  //"_Slave_Ports_set_I2C" //5  - to set ports associated on PW
             }
             
+            #if defined(DISPLAY_array16_T_is_DISPLAY_string_T)
+            #else
           //  DISPLAY__print_loop(0,7,"", 0 , DISPLAY__print_loop_ACTION_POP);
-
+            #endif
             
             if(time > TASK_TYPE_T_Slave_Ports_broadcast____time_min_run_MIN_A) {
                     Serial.print("[ #777 time > TASK_TYPE_T_Slave_Ports_broadcast____time_min_run_MIN_A][");Serial.print(TASK_TYPE_T_Slave_Ports_broadcast____time_min_run_MIN_A);Serial.print(print_SEP_RT);