a.binder 5 éve
szülő
commit
c85355f011

+ 4 - 3
SE/stuff/P5_Automation_can-dev-res-working-1930/TASK_TYPE_T_Set_Port_Smooth_forward__.h

@@ -25,15 +25,16 @@ void TASK_TYPE_T_Set_Port_Smooth_forward__POP(
                                                                 + TASK_PORT_ASSOC_A.Exp_state_level_NEW_DELTA_A );
 
                 //callback
-                
+                Exp_state_level_T TASK_TYPE_T_Set_Ports_Status_LIMITS_A__VALIDATE_A = TASK_TYPE_T_Set_Ports_Status_LIMITS_A__VALIDATE(TASK_PORT_ASSOC_A.Slave_Ports_Status_T_INDEX, 
+                                                                Slave_Ports_Status_A[TASK_PORT_ASSOC_A.Slave_Ports_Status_T_INDEX].Exp_state_level_A
+                                                                + TASK_PORT_ASSOC_A.Exp_state_level_NEW_DELTA_A );
                  Slave_Ports_action_func(Slave_Ports_Status_QUEUE_A,  Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A, Slave_Ports_Status_A ,
                                                             Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A , TASK_TYPE_T_request_set_new_Exp_state ,
                                                             TASK_PORT_ASSOC_A,
                                                             time_seq_id_A, time_min_run_A,  ARDUINO_ARRAY_INDEX_NOT_SET ,  
                                                             Exp_state_ON_USE_LEVEL ,
                                                                 //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
-                                                                Slave_Ports_Status_A[TASK_PORT_ASSOC_A.Slave_Ports_Status_T_INDEX].Exp_state_level_A
-                                                                + TASK_PORT_ASSOC_A.Exp_state_level_NEW_DELTA_A   
+                                                               TASK_TYPE_T_Set_Ports_Status_LIMITS_A__VALIDATE_A 
                                                            );
         } else {SPFTFT2(error,smooth,32);}
         

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

@@ -24,6 +24,17 @@ void TASK_TYPE_T_Set_Ports_Status_LIMITS_A__GET( int  Slave_Ports_Status_A__i ,
 }
 
 
+Exp_state_level_T TASK_TYPE_T_Set_Ports_Status_LIMITS_A__VALIDATE(int Slave_Ports_Status_A__i , Exp_state_level_T Exp_state_level_A) { //sets adequate value 
+     if(Exp_state_level_A > TASK_TYPE_T_Set_Ports_Status_LIMITS_A[Slave_Ports_Status_A__i].Exp_state_level_MAX_A ) {
+            SPFTFTFT(validate,limit,max);
+            return TASK_TYPE_T_Set_Ports_Status_LIMITS_A[Slave_Ports_Status_A__i].Exp_state_level_MAX_A ;
+     } else if(Exp_state_level_A < TASK_TYPE_T_Set_Ports_Status_LIMITS_A[Slave_Ports_Status_A__i].Exp_state_level_MIN_A ) {
+            SPFTFTFT(validate,limit,min);
+            return TASK_TYPE_T_Set_Ports_Status_LIMITS_A[Slave_Ports_Status_A__i].Exp_state_level_MIN_A ;
+     }  else {
+        return Exp_state_level_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 ) {

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

@@ -822,7 +822,7 @@ void DISPLAY_MENU_SELECTOR(DISPLAY_T* DISPLAY_A ,
                                              encoderPos_t = millis() + 1000 ;
                                              encoderPos_t1 = millis() + 500 ;
                                              encoderPos_t2 = millis() + 250 ;
-                                            _Slave_Ports_queue__add(  Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,  TASK_TYPE_T_Set_Port_Smooth_forward__ ,TASK_PORT_ASSOC_SMOOTH_A ,millis(), millis() + 100, ARDUINO_ARRAY_INDEX_NOT_SET) ;
+                                            _Slave_Ports_queue__add(  Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,  TASK_TYPE_T_Set_Port_Smooth_forward__ ,TASK_PORT_ASSOC_SMOOTH_A ,millis(), millis() + 1, ARDUINO_ARRAY_INDEX_NOT_SET) ;
 
                                         } else if(encoderPos_t1 < millis()   ) {
                                          SPL();
@@ -879,7 +879,7 @@ void DISPLAY_MENU_SELECTOR(DISPLAY_T* DISPLAY_A ,
                                              encoderPos_t = millis() + 1000 ;
                                              encoderPos_t1 = millis() + 500 ;
                                              encoderPos_t2 = millis() + 250 ;
-                                            _Slave_Ports_queue__add(  Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,  TASK_TYPE_T_Set_Port_Smooth_forward__ ,TASK_PORT_ASSOC_SMOOTH_A ,millis(), millis() + 100, ARDUINO_ARRAY_INDEX_NOT_SET) ;
+                                            _Slave_Ports_queue__add(  Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,  TASK_TYPE_T_Set_Port_Smooth_forward__ ,TASK_PORT_ASSOC_SMOOTH_A ,millis(), millis() + 1, ARDUINO_ARRAY_INDEX_NOT_SET) ;
 
                                         } else if(encoderPos_t1 < millis()   ) {
                                          SPL();

+ 21 - 1
SE/stuff/P5_Automation_can-dev-res-working-1930/___CONFIG/0x11/config_Slave_Ports_LOCAL_0x11_init.h

@@ -127,7 +127,27 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                                 0,0// time_seq_id, time_min_run
                                 );
                                          
-                              
+                         Slave_Ports_Status_add_port(
+                                Slave_Ports_Status_A ,
+                                Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A,
+                                    Slave_Ports_Status_T_ARDUINO_ARRAY_INDEX_TABLE_A,
+                                    Slave_Ports_Status_T_ARDUINO_ARRAY_INDEX_T_TO_DELETE_A,
+                                    Slave_Ports_Status_T_ARDUINO_ARRAY_ASSOC_TABLE_S_Port_ID_A,
+                                6,  // int  Port_ID,
+                                0x11 ,  //int  _Slave_ID,
+                                PortTypes_PWM_EXP_I2C ,// | PortTypes_SERVO  ,// | PortTypes_SERVO //int  PortTypes,
+                                0x40 ,  //int  Address,
+                                    7 , //int  LocalPort,
+                                Exp_state_OFF, //int  Exp_state,
+                                Exp_state_ttl_TO_REFRESH , //Exp_state_ttl_TO_REFRESH, //int  Exp_state_ttl,
+                                Broadcast_state_FULL_FRESH, //Broadcast_state_TO_REFRESH, //int  Broadcast_state,
+                                I2C_port_DEFAULT, //int I2C_port,
+                                I2C_driver_Adafruit_PWMServoDriver ,//int I2C_driver
+                                IS_Local_TRUE, Exp_state_level_INIT,
+                                "SilKier",
+                                0,0// time_seq_id, time_min_run
+                                );
+                               
                               
                                 
                                 

+ 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);
 */
 //#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 ) //{

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

@@ -300,6 +300,6 @@ class MyObject{
 MyObject anObject;  //create an instance of MyObject 
   
   */
-typedef byte Exp_state_level_T ;
+typedef int Exp_state_level_T ;
 typedef char Port_ID_DESCR_T[8] ;