a.binder 5 tahun lalu
induk
melakukan
6dedab9526

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

@@ -360,8 +360,8 @@ if(ARDUINO_FUNCT_INIT_RESULT__Slave_Ports_LOCAL_init == true ){
         millis() + ARDUINO_time_seq_id_A_INCREMENT
         millis() + ARDUINO_time_seq_id_A_INCREMENT
          //queue
          //queue
         ,Slave_Ports_Status_QUEUE_A,
         ,Slave_Ports_Status_QUEUE_A,
-        TASK_TYPE_A,
-        TASK_PORT_ASSOC_A
+        TASK_TYPE_T__EMPTY__JUST_PASSED_ARG__,
+        TASK_PORT_ASSOC_EMPTY
      );
      );
 
 
  // Serial.println(time);
  // Serial.println(time);

+ 8 - 1
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_Status_QUEUE_func.h

@@ -49,6 +49,8 @@ long time_min_run //,
      Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_back + 1 ].TASK_PORT_ASSOC_A=TASK_PORT_ASSOC_A ;
      Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_back + 1 ].TASK_PORT_ASSOC_A=TASK_PORT_ASSOC_A ;
      Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_back + 1 ].time_seq_id=time_seq_id ;
      Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_back + 1 ].time_seq_id=time_seq_id ;
      Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_back + 1 ].time_min_run=time_min_run ;
      Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_back + 1 ].time_min_run=time_min_run ;
+ 
+ return true ;
     
     
 }
 }
 
 
@@ -122,7 +124,7 @@ void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QU
    //int count = _Slave_Ports_queuev.count();
    //int count = _Slave_Ports_queuev.count();
    //int _Slave_Ports_queue_pop _Slave_Ports_queuev.pop();
    //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);
   Serial.print("#180 run _Slave_Ports_queue__POP cnt "); Serial.print(_Slave_Ports_queue_count); Serial.print(" , pop: "); Serial.println(_Slave_Ports_queue_pop);
-
+               _Slave_Ports_queue_task_type_DESC(Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A) ; 
    
    
     if (_Slave_Ports_queue_count > 0) {
     if (_Slave_Ports_queue_count > 0) {
                             /*
                             /*
@@ -188,6 +190,7 @@ void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QU
                             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("#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("]  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("]  TASK_TYPE_A["); Serial.print(Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A);
+                            Serial.print("]  Will wait() to next ["); 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("]  ");
                             Serial.print("]  POP/ID ["); Serial.print(_Slave_Ports_queue_pop); Serial.println("]  ");
                             _Slave_Ports_queue__add( Slave_Ports_Status_QUEUE_A,
                             _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_TYPE_A,
@@ -208,6 +211,10 @@ void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QU
                                       Serial.print("#337 running _Slave_Ports_broadcast = ");     Serial.println( Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A); Serial.println("]");     
                                       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"
                                      // #include "_Slave_Ports_ttl_decrement.h"
                                      _Slave_Ports_broadcast_POP(Slave_Ports_Status_QUEUE_A, _Slave_Ports_queue_pop ,  Slave_Ports_Status_A, LCDtim ) ; 
                                      _Slave_Ports_broadcast_POP(Slave_Ports_Status_QUEUE_A, _Slave_Ports_queue_pop ,  Slave_Ports_Status_A, LCDtim ) ; 
+                     } else if(Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A == TASK_TYPE_T_DISPLAY_queue_pop________ ) {
+                       Serial.print("#212 DISPLAY TASK_TYPE_A[");     Serial.print( Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A);
+                             Serial.println("] ");   
+                     
                      } else {
                      } 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.print("$177 Error unsupported type TASK_TYPE_A[");     Serial.print( Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A);

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

@@ -131,6 +131,7 @@
                         , Slave_Ports_Status_QUEUE_A,
                         , Slave_Ports_Status_QUEUE_A,
                          TASK_TYPE_A,
                          TASK_TYPE_A,
                          TASK_PORT_ASSOC_A
                          TASK_PORT_ASSOC_A
+                        
                           ); 
                           ); 
         int i;
         int i;
         for(i=ARDUINO_ARRAY_INDEX_FIRST ; i < ARDUINO_ARRAY_INDEX_LIMIT_PORTS; i++) {//
         for(i=ARDUINO_ARRAY_INDEX_FIRST ; i < ARDUINO_ARRAY_INDEX_LIMIT_PORTS; i++) {//
@@ -180,6 +181,10 @@
                      DISPLAY_TARGET_A,
                      DISPLAY_TARGET_A,
                     time_seq_id_A,
                     time_seq_id_A,
                     time_min_run_A
                     time_min_run_A
+                     //queue
+                          , Slave_Ports_Status_QUEUE_A,
+                            TASK_TYPE_A,
+                            TASK_PORT_ASSOC_A
                    ); 
                    ); 
                delay(100);
                delay(100);
             }
             }

+ 7 - 0
SE/stuff/P5_Automation_can-dev-res/_TASK_TYPES_func.h

@@ -17,6 +17,13 @@ void _Slave_Ports_queue_task_type_DESC( int _Slave_Ports_queue_task_type ) {//,
                 case TASK_TYPE_T_Slave_Ports_set_I2C______:  
                 case TASK_TYPE_T_Slave_Ports_set_I2C______:  
                   Serial.println("TASK_TYPE_T_Slave_Ports_set_I2C______");
                   Serial.println("TASK_TYPE_T_Slave_Ports_set_I2C______");
                   break;
                   break;
+                 case TASK_TYPE_T_DISPLAY_queue_pop________:  
+                  Serial.println("TASK_TYPE_T_DISPLAY_queue_pop________");
+                  break;
+                 case TASK_TYPE_T__EMPTY__JUST_PASSED_ARG__:  
+                  Serial.println("TASK_TYPE_T__EMPTY__JUST_PASSED_ARG__");
+                  break;
+                  
                 Serial.println("106 unknown _Slave_Ports_queue_task_type");
                 Serial.println("106 unknown _Slave_Ports_queue_task_type");
           }
           }
 }
 }

+ 1 - 0
SE/stuff/P5_Automation_can-dev-res/_TASK_TYPES_struct.h

@@ -9,6 +9,7 @@ const TASK_TYPE_T TASK_TYPE_T_request_set_new_Exp_state = 0x03 ;
 const TASK_TYPE_T TASK_TYPE_T_Slave_Ports_broadcast____ = 0x04 ;
 const TASK_TYPE_T TASK_TYPE_T_Slave_Ports_broadcast____ = 0x04 ;
 const TASK_TYPE_T TASK_TYPE_T_Slave_Ports_set_I2C______ = 0x05 ;
 const TASK_TYPE_T TASK_TYPE_T_Slave_Ports_set_I2C______ = 0x05 ;
 const TASK_TYPE_T TASK_TYPE_T_DISPLAY_queue_pop________ = 0x06 ;
 const TASK_TYPE_T TASK_TYPE_T_DISPLAY_queue_pop________ = 0x06 ;
+const TASK_TYPE_T TASK_TYPE_T__EMPTY__JUST_PASSED_ARG__ = 0x07 ;
 
 
 
 
 
 

+ 8 - 3
SE/stuff/P5_Automation_can-dev-res/__main_loop_top.h

@@ -4,7 +4,12 @@
 
 
 if(ARDUINO_FUNCT_INIT_RESULT_Slave_Ports_queue__add == true) {
 if(ARDUINO_FUNCT_INIT_RESULT_Slave_Ports_queue__add == true) {
 } else {
 } 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
+    #if defined(DEBUG)
+        Serial.print("#7 main loop top ARDUINO_FUNCT_INIT_RESULT_Slave_Ports_queue__add=[");
+        Serial.print(ARDUINO_FUNCT_INIT_RESULT_Slave_Ports_queue__add);
+        Serial.println(""]  );
+     #endif
+ARDUINO_FUNCT_INIT_RESULT_Slave_Ports_queue__add = _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
+ARDUINO_FUNCT_INIT_RESULT_Slave_Ports_queue__add = _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
+ARDUINO_FUNCT_INIT_RESULT_Slave_Ports_queue__add = _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
 }
 }

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

@@ -71,8 +71,8 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(Slave_Ports_Status_T* Slave_
                            0 //time_min_run_A =
                            0 //time_min_run_A =
                            //QUEUE
                            //QUEUE
                            , Slave_Ports_Status_QUEUE_A,
                            , Slave_Ports_Status_QUEUE_A,
-                            TASK_TYPE_A,
-                            TASK_PORT_ASSOC_A
+                            TASK_TYPE_T__EMPTY__JUST_PASSED_ARG__,
+                            TASK_PORT_ASSOC_EMPTY
                  );
                  );