a.binder il y a 5 ans
Parent
commit
728d3fed08

+ 5 - 4
SE/stuff/P5_Automation_can-dev-res/P5_Automation_can-dev-res.ino

@@ -274,11 +274,11 @@ void setup() {
 #endif
 
 
-
+/* TODO
  String LCDarray1="CAN_1602_LCD           ";  //the string to print onthe LCD
  String LCDarray2="Testing id   ";  //the string to print onthe LCD
  LCDarray2.concat(String(Active_ControllerID, HEX) ) ;
- 
+ */
 
   
   // put your setup code here, to run once:
@@ -294,10 +294,11 @@ void setup() {
   #include "_CAN_setup.h"
  
    #if defined(HAS_LCD1602) 
+   /* todo 
       LCDarray1 = "loop.... ";
       LCDarray2 = "....";
      LCD_print(LCDarray1, LCDarray2, LCDtim/10);
-     
+     */
     #endif
 
  #include "__main_setup.h"
@@ -338,7 +339,7 @@ void loop() {
        0,
         0
      );
-                
+
  // Serial.println(time);
       #include "_SlaveID_loop1.h" //todo PCINT
       #include "_ControllerID_loop1.h"  //todo make default

+ 16 - 15
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_Status_func.h

@@ -80,6 +80,7 @@
                     #endif    
    
         String message ;
+        String message2 ;
              DISPLAY__print(
                           DISPLAY_A ,
                           DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
@@ -92,8 +93,8 @@
                           ); 
         int i;
         for(i=ARDUINO_ARRAY_INDEX_FIRST ; i <= ARDUINO_ARRAY_INDEX_LIMIT_PORTS; i++) {
-          
-                
+           DISPLAY_array16_T  DISPLAY_array16_AA="" ;
+           DISPLAY_array16_T  DISPLAY_array16_AB="" ;
         
             if(Slave_Ports_Status_A[i].Port_ID > 0) {
             
@@ -101,40 +102,40 @@
                             Serial.print("#68 Port_Dspl[DEBUG]  i "); Serial.print(i);
                             Serial.println("]  ");
                     #endif    
-                DISPLAY_array16_A="";
-                 message = "" ;
+                  message = "";
                  message.concat("+P #")  ; 
                  message.concat(i);
                  message.concat(" ID[");
                  message.concat(Slave_Ports_Status_A[i].Port_ID )  ; 
                  message.concat(" ?");
-                  message.toCharArray(DISPLAY_array16_A, message.length());
+                  message.toCharArray(DISPLAY_array16_AA, message.length());
                   DISPLAY__print(
                    DISPLAY_A ,
                    DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
                    DISPLAY_PHYSICAL_CHAR_A, 
                     DISPLAY_pos_seq_A,
-                     DISPLAY_array16_A,
+                     DISPLAY_array16_AA,
                      DISPLAY_TARGET_A,
                     time_seq_id_A,
                     time_min_run_A
                    ); 
                    delay(100);
-                   message = "" ; DISPLAY_array16_A="";
-                 message.concat(Slave_Ports_Status_A[i].Exp_state )  ;
-                 message.concat(" T");
-                 message.concat(Slave_Ports_Status_A[i].Exp_state_ttl )  ;
-                 message.concat(" B[");
-                 message.concat(Slave_Ports_Status_A[i].Broadcast_state )  ;
-                 message.concat(" ");
-                 message.toCharArray(DISPLAY_array16_A, message.length());             
+                  // DISPLAY_array16_AA = 0 ;
+                   message2 = ""  ; message2.concat("   E:");
+                 message2.concat(Slave_Ports_Status_A[i].Exp_state )  ;
+                 message2.concat(" T");
+                 message2.concat(Slave_Ports_Status_A[i].Exp_state_ttl )  ;
+                 message2.concat(" B[");
+                 message2.concat(Slave_Ports_Status_A[i].Broadcast_state )  ;
+                 message2.concat(" ");
+                 message2.toCharArray(DISPLAY_array16_AB, message2.length());             
                 
                  DISPLAY__print(
                    DISPLAY_A ,
                    DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
                    DISPLAY_PHYSICAL_CHAR_A, 
                     DISPLAY_pos_seq_A,
-                     DISPLAY_array16_A,
+                     DISPLAY_array16_AB,
                      DISPLAY_TARGET_A,
                     time_seq_id_A,
                     time_min_run_A

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

@@ -8,7 +8,7 @@
      // DISPLAY_DEV.setTextSize(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_textsize_x_A , DISPLAY_PHYSICAL_CHAR_A.DISPLAY_textsize_y_A);
      DISPLAY_DEV.clearScreen();
      DISPLAY_DEV.setCursor(0,0);
-     DISPLAY_DEV.print(LCDarray1);
-     DISPLAY_DEV.setCursor(0,10);
-     DISPLAY_DEV.print(LCDarray2);
+    // DISPLAY_DEV.print(LCDarray1);
+    // DISPLAY_DEV.setCursor(0,10);
+    // DISPLAY_DEV.print(LCDarray2);