|
@@ -104,7 +104,12 @@
|
|
|
DISPLAY_T_ARDUINO_ATTR_ARRAY_T &DISPLAY_T_ARDUINO_ATTR_ARRAY_A ,
|
|
DISPLAY_T_ARDUINO_ATTR_ARRAY_T &DISPLAY_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
DISPLAY_PHYSICAL_CHAR_T &DISPLAY_PHYSICAL_CHAR_A,
|
|
DISPLAY_PHYSICAL_CHAR_T &DISPLAY_PHYSICAL_CHAR_A,
|
|
|
DISPLAY_pos_seq_T DISPLAY_pos_seq_A,
|
|
DISPLAY_pos_seq_T DISPLAY_pos_seq_A,
|
|
|
- DISPLAY_array16_T DISPLAY_array16_A,
|
|
|
|
|
|
|
+ #if defined(DISPLAY_array16_T_is_DISPLAY_string_T)
|
|
|
|
|
+ DISPLAY_string_T DISPLAY_string_A,
|
|
|
|
|
+ #else
|
|
|
|
|
+ DISPLAY_array16_T DISPLAY_array16_A,
|
|
|
|
|
+ #endif
|
|
|
|
|
+
|
|
|
DISPLAY_TARGET_T DISPLAY_TARGET_A,
|
|
DISPLAY_TARGET_T DISPLAY_TARGET_A,
|
|
|
time_seq_id_T time_seq_id_A,
|
|
time_seq_id_T time_seq_id_A,
|
|
|
time_min_run_T time_min_run_A
|
|
time_min_run_T time_min_run_A
|
|
@@ -134,34 +139,60 @@
|
|
|
Serial.println("] ");
|
|
Serial.println("] ");
|
|
|
}
|
|
}
|
|
|
#endif
|
|
#endif
|
|
|
-
|
|
|
|
|
- String message_init = String(Active_ControllerID, HEX) ;
|
|
|
|
|
- DISPLAY_array16_T DISPLAY_array16_AAT ;
|
|
|
|
|
- // message_init.concat(DISPLAY_array16_A);
|
|
|
|
|
- message_init.concat("] #C: ");
|
|
|
|
|
- message_init = message_init + Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A ;
|
|
|
|
|
- message_init = DISPLAY_array16_A + message_init ;
|
|
|
|
|
- //message_init.concat(Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A , INT );
|
|
|
|
|
- message_init.concat(" ");
|
|
|
|
|
- message_init.toCharArray(DISPLAY_array16_AAT, 16); //message_init.length()
|
|
|
|
|
-
|
|
|
|
|
- String message ;
|
|
|
|
|
- String message2 ;
|
|
|
|
|
- DISPLAY__print(
|
|
|
|
|
- DISPLAY_A ,
|
|
|
|
|
- DISPLAY_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
|
|
- DISPLAY_PHYSICAL_CHAR_A,
|
|
|
|
|
- DISPLAY_pos_seq_A | DISPLAY_pos_seq_A_CLEARSCREEN,
|
|
|
|
|
- DISPLAY_array16_AAT,
|
|
|
|
|
- DISPLAY_TARGET_A,
|
|
|
|
|
- time_seq_id_A,
|
|
|
|
|
- time_min_run_A
|
|
|
|
|
- //queue
|
|
|
|
|
- , Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
|
|
- TASK_TYPE_A,
|
|
|
|
|
- TASK_PORT_ASSOC_A
|
|
|
|
|
-
|
|
|
|
|
- );
|
|
|
|
|
|
|
+ String message_init = String(Active_ControllerID, HEX) ;
|
|
|
|
|
+ message_init.concat("] #C: ");
|
|
|
|
|
+ message_init = message_init + Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A ;
|
|
|
|
|
+ message_init.concat(" ");
|
|
|
|
|
+ #if defined(DISPLAY_array16_T_is_DISPLAY_string_T)
|
|
|
|
|
+
|
|
|
|
|
+ DISPLAY__print(
|
|
|
|
|
+ DISPLAY_A ,
|
|
|
|
|
+ DISPLAY_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
|
|
+ DISPLAY_PHYSICAL_CHAR_A,
|
|
|
|
|
+ DISPLAY_pos_seq_A | DISPLAY_pos_seq_A_CLEARSCREEN,
|
|
|
|
|
+ message_init, // DISPLAY_array16_AAT,
|
|
|
|
|
+ DISPLAY_TARGET_A,
|
|
|
|
|
+ time_seq_id_A,
|
|
|
|
|
+ time_min_run_A
|
|
|
|
|
+ //queue
|
|
|
|
|
+ , Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
|
|
+ TASK_TYPE_A,
|
|
|
|
|
+ TASK_PORT_ASSOC_A
|
|
|
|
|
+
|
|
|
|
|
+ );
|
|
|
|
|
+ #else
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ DISPLAY_array16_T DISPLAY_array16_AAT ;
|
|
|
|
|
+ // message_init.concat(DISPLAY_array16_A);
|
|
|
|
|
+
|
|
|
|
|
+ message_init = DISPLAY_array16_A + message_init ;
|
|
|
|
|
+ //message_init.concat(Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A , INT );
|
|
|
|
|
+ message_init.concat(" ");
|
|
|
|
|
+ message_init.toCharArray(DISPLAY_array16_AAT, 16); //message_init.length()
|
|
|
|
|
+
|
|
|
|
|
+ String message ;
|
|
|
|
|
+ String message2 ;
|
|
|
|
|
+ DISPLAY__print(
|
|
|
|
|
+ DISPLAY_A ,
|
|
|
|
|
+ DISPLAY_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
|
|
+ DISPLAY_PHYSICAL_CHAR_A,
|
|
|
|
|
+ DISPLAY_pos_seq_A | DISPLAY_pos_seq_A_CLEARSCREEN,
|
|
|
|
|
+ DISPLAY_array16_AAT,
|
|
|
|
|
+ DISPLAY_TARGET_A,
|
|
|
|
|
+ time_seq_id_A,
|
|
|
|
|
+ time_min_run_A
|
|
|
|
|
+ //queue
|
|
|
|
|
+ , Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
|
|
+ TASK_TYPE_A,
|
|
|
|
|
+ TASK_PORT_ASSOC_A
|
|
|
|
|
+
|
|
|
|
|
+ );
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ #endif
|
|
|
|
|
+
|
|
|
int i;
|
|
int i;
|
|
|
for(i=ARDUINO_ARRAY_INDEX_FIRST ; i<=5 ; i++) {//i <= Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A
|
|
for(i=ARDUINO_ARRAY_INDEX_FIRST ; i<=5 ; i++) {//i <= Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A
|
|
|
DISPLAY_array16_T DISPLAY_array16_AA="" ;
|
|
DISPLAY_array16_T DISPLAY_array16_AA="" ;
|
|
@@ -175,25 +206,22 @@
|
|
|
Serial.println("] ");
|
|
Serial.println("] ");
|
|
|
}
|
|
}
|
|
|
#endif
|
|
#endif
|
|
|
- message = "";
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ #if defined(DISPLAY_array16_T_is_DISPLAY_string_T)
|
|
|
|
|
+ String message = "";
|
|
|
|
|
+ String message2 ;
|
|
|
|
|
+ #else
|
|
|
|
|
+
|
|
|
|
|
+ message = "";
|
|
|
|
|
+ #endif
|
|
|
|
|
+
|
|
|
//message.concat(":") ;
|
|
//message.concat(":") ;
|
|
|
message.concat(i);
|
|
message.concat(i);
|
|
|
message.concat(".");
|
|
message.concat(".");
|
|
|
message.concat(Slave_Ports_Status_A[i].Port_ID ) ;
|
|
message.concat(Slave_Ports_Status_A[i].Port_ID ) ;
|
|
|
message.concat(" ");
|
|
message.concat(" ");
|
|
|
- // 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_AA,
|
|
|
|
|
- DISPLAY_TARGET_A,
|
|
|
|
|
- time_seq_id_A,
|
|
|
|
|
- time_min_run_A
|
|
|
|
|
- );
|
|
|
|
|
- delay(100);
|
|
|
|
|
- // DISPLAY_array16_AA = 0 ;*/
|
|
|
|
|
|
|
+
|
|
|
message2 = message ; message2.concat(" ");//E:
|
|
message2 = message ; message2.concat(" ");//E:
|
|
|
String Exp_state_s = BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state) ; // ="";
|
|
String Exp_state_s = BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state) ; // ="";
|
|
|
//message2.concat(Exp_state_s.substring(1,8));
|
|
//message2.concat(Exp_state_s.substring(1,8));
|
|
@@ -275,23 +303,41 @@
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
|
- message2.toCharArray(DISPLAY_array16_AB, message2.length());
|
|
|
|
|
|
|
+ #if defined(DISPLAY_array16_T_is_DISPLAY_string_T)
|
|
|
|
|
+ DISPLAY__print(
|
|
|
|
|
+ DISPLAY_A ,
|
|
|
|
|
+ DISPLAY_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
|
|
+ DISPLAY_PHYSICAL_CHAR_A,
|
|
|
|
|
+ DISPLAY_pos_seq_A,
|
|
|
|
|
+ message2, //DISPLAY_array16_AB,
|
|
|
|
|
+ DISPLAY_TARGET_A,
|
|
|
|
|
+ time_seq_id_A,
|
|
|
|
|
+ time_min_run_A
|
|
|
|
|
+ //queue
|
|
|
|
|
+ , Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
|
|
+ TASK_TYPE_A,
|
|
|
|
|
+ TASK_PORT_ASSOC_A
|
|
|
|
|
+ );
|
|
|
|
|
+ #else
|
|
|
|
|
+ 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_AB,
|
|
|
|
|
+ DISPLAY_TARGET_A,
|
|
|
|
|
+ time_seq_id_A,
|
|
|
|
|
+ time_min_run_A
|
|
|
|
|
+ //queue
|
|
|
|
|
+ , Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
|
|
+ TASK_TYPE_A,
|
|
|
|
|
+ TASK_PORT_ASSOC_A
|
|
|
|
|
+ );
|
|
|
|
|
+ #endif
|
|
|
|
|
+
|
|
|
|
|
|
|
|
- DISPLAY__print(
|
|
|
|
|
- DISPLAY_A ,
|
|
|
|
|
- DISPLAY_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
|
|
- DISPLAY_PHYSICAL_CHAR_A,
|
|
|
|
|
- DISPLAY_pos_seq_A,
|
|
|
|
|
- DISPLAY_array16_AB,
|
|
|
|
|
- DISPLAY_TARGET_A,
|
|
|
|
|
- time_seq_id_A,
|
|
|
|
|
- time_min_run_A
|
|
|
|
|
- //queue
|
|
|
|
|
- , Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
|
|
- TASK_TYPE_A,
|
|
|
|
|
- TASK_PORT_ASSOC_A
|
|
|
|
|
- );
|
|
|
|
|
// delay(100);
|
|
// delay(100);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|