a.binder 5 лет назад
Родитель
Сommit
62e1f405d5

+ 3 - 3
SE/stuff/P5_Automation_can-dev-res/_Port_Broadcast_state_struct.h

@@ -4,9 +4,9 @@ typedef int Broadcast_state_T ;
 const Broadcast_state_T  Broadcast_state_TO_REFRESH = 1; //0x01 ;
 
 
-const Broadcast_state_T  Broadcast_state_FRESH = 30 ;// 0x30 ;
+const Broadcast_state_T  Broadcast_state_FRESH = 15 ;// 0x30 ;
 
-const Broadcast_state_T  Broadcast_state_LOW = 5 ;// 0x30 ;
+const Broadcast_state_T  Broadcast_state_LOW = 3 ;// 0x30 ;
 
-const Broadcast_state_T  Broadcast_state_FULL_FRESH = 150; //0xFF ;
+const Broadcast_state_T  Broadcast_state_FULL_FRESH = 30; //0xFF ;
 

+ 12 - 10
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_Status_QUEUE_add_func.h

@@ -13,10 +13,12 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_queue__add( Slave_Ports_Status_QUEUE_T*
     ARDUINO_ARRAY_INDEX_T DISPLAY_ARDUINO_ARRAY_INDEX_A //optionally
     //int _Slave_Ports_queue_peek , int _Slave_Ports_queue_push , int _Slave_Ports_queue_peek_new
     ) {
+    
+    #if defined(DEBUG_QUEUE)
       Serial.println(".");
           Serial.print("#152 _Slave_Ports_queue__add  TASK_TYPE_A[");
            Serial.print(TASK_TYPE_A); Serial.print(" [");  _Slave_Ports_queue_task_type_DESC(TASK_TYPE_A); Serial.print("] ");
-           
+    #endif
            
       
       
@@ -89,13 +91,13 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_queue__add( Slave_Ports_Status_QUEUE_T*
         //ARDUINO_QUEUE_FLAG_CANNOT_OVERWRITE , millis() ) ;
       } else {
       
-                  
+            #if defined(DEBUG_QUEUE)      
                  Serial.print("]#810A   [USING] [INDEX_NEXT_A]=[LOCK["); 
                  
                   //Slave_Ports_Status_QUEUE_T_INDEX_NEXT_A =  Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A ;
                          Serial.print( Slave_Ports_Status_QUEUE_T_INDEX_NEXT_A);   Serial.print("]  [");
                          Serial.print("   [Slave_Ports_Status_QUEUE_T_INDEX_NEXT_A[");Serial.print(Slave_Ports_Status_QUEUE_T_INDEX_NEXT_A);Serial.print("]]   ");
-                     
+            #endif
                   Slave_Ports_Status_QUEUE_A[Slave_Ports_Status_QUEUE_T_INDEX_NEXT_A].QUEUE_ID_A = Slave_Ports_Status_QUEUE_STATIC_ID_COUNTER_T() ; //Slave_Ports_Status_QUEUE_T_INDEX_NEXT_A ; //todo should be counter //_Slave_Ports_queue_back + 1 ;
                   Slave_Ports_Status_QUEUE_A[Slave_Ports_Status_QUEUE_T_INDEX_NEXT_A].TASK_TYPE_A = TASK_TYPE_A ;
                   Slave_Ports_Status_QUEUE_A[Slave_Ports_Status_QUEUE_T_INDEX_NEXT_A].TASK_PORT_ASSOC_A=TASK_PORT_ASSOC_A ;
@@ -107,13 +109,13 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_queue__add( Slave_Ports_Status_QUEUE_T*
                ARDUINO_FUNCT_INIT_RESULT_T   ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE_A = ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE(Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A, Slave_Ports_Status_QUEUE_T_INDEX_NEXT_A,
                    //ARDUINO_QUEUE_FLAG_QUEUE,
                    ARDUINO_QUEUE_ELEMENT_FLAG_STANDARD  ) ;
-                    Serial.print(" after [COMMIT] new QUEUE_ID_A["); Serial.print(Slave_Ports_Status_QUEUE_A[Slave_Ports_Status_QUEUE_T_INDEX_NEXT_A].QUEUE_ID_A ); Serial.print("]    ");
-                     
-                     Serial.print(" COMIT[RES]["); Serial.print(ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE_A); Serial.print("] ");
-                    Serial.print(" NEXT["); Serial.print(Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A ); Serial.print("] ");
-                    Serial.print(" PEEK["); Serial.print(Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A ); Serial.print("] ");
-                    Serial.print(" COUNT["); Serial.print(Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_COUNT_A ); Serial.println("] ");
-                     
+                   #if defined(DEBUG_QUEUE)
+                        Serial.print(" after [COMMIT] new QUEUE_ID_A["); Serial.print(Slave_Ports_Status_QUEUE_A[Slave_Ports_Status_QUEUE_T_INDEX_NEXT_A].QUEUE_ID_A ); Serial.print("]    ");
+                         Serial.print(" COMIT[RES]["); Serial.print(ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE_A); Serial.print("] ");
+                        Serial.print(" NEXT["); Serial.print(Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A ); Serial.print("] ");
+                        Serial.print(" PEEK["); Serial.print(Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A ); Serial.print("] ");
+                        Serial.print(" COUNT["); Serial.print(Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_COUNT_A ); Serial.println("] ");
+                     #endif
               return true ;
       }
     

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

@@ -221,11 +221,13 @@ void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QU
         
         
                      if(Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].time_min_run > time) {
+                           #if defined(DEBUG_QUEUE)
                             Serial.print("#182 QUEUE reassign .time_seq_id > millis()  time_seq_id[");     Serial.print( Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].time_seq_id); 
                             Serial.print("]  millis()["); Serial.print(time);
                             Serial.print("]  TASK_TYPE_A["); Serial.print(Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].TASK_TYPE_A);
                             Serial.print("]  Will wait() to next ["); Serial.print(Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].time_seq_id);
-                            Serial.print("]  #["); Serial.print(ARDUINO_ARRAY_INDEX_POP_LOCK_A);  Serial.print("]  ID["); Serial.print(Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].QUEUE_ID_A);  Serial.println("]  ");  
+                            Serial.print("]  #["); Serial.print(ARDUINO_ARRAY_INDEX_POP_LOCK_A);  Serial.print("]  ID["); Serial.print(Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].QUEUE_ID_A);  Serial.println("]  ");
+                           #endif  
                             _Slave_Ports_queue__add( Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A , 
                                 Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].TASK_TYPE_A,
                                 Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].TASK_PORT_ASSOC_A,
@@ -233,7 +235,9 @@ void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QU
                                 Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].time_min_run,
                                 Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].DISPLAY_ARDUINO_ARRAY_INDEX_A
                               );
+                              #if defined(DEBUG_QUEUE)
                                Serial.print("[WILL DELETE REC]     millis()["); Serial.print(time);
+                              #endif
                               Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A]={} ; //TODO delete by func