a.binder 5 jaren geleden
bovenliggende
commit
a54a8b8881

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

@@ -99,8 +99,28 @@
 #define DISABLE_DISPLAY__add_record 
 #define DISPLAY_array16_T_is_DISPLAY_string_T 
 #define ENABLE_DISPLAY_MENU
+//#define DISABLE_ANY_PRINT //when uno ?
 #define __OFFSET 0
 
+#define Sprintln(a) (Serial.println(a))
+/*
+Then instead of
+
+Serial.println(F("Hello world!"));
+write
+
+Sprintln(F("Hello world!"));
+etc. To deactivate the Serial printing, define the macro empty:
+
+#define Sprintln(a) 
+
+
+*/
+
+
+
+#include "___CONFIG/config_Active_ControllerID.h" //there kleep id of device
+
 
 #define HAS__jm_Scheduler //to allow planned actions blink etc
 
@@ -140,7 +160,6 @@
 //#define Active_ControllerID _ControllerID 
 //#define Active_ControllerID _Slave1_ID 
 
-#include "___CONFIG/config_Active_ControllerID.h" //there kleep id of device
 
 //#include "config_Slave_Ports_LOCAL_0x101_init.h" //there kleep config of this id device
 
@@ -174,6 +193,13 @@
 
 
 
+#if Active_ControllerID == 0x14 
+    const int Active_ControllerID_HEX = 0x14 ;
+    #include "___CONFIG/0x14/config_Active_ControllerID_0x14.h"  //there kleep config of this id device
+#endif
+
+
+
 
 
 #if defined(HAS_TFT_ILI9163C)
@@ -353,6 +379,13 @@
 #endif
 
 
+
+
+#if Active_ControllerID == 0x14
+    #include "___CONFIG/0x14/config_Slave_Ports_LOCAL_0x14_init.h"
+#endif
+
+
 #if defined(HAS_I2C_driver_Adafruit_PWMServoDriver)
  #include "_I2C_driver_Adafruit_PWMServoDriver/_I2C_driver_Adafruit_PWMServoDriver_init.h"
 #endif

+ 20 - 10
SE/stuff/P5_Automation_can-dev-res/_CAN/_CAN_func.h

@@ -9,10 +9,11 @@ void CAN_READ(
           // If pin 2 is low, read receive buffer
             {
               CAN0.readMsgBuf(&CANrxId, &CANlen, CANrxBuf); // Read data: len = data length, buf = data byte(s)
-              Serial.print("#5555CAN_READ read ID: ");
-              Serial.print(CANrxId, HEX);
-              Serial.print(" Data: [");Serial.print(CANlen); Serial.print("]"); 
-            
+               #if not defined(DISABLE_ANY_PRINT)
+                    Serial.print("#5555CAN_READ read ID: ");
+                    Serial.print(CANrxId, HEX);
+                    Serial.print(" Data: [");Serial.print(CANlen); Serial.print("]"); 
+                #endif
             
                 if(CANlen == CAN_MSG_DATA8_LEN) {
                 
@@ -30,7 +31,7 @@ void CAN_READ(
                          CAN_MSG8_BIT_7_T CAN_MSG8_BIT_7_A = CANrxBuf[6] ;
                          CAN_MSG8_BIT_8_T CAN_MSG8_BIT_8_A = CANrxBuf[7] ;
                          
-                   
+                   #if not defined(DISABLE_ANY_PRINT) 
                   // Serial.print();
                    
                    Serial.print("1.REM::");Serial.print(CAN_MSG8_BIT_1_A, HEX);
@@ -56,11 +57,14 @@ void CAN_READ(
                                       Serial.print(" ");
                          }
                    
+                    #endif
                     
                     if(CAN_MSG8_BIT_2_A == _CAN_REMOTE_ID ) {
                     
                             if(CAN_MSG8_BIT_8_A == TASK_TYPE_T_Slave_Ports_broadcast____) {
-                                Serial.println("[CAN_MSG8_BIT_8_A]==[T_BCAST]->[ADD][PORTS]")   ;      
+                             #if not defined(DISABLE_ANY_PRINT)
+                                Serial.println("[CAN_MSG8_BIT_8_A]==[T_BCAST]->[ADD][PORTS]")   ;
+                                #endif      
                                         Slave_Ports_Status_add_port(
                                                                        Slave_Ports_Status_A ,
                                                                        Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A,
@@ -91,8 +95,9 @@ void CAN_READ(
                                         8 =  _Slave_Ports_Protocol_CAN_A._CAN_8; // 0xFF;
                                    */
                                    
-                                   
-                                      Serial.println("[CAN_MSG8_BIT_8_A]==[request_set_new_Exp_state]->[SET][PORTS]")   ;      
+                                    #if not defined(DISABLE_ANY_PRINT)
+                                      Serial.println("[CAN_MSG8_BIT_8_A]==[request_set_new_Exp_state]->[SET][PORTS]")   ;
+                                      #endif      
                                        TASK_PORT_ASSOC_T TASK_PORT_ASSOC_A={
                                          CAN_MSG8_BIT_3_A,
                                          CAN_MSG8_BIT_1_A,
@@ -104,19 +109,23 @@ void CAN_READ(
                                     
                                 
                                 } else {
+                                 #if not defined(DISABLE_ANY_PRINT)
                                     Serial.println("81[CAN][RECV][UNKNOWN][CAN_MSG8_BIT_8_A][")   ;
                                     Serial.print(CAN_MSG8_BIT_8_A, HEX) ;
-                                    Serial.print("] ");   
+                                    Serial.print("] ");
+                                    #endif   
                                 }
                       } else { //if(CAN_MSG8_BIT_2_A == _CAN_REMOTE_ID ) {
+                                #if not defined(DISABLE_ANY_PRINT)
                                     Serial.println("81[CAN][RECV][ERROR][_CAN_REMOTE_ID<>CAN_MSG8_BIT_2_A][")   ;
                                     Serial.print(CAN_MSG8_BIT_2_A, HEX) ; Serial.print("]["); Serial.print(_CAN_REMOTE_ID, HEX) ;
                                     Serial.print("] ");
+                                #endif
                       }      
                 
               } else { //if(CANlen == CAN_MSG_DATA8_LEN) 
               
-            
+             #if not defined(DISABLE_ANY_PRINT)
                         for(int i = 0; i<CANlen; i++)           // Print each byte of the data
                          {
                            if(CANrxBuf[i] < 0x10)                // If data byte is less than 0x10, add a leading zero
@@ -129,6 +138,7 @@ void CAN_READ(
                        
                             
                          }
+                   #endif
                 }
              
               Serial.println();

+ 20 - 14
SE/stuff/P5_Automation_can-dev-res/_CAN/_Slave_Ports_Protocol_CAN_struct.h

@@ -122,18 +122,18 @@ byte CAN_broadcast_to_data(_Slave_Ports_Protocol_CAN_broadcast_T
             CAN_MSG8_BIT_7_T CAN_MSG8_BIT_7_A = _Slave_Ports_Protocol_CAN_broadcast_A.Broadcast_state;
             CAN_MSG8_BIT_8_T CAN_MSG8_BIT_8_A = _Slave_Ports_Protocol_CAN_broadcast_A._CAN_8;
             
-        
-         Serial.print("#80 CAN_broadcast_to_data   [  ");
-            Serial.print(" "); Serial.print("1["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A._CAN_REMOTE_ID); Serial.print(".");   Serial.print(CAN_MSG8_BIT_1_A);  Serial.print("] ");
-            Serial.print(" "); Serial.print("2["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A._CAN_SENDER_ID); Serial.print(".");   Serial.print(CAN_MSG8_BIT_2_A);  Serial.print("] ");
-            Serial.print(" "); Serial.print("3["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A.Port_ID); Serial.print("]  ");
-            Serial.print(" "); Serial.print("4["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A.PortTypes); Serial.print("]  ");
-            Serial.print(" "); Serial.print("5["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A.Exp_state); Serial.print("]  ");
-            Serial.print(" "); Serial.print("6["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A.Exp_state_ttl); Serial.print("]  ");
-            Serial.print(" "); Serial.print("7["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A.Broadcast_state); Serial.print("]  ");
-            Serial.print(" "); Serial.print("8["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A._CAN_8); Serial.print("]  "); 
-         Serial.println("   "); 
-         
+         #if not defined(DISABLE_ANY_PRINT)
+                Serial.print("#80 CAN_broadcast_to_data   [  ");
+                   Serial.print(" "); Serial.print("1["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A._CAN_REMOTE_ID); Serial.print(".");   Serial.print(CAN_MSG8_BIT_1_A);  Serial.print("] ");
+                   Serial.print(" "); Serial.print("2["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A._CAN_SENDER_ID); Serial.print(".");   Serial.print(CAN_MSG8_BIT_2_A);  Serial.print("] ");
+                   Serial.print(" "); Serial.print("3["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A.Port_ID); Serial.print("]  ");
+                   Serial.print(" "); Serial.print("4["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A.PortTypes); Serial.print("]  ");
+                   Serial.print(" "); Serial.print("5["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A.Exp_state); Serial.print("]  ");
+                   Serial.print(" "); Serial.print("6["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A.Exp_state_ttl); Serial.print("]  ");
+                   Serial.print(" "); Serial.print("7["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A.Broadcast_state); Serial.print("]  ");
+                   Serial.print(" "); Serial.print("8["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A._CAN_8); Serial.print("]  "); 
+                Serial.println("   "); 
+          #endif
        byte  return_c[8] = {
                        // 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x07
                       // CAN_MSG8_BIT_1_A , // _Slave_Ports_Protocol_CAN_broadcast_A._CAN_REMOTE_ID,
@@ -164,6 +164,7 @@ void CAN_MSG8_A_ptr(_Slave_Ports_Protocol_CAN_broadcast_T
             //CAN_MSG8_BIT_1_T
           
         //#ifdef DEBUG_CAN
+         #if not defined(DISABLE_ANY_PRINT)
                 Serial.print("#155 CAN_broadcast_to_data_ptr   [  ");
                    Serial.print(" "); Serial.print("1["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A._CAN_REMOTE_ID); Serial.print("] ");
                    Serial.print(" "); Serial.print("2["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A._CAN_SENDER_ID); Serial.print("] ");
@@ -173,7 +174,8 @@ void CAN_MSG8_A_ptr(_Slave_Ports_Protocol_CAN_broadcast_T
                    Serial.print(" "); Serial.print("6["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A.Exp_state_ttl); Serial.print("]  ");
                    Serial.print(" "); Serial.print("7["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A.Broadcast_state); Serial.print("]  ");
                    Serial.print(" "); Serial.print("8["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A._CAN_8); Serial.print("]  "); 
-                Serial.println("   "); 
+                Serial.println("   ");
+            #endif 
         // #endif
          CAN_MSG8_A[0] = _Slave_Ports_Protocol_CAN_broadcast_A._CAN_REMOTE_ID; // 0xFF;
          CAN_MSG8_A[1] = _Slave_Ports_Protocol_CAN_broadcast_A._CAN_SENDER_ID; // 0xFF;
@@ -198,6 +200,7 @@ void CAN_MSG8_A_Slave_Ports_Protocol_CAN_request_set_new_Exp_state_T(_Slave_Port
             //CAN_MSG8_BIT_1_T
           
         //#ifdef DEBUG_CAN
+         #if not defined(DISABLE_ANY_PRINT)
                 Serial.print("#155 CAN_broadcast_to_data_ptr   [  ");
                    Serial.print(" "); Serial.print("1["); Serial.print(_Slave_Ports_Protocol_CAN_A._CAN_REMOTE_ID); Serial.print("] ");
                    Serial.print(" "); Serial.print("2["); Serial.print(_Slave_Ports_Protocol_CAN_A._CAN_SENDER_ID); Serial.print("] ");
@@ -208,6 +211,7 @@ void CAN_MSG8_A_Slave_Ports_Protocol_CAN_request_set_new_Exp_state_T(_Slave_Port
                    Serial.print(" "); Serial.print("7["); Serial.print(_Slave_Ports_Protocol_CAN_A.Exp_state_level_A); Serial.print("]  ");
                    Serial.print(" "); Serial.print("8["); Serial.print(_Slave_Ports_Protocol_CAN_A._CAN_8); Serial.print("]  "); 
                 Serial.println("   "); 
+                #endif
         // #endif
          CAN_MSG8_A[0] = _Slave_Ports_Protocol_CAN_A._CAN_REMOTE_ID; // 0xFF;
          CAN_MSG8_A[1] = _Slave_Ports_Protocol_CAN_A._CAN_SENDER_ID; // 0xFF;
@@ -227,11 +231,13 @@ void CAN_MSG8_A_Slave_Ports_Protocol_CAN_request_set_new_Exp_state_T(_Slave_Port
 
 void CAN_data_debug(byte data[8]) {
     int i;
+     #if not defined(DISABLE_ANY_PRINT)
     Serial.print("#102 CAN_data_debug   [  ");
     for(i=0; i<8; i++) {
         Serial.print(" "); Serial.print(i+1); Serial.print("["); Serial.print(data[i]); Serial.print("."); Serial.print(data[i], HEX); Serial.print("] "); 
     }
-    Serial.println("   "); 
+    Serial.println("   ");
+    #endif 
 }
 
 

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

@@ -21,7 +21,7 @@
                
                 ) {
                 
-                #if defined(DEBUG)
+                             #if defined(DEBUG)
                                                      Serial.print("#13444 DISPLAY__add_record[DEBUG] # BEFORE COUNT["); Serial.print(Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A);
                                                       Serial.print("] INDEX_LAST["); Serial.print( DISPLAY_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_LAST_A);
                                                       Serial.print("] INDEX_CURRENT["); Serial.print( DISPLAY_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A);

+ 22 - 10
SE/stuff/P5_Automation_can-dev-res/_DISPLAY_func - Copy.h

@@ -47,8 +47,9 @@ void DISPLAY__print_ANY(DISPLAY_T_ARDUINO_ATTR_ARRAY_T &DISPLAY_T_ARDUINO_ATTR_A
                                Serial.print(" 27[DEBUG] ");
                            }
                     #endif 
-                Serial.println("] "); 
-              
+                     #if not defined(DISABLE_ANY_PRINT)
+                        Serial.println("] "); 
+                      #endif
                 //todo position current   
                 //todo positions max
                     #if defined(HAS_TFT_ILI9163C)
@@ -109,8 +110,9 @@ void DISPLAY__print_IMMEDIATE(
                             
                             DISPLAY_pos_seq_A) ;
                     #else 
-                
-                        Serial.println(DISPLAY_array16_A);
+                            #if not defined(DISABLE_ANY_PRINT)
+                                Serial.println(DISPLAY_array16_A);
+                            #endif
                   
                     #endif
                              //   DISPLAY__print_ANY(DISPLAY_T_ARDUINO_ATTR_ARRAY_A, DISPLAY_PHYSICAL_CHAR_A, DISPLAY_pos_seq_A, DISPLAY_array16_A);     
@@ -169,21 +171,30 @@ void DISPLAY__print_IMMEDIATE(
                 //strcpy(DISPLAY__print_loop_A[DISPLAY__print_loop_INDEX_CURRENT_A].message, message );
                 DISPLAY__print_loop_A[DISPLAY__print_loop_INDEX_CURRENT_A].message = message ;
             }
+             #if not defined(DISABLE_ANY_PRINT)
               Serial.print("#137[DISPLAY__print_loop][ADD] [i][");Serial.print(DISPLAY__print_loop_INDEX_CURRENT_A); Serial.println("] ");
+              #endif
         } else if(DISPLAY__print_loop_ACTION_A == DISPLAY__print_loop_ACTION_POP)  {
+            #if not defined(DISABLE_ANY_PRINT)
             Serial.print("#137[DISPLAY__print_loop][POP] [i][");Serial.print(DISPLAY__print_loop_INDEX_CURRENT_A); Serial.print("] p[");Serial.print(DISPLAY__print_loop_QUEUE_PEEK_A); Serial.print("] ");
+            #endif
               if(DISPLAY__print_loop_QUEUE_PEEK_A > 0 ) {
                 DISPLAY_DEV.setCursor(DISPLAY__print_loop_A[DISPLAY__print_loop_QUEUE_PEEK_A].DISPLAY_CURSOR_X_CHARS_A * DISPLAY_textsize_x_A,
                    DISPLAY__print_loop_A[DISPLAY__print_loop_QUEUE_PEEK_A].DISPLAY_CURSOR_Y_CHARS_A * DISPLAY_textsize_y_A);
                    DISPLAY_DEV.print(DISPLAY__print_loop_A[DISPLAY__print_loop_QUEUE_PEEK_A].message);
-                   Serial.print(" msg["); Serial.print(DISPLAY__print_loop_A[DISPLAY__print_loop_QUEUE_PEEK_A].message); Serial.print("] ");
-                   
+                    #if not defined(DISABLE_ANY_PRINT)
+                    Serial.print(" msg["); Serial.print(DISPLAY__print_loop_A[DISPLAY__print_loop_QUEUE_PEEK_A].message); Serial.print("] ");
+                    #endif
                    
                    
                } else {
+                #if not defined(DISABLE_ANY_PRINT)
                 Serial.print(" [PEEK][EMPTY] ");
+                #endif
                }
+                #if not defined(DISABLE_ANY_PRINT)
                Serial.println("] ");
+               #endif
         }
       
     }
@@ -241,18 +252,19 @@ void DISPLAY__print_IMMEDIATE(
                                      // Serial.print("#28 running _Slave_Ports_ttl_decrement = ");
                 
                     } else {
-                         // #if defined(DEBUG)
+                          #if defined(DEBUG)
                                  Serial.print("#88 DISPLAY__print [DEBUG]  else  "); Serial.print(DISPLAY_pos_seq_A , BIN);
                                  Serial.println("]  ");
-                        // #endif    
+                         #endif    
                          
                     #if defined(DISABLE_TASK_TYPE_T_DISPLAY_queue_pop________)
                      Serial.print("#167 DISABLE_TASK_TYPE_T_DISPLAY_queue_pop________");
                     #else     
-                      
+                       #if not defined(DISABLE_ANY_PRINT)
                        Serial.print("#253 TODO WHY ? BIN DISPLAY_pos_seq_A["); Serial.print(DISPLAY_pos_seq_A, BIN);
                              Serial.print("]& IMM ["); Serial.print(DISPLAY_pos_seq_A_IMMEDIATE, BIN); Serial.print("] res[") ; Serial.print((DISPLAY_pos_seq_A & DISPLAY_pos_seq_A_IMMEDIATE) , BIN ) ;
-                              Serial.print(" ] String [") ; Serial.print(DISPLAY_string_A); Serial.print("] "); 
+                              Serial.print(" ] String [") ; Serial.print(DISPLAY_string_A); Serial.print("] ");
+                              #endif 
                     /*  DISPLAY__add_record(  DISPLAY_A ,
                              DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
                              DISPLAY_PHYSICAL_CHAR_A, 

+ 11 - 3
SE/stuff/P5_Automation_can-dev-res/_DISPLAY_func.h

@@ -61,7 +61,7 @@ void DISPLAY__print_ANY(DISPLAY_T_ARDUINO_ATTR_ARRAY_T &DISPLAY_T_ARDUINO_ATTR_A
                              DISPLAY_pos_seq_A) ;
                     #else 
                 
-                        Serial.println(DISPLAY_array16_A);
+                  //      Serial.println(DISPLAY_array16_A);
                   
                     #endif
                   
@@ -110,7 +110,7 @@ void DISPLAY__print_IMMEDIATE(
                             DISPLAY_pos_seq_A) ;
                     #else 
                 
-                        Serial.println(DISPLAY_array16_A);
+                        
                   
                     #endif
                              //   DISPLAY__print_ANY(DISPLAY_T_ARDUINO_ATTR_ARRAY_A, DISPLAY_PHYSICAL_CHAR_A, DISPLAY_pos_seq_A, DISPLAY_array16_A);     
@@ -293,6 +293,9 @@ void DISPLAY__CURSOR_Y_CHARS__SET(DISPLAY_PHYSICAL_CHAR_T &DISPLAY_PHYSICAL_CHAR
                 }
                 
           
+          
+       
+         #if defined(HAS_TFT_ILI9163C) 
 
 void DISPLAY__print_menu(DISPLAY_T* DISPLAY_A ,
         DISPLAY_T_ARDUINO_ATTR_ARRAY_T &DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
@@ -447,9 +450,14 @@ void DISPLAY__print_menu(DISPLAY_T* DISPLAY_A ,
         
     }
 
+#endif
+
 
 #include "_Slave_Ports_action_func.h"
 
+   #if defined(HAS_TFT_ILI9163C) 
+
+
 void DISPLAY_MENU_SELECTOR(DISPLAY_T* DISPLAY_A ,
         DISPLAY_T_ARDUINO_ATTR_ARRAY_T &DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
         DISPLAY_PHYSICAL_CHAR_T &DISPLAY_PHYSICAL_CHAR_A, 
@@ -683,4 +691,4 @@ void DISPLAY_MENU_SELECTOR(DISPLAY_T* DISPLAY_A ,
     }
         
 
-
+#endif

+ 2 - 1
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_Status_QUEUE_add_func.h

@@ -31,7 +31,8 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_queue__add( Slave_Ports_Status_QUEUE_T*
            // Serial.print("]  [OLD_QUEUE]   cur peek[");
             //Serial.print(_Slave_Ports_queue_peek);  Serial.print("] cur back[");  Serial.print(_Slave_Ports_queue_back); 
             
-            Serial.print("]    new push[");
+            
+            Sprintln(F("]    new push["));
             #if defined(DEBUG_QUEUE_WAIT)
                 Serial.print("  [delay][");Serial.print(DEBUG_QUEUE_WAIT); Serial.print("]  ");    
                 delay(DEBUG_QUEUE_WAIT);

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

@@ -243,14 +243,14 @@
             
             
            
-            
+            #if defined(HAS_TFT_ILI9163C)
            
                DISPLAY__print_menu( DISPLAY_A ,DISPLAY_T_ARDUINO_ATTR_ARRAY_A , DISPLAY_PHYSICAL_CHAR_A, 
                          1,  //DISPLAY_MENU_ITEM_INDEX_T DISPLAY_MENU_ITEM_INDEX_A
                          time_seq_id_A, (time_seq_id_A + 5000) 
                           );  
                 
-              
+              #endif
            
         
             

+ 5 - 2
SE/stuff/P5_Automation_can-dev-res/___CONFIG/0x14/config_Active_ControllerID_0x14.h

@@ -1,6 +1,6 @@
 
 //there kleep config of this id device
-#define HAS_TFT_ILI9163C 
+//#define HAS_TFT_ILI9163C 
 // #define HAS_LCD1602 
 //#define HAS_ROTTARY_SW
 //#define HAS__PCINT_setup //to allow interrupts
@@ -11,4 +11,7 @@
 //#define DEBUG 5 
 //#define DISABLE_LOOP //To debug and disable any output
 
-#define DISABLE_TASK_TYPE_T_DISPLAY_queue_pop________
+//#define DISABLE_TASK_TYPE_T_DISPLAY_queue_pop________
+
+
+#define DISABLE_ANY_PRINT //when uno ?

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

@@ -168,6 +168,8 @@ 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) {    
+    
+        #if not defined(DISABLE_ANY_PRINT)
         Serial.println("   [#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[");
@@ -203,7 +205,8 @@ void ARDUINO_ATTR_ARRAY_S__display(  //to init attr list table[1]
              Serial.print(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_BACK_A); Serial.print("]  QUEUE_FRONT["); //ostatni zabrany element
              Serial.print(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_FRONT_A); Serial.print("]  QUEUE_PEEK["); 
              Serial.print(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A); Serial.print("]  QUEUE_COUNT[");  //todo ostatni element zabierany
-             Serial.print(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_COUNT_A );  Serial.println("]    ");//kolejka elementow  
+             Serial.print(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_COUNT_A );  Serial.println("]    ");//kolejka elementow
+             #endif  
     }
 
 
@@ -230,6 +233,7 @@ void ARDUINO_ATTR_ARRAY_S__INDEX_NEXT_rotate(  //to maintain limit and set new i
    // ARDUINO_QUEUE_FLAG_T ARDUINO_QUEUE_FLAG_A, bez semnsiu fagi
     ARDUINO_ARRAY_time_min_run_MIN_T ARDUINO_ARRAY_time_min_run_MIN_A  //to provide index pointer to last
     ) {    
+     #if not defined(DISABLE_ANY_PRINT)
         Serial.print("   [#156 ARDUINO_ATTR_ARRAY_S__INDEX_NEXT_rotate]   #CURRENT[");
         if(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_LIMIT_A <= 0) {
               Serial.print("  [#157]  [ROTATE ERROR] [NOT SET] [ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_LIMIT_A ]  ");
@@ -252,7 +256,7 @@ void ARDUINO_ATTR_ARRAY_S__INDEX_NEXT_rotate(  //to maintain limit and set new i
              // ARDUINO_ARRAY_ATTR_QUEUE_BACK_T ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_BACK_A ;
             
             //ARDUINO_ARRAY_ATTR_QUEUE_COUNT_T ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_COUNT_A ;
-
+    #endif
          
          //validate if ARDUINO_ARRAY_ATTR_QUEUE_BACK_A nie nachodzi
             return ARDUINO_ARRAY_INDEX_FIRST ;
@@ -279,14 +283,17 @@ ARDUINO_FUNCT_INIT_RESULT_T ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE(
       
       #if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT)  || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE)
       // || DEBUG_QUEUE)
-      
+         #if not defined(DISABLE_ANY_PRINT)
         Serial.println("[  #297 ARDUINO_ATTR_ARRAY_S__commit_added_element]  [INCREMENTED]  ARDUINO_QUEUE_ELEMENT_FLAG_A[");Serial.print(ARDUINO_QUEUE_ELEMENT_FLAG_A,BIN); Serial.print("]   ");
+        #endif
       #endif
       
     
     if(ARDUINO_ARRAY_INDEX_CURRENT_A == ARDUINO_ARRAY_INDEX_CORRUPT )  {
      #if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT)  || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE)
+         #if not defined(DISABLE_ANY_PRINT)
         Serial.println("[  #2398 commit_added_element]  [ARDUINO_ARRAY_INDEX_CORRUPT] ignored");
+         #endif
       #endif
     } else if(ARDUINO_QUEUE_ELEMENT_FLAG_A & ARDUINO_QUEUE_ELEMENT_FLAG_INITIAL_CORRUPT) {
       #if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT)  || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE)
@@ -318,10 +325,11 @@ ARDUINO_FUNCT_INIT_RESULT_T ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE(
                         ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A ++;
                         ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_COUNT_A ++;   
                  #if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT)  || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE)
+                      #if not defined(DISABLE_ANY_PRINT)
                         Serial.print("433[ELSE] [QUEUE++]");
                         Serial.print(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A);
                         Serial.print("] ");
-                      
+                     #endif 
                    #endif
                 
                 
@@ -393,7 +401,9 @@ ARDUINO_ARRAY_INDEX_NEXT_LOCK_T ARDUINO_ARRAY_INDEX_POP_LOCK( ARDUINO_ATTR_ARRAY
                  ARDUINO_ARRAY_INDEX_NEXT_T ARDUINO_ARRAY_INDEX_NEXT_A ;
                   ARDUINO_ARRAY_INDEX_NEXT_A =  ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A ;
                      #if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
-                              Serial.print("  [ARDUINO_ARRAY_INDEX_POP_LOCK]?  ");       
+                             #if not defined(DISABLE_ANY_PRINT)
+                              Serial.print("  [ARDUINO_ARRAY_INDEX_POP_LOCK]?  ");
+                              #endif       
                           #endif 
                  if(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A > 0) {
                                  #if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)