Arkadiusz Binder 5 lat temu
rodzic
commit
db9a2327c7

+ 5 - 4
SE/stuff/P5_Automation_can-dev-res-working-1930/P5_Automation_can-dev-res-working-1930.ino

@@ -432,13 +432,15 @@ void setup() {  //REMEMBER NOT INITIALIZE ANY VARIABLES OR ARRAYS
     Serial.begin(115200);
     
     
-    
+ARDUINO_SETUP_DEF_T HAS_I2C_driver_Adafruit_PWMServoDriver_A = false;
+
 #if defined(DEBUG) || defined(DEBUG_QUEUE)
          Serial.println("#329 Serial.begin(115200)");
 #endif
 
 ARDUINO_SETUP_DEF_T HAS_ROTTARY_SW_A = false;
-//#include "___CONFIG/0x11/setup_Active_ControllerID_0x11.h"
+#include "___CONFIG/0x11/setup_Active_ControllerID_0x11.h"
+#include "___CONFIG/0x13/setup_Active_ControllerID_0x13.h"
 
 
 //todo PCINT service
@@ -464,8 +466,7 @@ ARDUINO_SETUP_DEF_T HAS_ROTTARY_SW_A = false;
  LCDarray2.concat(String(Active_ControllerID, HEX) ) ;
  */
 
-ARDUINO_SETUP_DEF_T HAS_I2C_driver_Adafruit_PWMServoDriver_A = false;
-#if defined(HAS_I2C_driver_Adafruit_PWMServoDriver)        
+#if defined(HAS_I2C_driver_Adafruit_PWMServoDriver)
             #if  defined(DISABLE_LOOP) || defined(DEBUG) || defined(DEBUG_I2C_driver_Adafruit_PWMServoDriver)
                      Serial.println("#401 will include /_I2C_driver_Adafruit_PWMServoDriver_setup.h");
             #endif

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

@@ -317,6 +317,30 @@ DISPLAY_LATENCY_PASS__POP(
                          return false;
                  }
         }
+
+
+
+       
+DISPLAY_DEBUG_LATENCY_PASS__POP(
+        time_seq_id_T time_seq_id_A,
+        time_min_run_T time_min_run_A
+        ) {
+                 static time_seq_id_T last_time_seq_id_A = time_seq_id_A;
+                 static time_min_run_T last_time_min_run_A = time_min_run_A;
+                 
+        if(time_seq_id_A <= 1 or time_min_run_A <= 1) {
+            Serial.print("[DISPLAY_LATENCY_PASS__POP][ERR]["); Serial.print(time_seq_id_A);Serial.print("]["); Serial.print(time_min_run_A); Serial.print("]");
+            delay(2000);
+        }
+                 if(time_seq_id_A >= last_time_min_run_A) {
+                         last_time_min_run_A = time_min_run_A;
+                         return true;
+                 } else {
+                         return false;
+                 }
+        }
+
+
          
    #if defined(USE_DISPLAY_char_PA)  
         void DISPLAY_char_P_print(DISPLAY_char24_T &DISPLAY_char_PA ) {

+ 2 - 1
SE/stuff/P5_Automation_can-dev-res-working-1930/___CONFIG/0x13/setup_Active_ControllerID_0x13.h

@@ -1,4 +1,5 @@
 if(EEPROM_Active_ControllerID_read_A == 0x13) {
 HAS_ROTTARY_SW_A = true ; //#define HAS_ROTTARY_SW
-HAS_I2C_driver_Adafruit_PWMServoDriver_A = true ; 
+HAS_I2C_driver_Adafruit_PWMServoDriver_A = true ;
+pinMode(PortA7, INPUT); 
 }

+ 1 - 1
SE/stuff/P5_Automation_can-dev-res-working-1930/___loop/__main_loop_end.h

@@ -130,7 +130,7 @@ if(ARDUINO_LOOP_LATENCY_COUNTER__MAIN_END(ARDUINO_LOOP_LATENCY__MAIN_END_A, ARDU
                   
     
                             
-    if(DISPLAY_LATENCY_PASS__POP(time,time + ARDUINO_LOOP_LATENCY_DISPLAY_MENU )) {
+                            if(DISPLAY_DEBUG_LATENCY_PASS__POP(time,time + ARDUINO_LOOP_LATENCY_DISPLAY_MENU )) {
                                 //debug analpir
                                 DISPLAY_DEV.fillRect( 0, ( DISPLAY_CURSOR_Y_CHARS_DEBUG * DISPLAY_PHYSICAL_CHAR_A.DISPLAY_textsize_y_A ) , DISPLAY_PHYSICAL_CHAR_A.DISPLAY_PHYSICAL_X_PX_A , DISPLAY_PHYSICAL_CHAR_A.DISPLAY_textsize_y_A , RED );
                                 DISPLAY_DEV.setCursor(0 , DISPLAY_CURSOR_Y_CHARS_DEBUG * DISPLAY_PHYSICAL_CHAR_A.DISPLAY_textsize_y_A );