a.binder 5 éve
szülő
commit
dae923be8a

+ 10 - 6
SE/stuff/P5_Automation_can-dev-res-working-1930/_DISPLAY_func.h

@@ -392,9 +392,12 @@ void DISPLAY__print_menu(DISPLAY_T* DISPLAY_A ,
                     #endif
                 
            
-                        if(DISPLAY_LATENCY_PASS__POP(time_seq_id_A, time_min_run_A ) or DISPLAY_PHYSICAL_CHAR_A.DISPLAY_ELEMENT_TO_REFRESH_A == true  ) {
+                        if(DISPLAY_LATENCY_PASS__POP(time_seq_id_A, time_min_run_A )
+                             or DISPLAY_PHYSICAL_CHAR_A.DISPLAY_ELEMENT_TO_REFRESH_A == true 
+                              ) {
                                 if(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_ELEMENT_TO_REFRESH_A == true ) { 
                                     SPFTFT2(display,refresh,396);
+                                    DISPLAY_PHYSICAL_CHAR_A.DISPLAY_ELEMENT_TO_REFRESH_A = false;
                                 }
                                 
                         
@@ -432,7 +435,8 @@ void DISPLAY__print_menu(DISPLAY_T* DISPLAY_A ,
                                  // DISPLAY_DEV.print("test88");
                           
                                       if(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].DISPLAY_MENU_ITEM_FLAG_A == DISPLAY_MENU_ITEM_FLAG_INITIALIZED 
-                                            and DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].DISPLAY_ELEMENT_TO_REFRESH_A == true ) {
+                                            and DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].DISPLAY_ELEMENT_TO_REFRESH_A == true 
+                                            ) {
                                       
                                             //if(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].time_seq_id_A + ARDUINO_LOOP_LATENCY_DISPLAY_MENU >  time_seq_id_A  ) {
                                                   // Serial.print(" 366[LAT[ "); Serial.print(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].time_seq_id_A); Serial.print("] ");
@@ -534,7 +538,7 @@ void DISPLAY__print_menu(DISPLAY_T* DISPLAY_A ,
                                                   
                                                   
                                                   //EOF MESSAGE
-                                                  //if(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].DISPLAY_ELEMENT_TO_REFRESH_A == true) {  
+                                                 if(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].DISPLAY_ELEMENT_TO_REFRESH_A == true) {  
                                                         if(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].DISPLAY_MENU_ITEM_CLASS_A ==  DISPLAY_MENU_ITEM_CLASS_MENU_TITLE) {
                                                           #include "_DISPLAY_func_PRINT_CLASS_MENU_TITLE.h"
                                                         } else {
@@ -553,7 +557,7 @@ void DISPLAY__print_menu(DISPLAY_T* DISPLAY_A ,
                                                                           }
                                                                   }
                                                  DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].DISPLAY_ELEMENT_TO_REFRESH_A = false;
-                                                //    }
+                                                    }
                                                  
                                                   
                                                  // DISPLAY_DEV.print("test 123");
@@ -628,7 +632,7 @@ void DISPLAY_MENU_SELECTOR(DISPLAY_T* DISPLAY_A ,
                      #endif
                             if(DISPLAY_MENU_SELECTOR_oldEncPos_A > DISPLAY_MENU_SELECTOR_encoderPos_A) {
                             #if defined(DISPLAY_MENU_SELECTOR_DEBUG) 
-                            Serial.print(" #386[ENCODER][CHANGED]> ");
+                            Serial.print(" #386[ENCODER][CHANGED]< ");
                             #endif
                                 DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_SELECTOR_A[1].DISPLAY_MENU_INDEX_A --;
                                         if(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_SELECTOR_A[1].DISPLAY_MENU_INDEX_A <= ARDUINO_ARRAY_INDEX_FIRST ) { 
@@ -639,7 +643,7 @@ void DISPLAY_MENU_SELECTOR(DISPLAY_T* DISPLAY_A ,
                                          }
                             } else {
                                 #if defined(DISPLAY_MENU_SELECTOR_DEBUG)  
-                                Serial.print("#386[ENCODER][CHANGED]< ");
+                                Serial.print("#386[ENCODER][CHANGED]> ");
                                 #endif
                                              if(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_SELECTOR_A[1].DISPLAY_MENU_INDEX_A - 1].DISPLAY_MENU_ITEM_A[1].DISPLAY_MENU_ITEM_FLAG_A == DISPLAY_MENU_ITEM_FLAG_EMPTY) {
                                              #if defined(DISPLAY_MENU_SELECTOR_DEBUG) 

+ 3 - 3
SE/stuff/P5_Automation_can-dev-res-working-1930/_DISPLAY_struct.h

@@ -154,7 +154,7 @@ struct DISPLAY_MENU_ITEM_S { //elementy menu
      DISPLAY_char24_T  *DISPLAY_char_PA ; //pointer do wiadomosci
      #endif
      DISPLAY_char24_T DISPLAY_char24_A;
-     DISPLAY_ELEMENT_TO_REFRESH_T DISPLAY_ELEMENT_TO_REFRESH_A = true;
+     DISPLAY_ELEMENT_TO_REFRESH_T DISPLAY_ELEMENT_TO_REFRESH_A ;// = true;
 } ;
 
 typedef struct DISPLAY_MENU_ITEM_S DISPLAY_MENU_ITEM_T ;
@@ -185,7 +185,7 @@ typedef struct DISPLAY_MENU_ITEM_S DISPLAY_MENU_ITEM_T ;
            ARDUINO_ARRAY_INDEX_CURRENT_T ARDUINO_ARRAY_INDEX_CURRENT_A ; //ktory jest aktywny element
            DISPLAY_MENU_SELECTOR_STATUS_T DISPLAY_MENU_SELECTOR_STATUS_A ; //opcja kontekstu selektora
            DISPLAY_CURSOR_SHIFT_Y_T DISPLAY_CURSOR_SHIFT_Y_A  = 0; //
-           DISPLAY_ELEMENT_TO_REFRESH_T DISPLAY_ELEMENT_TO_REFRESH_A = true;
+           DISPLAY_ELEMENT_TO_REFRESH_T DISPLAY_ELEMENT_TO_REFRESH_A ; //;= true;
   }
 ;
  
@@ -202,9 +202,9 @@ typedef struct DISPLAY_MENU_ITEM_S DISPLAY_MENU_ITEM_T ;
            DISPLAY_CURSOR_Y_CHARS_T DISPLAY_CURSOR_Y_CHARS_A ;
            DISPLAY_textsize_x_T DISPLAY_textsize_x_A;
            DISPLAY_textsize_y_T DISPLAY_textsize_y_A;
+           DISPLAY_ELEMENT_TO_REFRESH_T DISPLAY_ELEMENT_TO_REFRESH_A ;//= true;
            DISPLAY_MENU_T DISPLAY_MENU_A[ARDUINO_ARRAY_INDEX_LIMIT_DISPLAY_MENU] ;
            DISPLAY_MENU_SELECTOR_T DISPLAY_MENU_SELECTOR_A[1] ;
-           DISPLAY_ELEMENT_TO_REFRESH_T DISPLAY_ELEMENT_TO_REFRESH_A ;//= true;
 
  } ;
  

+ 1 - 0
SE/stuff/P5_Automation_can-dev-res-working-1930/___CONFIG/0x35/config_Active_ControllerID_0x35.h

@@ -22,6 +22,7 @@
 //#define DEBUG_QUEUE_WAIT
 //#define DEBUG_LATENCY_MARKER
 //#define DISABLE_TASK_TYPE_T_DISPLAY_queue_pop________
+#define DISPLAY_MENU_SELECTOR_DEBUG
 //#error
 //#define DEBUG 5