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

+ 9 - 11
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_Status_QUEUE_func.h

@@ -134,16 +134,14 @@ void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QU
  
       
   ARDUINO_ARRAY_INDEX_NEXT_LOCK_T ARDUINO_ARRAY_INDEX_POP_LOCK_A = ARDUINO_ARRAY_INDEX_POP_LOCK(Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A);
-       #if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT)  || defined(DEBUG_STORAGE_QUEUE_TEST)
-        Serial.println("136 after ARDUINO_ARRAY_INDEX_POP_LOCK"); ARDUINO_ATTR_ARRAY_S__display(Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A);
-        Serial.print(" ARDUINO_ARRAY_INDEX_NEXT_LOCK_A[POP_LOCK][");Serial.print(ARDUINO_ARRAY_INDEX_POP_LOCK_A); Serial.print("] ");
-       #endif
 
-  ARDUINO_ARRAY_ATTR_QUEUE_T Slave_Ports_ATTR_QUEUE_A = ARDUINO_ARRAY_ATTR_QUEUE(Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A) ;//ARDUINO_ARRAY_INDEX_CURRENT_T Slave_Ports_ATTR_QUEUE_PEEK_A ;// = Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A ;
 
- 
- Serial.print(" COUNT_MAX["); Serial.print(Slave_Ports_ATTR_QUEUE_A.ARDUINO_ARRAY_ATTR_QUEUE_COUNT_MAX_A); 
-    Serial.print("] COUNT_A["); Serial.print(Slave_Ports_ATTR_QUEUE_A.ARDUINO_ARRAY_ATTR_QUEUE_COUNT_A); Serial.print("] ");
+ // ARDUINO_ARRAY_ATTR_QUEUE_T Slave_Ports_ATTR_QUEUE_A = ARDUINO_ARRAY_ATTR_QUEUE(Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A) ;//ARDUINO_ARRAY_INDEX_CURRENT_T Slave_Ports_ATTR_QUEUE_PEEK_A ;// = Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A ;
+
+  Serial.println("136 after ARDUINO_ARRAY_INDEX_POP_LOCK"); ARDUINO_ATTR_ARRAY_S__display(Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A);
+        Serial.print(" [POP_LOCK][");Serial.print(ARDUINO_ARRAY_INDEX_POP_LOCK_A); Serial.print("] ");
+        Serial.print(" COUNT_MAX["); Serial.print(Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_LIMIT_A); 
+       Serial.print("] COUNT_A["); Serial.print(Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_COUNT_A); Serial.print("] ");
   //  Serial.print("] BACK_A["); Serial.print(Slave_Ports_ATTR_QUEUE_A.ARDUINO_ARRAY_ATTR_QUEUE_BACK_A); Serial.print("] ");
    // Serial.print("] FRONT_A["); Serial.print(Slave_Ports_ATTR_QUEUE_A.ARDUINO_ARRAY_ATTR_QUEUE_FRONT_A); Serial.println("] ");
     
@@ -214,10 +212,10 @@ void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QU
                                      _Slave_Ports_broadcast_POP(                                     
                                                  Slave_Ports_Status_QUEUE_A, 
                                                  Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
-                                                 Slave_Ports_ATTR_QUEUE_A.ARDUINO_ARRAY_ATTR_QUEUE_COUNT_A, 
+                                                 Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_COUNT_A, 
                                                  ARDUINO_ARRAY_INDEX_POP_LOCK_A, 
-                                                 Slave_Ports_ATTR_QUEUE_A.ARDUINO_ARRAY_ATTR_QUEUE_FRONT_A, 
-                                                 Slave_Ports_ATTR_QUEUE_A.ARDUINO_ARRAY_ATTR_QUEUE_BACK_A,
+                                                 Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_FRONT_A, 
+                                                 Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_BACK_A,
                                                  ARDUINO_ARRAY_INDEX_POP_LOCK_A,
                                                  LCDtim,   
                                               Slave_Ports_Status_A ,

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

@@ -368,7 +368,7 @@ ARDUINO_FUNCT_INIT_RESULT_T ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE(
     return false;
     
 }
-
+/*
 ARDUINO_ARRAY_ATTR_QUEUE_T ARDUINO_ARRAY_ATTR_QUEUE(ARDUINO_ATTR_ARRAY_T &ARDUINO_ATTR_ARRAY_A) {
         ARDUINO_ARRAY_ATTR_QUEUE_T ARDUINO_ARRAY_ATTR_QUEUE_A = {} ;
          ARDUINO_ARRAY_ATTR_QUEUE_A.ARDUINO_ARRAY_ATTR_QUEUE_COUNT_MAX_A = ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_LIMIT_A ;
@@ -380,7 +380,7 @@ ARDUINO_ARRAY_ATTR_QUEUE_T ARDUINO_ARRAY_ATTR_QUEUE(ARDUINO_ATTR_ARRAY_T &ARDUIN
         }
 
 
-
+*/
 
 ARDUINO_ARRAY_INDEX_CURRENT_T ARDUINO_ARRAY_INDEX_CURRENT(
        ARDUINO_ATTR_ARRAY_S &ARDUINO_ATTR_ARRAY_A