a.binder 5 vuotta sitten
vanhempi
commit
12348b0612

+ 2 - 0
SE/stuff/P5_Automation_can-dev-res/P5_Automation_can-dev-res.ino

@@ -100,6 +100,8 @@
 #define DISPLAY_array16_T_is_DISPLAY_string_T 
 #define ENABLE_DISPLAY_MENU
 //#define DISABLE_ANY_PRINT //when uno ?
+#define DISPLAY_MENU_SELECTOR_DEBUG 
+#define DISPLAY__print_menu_DELAY 500 
 
 
 #define Sprintln(a) (Serial.println(a))

+ 2 - 2
SE/stuff/P5_Automation_can-dev-res/_DISPLAY_add_record_func.h

@@ -121,7 +121,7 @@
                 Serial.print("#66 ");
                 #endif
                     if(time_seq_id_A == 0 ) {
-                        DISPLAY_A[i].time_seq_id_A = millis() ;
+                        DISPLAY_A[i].time_seq_id_A = time_seq_id_A ;
                     } else {
                        DISPLAY_A[i].time_seq_id_A = time_seq_id_A ;
                     }
@@ -152,7 +152,7 @@
                 _Slave_Ports_queue__add( 
                      Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A,
                       TASK_TYPE_T_DISPLAY_queue_pop________ 
-                    ,TASK_PORT_ASSOC_EMPTY ,millis(), millis() + ARDUINO_time_seq_id_A_INCREMENT ,
+                    ,TASK_PORT_ASSOC_EMPTY , time_seq_id_A, time_seq_id_A + ARDUINO_time_seq_id_A_INCREMENT ,
                     DISPLAY_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A
                     ) ;  //"_Slave_Ports_set_I2C" //5  - to set ports associated on PW       
                        

+ 8 - 4
SE/stuff/P5_Automation_can-dev-res/_DISPLAY_func.h

@@ -349,7 +349,10 @@ void DISPLAY__print_menu(DISPLAY_T* DISPLAY_A ,
                    
                 Serial.println(" ");*/
                 
-                
+                #if defined(DISPLAY__print_menu_DELAY)
+                    Serial.print("D");
+                    delay(DISPLAY__print_menu_DELAY);
+                #endif
                 
            
                         
@@ -357,7 +360,7 @@ void DISPLAY__print_menu(DISPLAY_T* DISPLAY_A ,
                         //DISPLAY_PHYSICAL_CHAR_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i] 
                         
                    
-            
+                        
                         if(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].DISPLAY_MENU_ITEM_FLAG_A == DISPLAY_MENU_ITEM_FLAG_INITIALIZED ) {
                         
                               if(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].time_seq_id_A + ARDUINO_LOOP_LATENCY_DISPLAY_MENU >  time_seq_id_A  ) {
@@ -722,8 +725,9 @@ void DISPLAY_MENU_SELECTOR(DISPLAY_T* DISPLAY_A ,
                  } 
         } // if(DISPLAY_MENU_SELECTOR_oldEncPos_A != DISPLAY_MENU_SELECTOR_encoderPos_A ) {
         
-        
-        
+        #if defined(DISPLAY_MENU_SELECTOR_DEBUG)
+        Serial.print("DEBUG["); Serial.print(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_SELECTOR_A[1].DISPLAY_MENU_SELECTOR_STATUS_A,  BIN);
+        #endif
         Serial.println("   ");
         
     }

+ 2 - 1
SE/stuff/P5_Automation_can-dev-res/_ROTTARY_SW/_ROTTARY_SW_loop.h

@@ -55,11 +55,12 @@
         0
    };
    */
-   TASK_PORT_ASSOC_T TASK_PORT_ASSOC_A={
+  /* TASK_PORT_ASSOC_T TASK_PORT_ASSOC_A={
         1,
         0x13,
         0
    };
+   */
    /*
    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_TYPE_T TASK_TYPE_A,

+ 2 - 2
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_Status_func.h

@@ -95,8 +95,8 @@
                                           i);//Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A
                   
                   
-                  // _Slave_Ports_queue__add(  Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
-                  //   TASK_TYPE_T_Broadcast_state_LOW______  ,TASK_PORT_ASSOC_EMPTY ,time_seq_id, time_seq_id + 50000  , 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_Broadcast_state_LOW______  ,TASK_PORT_ASSOC_EMPTY ,time_seq_id, time_seq_id + 50000  , ARDUINO_ARRAY_INDEX_NOT_SET ) ;
                      
                      
                } else {

+ 2 - 2
SE/stuff/P5_Automation_can-dev-res/___CONFIG/0x11/config_Slave_Ports_LOCAL_0x11_init.h

@@ -105,8 +105,8 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                            //"012345678901234" , 
                            "#50 Added ports ",//DISPLAY_array16_A
                           DISPLAY_TARGET_DISPLAY128,
-                          millis(), //time_seq_id_A,
-                           millis() + 5000 //time_min_run_A =
+                          time_seq_id, //time_seq_id_A,
+                           time_seq_id + 5000 //time_min_run_A =
                            //QUEUE
                            , Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A, 
                             TASK_TYPE_T__EMPTY__JUST_PASSED_ARG__,

+ 2 - 2
SE/stuff/P5_Automation_can-dev-res/___CONFIG/0x13/config_Slave_Ports_LOCAL_0x13_init.h

@@ -104,8 +104,8 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                          //"012345678901234" , //
                          "#50 Added ports ",//DISPLAY_array16_A
                           DISPLAY_TARGET_DISPLAY128,
-                          millis(), //time_seq_id_A,
-                           millis() + 5000 //time_min_run_A =
+                          time_seq_id, //time_seq_id_A,
+                          time_seq_id + 5000 //time_min_run_A =
                            //QUEUE
                            , Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
                             TASK_TYPE_T__EMPTY__JUST_PASSED_ARG__,

+ 2 - 2
SE/stuff/P5_Automation_can-dev-res/___CONFIG/0x14/config_Slave_Ports_LOCAL_0x14_init.h

@@ -100,8 +100,8 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                          //"012345678901234" , //
                          "#50 Added ports ",//DISPLAY_array16_A
                           DISPLAY_TARGET_DISPLAY128,
-                          millis(), //time_seq_id_A,
-                           millis() + 5000 //time_min_run_A =
+                          time_seq_id, //time_seq_id_A,
+                          time_seq_id + 5000 //time_min_run_A =
                            //QUEUE
                            , Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
                             TASK_TYPE_T__EMPTY__JUST_PASSED_ARG__,

+ 1 - 1
SE/stuff/P5_Automation_can-dev-res/___main/__main_struct_limits.h

@@ -9,7 +9,7 @@ const ARDUINO_ARRAY_INDEX_LIMIT_T  ARDUINO_ARRAY_INDEX_LIMIT_PORTS_I2C = 5 ;
 
 const ARDUINO_ARRAY_INDEX_LIMIT_T  ARDUINO_ARRAY_INDEX_LIMIT_DISPLAY = 5 ;
 
-const ARDUINO_ARRAY_INDEX_LIMIT_T  ARDUINO_ARRAY_INDEX_LIMIT_DISPLAY_MENU = 3 ;
+const ARDUINO_ARRAY_INDEX_LIMIT_T  ARDUINO_ARRAY_INDEX_LIMIT_DISPLAY_MENU = 2 ;
 const ARDUINO_ARRAY_INDEX_LIMIT_T  ARDUINO_ARRAY_INDEX_LIMIT_DISPLAY_MENU_ITEM_A = 8 ;