migr tp macpro

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

@@ -388,7 +388,7 @@ void DISPLAY__print_menu(DISPLAY_T* DISPLAY_A ,
                       
                     #if defined(DISPLAY__print_menu_DELAY)
                     Serial.print("D");
-                    delay(DISPLAY__print_menu_DELAY);
+                    //delay(DISPLAY__print_menu_DELAY);
                     #endif
                 
            
@@ -713,6 +713,7 @@ void DISPLAY_MENU_SELECTOR(DISPLAY_T* DISPLAY_A ,
             
             } else if(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_SELECTOR_A[1].DISPLAY_MENU_SELECTOR_STATUS_A == DISPLAY_MENU_SELECTOR_ITEM_OPTIONS_USE_LEVEL_FLAG) { //else if(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_SELECTOR_A[1].DISPLAY_MENU_SELECTOR_STATUS_A == DISPLAY_MENU_SELECTOR_ITEM_FLAG)
                 if(DISPLAY_MENU_SELECTOR_oldEncPos_A > DISPLAY_MENU_SELECTOR_encoderPos_A) {
+                 Serial.print("[LEV]-");Serial.print(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_SELECTOR_A[1].DISPLAY_MENU_INDEX_A].DISPLAY_MENU_ITEM_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_SELECTOR_A[1].DISPLAY_MENU_ITEM_INDEX_A].Exp_state_level_A);
                              if(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_SELECTOR_A[1].DISPLAY_MENU_INDEX_A].DISPLAY_MENU_ITEM_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_SELECTOR_A[1].DISPLAY_MENU_ITEM_INDEX_A].Exp_state_level_A > 0) {
                              DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_SELECTOR_A[1].DISPLAY_MENU_INDEX_A].DISPLAY_MENU_ITEM_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_SELECTOR_A[1].DISPLAY_MENU_ITEM_INDEX_A].Exp_state_level_A -=5  ; //--;
                              if(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_SELECTOR_A[1].DISPLAY_MENU_INDEX_A].DISPLAY_MENU_ITEM_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_SELECTOR_A[1].DISPLAY_MENU_ITEM_INDEX_A].Exp_state_level_A < 0 ) DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_SELECTOR_A[1].DISPLAY_MENU_INDEX_A].DISPLAY_MENU_ITEM_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_SELECTOR_A[1].DISPLAY_MENU_ITEM_INDEX_A].Exp_state_level_A = 0 ;
@@ -745,8 +746,9 @@ void DISPLAY_MENU_SELECTOR(DISPLAY_T* DISPLAY_A ,
                                     
                                     
                              } //if(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_SELECTOR_A[1].DISPLAY_MENU_INDEX_A].DISPLAY_MENU_ITEM_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_SELECTOR_A[1].DISPLAY_MENU_ITEM_INDEX_A].Exp_state_level_A < 254) {
-                } //  if(DISPLAY_MENU_SELECTOR_oldEncPos_A < DISPLAY_MENU_SELECTOR_encoderPos_A) {
-              
+                } else { //  if(DISPLAY_MENU_SELECTOR_oldEncPos_A < DISPLAY_MENU_SELECTOR_encoderPos_A) {
+                    Serial.print("[ERR}750E");
+                }
                 
             } //else  if(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_SELECTOR_A[1].DISPLAY_MENU_SELECTOR_STATUS_A == DISPLAY_MENU_SELECTOR_ITEM_OPTIONS_USE_LEVEL_FLAG)
         

SE/stuff/P5_Automation_can-dev-res-working-1930/_ROTTARY_SW/_ROTTARY_SW_func.h

@@ -34,6 +34,7 @@ void ROTTARY_SW_dt_INT() {
   if (reading1 == 1 and reading1 == 1 and aFlag) { //check that we have both pins at detent (HIGH) and that we are expecting detent on this pin's rising edge
     
     if(encoderPos == ARDUINO_SIZE_MIN_encoderPos) {
+        encoderPos = ARDUINO_SIZE_MAX_encoderPos;
     } else {
         encoderPos --; //increment the encoder's position count
     }
@@ -63,6 +64,7 @@ void ROTTARY_SW_clk_INT(){
     
     
     if(encoderPos == ARDUINO_SIZE_MAX_encoderPos) {
+        encoderPos = ARDUINO_SIZE_MIN_encoderPos ;
     } else {
         encoderPos ++; //increment the encoder's position count
     }

SE/stuff/P5_Automation_can-dev-res-working-1930/_Slave_Ports_I2C_func_PCF8574.h

@@ -33,7 +33,7 @@
                         bitWrite(PCF8574_PORSTATUS_DRIVER_A[drvindex].PCF8574_PORSTATUS_A,Slave_Ports_Status_A[i].LocalPort,1 );
                       }
                       
-                        Serial.print(" PCF8574[");  
+                        Serial.print(" PCF8574 l[");   Serial.print(Slave_Ports_Status_A[i].Exp_state_level_A);   Serial.print(" B");  
                          Serial.print(String(PCF8574_PORSTATUS_DRIVER_A[drvindex].PCF8574_PORSTATUS_A,BIN));  
                          Wire.beginTransmission(Slave_Ports_Status_A[i].Address);
                           Wire.write(PCF8574_PORSTATUS_DRIVER_A[drvindex].PCF8574_PORSTATUS_A);

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

@@ -7,9 +7,10 @@
 #define HAS_I2C_driver_Adafruit_PWMServoDriver 
 //#define DEBUG_I2C_driver_Adafruit_PWMServoDriver
 //#define HAS_CAN
-
+//#define DISPLAY__print_menu_DELAY
 #define HAS__PCINT_setup //to allow interrupts
-
+#define DEBUG_QUEUE_WAIT
+//#define DEBUG_LATENCY_MARKER
 //#define DISABLE_TASK_TYPE_T_DISPLAY_queue_pop________
 //#error
 //#define DEBUG 5 

SE/stuff/P5_Automation_can-dev-res-working-1930/___loop/___loop_init.h

@@ -7,8 +7,8 @@
 
 
 
-    static ARDUINO_LOOP_LATENCY_T      ARDUINO_LOOP_LATENCY__MAIN_A = 250 ; //EVERY 10 LOOPS INIT THIS LATENCY
-    static ARDUINO_LOOP_LATENCY_T     ARDUINO_LOOP_LATENCY__MAIN_END_A = 500 ; //EVERY 10 LOOPS INIT THIS LATENCY
+    static ARDUINO_LOOP_LATENCY_T      ARDUINO_LOOP_LATENCY__MAIN_A = 50; //250 ; //EVERY 10 LOOPS INIT THIS LATENCY
+    static ARDUINO_LOOP_LATENCY_T     ARDUINO_LOOP_LATENCY__MAIN_END_A = 100;//500 ; //EVERY 10 LOOPS INIT THIS LATENCY
 
 
 

SE/stuff/P5_Automation_can-dev-res-working-1930/___main/__main_struct_limits.h

@@ -27,8 +27,8 @@ ARDUINO_ARRAY_time_min_run_MIN_T TASK_TYPE_T_Slave_Ports_broadcast____time_min_r
 ARDUINO_ARRAY_time_min_run_MIN_T TASK_TYPE_T_Slave_Ports_set_I2C______time_min_run_MIN_A_INCREMENT_A = 20000 ;
 
 
-const ARDUINO_LOOP_LATENCY_TASK_T ARDUINO_LOOP_LATENCY_TASK_ROTTARY_SW_loop_A = 500 ; //how to implement?
+const ARDUINO_LOOP_LATENCY_TASK_T ARDUINO_LOOP_LATENCY_TASK_ROTTARY_SW_loop_A = 100 ;//500 ; //how to implement?
 
-const ARDUINO_LOOP_LATENCY_TASK_T ARDUINO_LOOP_LATENCY_DISPLAY_MENU = 1200 ; //how to implement?
+const ARDUINO_LOOP_LATENCY_TASK_T ARDUINO_LOOP_LATENCY_DISPLAY_MENU = 300 ; //1200 ; //how to implement?
 
 #define NUMBER_SHORTS_TO_ALLOCATE 20