a.binder 5 lat temu
rodzic
commit
0a793d70fd

+ 39 - 0
SE/stuff/P5_Automation_can-dev-res-working-1930/TASK_TYPE_T_Set_Ports_Status_LIMITS_A__.h

@@ -0,0 +1,39 @@
+
+#if defined(TASK_TYPE_T_Set_Ports_Status_LIMITS_A__h)
+#else
+    #define TASK_TYPE_T_Set_Ports_Status_LIMITS_A__h
+
+void TASK_TYPE_T_Set_Ports_Status_LIMITS_A__SET(Port_ID_T  Port_ID , Exp_state_level_T Exp_state_level_MIN_A, Exp_state_level_T Exp_state_level_MAX_A) {
+    if(Port_ID > 0 ) {
+        for(int i = 0 ; i < ARDUINO_ARRAY_INDEX_LIMIT_PORTS; i++) {
+            if(Slave_Ports_Status_A[i].Port_ID == Port_ID) {
+                TASK_TYPE_T_Set_Ports_Status_LIMITS_A[i].Exp_state_level_MIN_A = Exp_state_level_MIN_A ;
+                TASK_TYPE_T_Set_Ports_Status_LIMITS_A[i].Exp_state_level_MAX_A = Exp_state_level_MAX_A ;
+                break ; 
+            }
+        }
+    }
+}
+
+
+void TASK_TYPE_T_Set_Ports_Status_LIMITS_A__GET( int  Slave_Ports_Status_A__i , Exp_state_level_T &Exp_state_level_MIN_A, Exp_state_level_T &Exp_state_level_MAX_A) {
+     
+            Exp_state_level_MIN_A = TASK_TYPE_T_Set_Ports_Status_LIMITS_A[Slave_Ports_Status_A__i].Exp_state_level_MIN_A ;
+            Exp_state_level_MAX_A = TASK_TYPE_T_Set_Ports_Status_LIMITS_A[Slave_Ports_Status_A__i].Exp_state_level_MAX_A  ;
+        
+}
+
+
+
+void TASK_TYPE_T_Set_Ports_Status_LIMITS_A__ASSERT(int Slave_Ports_Status_A__i ) {
+     if(Slave_Ports_Status_A[Slave_Ports_Status_A__i].Exp_state_level_A > TASK_TYPE_T_Set_Ports_Status_LIMITS_A[Slave_Ports_Status_A__i].Exp_state_level_MAX_A ) {
+            Slave_Ports_Status_A[Slave_Ports_Status_A__i].Exp_state_level_A = TASK_TYPE_T_Set_Ports_Status_LIMITS_A[Slave_Ports_Status_A__i].Exp_state_level_MAX_A ;
+            SPFTFTFT(assert,limit,max);
+     } else if(Slave_Ports_Status_A[Slave_Ports_Status_A__i].Exp_state_level_A < TASK_TYPE_T_Set_Ports_Status_LIMITS_A[Slave_Ports_Status_A__i].Exp_state_level_MIN_A ) {
+            Slave_Ports_Status_A[Slave_Ports_Status_A__i].Exp_state_level_A = TASK_TYPE_T_Set_Ports_Status_LIMITS_A[Slave_Ports_Status_A__i].Exp_state_level_MIN_A ;
+            SPFTFTFT(assert,limit,min);
+     }      
+}
+
+
+#endif

+ 9 - 6
SE/stuff/P5_Automation_can-dev-res-working-1930/_DISPLAY_func_PRINT_PORT_ELEMENT.h

@@ -1,10 +1,13 @@
 message = "";
 message = "";
 
 
 
 
-          if(Slave_Ports_Status_DESCR_A[i].Port_ID > 0 ) {
-            message.concat(i);  message.concat("."); message.concat(Slave_Ports_Status_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].ARDUINO_ARRAY_INDEX_A].Port_ID);  message.concat(".");  message.concat(Slave_Ports_Status_DESCR_A[i].Port_ID_DESCR_A);
+          if(Slave_Ports_Status_DESCR_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].ARDUINO_ARRAY_INDEX_A].Port_ID > 0 ) {
+          
+           // message.concat( DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].ARDUINO_ARRAY_INDEX_A);  message.concat(".");
+             message.concat(Slave_Ports_Status_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].ARDUINO_ARRAY_INDEX_A].Port_ID);  message.concat(".");  
+                message.concat(Slave_Ports_Status_DESCR_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].ARDUINO_ARRAY_INDEX_A].Port_ID_DESCR_A);
           } else {
           } else {
-               message.concat(i);  message.concat("."); message.concat(Slave_Ports_Status_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].ARDUINO_ARRAY_INDEX_A].Port_ID);
+               message.concat( DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].ARDUINO_ARRAY_INDEX_A);  message.concat("."); message.concat(Slave_Ports_Status_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].ARDUINO_ARRAY_INDEX_A].Port_ID);
                
                
           } 
           } 
           message.concat(TAB_S);
           message.concat(TAB_S);
@@ -18,10 +21,10 @@ message = "";
                             message.concat("3");
                             message.concat("3");
                        }
                        }
                       
                       
-                       message.concat(TAB_S);
+                       message.concat(" ");
                        
                        
                          if(Slave_Ports_Status_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].ARDUINO_ARRAY_INDEX_A].IS_gone_A == IS_gone_TRUE) {
                          if(Slave_Ports_Status_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].ARDUINO_ARRAY_INDEX_A].IS_gone_A == IS_gone_TRUE) {
-                             message.concat(" [---] ");
+                             message.concat("[-]");
                          } else {
                          } else {
                              
                              
                              
                              
@@ -60,7 +63,7 @@ message = "";
                                        } else if(Slave_Ports_Status_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].ARDUINO_ARRAY_INDEX_A].Exp_state & Exp_state_SET ) {
                                        } else if(Slave_Ports_Status_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].ARDUINO_ARRAY_INDEX_A].Exp_state & Exp_state_SET ) {
                                         message.concat("*");//E:  
                                         message.concat("*");//E:  
                                        } else  if (!( ( Slave_Ports_Status_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].ARDUINO_ARRAY_INDEX_A].Exp_state & Exp_state_SET ) ^ Exp_state_SET ))  {
                                        } else  if (!( ( Slave_Ports_Status_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].ARDUINO_ARRAY_INDEX_A].Exp_state & Exp_state_SET ) ^ Exp_state_SET ))  {
-                                          message.concat(" ** ");//E:
+                                          message.concat("**");//E:
                                        } else {
                                        } else {
                                            message.concat(" ?");//E: 
                                            message.concat(" ?");//E: 
                                        }
                                        }

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

@@ -278,7 +278,7 @@ typedef byte DISPLAY__print_loop_ACTION_T ;
 const DISPLAY__print_loop_ACTION_T DISPLAY__print_loop_ACTION_ADD = B00000001 ;
 const DISPLAY__print_loop_ACTION_T DISPLAY__print_loop_ACTION_ADD = B00000001 ;
 const DISPLAY__print_loop_ACTION_T DISPLAY__print_loop_ACTION_POP = B00000010 ;
 const DISPLAY__print_loop_ACTION_T DISPLAY__print_loop_ACTION_POP = B00000010 ;
 
 
-const DISPLAY_CURSOR_T DISPLAY_char24_TAB_SIZE =    3 ;
+const DISPLAY_CURSOR_T DISPLAY_char24_TAB_SIZE =    2 ;
     
     
     #if defined(USE_DISPLAY_char_PA)
     #if defined(USE_DISPLAY_char_PA)
         void DISPLAY_char_P(  String message ,  DISPLAY_char24_T  &DISPLAY_char_PA  ) {//DISPLAY_char24_T DISPLAY_char24_A
         void DISPLAY_char_P(  String message ,  DISPLAY_char24_T  &DISPLAY_char_PA  ) {//DISPLAY_char24_T DISPLAY_char24_A

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

@@ -3,7 +3,7 @@
   lcd.init();                      // Print a message to the LCD.
   lcd.init();                      // Print a message to the LCD.
   lcd.backlight();
   lcd.backlight();
   lcd.setCursor(0,0);
   lcd.setCursor(0,0);
- // lcd.print("Hello, world!");
+ lcd.print("debug p5 ");
    
    
 #else
 #else
  lcd.begin(LCD1602_DISPLAY_PHYSICAL_X_CHARS_A, LCD1602_DISPLAY_PHYSICAL_Y_CHARS_A);
  lcd.begin(LCD1602_DISPLAY_PHYSICAL_X_CHARS_A, LCD1602_DISPLAY_PHYSICAL_Y_CHARS_A);

+ 15 - 3
SE/stuff/P5_Automation_can-dev-res-working-1930/_ROTTARY_SW/_ROTTARY_SW_config.h

@@ -1,8 +1,20 @@
 // rottary switch ports 
 // rottary switch ports 
-#define ROTTARY_SW_sw PortA8 //A8 // 62 // A8 //A8 //53 // 89 // = A8
-#define ROTTARY_SW_dt PortA10  //A9 // 90 // = A9
-#define ROTTARY_SW_clk PortA9 //A10  // 91 // = A10
 
 
+#if defined(ROTTARY_SW_sw)
+#else 
+    #define ROTTARY_SW_sw PortA8 //A8 // 62 // A8 //A8 //53 // 89 // = A8
+#endif
+
+
+#if defined(ROTTARY_SW_dt)
+#else
+    #define ROTTARY_SW_dt PortA10  //A9 // 90 // = A9
+#endif
+
+#if defined(ROTTARY_SW_clk)
+#else
+    #define ROTTARY_SW_clk PortA9 //A10  // 91 // = A10
+#endif
 /*
 /*
  LOW to trigger the interrupt whenever the pin is low,
  LOW to trigger the interrupt whenever the pin is low,
 CHANGE to trigger the interrupt whenever the pin changes value
 CHANGE to trigger the interrupt whenever the pin changes value

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

@@ -7,7 +7,7 @@
                       int drvfound = 0;
                       int drvfound = 0;
                       int drvindex = 0;
                       int drvindex = 0;
                       int freeindx = -1;
                       int freeindx = -1;
-                      for(int drv = 0 ; drv<2 ; drv++ ) {
+                      for(int drv = 0 ; drv<ARDUINO_ARRAY_INDEX_LIMIT_PORTS ; drv++ ) {
                             
                             
                             if(I2C_driver_PHYSICAL_PORT_SERVO_PORSTATUS_DRIVER_A[drv].LocalPort == Slave_Ports_Status_A[i].LocalPort) {
                             if(I2C_driver_PHYSICAL_PORT_SERVO_PORSTATUS_DRIVER_A[drv].LocalPort == Slave_Ports_Status_A[i].LocalPort) {
                                 drvfound ++;
                                 drvfound ++;

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

@@ -46,7 +46,7 @@
             Serial.print(" [P+["); Serial.print(_Slave_ID); Serial.print("] ");
             Serial.print(" [P+["); Serial.print(_Slave_ID); Serial.print("] ");
         }
         }
         
         
-          if(i == ARDUINO_ARRAY_INDEX_CORRUPT) {
+          if(i == ARDUINO_ARRAY_INDEX_CORRUPT ) { // ) {
                
                
                 // Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A ++;
                 // Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A ++;
                           Slave_Ports_Status_A[i].Port_ID=0;
                           Slave_Ports_Status_A[i].Port_ID=0;

+ 2 - 2
SE/stuff/P5_Automation_can-dev-res-working-1930/___CONFIG/0x11/config_Active_ControllerID_0x11.h

@@ -5,8 +5,8 @@
 
 
 // rottary switch ports 
 // rottary switch ports 
 #define ROTTARY_SW_sw PortA8 
 #define ROTTARY_SW_sw PortA8 
-#define ROTTARY_SW_dt PortA10
-#define ROTTARY_SW_clk PortA9   
+#define ROTTARY_SW_dt PortA9
+#define ROTTARY_SW_clk PortA10    
 
 
 #define HAS_CAN
 #define HAS_CAN
 #define HAS_TFT_ILI9163C
 #define HAS_TFT_ILI9163C

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

@@ -41,3 +41,5 @@
 //#define DEBUG_QUEUE_WAIT 500
 //#define DEBUG_QUEUE_WAIT 500
 //#define DEBUG_STORAGE_QUEUE_TEST
 //#define DEBUG_STORAGE_QUEUE_TEST
 //#define DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK
 //#define DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK
+
+#define PROGMEM_CONSOLE_WRITE

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

@@ -210,7 +210,7 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                                 "Halo X",
                                 "Halo X",
                                 0,0// time_seq_id, time_min_run
                                 0,0// time_seq_id, time_min_run
                                 );   
                                 );   
-                                TASK_TYPE_T_Set_Ports_Status_LIMITS_A__SET(4,0,90);
+                                TASK_TYPE_T_Set_Ports_Status_LIMITS_A__SET(4,0,85);
                                 
                                 
                               Slave_Ports_Status_add_port(
                               Slave_Ports_Status_add_port(
                                 Slave_Ports_Status_A ,
                                 Slave_Ports_Status_A ,

+ 2 - 2
SE/stuff/P5_Automation_can-dev-res-working-1930/___CONFIG/config_Active_ControllerID.h

@@ -8,8 +8,8 @@ EEPROM.get( EEPROM_Active_ControllerID_addr, EEPROM_Active_ControllerID_read );
 //EEPROM_Active_ControllerID_read = EEPROM.read(EEPROM_Active_ControllerID_addr);
 //EEPROM_Active_ControllerID_read = EEPROM.read(EEPROM_Active_ControllerID_addr);
 */
 */
 //#define Active_ControllerID 0x13
 //#define Active_ControllerID 0x13
-//#define Active_ControllerID 0x11
-#define Active_ControllerID 0x35
+#define Active_ControllerID 0x11
+//#define Active_ControllerID 0x35
 
 
 
 
 //if(EEPROM_Active_ControllerID_read > 0 ) //{
 //if(EEPROM_Active_ControllerID_read > 0 ) //{

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

@@ -135,7 +135,7 @@ if(ARDUINO_LOOP_LATENCY_COUNTER__MAIN_END(ARDUINO_LOOP_LATENCY__MAIN_END_A, ARDU
                                 
                                 
         
         
                                 DISPLAY_DEV.print("P:"); DISPLAY_DEV.print(Port11); DISPLAY_DEV.print(" "); DISPLAY_DEV.print(digitalRead(Port11)); //DISPLAY_DEV.print(analogRead(Port11));
                                 DISPLAY_DEV.print("P:"); DISPLAY_DEV.print(Port11); DISPLAY_DEV.print(" "); DISPLAY_DEV.print(digitalRead(Port11)); //DISPLAY_DEV.print(analogRead(Port11));
-                                #if defined(DISABLE_PROGMEM_CONSOLE_PRINT)
+                                #if defined(PROGMEM_CONSOLE_WRITE)
                                  LCD_print_DISPLAY_MENU_A(DISPLAY_MENU_A__PROGMEM_CONSOLE_PRINT);
                                  LCD_print_DISPLAY_MENU_A(DISPLAY_MENU_A__PROGMEM_CONSOLE_PRINT);
                                 #endif
                                 #endif
                             }
                             }

+ 2 - 2
SE/stuff/P5_Automation_can-dev-res-working-1930/___main/__main_I2C_struc.h

@@ -43,8 +43,8 @@ struct I2C_driver_PHYSICAL_PORT_SERVO_PORSTATUS_DRIVER_S {
 
 
 typedef I2C_driver_PHYSICAL_PORT_SERVO_PORSTATUS_DRIVER_S I2C_driver_PHYSICAL_PORT_SERVO_PORSTATUS_DRIVER_T ;
 typedef I2C_driver_PHYSICAL_PORT_SERVO_PORSTATUS_DRIVER_S I2C_driver_PHYSICAL_PORT_SERVO_PORSTATUS_DRIVER_T ;
 
 
-I2C_driver_PHYSICAL_PORT_SERVO_PORSTATUS_DRIVER_T I2C_driver_PHYSICAL_PORT_SERVO_PORSTATUS_DRIVER_A[8] ;
-Servo I2C_driver_PHYSICAL_PORT_SERVO_PORSTATUS_DRIVER_SERVO_A[8] ;
+I2C_driver_PHYSICAL_PORT_SERVO_PORSTATUS_DRIVER_T I2C_driver_PHYSICAL_PORT_SERVO_PORSTATUS_DRIVER_A[ARDUINO_ARRAY_INDEX_LIMIT_PORTS] ;
+Servo I2C_driver_PHYSICAL_PORT_SERVO_PORSTATUS_DRIVER_SERVO_A[ARDUINO_ARRAY_INDEX_LIMIT_PORTS] ;
 //Servo I2C_driver_PHYSICAL_PORT_SERVO_PORSTATUS_DRIVER_SERVO_A_TEST ;
 //Servo I2C_driver_PHYSICAL_PORT_SERVO_PORSTATUS_DRIVER_SERVO_A_TEST ;
 
 
 // PCF8574_PORSTATUS_DRIVER_A[0].I2C_ADDRESS_A  = 0x20 ;
 // PCF8574_PORSTATUS_DRIVER_A[0].I2C_ADDRESS_A  = 0x20 ;