a.binder 5 년 전
부모
커밋
f453304767

+ 11 - 4
SE/stuff/P5_Automation_can-dev-res/P5_Automation_can-dev-res.ino

@@ -188,11 +188,13 @@
 
 
 #include "_TASK_TYPES_func.h"
+#include "_Slave_Ports_ttl_decrement_func.h"
+#include "_Slave_Ports_broadcast_func.h"
 #include "_Slave_Ports_Status_QUEUE_func.h"
 #include "_Slave_Ports_Protocol_CAN_func.h"
 #include "_Slave_Ports_Status_func.h"
-#include "_Slave_Ports_broadcast_func.h"
-#include "_Slave_Ports_ttl_decrement_func.h"
+
+
 
   #include "_Slave_Ports.h"
  // #include "_Slave_Ports_ttl_decrement_POP.h"
@@ -240,6 +242,7 @@
 
 #include "config_Slave_Ports_LOCAL_init.h"
 
+#include "__main_init.h"
 
 
 void setup() {
@@ -320,7 +323,7 @@ void loop() {
   #include "_PCINT_loop.h"
 #endif 
 
-  ARDUINO_FUNCT_INIT_RESULT_T ARDUINO_FUNCT_INIT_RESULT__Slave_Ports_LOCAL_init ;
+ 
 
 if(ARDUINO_FUNCT_INIT_RESULT__Slave_Ports_LOCAL_init == true ){
         }  else { 
@@ -354,7 +357,11 @@ if(ARDUINO_FUNCT_INIT_RESULT__Slave_Ports_LOCAL_init == true ){
         "336 PORTS:",
         DISPLAY_TARGET_DISPLAY128,
        millis(),
-        0
+        millis() + ARDUINO_time_seq_id_A_INCREMENT
+         //queue
+        ,Slave_Ports_Status_QUEUE_A,
+        TASK_TYPE_A,
+        TASK_PORT_ASSOC_A
      );
 
  // Serial.println(time);

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

@@ -122,7 +122,12 @@ void DISPLAY__print_IMMEDIATE(
             DISPLAY_array16_T DISPLAY_array16_A,
             DISPLAY_TARGET_T DISPLAY_TARGET_A,
             time_seq_id_T time_seq_id_A,
-            time_min_run_T time_min_run_A        
+            time_min_run_T time_min_run_A     
+            //QUEUE
+            ,Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QUEUE_A,
+            TASK_TYPE_T TASK_TYPE_A,
+            TASK_PORT_ASSOC_T TASK_PORT_ASSOC_A
+               
                 ) {
                  int i = DISPLAY_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A ;
                          if(i == ARDUINO_ARRAY_INDEX_CORRUPT) {
@@ -186,6 +191,10 @@ void DISPLAY__print_IMMEDIATE(
         DISPLAY_TARGET_T DISPLAY_TARGET_A,
         time_seq_id_T time_seq_id_A,
         time_min_run_T time_min_run_A
+        //queue
+        ,Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QUEUE_A,
+        TASK_TYPE_T TASK_TYPE_A,
+        TASK_PORT_ASSOC_T TASK_PORT_ASSOC_A
                 )
                 {
                 
@@ -225,6 +234,10 @@ void DISPLAY__print_IMMEDIATE(
                              DISPLAY_TARGET_A,
                              time_seq_id_A,
                              time_min_run_A
+                             //queue
+                             , Slave_Ports_Status_QUEUE_A,
+                             TASK_TYPE_A,
+                             TASK_PORT_ASSOC_A
                          ) ;
                          
                     }

+ 0 - 118
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports.h

@@ -6,124 +6,6 @@
 //#include "Slave_Ports_Status_S.h"
 
 
-Slave_Ports_Status_QUEUE_T Slave_Ports_Status_QUEUE_A[11];
-
-
-
-
- void _Slave_Ports_queue__POP( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QUEUE_A, 
- int _Slave_Ports_queue_count, 
- int _Slave_Ports_queue_pop, 
- int _Slave_Ports_queue_front, 
- int _Slave_Ports_queue_back,
- int _Slave_Ports_queue_peek,
- int LCDtim,   Slave_Ports_Status_T*  Slave_Ports_Status_A) {
-   //int count = _Slave_Ports_queuev.count();
-   //int _Slave_Ports_queue_pop _Slave_Ports_queuev.pop();
-  Serial.print("#180 run _Slave_Ports_queue__POP cnt "); Serial.print(_Slave_Ports_queue_count); Serial.print(" , pop: "); Serial.println(_Slave_Ports_queue_pop);
-
-   
-    if (_Slave_Ports_queue_count > 0) {
-
-                             String LCDarray1 = "`Slave_Ports_queue size [";
-                             LCDarray1.concat(_Slave_Ports_queue_count);
-                             LCDarray1.concat("] Oldest["); 
-                             LCDarray1.concat(_Slave_Ports_queue_pop);
-                             
-                             LCDarray1.concat("] Curr[");
-                             LCDarray1.concat(_Slave_Ports_queue_front);
-
-                             String LCDarray2 = "]  last[";
-                             LCDarray2.concat(_Slave_Ports_queue_back);
-                             LCDarray2.concat("] Next[");
-                             LCDarray2.concat(_Slave_Ports_queue_peek);
-                             
-  
-    Serial.print(LCDarray1);
-    Serial.println(LCDarray2);
-//    LCD_print(LCDarray1, LCDarray2, LCDtim / 3 ) ;
-
-              if(Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].QUEUE_ID_A == 0 and 
-                Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].QUEUE_ID_A == 0 and 
-                  Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A == 0 and 
-                    //Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_PORT_ASSOC_A == 0 and 
-                      Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].time_seq_id == 0 and 
-                        Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].time_min_run == 0 ) {
-                   String LCDarray1 = "#206 Error with queue";
-                   String LCDarray2 = "ID: ";
-                    LCDarray2.concat( _Slave_Ports_queue_pop);  LCDarray2.concat("] ");
-                   Serial.print(LCDarray1);
-                   Serial.println(LCDarray2);
-          //          LCD_print(LCDarray1, LCDarray2, LCDtim / 3 ) ;
-              } else {
-                   String LCDarray1 = "#407 Running task";
-                   String LCDarray2 = "ID: ";
-                    LCDarray2.concat( _Slave_Ports_queue_pop);  LCDarray2.concat("] task_type[");
-                      
-                        LCDarray2.concat( Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A);  LCDarray2.concat("] ");
-                   
-                   Serial.print(LCDarray1);
-                   Serial.println(LCDarray2);
-            //        LCD_print(LCDarray1, LCDarray2, LCDtim / 3 ) ;
-
-
-                     switch (Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A) {
-                            case TASK_TYPE_T_Slave_Ports_ttl_decrement:    // your hand is on the sensor
-                                      Serial.print("#224 running _Slave_Ports_ttl_decrement = ");     Serial.println( Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A);
-                                      //#include "_Slave_Ports_ttl_decrement.h"
-                                      _Slave_Ports_ttl_decrement_POP(Slave_Ports_Status_QUEUE_A, _Slave_Ports_queue_pop ,  Slave_Ports_Status_A ) ;  
-                                      break;
-                                      
-                            case TASK_TYPE_T_Slave_Ports_broadcast____:
-                                      Serial.print("#337 running _Slave_Ports_broadcast = ");     Serial.println( Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A);
-                                     // #include "_Slave_Ports_ttl_decrement.h"
-                                     _Slave_Ports_broadcast_POP(Slave_Ports_Status_QUEUE_A, _Slave_Ports_queue_pop ,  Slave_Ports_Status_A, LCDtim ) ; 
-                                     break;
-
-                             Serial.print("Error unsupported type ");     Serial.println( Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A);     
-                     }
-
-                    
-              }
-
-
-   
-  } else {
-    String LCDarray1 = "Nothing to";
-    String LCDarray2 = "process...";
-    //LCDarray2.reserve(16);
-    Serial.print(LCDarray1); 
-    Serial.println(LCDarray2); 
-
-   //  Serial.print("#32 String LCDarray2 len"); 
-    // int LCDarray2_length = LCDarray2.length;
-   /*  Serial.print(LCDarray2.length()); 
-     Serial.println("] now "); 
-     LCDarray2 = make_str16(LCDarray2);
-    Serial.print(LCDarray2.length()); 
-     Serial.println("]  next #338"); 
-
-      for(int i = 0; i < (17 - LCDarray2.length()); i++)
-        LCDarray2 += 'x';  
-       
-      Serial.print(LCDarray2.length()); 
-     Serial.println("]  "); 
- */
-    
-    Serial.print(" #364 scount "); 
-     Serial.print(_Slave_Ports_queue_count); 
-     Serial.print(" _Slave_Ports_queue.front(): "); 
-     Serial.print(_Slave_Ports_queue_front); 
-     Serial.print(" _Slave_Ports_queue.back(): "); 
-     Serial.print(_Slave_Ports_queue_back); 
-     Serial.print(" _Slave_Ports_queue.peek(): "); 
-     Serial.println(_Slave_Ports_queue_peek); 
-//     LCD_print(LCDarray1, LCDarray2, LCDtim / 3 ) ;
-  }
- }
-
-
-
 
 
 

+ 164 - 2
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_Status_QUEUE_func.h

@@ -18,7 +18,7 @@ void _Slave_Ports_queue__INIT( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QU
 }
 
 
-void _Slave_Ports_queue__add( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QUEUE_A,
+ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_queue__add( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QUEUE_A,
 TASK_TYPE_T TASK_TYPE_A,
 TASK_PORT_ASSOC_T TASK_PORT_ASSOC_A,
 long time_seq_id, 
@@ -26,7 +26,8 @@ long time_min_run //,
 //int _Slave_Ports_queue_peek , int _Slave_Ports_queue_push , int _Slave_Ports_queue_peek_new
 ) {
   Serial.println(".");
-      Serial.print("#152 _Slave_Ports_queue__add  peek: ["); 
+      Serial.print("#152 _Slave_Ports_queue__add  TASK_TYPE_A[");
+       Serial.print(TASK_TYPE_A); Serial.print("]  peek:["); 
        int _Slave_Ports_queue_peek = _Slave_Ports_queue.peek() ;
        int _Slave_Ports_queue_back = _Slave_Ports_queue.back() ;
      //  int _Slave_Ports_queue_push_new_ref;
@@ -101,3 +102,164 @@ void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QU
         }
 }
 
+
+
+
+
+ void _Slave_Ports_queue__POP( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QUEUE_A, 
+ int _Slave_Ports_queue_count, 
+ int _Slave_Ports_queue_pop, 
+ int _Slave_Ports_queue_front, 
+ int _Slave_Ports_queue_back,
+ int _Slave_Ports_queue_peek,
+ int LCDtim,   Slave_Ports_Status_T*  Slave_Ports_Status_A
+ //DISPLAY
+ , DISPLAY_T* DISPLAY_A ,
+   DISPLAY_T_ARDUINO_ATTR_ARRAY_T &DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
+   DISPLAY_PHYSICAL_CHAR_T &DISPLAY_PHYSICAL_CHAR_A
+ 
+ ) {
+   //int count = _Slave_Ports_queuev.count();
+   //int _Slave_Ports_queue_pop _Slave_Ports_queuev.pop();
+  Serial.print("#180 run _Slave_Ports_queue__POP cnt "); Serial.print(_Slave_Ports_queue_count); Serial.print(" , pop: "); Serial.println(_Slave_Ports_queue_pop);
+
+   
+    if (_Slave_Ports_queue_count > 0) {
+                            /*
+                             String LCDarray1 = "`Slave_Ports_queue size [";
+                             LCDarray1.concat(_Slave_Ports_queue_count);
+                             LCDarray1.concat("] Oldest["); 
+                             LCDarray1.concat(_Slave_Ports_queue_pop);
+                             
+                             LCDarray1.concat("] Curr[");
+                             LCDarray1.concat(_Slave_Ports_queue_front);
+
+                             String LCDarray2 = "]  last[";
+                             LCDarray2.concat(_Slave_Ports_queue_back);
+                             LCDarray2.concat("] Next[");
+                             LCDarray2.concat(_Slave_Ports_queue_peek);
+                              Serial.print(LCDarray1);
+                                Serial.println(LCDarray2);
+                             */
+                    #if defined(DEBUG)
+                                   Serial.print("#166 _queue__POP [DEBUG]  INF  size["); Serial.print(_Slave_Ports_queue_count);
+                                   Serial.print("] pop["); Serial.print(_Slave_Ports_queue_pop);
+                                   Serial.print("] front["); Serial.print(_Slave_Ports_queue_front);
+                                   Serial.print("] back["); Serial.print(_Slave_Ports_queue_back);
+                                   Serial.print("] peek["); Serial.print(_Slave_Ports_queue_peek);
+                                   Serial.println("]  ");
+                    #endif   
+   
+//    LCD_print(LCDarray1, LCDarray2, LCDtim / 3 ) ;
+
+              if(Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].QUEUE_ID_A == 0 and 
+                Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].QUEUE_ID_A == 0 and 
+                  Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A == 0 and 
+                    //Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_PORT_ASSOC_A == 0 and 
+                      Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].time_seq_id == 0 and 
+                        Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].time_min_run == 0 ) {
+               /* todo
+                   String LCDarray1 = "#206 Error with queue";
+                   String LCDarray2 = "ID: ";
+                    LCDarray2.concat( _Slave_Ports_queue_pop);  LCDarray2.concat("] ");
+                   Serial.print(LCDarray1);
+                   Serial.println(LCDarray2);
+          //          LCD_print(LCDarray1, LCDarray2, LCDtim / 3 ) ;
+                */
+                  #if defined(DEBUG)
+                    // if(DEBUG > 6) {
+                                   Serial.print("#166 _queue__POP [DEBUG]  Error with queue [_Slave_Ports_queue_pop"); Serial.print(_Slave_Ports_queue_pop);
+                                   Serial.println("]  ");
+                             //      }
+                    #endif    
+              } else {
+                   /*todo
+                   String LCDarray1 = "#407 Running task";
+                   String LCDarray2 = "ID: ";
+                    LCDarray2.concat( _Slave_Ports_queue_pop);  LCDarray2.concat("] task_type[");
+                      
+                        LCDarray2.concat( Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A);  LCDarray2.concat("] ");
+                   
+                   Serial.print(LCDarray1);
+                   Serial.println(LCDarray2);
+            //        LCD_print(LCDarray1, LCDarray2, LCDtim / 3 ) ;
+                    */
+                     if(Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].time_min_run > millis()) {
+                            Serial.print("#182 QUEUE reassign .time_seq_id > millis()  time_seq_id[");     Serial.print( Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].time_seq_id); 
+                            Serial.print("]  millis()["); Serial.print(millis());
+                            Serial.print("]  TASK_TYPE_A["); Serial.print(Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A);
+                            Serial.print("]  POP/ID ["); Serial.print(_Slave_Ports_queue_pop); Serial.println("]  ");
+                            _Slave_Ports_queue__add( Slave_Ports_Status_QUEUE_A,
+                                Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A,
+                                Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_PORT_ASSOC_A,
+                                Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].time_seq_id,
+                                Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].time_min_run 
+                              );
+                              Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop]={} ; 
+
+                     } else if(Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A == TASK_TYPE_T_Slave_Ports_ttl_decrement) {
+                            
+                                      Serial.print("#224 running _Slave_Ports_ttl_decrement = ");     Serial.println( Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A); Serial.println("]");     
+                                      //#include "_Slave_Ports_ttl_decrement.h"
+                                      _Slave_Ports_ttl_decrement_POP(Slave_Ports_Status_QUEUE_A, _Slave_Ports_queue_pop ,  Slave_Ports_Status_A ) ;  
+                            
+                                      
+                     } else if(Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A == TASK_TYPE_T_Slave_Ports_broadcast____) {
+                                      Serial.print("#337 running _Slave_Ports_broadcast = ");     Serial.println( Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A); Serial.println("]");     
+                                     // #include "_Slave_Ports_ttl_decrement.h"
+                                     _Slave_Ports_broadcast_POP(Slave_Ports_Status_QUEUE_A, _Slave_Ports_queue_pop ,  Slave_Ports_Status_A, LCDtim ) ; 
+                     } else {
+
+                             Serial.print("$177 Error unsupported type TASK_TYPE_A[");     Serial.print( Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A);
+                             Serial.println("] REASSIGN NEXT QUEUE FOR FURTHER ACTION");     
+                             _Slave_Ports_queue__add( Slave_Ports_Status_QUEUE_A,
+                                Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A,
+                                Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_PORT_ASSOC_A,
+                                millis(), 
+                                millis() +  ARDUINO_time_seq_id_A_INCREMENT 
+                              );
+                              Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop]={} ;  
+                     }
+
+                    
+              }
+
+
+   
+  } else {
+    String LCDarray1 = "Nothing to";
+    String LCDarray2 = "process...";
+    //LCDarray2.reserve(16);
+    Serial.print(LCDarray1); 
+    Serial.println(LCDarray2); 
+
+   //  Serial.print("#32 String LCDarray2 len"); 
+    // int LCDarray2_length = LCDarray2.length;
+   /*  Serial.print(LCDarray2.length()); 
+     Serial.println("] now "); 
+     LCDarray2 = make_str16(LCDarray2);
+    Serial.print(LCDarray2.length()); 
+     Serial.println("]  next #338"); 
+
+      for(int i = 0; i < (17 - LCDarray2.length()); i++)
+        LCDarray2 += 'x';  
+       
+      Serial.print(LCDarray2.length()); 
+     Serial.println("]  "); 
+ */
+    
+    Serial.print(" #364 scount "); 
+     Serial.print(_Slave_Ports_queue_count); 
+     Serial.print(" _Slave_Ports_queue.front(): "); 
+     Serial.print(_Slave_Ports_queue_front); 
+     Serial.print(" _Slave_Ports_queue.back(): "); 
+     Serial.print(_Slave_Ports_queue_back); 
+     Serial.print(" _Slave_Ports_queue.peek(): "); 
+     Serial.println(_Slave_Ports_queue_peek); 
+//     LCD_print(LCDarray1, LCDarray2, LCDtim / 3 ) ;
+  }
+ }
+
+
+
+

+ 3 - 0
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_Status_QUEUE_struct.h

@@ -18,6 +18,9 @@ typedef int QUEUE_ID_T ;
 
 
 
+Slave_Ports_Status_QUEUE_T Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_LIMIT_QUEUE];
+
+
 
 /*
 

+ 8 - 0
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_Status_func.h

@@ -80,6 +80,10 @@
         DISPLAY_TARGET_T DISPLAY_TARGET_A,
         time_seq_id_T time_seq_id_A,
         time_min_run_T time_min_run_A
+        //queue
+        ,Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QUEUE_A,
+        TASK_TYPE_T TASK_TYPE_A,
+        TASK_PORT_ASSOC_T TASK_PORT_ASSOC_A
   )
    {
    
@@ -123,6 +127,10 @@
                             DISPLAY_TARGET_A,
                            time_seq_id_A,
                            time_min_run_A
+                          //queue
+                        , Slave_Ports_Status_QUEUE_A,
+                         TASK_TYPE_A,
+                         TASK_PORT_ASSOC_A
                           ); 
         int i;
         for(i=ARDUINO_ARRAY_INDEX_FIRST ; i < ARDUINO_ARRAY_INDEX_LIMIT_PORTS; i++) {//

+ 2 - 0
SE/stuff/P5_Automation_can-dev-res/__main_init.h

@@ -0,0 +1,2 @@
+ARDUINO_FUNCT_INIT_RESULT_T ARDUINO_FUNCT_INIT_RESULT_Slave_Ports_queue__add ;
+ ARDUINO_FUNCT_INIT_RESULT_T ARDUINO_FUNCT_INIT_RESULT__Slave_Ports_LOCAL_init ;

+ 9 - 1
SE/stuff/P5_Automation_can-dev-res/__main_loop_end.h

@@ -10,7 +10,15 @@
  _Slave_Ports_queue_front, 
  _Slave_Ports_queue_back,
  _Slave_Ports_queue_peek,
- LCDtim, Slave_Ports_Status_A);
+ LCDtim, Slave_Ports_Status_A
+ //DISPLAY
+ ,
+        DISPLAY_A ,
+        DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
+        DISPLAY_PHYSICAL_CHAR_A
+        
+ 
+ );
  
  
  

+ 10 - 0
SE/stuff/P5_Automation_can-dev-res/__main_loop_top.h

@@ -0,0 +1,10 @@
+
+
+//ARDUINO_FUNCT_INIT_RESULT_T ARDUINO_FUNCT_INIT_RESULT_Slave_Ports_queue__add ;
+
+if(ARDUINO_FUNCT_INIT_RESULT_Slave_Ports_queue__add == true) {
+} else {
+_Slave_Ports_queue__add(  Slave_Ports_Status_QUEUE_A,  TASK_TYPE_T_Slave_Ports_broadcast____ ,TASK_PORT_ASSOC_EMPTY ,millis(), millis() + ARDUINO_time_seq_id_A_INCREMENT  ) ;  //        "_Slave_Ports_broadcast", //4
+_Slave_Ports_queue__add(  Slave_Ports_Status_QUEUE_A,  TASK_TYPE_T_Slave_Ports_set_I2C______ ,TASK_PORT_ASSOC_EMPTY ,millis(), millis() + ARDUINO_time_seq_id_A_INCREMENT ) ;  //"_Slave_Ports_set_I2C" //5  - to set ports associated on PW
+_Slave_Ports_queue__add(  Slave_Ports_Status_QUEUE_A,  TASK_TYPE_T_DISPLAY_queue_pop________ ,TASK_PORT_ASSOC_EMPTY ,millis(), millis() + ARDUINO_time_seq_id_A_INCREMENT ) ;  //"_Slave_Ports_set_I2C" //5  - to set ports associated on PW
+}

+ 0 - 3
SE/stuff/P5_Automation_can-dev-res/__main_setup.h

@@ -7,9 +7,6 @@ _Slave_Ports_queue__list(Slave_Ports_Status_QUEUE_A);
 //  int _Slave_Ports_queue_push = _Slave_Ports_queue.push(_Slave_Ports_queue.peek() + 1) ; 
   //int _Slave_Ports_queue_peek_new = _Slave_Ports_queue.peek() ; _Slave_Ports_queue__add(  *Slave_Ports_Status_QUEUE_A, 0x01 ,0x00 ,100, 5000 ) ;  // _Slave_Ports_queue_peek, _Slave_Ports_queue.push(_Slave_Ports_queue.peek() + 1), _Slave_Ports_queue.peek());
  
-_Slave_Ports_queue__add(  Slave_Ports_Status_QUEUE_A,  TASK_TYPE_T_Slave_Ports_broadcast____ ,TASK_PORT_ASSOC_EMPTY ,100, 5000 ) ;  //        "_Slave_Ports_broadcast", //4
-_Slave_Ports_queue__add(  Slave_Ports_Status_QUEUE_A,  TASK_TYPE_T_Slave_Ports_set_I2C______ ,TASK_PORT_ASSOC_EMPTY ,100, 5000 ) ;  //"_Slave_Ports_set_I2C" //5  - to set ports associated on PW
-
  //  _Slave_Ports_queue_peek =  _Slave_Ports_queue.peek() ; 
    //_Slave_Ports_queue_push =  _Slave_Ports_queue.push(_Slave_Ports_queue.peek() + 1) ;  
    //_Slave_Ports_queue_peek_new = _Slave_Ports_queue.peek() ; 

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

@@ -51,7 +51,7 @@ const ARDUINO_ARRAY_INDEX_CURRENT_T ARDUINO_ARRAY_INDEX_CURRENT_INIT = 0 ;  //
 const ARDUINO_ARRAY_INDEX_LAST_T ARDUINO_ARRAY_INDEX_LAST_INIT = 0 ;
 const ARDUINO_ARRAY_INDEX_NEXT_T ARDUINO_ARRAY_INDEX_NEXT_INIT = 1;
 
-const int ARDUINO_time_seq_id_A_INCREMENT = 1000 ; 
+const int ARDUINO_time_seq_id_A_INCREMENT = 10000 ; 
 
 const ARDUINO_ARRAY_INDEX_T ARDUINO_ATTR_ARRAY_S_INDEX = ARDUINO_ARRAY_INDEX_FIRST ;
 

+ 3 - 2
SE/stuff/P5_Automation_can-dev-res/__main_struct_funct.h

@@ -21,7 +21,8 @@ void ARDUINO_ARRAY_ASSOC_TABLE_commit_added_element(
     ARDUINO_ARRAY_INDEX_T* ARDUINO_ARRAY_INDEX_A,
     ARDUINO_ARRAY_PRIMARY_KET_T ARDUINO_ARRAY_PRIMARY_KET_A
 ) {
-
+ 
+    int i = ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A ;
 
 }
 
@@ -44,7 +45,7 @@ void ARDUINO_ATTR_ARRAY_S__commit_added_element(
     
     //ARDUINO_ARRAY_INDEX_LIMIT_A; todo use limits
                 #if defined(DEBUG) 
-                             Serial.print("#36 _commit_added_element [DEBUG]  #C["); Serial.print(ARDUINO_ARRAY_INDEX_CURRENT_A);
+                             Serial.print("#36 ATTR_ARRAY_S [DEBUG]  #C["); Serial.print(ARDUINO_ARRAY_INDEX_CURRENT_A);
                             Serial.print("] CountNew["); Serial.print( ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A);
                             Serial.print("] Last["); Serial.print( ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_LAST_A);
                             Serial.print("] Curr["); Serial.print( ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A); 

+ 2 - 0
SE/stuff/P5_Automation_can-dev-res/__main_struct_limits.h

@@ -6,4 +6,6 @@ const ARDUINO_ARRAY_INDEX_LIMIT_T  ARDUINO_ARRAY_INDEX_T_TO_DELETE_S_LIMIT = 5 ;
 const ARDUINO_ARRAY_INDEX_LIMIT_T  ARDUINO_ARRAY_INDEX_LIMIT_PORTS = 100 ;
 const ARDUINO_ARRAY_INDEX_LIMIT_T  ARDUINO_ARRAY_INDEX_LIMIT_DISPLAY = 10 ;
 
+const ARDUINO_ARRAY_INDEX_LIMIT_T  ARDUINO_ARRAY_INDEX_LIMIT_QUEUE = 20 ;
+
 

+ 4 - 0
SE/stuff/P5_Automation_can-dev-res/config_Slave_Ports_LOCAL_init.h

@@ -69,6 +69,10 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(Slave_Ports_Status_T* Slave_
                           DISPLAY_TARGET_DISPLAY128,
                           millis(), //time_seq_id_A,
                            0 //time_min_run_A =
+                           //QUEUE
+                           , Slave_Ports_Status_QUEUE_A,
+                            TASK_TYPE_A,
+                            TASK_PORT_ASSOC_A
                  );