|
@@ -392,9 +392,12 @@ void DISPLAY__print_menu(DISPLAY_T* DISPLAY_A ,
|
|
|
#endif
|
|
#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 ) {
|
|
if(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_ELEMENT_TO_REFRESH_A == true ) {
|
|
|
SPFTFT2(display,refresh,396);
|
|
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");
|
|
// 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
|
|
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 ) {
|
|
//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("] ");
|
|
// 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
|
|
//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) {
|
|
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"
|
|
#include "_DISPLAY_func_PRINT_CLASS_MENU_TITLE.h"
|
|
|
} else {
|
|
} 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_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");
|
|
// DISPLAY_DEV.print("test 123");
|
|
@@ -628,7 +632,7 @@ void DISPLAY_MENU_SELECTOR(DISPLAY_T* DISPLAY_A ,
|
|
|
#endif
|
|
#endif
|
|
|
if(DISPLAY_MENU_SELECTOR_oldEncPos_A > DISPLAY_MENU_SELECTOR_encoderPos_A) {
|
|
if(DISPLAY_MENU_SELECTOR_oldEncPos_A > DISPLAY_MENU_SELECTOR_encoderPos_A) {
|
|
|
#if defined(DISPLAY_MENU_SELECTOR_DEBUG)
|
|
#if defined(DISPLAY_MENU_SELECTOR_DEBUG)
|
|
|
- Serial.print(" #386[ENCODER][CHANGED]> ");
|
|
|
|
|
|
|
+ Serial.print(" #386[ENCODER][CHANGED]< ");
|
|
|
#endif
|
|
#endif
|
|
|
DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_SELECTOR_A[1].DISPLAY_MENU_INDEX_A --;
|
|
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 ) {
|
|
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 {
|
|
} else {
|
|
|
#if defined(DISPLAY_MENU_SELECTOR_DEBUG)
|
|
#if defined(DISPLAY_MENU_SELECTOR_DEBUG)
|
|
|
- Serial.print("#386[ENCODER][CHANGED]< ");
|
|
|
|
|
|
|
+ Serial.print("#386[ENCODER][CHANGED]> ");
|
|
|
#endif
|
|
#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(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)
|
|
#if defined(DISPLAY_MENU_SELECTOR_DEBUG)
|