Parcourir la source

err static itp

a.binder il y a 5 ans
Parent
commit
80ef2cc58f

+ 10 - 1
SE/stuff/P5_Automation_can-dev-res/P5_Automation_can-dev-res.ino

@@ -527,6 +527,15 @@ void loop() {
                            Serial.println("] ");  
                        #endif
                }
+               
+               #ifdef DEBUG_DISPLAY
+               
+                Serial.print("#532 Will  TODO bug when too many mesgs to queue ..DISPLAY_pos_seq_T[");
+                     Serial.print(DISPLAY_pos_seq_A_NEXT  , BIN);  Serial.print("]+[ ");    Serial.print(DISPLAY_pos_seq_A_IMMEDIATE  , BIN); Serial.print("]  ==[ "); Serial.print(DISPLAY_pos_seq_A_NEXT | DISPLAY_pos_seq_A_IMMEDIATE  , BIN);
+                     Serial.print("]  DISPLAY_TARGET_T 128["); Serial.print(DISPLAY_TARGET_DISPLAY128, BIN);Serial.print("]  bin[");
+                     Serial.println("]   ");
+               #endif 
+               
                Slave_Ports_Status__DISPLAY_TARGET(
                      Slave_Ports_Status_A ,
                      Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A,
@@ -534,7 +543,7 @@ void loop() {
                        DISPLAY_A ,
                          DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
                          DISPLAY_PHYSICAL_CHAR_A, 
-                    DISPLAY_pos_seq_A_NEXT + DISPLAY_pos_seq_A_IMMEDIATE ,
+                    DISPLAY_pos_seq_A_NEXT | DISPLAY_pos_seq_A_IMMEDIATE ,
                     "PORTS:",
                     DISPLAY_TARGET_DISPLAY128,
                    millis(),

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

@@ -133,7 +133,9 @@ void DISPLAY__print_IMMEDIATE(
                 )
                 {
                 
-                    #if defined(DEBUG)
+                    #ifdef DEBUG_DISPLAY
+                    Serial.print("127 DISPLAY__print DISPLAY_pos_seq_A["); Serial.print(BIN8_to_STRING(DISPLAY_pos_seq_A ));
+                        Serial.print("]  DISPLAY_TARGET_A["); Serial.print(BIN8_to_STRING(DISPLAY_TARGET_A )); Serial.print("]      [");
                             Serial.print("#26 Dspl ATTR CURRENT[ "); Serial.print(DISPLAY_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A);
                                      Serial.print("] LAST["); Serial.print(DISPLAY_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_LAST_A); 
                                      Serial.print("] COUNT["); Serial.print(DISPLAY_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A); 
@@ -143,13 +145,13 @@ void DISPLAY__print_IMMEDIATE(
                     #endif
                     
                     if(DISPLAY_pos_seq_A & DISPLAY_pos_seq_A_IMMEDIATE){ ////BIN TEST
-                            #if defined(DEBUG)
-                                    if(DEBUG > 6) {
+                            #ifdef DEBUG_DISPLAY
+                                    //if(DEBUG > 6) {
                                         Serial.print("#84 DISPLAY__print to DISPLAY__print_IMMEDIATE [DEBUG]  else  Seq["); Serial.print(DISPLAY_pos_seq_A , BIN);
                                         Serial.print("] Target["); Serial.print(DISPLAY_TARGET_A , BIN); 
                                         
                                         Serial.println("]  ");
-                                     }
+                                    // }
                                 #endif  
                            DISPLAY__print_IMMEDIATE(DISPLAY_T_ARDUINO_ATTR_ARRAY_A, DISPLAY_PHYSICAL_CHAR_A, DISPLAY_pos_seq_A,  DISPLAY_array16_A,  DISPLAY_TARGET_A);
                                      // Serial.print("#28 running _Slave_Ports_ttl_decrement = ");

+ 4 - 4
SE/stuff/P5_Automation_can-dev-res/_DISPLAY_struct.h

@@ -36,7 +36,7 @@ typedef  int DISPLAY_pos_seq_T ; //reqiested position in LCD
 typedef  int DISPLAY_pos_id_T ; //reqiested position id in LCD
 
  
-typedef int DISPLAY_TARGET_T ;
+typedef byte DISPLAY_TARGET_T ; //TODO BIN
 
  struct DISPLAY_S {
       int _queue_id ; //current queue task
@@ -73,9 +73,9 @@ typedef struct DISPLAY_S DISPLAY_T ;
  
  const DISPLAY_TARGET_T  DISPLAY_TARGET_CONSOLE      = B00000001 ;
  const DISPLAY_TARGET_T  DISPLAY_TARGET_LCD16        = B00000010 ;
- const DISPLAY_TARGET_T  DISPLAY_TARGET_DISPLAY128   = B00000100 ;
- const DISPLAY_TARGET_T  DISPLAY_TARGET_ALL          =            DISPLAY_TARGET_CONSOLE + DISPLAY_TARGET_LCD16 + DISPLAY_TARGET_DISPLAY128 ;
- const DISPLAY_TARGET_T  DISPLAY_TARGET_ANY          = B00001000 + DISPLAY_TARGET_CONSOLE + DISPLAY_TARGET_LCD16 + DISPLAY_TARGET_DISPLAY128 ;
+ static const DISPLAY_TARGET_T  DISPLAY_TARGET_DISPLAY128   = B00000100 ;
+ const DISPLAY_TARGET_T  DISPLAY_TARGET_ALL          =            DISPLAY_TARGET_CONSOLE | DISPLAY_TARGET_LCD16 | DISPLAY_TARGET_DISPLAY128 ;
+ const DISPLAY_TARGET_T  DISPLAY_TARGET_ANY          = B00001000 | DISPLAY_TARGET_CONSOLE | DISPLAY_TARGET_LCD16 | DISPLAY_TARGET_DISPLAY128 ;
  
  
  

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

@@ -31,7 +31,7 @@ DISPLAY__CURSOR_Y_CHARS__SET(DISPLAY_PHYSICAL_CHAR_A,
                           DISPLAY_A ,
                           DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
                           DISPLAY_PHYSICAL_CHAR_A, 
-                           DISPLAY_pos_seq_A_NEXT + DISPLAY_pos_seq_A_IMMEDIATE,
+                           DISPLAY_pos_seq_A_NEXT | DISPLAY_pos_seq_A_IMMEDIATE,
                             DISPLAY_array16_AA,
                             DISPLAY_TARGET_DISPLAY128,
                            millis() , // time_seq_id_T time_seq_id_A;

+ 41 - 29
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_I2C_func.h

@@ -47,7 +47,7 @@
                         
                           ); 
          
-       Serial.print("#200 Slave_Ports_I2C_POP  #COUNT_A");   Serial.print(Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A);
+       Serial.print("#200 Slave_Ports_I2C_POP  #COUNT_A[");   Serial.print(Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A);
         Serial.print("] INDEX_LAST[");                       Serial.print(Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_LAST_A);
         Serial.print("] INDEX_CURRENT[");                    Serial.print(Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A);
         Serial.print("] INDEX_NEXT[");                       Serial.print(Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A);
@@ -64,10 +64,10 @@
     for(i=ARDUINO_ARRAY_INDEX_FIRST;i <= (ARDUINO_ARRAY_INDEX_FIRST + Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A) ;i++) {
       if(Slave_Ports_Status_A[i].PortTypes & PortTypes_I2C) { //BIN TEST
             if(Slave_Ports_Status_A[i].Exp_state_ttl == Exp_state_ttl_TO_REFRESH ) {
-             #ifdef DEBUG
+             #ifdef DEBUG || DEBUG_CAN
                 if(DEBUG > 4) {
                Serial.print("#311 ttl min i2c for: I2C_port[");  Serial.print(Slave_Ports_Status_A[i].I2C_port);   Serial.print("] ttl[");  Serial.print(Slave_Ports_Status_A[i].Exp_state_ttl);
-                 Serial.print(" Port_ID[");  Serial.print(Slave_Ports_Status_A[i].Port_ID);   Serial.println("]  ");   Serial.print(" id[");  Serial.print(i);   Serial.println("]  "); 
+                 Serial.print(" Port_ID[");  Serial.print(Slave_Ports_Status_A[i].Port_ID);   Serial.println("]  ");   Serial.print(" #[");  Serial.print(i);   Serial.println("]  "); 
                  }
              #endif
                
@@ -77,12 +77,12 @@
                       //find port status
                       if(ARDUINO_ARRAY_INDEX_DRIVER_STATUS_TO_ADD == Adafruit_PWMServoDriver__get_DRIVER_STATUS_T(
                                 Adafruit_PWMServoDriver_A, Adafruit_PWMServoDriver_ATTR_ARRAY_A, Slave_Ports_Status_A[i].Address)) {
-                                 Serial.println("#80 I2C ARDUINO_ARRAY_INDEX_DRIVER_STATUS_TO_ADD   "); 
+                                 Serial.println("#80 I2C  [ARDUINO_ARRAY_INDEX_DRIVER_STATUS_TO_ADD]   "); 
                                  
                                  ARDUINO_ARRAY_INDEX_DRIVER_STATUS_T Adafruit_PWMServoDriver__add_A = Adafruit_PWMServoDriver__add(Adafruit_PWMServoDriver_A,Adafruit_PWMServoDriver_ATTR_ARRAY_A,Slave_Ports_Status_A[i].Address,  ARDUINO_ARRAY_INDEX_DRIVER_STATUS_TO_SETVAL_A) ;
                                  
                               if(ARDUINO_ARRAY_INDEX_DRIVER_STATUS_TO_SETVAL_A == Adafruit_PWMServoDriver__add_A) {
-                                       Serial.println("#83 I2C ARDUINO_ARRAY_INDEX_DRIVER_STATUS_TO_SETVAL_A   ");
+                                       Serial.println("#83 I2C [ARDUINO_ARRAY_INDEX_DRIVER_STATUS_TO_SETVAL_A]   ");
                                        
                                   //   ARDUINO_ARRAY_PRIMARY_KET_T I2C_INDEX_DRIVER_A =   Adafruit_PWMServoDriver__get_PRIMARY_KET_T(Adafruit_PWMServoDriver_A,Adafruit_PWMServoDriver_ATTR_ARRAY_A,Slave_Ports_Status_A[i].Address);
                                        
@@ -109,13 +109,14 @@
                                     }
                                     */
                                     
-                                    Serial.print("#112 I2C ADD    OK   id:");  Serial.print(I2C_INDEX_DRIVER_A);  Serial.println(" ] ");
+                                    Serial.print("#112 I2C [ADD]    [OK[   #");  Serial.print(I2C_INDEX_DRIVER_A);  Serial.println(" ] ");
                                     
                                     
                                                   
-                                     #ifdef DEBUG_CAN || DEBUG
-                                        Serial.print("#154   before PWM   Exp_state_ttl[");
-                                        Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state_ttl)); Serial.print("]  Exp_state[");
+                                     #if  DEBUG > 7
+                                         Serial.print("#["); Serial.print(i);  Serial.print("] ");Serial.print("#154   before PWM   Exp_state_ttl[");
+                                        Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state_ttl)); Serial.print("]  PortTypes[");
+                                        Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].PortTypes)); Serial.print("]  Broadcast_state[");
                                         Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state)); Serial.print("]  Broadcast_state[");
                                         Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Broadcast_state)); Serial.println("] ");
                                          Serial.print("#121  Exp_state[  ");
@@ -134,7 +135,7 @@
                                                         if (!( ( Slave_Ports_Status_A[i].Exp_state & B00000000 ) ^ Exp_state_OFF ))  Serial.print(" [ + OFF ] ");
                                                         if (!( ( Slave_Ports_Status_A[i].Exp_state & B11111111 ) ^ Exp_state_OFF ))  Serial.print(" [ # OFF ] ");
                                                         if (!( ( Slave_Ports_Status_A[i].Exp_state & B11111110 ) ^ B00000001 ))  Serial.print(" [ < OFF ] ");
-                                                        if (!( ( Slave_Ports_Status_A[i].Exp_state & B00000001 ) ^ B11111110 ))  Serial.print(" [ > OFF ] ");
+                                                        if (!( ( Slave_Ports_Status_A[i].Exp_state & B00000001 ) ^ B11111110 ))  Serial.println(" [ > OFF ] ");
                                       #endif          
                       
                              //   Slave_Ports_Status_A[i].Exp_state_ttl = Exp_state_ttl_IS_ACTIVE ;
@@ -143,29 +144,36 @@
                                     
                                     
                                     if(Slave_Ports_Status_A[i].PortTypes & PortTypes_SERVO) {
+                                            Serial.print("#147   [PortTypes_SERVO]   ");
                                                 if(Slave_Ports_Status_A[i].Exp_state & Exp_state_ON) {
                                     
                                                          Adafruit_PWMServoDriver_A[I2C_INDEX_DRIVER_A].Adafruit_PWMServoDriver_V.setPWM(Slave_Ports_Status_A[i].LocalPort, 0, map(90, 0, 180, SERVOMIN, SERVOMAX));
+                                                          Serial.print("#149 I2C_driver PortTypes_SERVO->ON Exp_state [SET]"); Serial.print(Slave_Ports_Status_A[i].Exp_state); Serial.print("]   after   [");
                                                          Slave_Ports_Status_A[i].Exp_state = Slave_Ports_Status_A[i].Exp_state | Exp_state_SET; //TODO TEST
+                                                            Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state)); Serial.println("]  ");
                                                          Slave_Ports_Status_A[i].Exp_state_ttl = Exp_state_ttl_IS_ACTIVE ;
                                                 } else if(Slave_Ports_Status_A[i].Exp_state & Exp_state_OFF)  {
                                                          Adafruit_PWMServoDriver_A[I2C_INDEX_DRIVER_A].Adafruit_PWMServoDriver_V.setPWM(Slave_Ports_Status_A[i].LocalPort, 0, map(0, 0, 180, SERVOMIN, SERVOMAX));
+                                                           Serial.print("#155 I2C_driver PortTypes_SERVO->OFF Exp_state [SET]"); Serial.print(Slave_Ports_Status_A[i].Exp_state); Serial.print("]   after   [");
                                                          Slave_Ports_Status_A[i].Exp_state = Slave_Ports_Status_A[i].Exp_state | Exp_state_SET; //TODO TEST
+                                                         Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state)); Serial.println("]  ");
                                                          Slave_Ports_Status_A[i].Exp_state_ttl = Exp_state_ttl_IS_ACTIVE ;
                                                 }
                                     } else {
-                                    
-                                                    if(Slave_Ports_Status_A[i].Exp_state == Exp_state_ON ) {
+                                     Serial.print("#163   [PortTypes*]   ");
+                                                    if(Slave_Ports_Status_A[i].Exp_state & Exp_state_ON ) { //TODO BINTEST
                                                         Adafruit_PWMServoDriver_A[I2C_INDEX_DRIVER_A].Adafruit_PWMServoDriver_V.setPWM(Slave_Ports_Status_A[i].LocalPort, 3000, 3000);
-                                                        Serial.print("#77 I2C_driver Exp_state [ON]"); Serial.print(Slave_Ports_Status_A[i].Exp_state); Serial.println("] ");
+                                                        Serial.print("#149 I2C_driver ->ON Exp_state [SET]"); Serial.print(Slave_Ports_Status_A[i].Exp_state); Serial.print("]   after   [");
                                                         Slave_Ports_Status_A[i].Exp_state = Slave_Ports_Status_A[i].Exp_state | Exp_state_SET; //TODO BITTEST
+                                                        Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state)); Serial.println("]  ");
                                                         Slave_Ports_Status_A[i].Exp_state_ttl = Exp_state_ttl_IS_ACTIVE ;
-                                                    } else if(Slave_Ports_Status_A[i].Exp_state == Exp_state_OFF ){
+                                                    } else if(Slave_Ports_Status_A[i].Exp_state & Exp_state_OFF ){ //TODO BINTEST
                                                         Adafruit_PWMServoDriver_A[I2C_INDEX_DRIVER_A].Adafruit_PWMServoDriver_V.setPWM(Slave_Ports_Status_A[i].LocalPort, 0, 0);
-                                                        Serial.print("#77 I2C_driver Exp_state [OFF]"); Serial.print(Slave_Ports_Status_A[i].Exp_state); Serial.println("] ");
+                                                        Serial.print("#149 I2C_driver ->OFF Exp_state [SET]"); Serial.print(Slave_Ports_Status_A[i].Exp_state); Serial.print("]   after   [");
                                                         Slave_Ports_Status_A[i].Exp_state = Slave_Ports_Status_A[i].Exp_state | Exp_state_SET; //TODO BITTEST
-                                                    } else if(Slave_Ports_Status_A[i].Exp_state == Exp_state_BLINK ){
-                                                             Serial.print("#168 I2C_driver [Exp_state_ERROR]  before]"); Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state)); Serial.println("]  after [");
+                                                        Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state)); Serial.println("]  ");
+                                                    } else if(Slave_Ports_Status_A[i].Exp_state & Exp_state_BLINK ){ //TODO BINTEST
+                                                             Serial.print("#168 I2C_driver ->BLINK [Exp_state_ERROR]  before]"); Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state)); Serial.println("]  after [");
                                                          Adafruit_PWMServoDriver_A[I2C_INDEX_DRIVER_A].Adafruit_PWMServoDriver_V.setPWM(Slave_Ports_Status_A[i].LocalPort, 0,2000);
                                                       //   delay(1000);
                                                          Adafruit_PWMServoDriver_A[I2C_INDEX_DRIVER_A].Adafruit_PWMServoDriver_V.setPWM(Slave_Ports_Status_A[i].LocalPort, 0,1000);
@@ -174,14 +182,15 @@
                                                          Slave_Ports_Status_A[i].Exp_state_ttl = Exp_state_ttl_IS_ACTIVE ;
                                                     } else {
                                                     
-                                                     Serial.print("#7555 unsupp   I2C_driver Exp_state "); Serial.print(Slave_Ports_Status_A[i].Exp_state); Serial.println("] ");
-                                                     Slave_Ports_Status_A[i].Exp_state = Slave_Ports_Status_A[i].Exp_state | Exp_state_SET | Exp_state_ERROR; //TODO BITTEST
+                                                     Serial.print("#183 I2C_driver [UNSUPP] [Exp_state_ERROR]  before]"); Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state)); Serial.println("]  after [");
+                                                          Slave_Ports_Status_A[i].Exp_state = Slave_Ports_Status_A[i].Exp_state | Exp_state_SET | Exp_state_ERROR; //TODO BITTEST
+                                                      Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state)); Serial.println("]  ");
                                                      Slave_Ports_Status_A[i].Exp_state_ttl = Exp_state_ttl_IS_ACTIVE ;
                                                     }
                                      }           
                                  
                                  
-                                        #ifdef DEBUG_CAN || DEBUG
+                                        #if DEBUG > 6
                                             Serial.println(""); Serial.println(i);  Serial.print(" #126   after PWM    Exp_state_ttl[");
                                             Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state_ttl)); Serial.print("]  Exp_state[");
                                             Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state)); Serial.print("]  Broadcast_state[");
@@ -210,27 +219,30 @@
                                                     
                                                 Serial.println("]  ");
                                          #endif
-                                 
-                                       
+                                          #ifdef DEBUG_CAN || DEBUG
+                                                Serial.println("  [#222] ");  Serial.println("  [#222] ");  Serial.println("  [#222] ");
+                                           #endif
                             } else {
-                               Serial.print("#6699 UNPLANNED I2C_driver ADDRES "); Serial.print(Slave_Ports_Status_A[i].Address); Serial.println("] ");
+                                Serial.print("#183 I2C_driver [UNPLANNED][ADDRES]  +[Exp_state_ERROR] +[Exp_state_SET] before]"); Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state)); Serial.println("]  after [");
                                Slave_Ports_Status_A[i].Exp_state = Slave_Ports_Status_A[i].Exp_state | Exp_state_SET | Exp_state_ERROR; //TODO BITTEST
+                                Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state)); Serial.println("]  ");
                                Slave_Ports_Status_A[i].Exp_state_ttl = Exp_state_ttl_IS_ACTIVE ;
                             }
                             
                     
                     
                     } else {
-                          Serial.print("#61122  I2C_driver unsupported "); Serial.print(Slave_Ports_Status_A[i].I2C_driver); Serial.println("] ");
+                           Serial.print("#232 I2C_driver [unsupported]  +[Exp_state_ERROR] +[Exp_state_SET] before]"); Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state)); Serial.println("]  after [");
                           Slave_Ports_Status_A[i].Exp_state = Slave_Ports_Status_A[i].Exp_state | Exp_state_SET | Exp_state_ERROR; //TODO BITTEST
+                           Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state)); Serial.println("]  ");
                           Slave_Ports_Status_A[i].Exp_state_ttl = Exp_state_ttl_IS_ACTIVE ;
                     }
                 
-                
-            }
-
-      }
-    }
+               
+            }  else { Serial.print("    #249  #i["); Serial.print(i); Serial.println("]     ");}
+        
+      } else { Serial.print("    #242  #i["); Serial.print(i); Serial.println("]     ");}
+    } 
 
  } 
 //#endif

+ 9 - 3
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_Status_QUEUE_add_func.h

@@ -9,14 +9,20 @@ ARDUINO_ARRAY_INDEX_T DISPLAY_ARDUINO_ARRAY_INDEX_A //optionally
 ) {
   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("]  cur_peek:["); 
+       Serial.print(TASK_TYPE_A); Serial.print(" [");  _Slave_Ports_queue_task_type_DESC(TASK_TYPE_A); Serial.print("]  cur_peek:[");
+       
+       
+       #ifdef DEBUG_QUEUE
+                Serial.print("   [16 DEBUG_QUEUE ]   ");
+               // ARDUINO_ATTR_ARRAY_S__display()
+       #endif 
+       
+        
        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;
       // if(_Slave_Ports_queue_back > _Slave_Ports_queue_peek)
       Serial.print(_Slave_Ports_queue_peek);  Serial.print("] cur back[");  Serial.print(_Slave_Ports_queue_back); Serial.print("] ");
-      
-     
       _Slave_Ports_queue.push(_Slave_Ports_queue_back + 1);
       int _Slave_Ports_queue_peek_new = _Slave_Ports_queue.peek() ;
      // int _Slave_Ports_queue__push = _Slave_Ports_queue__peek + 1 ;

+ 4 - 7
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_Status_QUEUE_func.h

@@ -37,14 +37,11 @@ void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QU
                 Serial.print(" $i[");
                 Serial.print(i);
 
-                 Serial.print("] QUEUE_ID_A: ");
+                 Serial.print("] QUEUE_ID_A: [");
                 Serial.print(Slave_Ports_Status_QUEUE_A[i].QUEUE_ID_A);
-
-                   
-
-                 Serial.print("] TASK_TYPE_A: ");
+                 Serial.print("] TASK_TYPE_A: [");
                                  Serial.print(Slave_Ports_Status_QUEUE_A[i].TASK_TYPE_A);
-                  Serial.print("] desc: ");
+                  Serial.print("] desc: [");
                  //Slave_Ports_queue_task_type_DESC(Slave_Ports_Status_QUEUE_A[i].TASK_TYPE_A);
                  //char res;
                  // res = _Slave_Ports_queue_task_type_DESC(Slave_Ports_Status_QUEUE_A[i]._Slave_Ports_queue_task_type);  Serial.print(res);
@@ -53,7 +50,7 @@ void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QU
                _Slave_Ports_queue_task_type_DESC(Slave_Ports_Status_QUEUE_A[i].TASK_TYPE_A) ; //(res); //_Slave_Ports_queue_task_type_DESC(Slave_Ports_Status_QUEUE_A[i]._Slave_Ports_queue_task_type
 
   
-                 Serial.print("] TASK_PORT_ASSOC_A: ");
+                 Serial.print("] TASK_PORT_ASSOC_A:[");
                 Serial.print(Slave_Ports_Status_QUEUE_A[i].TASK_PORT_ASSOC_A.Port_ID);
                      
                      

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

@@ -24,7 +24,7 @@ Slave_Ports_Status_QUEUE_T Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_LIMIT_
 typedef struct ARDUINO_ATTR_ARRAY_S Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_T ;
 
 
-Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_T Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A =  //[ARDUINO_ATTR_ARRAY_S_INDEX] 
+static Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_T Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A =  //[ARDUINO_ATTR_ARRAY_S_INDEX] 
         {    ARDUINO_ARRAY_INDEX_CURRENT_INIT ,
              ARDUINO_ARRAY_INDEX_LAST_INIT ,
              ARDUINO_ARRAY_COUNT_T_INIT ,

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

@@ -133,7 +133,7 @@
                           DISPLAY_A ,
                           DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
                           DISPLAY_PHYSICAL_CHAR_A, 
-                           DISPLAY_pos_seq_A + DISPLAY_pos_seq_A_CLEARSCREEN,
+                           DISPLAY_pos_seq_A | DISPLAY_pos_seq_A_CLEARSCREEN,
                             DISPLAY_array16_AAT,
                             DISPLAY_TARGET_A,
                            time_seq_id_A,
@@ -225,7 +225,9 @@
                     } else {
                      message2.concat(" ? ");//E: 
                     
-                        Serial.print("#228 debug BIN  Exp_state_s["); Serial.print(Exp_state_s); Serial.print("]    exp_state["); Serial.print(Slave_Ports_Status_A[i].Exp_state); Serial.print("]    BIN[");  Serial.print(Slave_Ports_Status_A[i].Exp_state, BIN); Serial.print("]    [   ");
+                    
+                    #if DEBUG > 7
+                        Serial.print("#228 debug BIN  #i["); Serial.print(i);  Serial.print("] Exp_state_s["); Serial.print(Exp_state_s);  Serial.print("]    exp_state["); Serial.print(Slave_Ports_Status_A[i].Exp_state); Serial.print("]    BIN[");  Serial.print(Slave_Ports_Status_A[i].Exp_state, BIN); Serial.print("]    [   ");
                         
                                                         if(Slave_Ports_Status_A[i].Exp_state &  Exp_state_SET )   Serial.print(" [ & SET ] "); //dziala opcjonalnie off
                                                         if(Slave_Ports_Status_A[i].Exp_state ==  Exp_state_SET )   Serial.print(" [ = SET ] "); //dziala only off   
@@ -249,6 +251,9 @@
                                 Serial.print(" ]     OFF || ON[");  Serial.print(BIN8_to_STRING( Exp_state_OFF || Exp_state_ON  )); Serial.println(" ]   ");
                         Serial.print(" ]  #248     OFF+SET["); Serial.print(BIN8_to_STRING( Exp_state_OFF + Exp_state_SET  )); 
                         Serial.print(" ]  #251     OFF || SET["); Serial.print(BIN8_to_STRING( Exp_state_OFF | Exp_state_SET  ));    Serial.println(" ]   ");
+                    #else
+                      Serial.print("#255 will message2  Exp_state[");  Serial.print(Slave_Ports_Status_A[i].Exp_state, BIN); Serial.println("]  "); 
+                    #endif
                     }
                      
                  

+ 5 - 1
SE/stuff/P5_Automation_can-dev-res/___CONFIG/0x101/config_Active_ControllerID_0x101.h

@@ -14,4 +14,8 @@
 #define DEBUG_I2C
 //#define HAS_DEBUG_ACTION_TRIG
 
-#define DEBUG_CAN
+#define DEBUG_CAN
+
+#define DEBUG_DISPLAY
+
+#define DEBUG_QUEUE

+ 1 - 1
SE/stuff/P5_Automation_can-dev-res/___CONFIG/0x101/config_Slave_Ports_LOCAL_0x101_init.h

@@ -25,7 +25,7 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                                     Slave_Ports_Status_T_ARDUINO_ARRAY_ASSOC_TABLE_S_Port_ID_A,
                                 1,  // int  Port_ID,
                                 Active_ControllerID ,  //int  _Slave_ID,
-                                PortTypes_P2M_EXP_I2C + PortTypes_SERVO , //int  PortTypes,
+                                PortTypes_P2M_EXP_I2C | PortTypes_SERVO , //int  PortTypes,
                                 0x40 ,  //int  Address,
                                 1 , //int  LocalPort,
                                 Exp_state_OFF, //int  Exp_state,

+ 1 - 1
SE/stuff/P5_Automation_can-dev-res/___CONFIG/0x103/config_Slave_Ports_LOCAL_0x103_init.h

@@ -25,7 +25,7 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                                     Slave_Ports_Status_T_ARDUINO_ARRAY_ASSOC_TABLE_S_Port_ID_A,
                                 1,  // int  Port_ID,
                                 Active_ControllerID ,  //int  _Slave_ID,
-                                PortTypes_P2M_EXP_I2C + PortTypes_SERVO , //int  PortTypes,
+                                PortTypes_P2M_EXP_I2C| PortTypes_SERVO , //int  PortTypes,
                                 0x40 ,  //int  Address,
                                 1 , //int  LocalPort,
                                 Exp_state_OFF, //int  Exp_state,

+ 1 - 1
SE/stuff/P5_Automation_can-dev-res/___loop/__main_loop_top.h

@@ -2,7 +2,7 @@
 
 //ARDUINO_FUNCT_INIT_RESULT_T ARDUINO_FUNCT_INIT_RESULT_Slave_Ports_queue__add ;
 
-if(ARDUINO_LOOP_LATENCY_COUNTER__MAIN(ARDUINO_LOOP_LATENCY__MAIN_A) <= ARDUINO_LOOP_LATENCY_COUNTER_INIT ) {
+if(ARDUINO_LOOP_LATENCY_COUNTER__MAIN(ARDUINO_LOOP_LATENCY__MAIN_A) <= ARDUINO_LOOP_LATENCY_COUNTER_INIT ) {        
 //if(ARDUINO_LOOP_LATENCY_COUNTER__MAIN_A <= ARDUINO_LOOP_LATENCY_COUNTER_INIT ) {
 
             // Serial.print("] COUNTER__MAIN_END_A["); Serial.print(ARDUINO_LOOP_LATENCY_COUNTER__MAIN_END(ARDUINO_LOOP_LATENCY__MAIN_END_A));  Serial.println("] ");

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

@@ -128,6 +128,25 @@ void ARDUINO_ARRAY_INDEX_TABLE_S__add_void(
     } 
 
 
+
+
+void ARDUINO_ATTR_ARRAY_S__display(  //to init attr list table[1]
+    ARDUINO_ATTR_ARRAY_T &ARDUINO_ATTR_ARRAY_A
+    ) {
+    
+    
+        Serial.print("   [#139 ARRAY_S__display]   #CURRENT[");
+             Serial.print(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A); Serial.print("]  #LAST[");
+             Serial.print(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_LAST_A); Serial.print("]  #COUNT[");
+             Serial.print(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A ); Serial.print("]  #LIMIT[");
+             Serial.print(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_LIMIT_A ); Serial.print("]  #NEXT[");
+             Serial.print(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A); Serial.print("]  @time_min_run[");
+             Serial.print(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_time_min_run_MIN_A ); Serial.print("]  #time_run_#[");
+             Serial.print(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_time_min_run_MIN_A ); Serial.println("]  ");  
+    }
+
+
+
 /*
 void ARDUINO_ARRAY_COUNT(
 ARDUINO_ARRAY_INDEX_TABLE_S* ARDUINO_ARRAY_INDEX_TABLE_A,

+ 2 - 2
SE/stuff/P5_Automation_can-dev-res/_bak/_DISPLAY_struct.bakh.h

@@ -63,8 +63,8 @@ typedef struct DISPLAY_S DISPLAY_T ;
  const DISPLAY_TARGET_T  DISPLAY_TARGET_CONSOLE      = B00000001 ;
  const DISPLAY_TARGET_T  DISPLAY_TARGET_LCD16        = B00000010 ;
  const DISPLAY_TARGET_T  DISPLAY_TARGET_DISPLAY128   = B00000100 ;
- const DISPLAY_TARGET_T  DISPLAY_TARGET_ALL          =            DISPLAY_TARGET_CONSOLE + DISPLAY_TARGET_LCD16 + DISPLAY_TARGET_DISPLAY128 ;
- const DISPLAY_TARGET_T  DISPLAY_TARGET_ANY          = B00001000 + DISPLAY_TARGET_CONSOLE + DISPLAY_TARGET_LCD16 + DISPLAY_TARGET_DISPLAY128 ;
+ const DISPLAY_TARGET_T  DISPLAY_TARGET_ALL          =            DISPLAY_TARGET_CONSOLE | DISPLAY_TARGET_LCD16 | DISPLAY_TARGET_DISPLAY128 ;
+ const DISPLAY_TARGET_T  DISPLAY_TARGET_ANY          = B00001000 | DISPLAY_TARGET_CONSOLE | DISPLAY_TARGET_LCD16 | DISPLAY_TARGET_DISPLAY128 ;