|
|
@@ -134,7 +134,7 @@
|
|
|
DISPLAY_A ,
|
|
|
DISPLAY_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
DISPLAY_PHYSICAL_CHAR_A,
|
|
|
- DISPLAY_pos_seq_A_NEXT,
|
|
|
+ DISPLAY_pos_seq_A_NEXT | DISPLAY_pos_seq_A_IMMEDIATE,
|
|
|
message,
|
|
|
DISPLAY_TARGET_DISPLAY128,
|
|
|
time , // time_seq_id_T time_seq_id_A;
|
|
|
@@ -153,7 +153,7 @@
|
|
|
DISPLAY_A ,
|
|
|
DISPLAY_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
DISPLAY_PHYSICAL_CHAR_A,
|
|
|
- DISPLAY_pos_seq_A_NEXT,
|
|
|
+ DISPLAY_pos_seq_A_NEXT | DISPLAY_pos_seq_A_IMMEDIATE,
|
|
|
DISPLAY_array16_AAA,
|
|
|
DISPLAY_TARGET_DISPLAY128,
|
|
|
time , // time_seq_id_T time_seq_id_A;
|
|
|
@@ -203,25 +203,45 @@
|
|
|
|
|
|
#if defined(DISABLE_TASK_TYPE_T_DISPLAY_queue_pop________)
|
|
|
#else
|
|
|
- DISPLAY_array16_T DISPLAY_array16_AAAA="" ;
|
|
|
- message = "3CAN SEND " ; message.concat(i); message.concat("."); message.concat(Slave_Ports_Status_A[i].Port_ID); message.concat(" >>> ");
|
|
|
-
|
|
|
- message.toCharArray(DISPLAY_array16_AAAA, 16);
|
|
|
- DISPLAY__CURSOR_Y_CHARS__SET(DISPLAY_PHYSICAL_CHAR_A,
|
|
|
- DISPLAY_CURSOR_Y_CHARS_CAN_DEBUG);
|
|
|
- DISPLAY__print( DISPLAY_A ,
|
|
|
- DISPLAY_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
- DISPLAY_PHYSICAL_CHAR_A,
|
|
|
- DISPLAY_pos_seq_A_NEXT | DISPLAY_pos_seq_A_IMMEDIATE, //TODO BITTEST
|
|
|
- DISPLAY_array16_AAAA, //message,
|
|
|
- DISPLAY_TARGET_DISPLAY128,
|
|
|
- time , // time_seq_id_T time_seq_id_A;
|
|
|
- time + 5000, //time_min_run_T time_min_run_A;
|
|
|
- //queue
|
|
|
- Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
- TASK_TYPE_T_Slave_Ports_broadcast____ , //TASK_TYPE_A,
|
|
|
- { Slave_Ports_Status_A[i].Port_ID } //TASK_PORT_ASSOC_A
|
|
|
- );
|
|
|
+ #if defined(DISPLAY_array16_T_is_DISPLAY_string_T)
|
|
|
+ message = "3CAN SEND " ; message.concat(i); message.concat("."); message.concat(Slave_Ports_Status_A[i].Port_ID); message.concat(" >>>");
|
|
|
+ DISPLAY__CURSOR_Y_CHARS__SET(DISPLAY_PHYSICAL_CHAR_A,
|
|
|
+ DISPLAY_CURSOR_Y_CHARS_CAN_DEBUG);
|
|
|
+ DISPLAY__print( DISPLAY_A ,
|
|
|
+ DISPLAY_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
+ DISPLAY_PHYSICAL_CHAR_A,
|
|
|
+ DISPLAY_pos_seq_A_NEXT | DISPLAY_pos_seq_A_IMMEDIATE, //TODO BITTEST
|
|
|
+ message, //message,
|
|
|
+ DISPLAY_TARGET_DISPLAY128,
|
|
|
+ time , // time_seq_id_T time_seq_id_A;
|
|
|
+ time + 5000, //time_min_run_T time_min_run_A;
|
|
|
+ //queue
|
|
|
+ Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
+ TASK_TYPE_T_Slave_Ports_broadcast____ , //TASK_TYPE_A,
|
|
|
+ { Slave_Ports_Status_A[i].Port_ID } //TASK_PORT_ASSOC_A
|
|
|
+ );
|
|
|
+ #else
|
|
|
+ DISPLAY_array16_T DISPLAY_array16_AAAA="" ;
|
|
|
+ message = "3CAN SEND " ; message.concat(i); message.concat("."); message.concat(Slave_Ports_Status_A[i].Port_ID); message.concat(" >>> ");
|
|
|
+
|
|
|
+ message.toCharArray(DISPLAY_array16_AAAA, 16);
|
|
|
+ DISPLAY__CURSOR_Y_CHARS__SET(DISPLAY_PHYSICAL_CHAR_A,
|
|
|
+ DISPLAY_CURSOR_Y_CHARS_CAN_DEBUG);
|
|
|
+ DISPLAY__print( DISPLAY_A ,
|
|
|
+ DISPLAY_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
+ DISPLAY_PHYSICAL_CHAR_A,
|
|
|
+ DISPLAY_pos_seq_A_NEXT | DISPLAY_pos_seq_A_IMMEDIATE, //TODO BITTEST
|
|
|
+ DISPLAY_array16_AAAA, //message,
|
|
|
+ DISPLAY_TARGET_DISPLAY128,
|
|
|
+ time , // time_seq_id_T time_seq_id_A;
|
|
|
+ time + 5000, //time_min_run_T time_min_run_A;
|
|
|
+ //queue
|
|
|
+ Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
+ TASK_TYPE_T_Slave_Ports_broadcast____ , //TASK_TYPE_A,
|
|
|
+ { Slave_Ports_Status_A[i].Port_ID } //TASK_PORT_ASSOC_A
|
|
|
+ );
|
|
|
+ #endif
|
|
|
+
|
|
|
#endif
|
|
|
#ifdef DEBUG_CAN || defined(DEBUG_TASK_TYPE_T_Slave_Ports_broadcast____)
|
|
|
Serial.print("#155 after CAN_SEND update [Broadcast_state_FULL_FRESH] for i[");
|
|
|
@@ -248,22 +268,40 @@
|
|
|
#endif
|
|
|
#if defined(DISABLE_TASK_TYPE_T_DISPLAY_queue_pop________)
|
|
|
#else
|
|
|
- DISPLAY_array16_T DISPLAY_array16_AAAAA="" ;
|
|
|
- message = "4CAN ERR " ; message.concat(i); message.concat("."); message.concat(Slave_Ports_Status_A[i].Port_ID); message.concat(" >>> ");
|
|
|
- message.toCharArray(DISPLAY_array16_AAAAA, 16);
|
|
|
- DISPLAY__print( DISPLAY_A ,
|
|
|
- DISPLAY_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
- DISPLAY_PHYSICAL_CHAR_A,
|
|
|
- DISPLAY_pos_seq_A_NEXT | DISPLAY_pos_seq_A_IMMEDIATE, //TODO BITTEST
|
|
|
- DISPLAY_array16_AAAAA,//DISPLAY_array16_I( "#107MSG ERROR " + char( Slave_Ports_Status_A[i].Port_ID ) , 2), //message,
|
|
|
- DISPLAY_TARGET_DISPLAY128,
|
|
|
- time , // time_seq_id_T time_seq_id_A;
|
|
|
- time +5000, //time_min_run_T time_min_run_A;
|
|
|
- //queue
|
|
|
- Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
- TASK_TYPE_T_Slave_Ports_broadcast____ , //TASK_TYPE_A,
|
|
|
- { Slave_Ports_Status_A[i].Port_ID } //TASK_PORT_ASSOC_A
|
|
|
- );
|
|
|
+ #if defined(DISPLAY_array16_T_is_DISPLAY_string_T)
|
|
|
+ message = "4CAN ERR " ; message.concat(i); message.concat("."); message.concat(Slave_Ports_Status_A[i].Port_ID); message.concat(" >>>");
|
|
|
+ DISPLAY__print( DISPLAY_A ,
|
|
|
+ DISPLAY_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
+ DISPLAY_PHYSICAL_CHAR_A,
|
|
|
+ DISPLAY_pos_seq_A_NEXT | DISPLAY_pos_seq_A_IMMEDIATE, //TODO BITTEST
|
|
|
+ message,//DISPLAY_array16_I( "#107MSG ERROR " + char( Slave_Ports_Status_A[i].Port_ID ) , 2), //message,
|
|
|
+ DISPLAY_TARGET_DISPLAY128,
|
|
|
+ time , // time_seq_id_T time_seq_id_A;
|
|
|
+ time +5000, //time_min_run_T time_min_run_A;
|
|
|
+ //queue
|
|
|
+ Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
+ TASK_TYPE_T_Slave_Ports_broadcast____ , //TASK_TYPE_A,
|
|
|
+ { Slave_Ports_Status_A[i].Port_ID } //TASK_PORT_ASSOC_A
|
|
|
+ );
|
|
|
+ #else
|
|
|
+ DISPLAY_array16_T DISPLAY_array16_AAAAA="" ;
|
|
|
+ message = "4CAN ERR " ; message.concat(i); message.concat("."); message.concat(Slave_Ports_Status_A[i].Port_ID); message.concat(" >>> ");
|
|
|
+ message.toCharArray(DISPLAY_array16_AAAAA, 16);
|
|
|
+ DISPLAY__print( DISPLAY_A ,
|
|
|
+ DISPLAY_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
+ DISPLAY_PHYSICAL_CHAR_A,
|
|
|
+ DISPLAY_pos_seq_A_NEXT | DISPLAY_pos_seq_A_IMMEDIATE, //TODO BITTEST
|
|
|
+ DISPLAY_array16_AAAAA,//DISPLAY_array16_I( "#107MSG ERROR " + char( Slave_Ports_Status_A[i].Port_ID ) , 2), //message,
|
|
|
+ DISPLAY_TARGET_DISPLAY128,
|
|
|
+ time , // time_seq_id_T time_seq_id_A;
|
|
|
+ time +5000, //time_min_run_T time_min_run_A;
|
|
|
+ //queue
|
|
|
+ Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
+ TASK_TYPE_T_Slave_Ports_broadcast____ , //TASK_TYPE_A,
|
|
|
+ { Slave_Ports_Status_A[i].Port_ID } //TASK_PORT_ASSOC_A
|
|
|
+ );
|
|
|
+ #endif
|
|
|
+
|
|
|
#endif
|
|
|
//String LCDarray1 = "Error Sending";
|
|
|
//String LCDarray2 = "Message...";
|