Pārlūkot izejas kodu

eliminating errors

a.binder 5 gadi atpakaļ
vecāks
revīzija
4dc06f6af5

+ 3 - 67
SE/stuff/P5_Automation_can-dev-res-working-1930/_Slave_Ports_Status_func.h

@@ -194,67 +194,14 @@
             
              if(Slave_Ports_Status_A[i].Port_ID > 0 ) {
             
-                  #if defined(USE_MESSAGE_OLD)
-                      message.concat(i);
-                      message.concat(".");
-                      message.concat(Slave_Ports_Status_A[i].Port_ID )  ; 
-                      message.concat(TAB_S);
-                      
-                       if(Slave_Ports_Status_A[i].PortTypes & PortTypes_SERVO ) {
-                            message.concat("S");
-                       }
-                       if(Slave_Ports_Status_A[i].PortTypes & PortTypes_SERVO_360 ) {
-                            message.concat("3");
-                       }
-                      
-                       message.concat(TAB_S);
-                         #endif   
+                
                          if(Slave_Ports_Status_A[i].IS_gone_A == IS_gone_TRUE) {
-                             message.concat(" [---] ");
+                          
                             
                          } else {
                              
                              
-                                #if defined(USE_MESSAGE_OLD)
-                                   message.concat(Slave_Ports_Status_A[i].Exp_state_ttl/10 )  ;
-                      
-                                              message.concat(TAB_S);// B:
-                                               message.concat(Slave_Ports_Status_A[i].Broadcast_state/10 )  ;
-                                           if(Slave_Ports_Status_A[i].IS_Local_A == IS_Local_TRUE) {
-                                               message.concat("L");// B:
-                                          } else if(Slave_Ports_Status_A[i].IS_Local_A == IS_Local_FALSE) {
-                                               message.concat("R");// B:
-                                          } 
-                                            message.concat(TAB_S);
-                                        if(Slave_Ports_Status_A[i].Exp_state & Exp_state_ON_USE_LEVEL ) {
-                                         message.concat("["); 
-                                        // int LVL;
-                                         //LVL = Slave_Ports_Status_A[i].Exp_state_level_A + 10 ;
-                                         message.concat(String(Slave_Ports_Status_A[i].Exp_state_level_A, DEC));
-                                          message.concat("]");
-                                          
-                                          message.concat(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_SELECTOR_A[1].DISPLAY_MENU_INDEX_A].DISPLAY_MENU_ITEM_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_SELECTOR_A[1].DISPLAY_MENU_ITEM_INDEX_A].Exp_state_level_A) ;
-                                          
-                                           /*if(Slave_Ports_Status_A[i].Exp_state_level_A < 10 ) message2.concat(" [___] ");//E:
-                                           else if(Slave_Ports_Status_A[i].Exp_state_level_A < 100 )  message2.concat("  [#___] ");//E:
-                                           else if(Slave_Ports_Status_A[i].Exp_state_level_A < 1000 ) message2.concat("  [##__] ");//E:
-                                           else if(Slave_Ports_Status_A[i].Exp_state_level_A < 2000 ) message2.concat("  [###_] ");//E:
-                                           else if(Slave_Ports_Status_A[i].Exp_state_level_A >= 2000 ) message2.concat(" [####] ");//E:
-                                           */
-                                         }
-                                         
-                                         message.concat(TAB_S);
-                                         
-                                       if(Slave_Ports_Status_A[i].Exp_state & Exp_state_SET_REQ_SEND ) {
-                                        message.concat(">*");//E:
-                                       } else if(Slave_Ports_Status_A[i].Exp_state & Exp_state_SET ) {
-                                        message.concat("*");//E:  
-                                       } else  if (!( ( Slave_Ports_Status_A[i].Exp_state & Exp_state_SET ) ^ Exp_state_SET ))  {
-                                          message.concat(" ** ");//E:
-                                       } else {
-                                           message.concat(" ?");//E: 
-                                       }
-                       #endif
+                             
              // String message = "P ";  message.concat(Slave_Ports_Status_A[i].Port_ID)  ;  message.concat(" ");
              
                 if(i >= (ARDUINO_ARRAY_INDEX_LIMIT_DISPLAY_MENU_ITEM_A - 1)) {
@@ -279,17 +226,6 @@
                 message.toCharArray(DISPLAY_char24_A, message.length());
                  memcpy(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i+1].DISPLAY_char24_A, DISPLAY_char24_A, message.length());
                   #endif
-                 /*            
-                     for(int s = 1; s<= message.length() ; s++) {//DISPLAY_char24_T_SIZE
-                       DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i+1].DISPLAY_char24_A[s] = message[s] ;
-                     }
-                   */                        
-                 //message.toCharArray( DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i+1].DISPLAY_char24_A, message.length() );
-                 //message.toCharArray(DISPLAY_char_A, message.length() ); //+ 1
-                 //strcpy(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i+1].DISPLAY_char_A,DISPLAY_char_A  ); //
-                 
-                 
-                 //free (message) ;
              
                 }
              

+ 22 - 22
SE/stuff/P5_Automation_can-dev-res-working-1930/___loop/__main_loop_end.h

@@ -99,35 +99,35 @@ if(ARDUINO_LOOP_LATENCY_COUNTER__MAIN_END(ARDUINO_LOOP_LATENCY__MAIN_END_A, ARDU
                      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,
-                      0 ,
-                       DISPLAY_A ,
-                         DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
-                         DISPLAY_PHYSICAL_CHAR_A, 
-                    DISPLAY_pos_seq_A_NEXT | DISPLAY_pos_seq_A_IMMEDIATE ,
-                    "PORTS [" ,
-                    DISPLAY_TARGET_DISPLAY128,
-                   time,
-                    time + ARDUINO_time_seq_id_A_INCREMENT //ARDUINO_LOOP_LATENCY_DISPLAY_MENU
-                     //queue
-                    ,Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
-                    TASK_TYPE_T__EMPTY__JUST_PASSED_ARG__,
-                    TASK_PORT_ASSOC_EMPTY
-                    //,DISPLAY_PHYSICAL_CHAR_A
-                 );
-                 
+                           
+                         Slave_Ports_Status__DISPLAY_TARGET(
+                               Slave_Ports_Status_A ,
+                               Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A,
+                                0 ,
+                                 DISPLAY_A ,
+                                   DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
+                                   DISPLAY_PHYSICAL_CHAR_A, 
+                              DISPLAY_pos_seq_A_NEXT | DISPLAY_pos_seq_A_IMMEDIATE ,
+                              "PORTS [" ,
+                              DISPLAY_TARGET_DISPLAY128,
+                             time,
+                              time + ARDUINO_time_seq_id_A_INCREMENT //ARDUINO_LOOP_LATENCY_DISPLAY_MENU
+                               //queue
+                              ,Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
+                              TASK_TYPE_T__EMPTY__JUST_PASSED_ARG__,
+                              TASK_PORT_ASSOC_EMPTY
+                              //,DISPLAY_PHYSICAL_CHAR_A
+                           );
+                             
                  
                    #if defined(HAS_TFT_ILI9163C)
-                    #if defined(USE_MESSAGE_OLD)
+                  
                             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,time + ARDUINO_LOOP_LATENCY_DISPLAY_MENU//time_seq_id_A, (time_seq_id_A + 5000) 
                                       ,Slave_Ports_Status_A 
                                        );
-                    #endif
+                  
                     #endif
                     
               #else