a.binder 5 lat temu
rodzic
commit
3a14750f5b

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

@@ -506,7 +506,7 @@ void DISPLAY__print_menu(DISPLAY_T* DISPLAY_A ,
                                                                     
                                                                     
                                                                     DISPLAY_DEV.fillRect(ic_sw_mX, ic_sw_MY , ic_sw_MX , ic_sw_mY , WHITE);
-                                                                        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 < 1) {
+                                                                        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_DEV.fillCircle(ic_sw_circl_X, ic_sw_circl_Y , ic_sw_circl_radius+1, BLACK);
                                                                            DISPLAY_DEV.fillCircle(ic_sw_circl_X, ic_sw_circl_Y , ic_sw_circl_radius, RED);
                                                                         } else {

+ 7 - 4
SE/stuff/P5_Automation_can-dev-res-working-1930/_DISPLAY_func_PRINT_PORT_ELEMENT.h

@@ -1,10 +1,13 @@
 message = "";
 
 
-
-          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 )  ; 
+          if(Slave_Ports_Status_DESCR_A[i].Port_ID > 0 ) {
+            message.concat(Slave_Ports_Status_DESCR_A[i].Port_ID_DESCR_A);
+          } else {
+                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);
           
           

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

@@ -346,4 +346,4 @@ void TASK_TYPE_T_Set_Port_Smooth_forward() {
  } //func 1
 //#endif
 
-#endif
+#endif

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

@@ -101,6 +101,13 @@
                     Slave_Ports_Status_A[i].I2C_driver = I2C_driver ;
                     Slave_Ports_Status_A[i].IS_Local_A = IS_Local_A;
                     Slave_Ports_Status_A[i].Exp_state_level_A = Exp_state_level_A;
+                    
+                    if(String(Port_ID_DESCR_A).length() > 0 ) {
+                        SPFTFT2(port,description,Port_ID_DESCR_A);
+                        Slave_Ports_Status_DESCR_A[i].Port_ID = Port_ID;
+                        memcpy(Slave_Ports_Status_DESCR_A[i].Port_ID_DESCR_A, Port_ID_DESCR_A,String(Port_ID_DESCR_A).length() );
+                    }
+                    
                   //  Slave_Ports_Status_A[Slave_Ports_Status_T_ARDUINO_ARRAY_COUNT_A + 1].I2C_driver = I2C_driver_F(I2C_driver) ;
                             ARDUINO_ATTR_ARRAY_S__commit_added_element(
                                           Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A ,