|
|
@@ -29,10 +29,10 @@
|
|
|
) {
|
|
|
Serial.print("#251 _Slave_Ports_broadcast_POP INDEX_CURRENT_A["); Serial.print(Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A); Serial.println("] ");
|
|
|
int i;
|
|
|
- for(i=ARDUINO_ARRAY_INDEX_FIRST;i<=Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A;i++) {
|
|
|
+ for(i=ARDUINO_ARRAY_INDEX_FIRST;i<= ARDUINO_ARRAY_INDEX_LIMIT_PORTS ;i++) { //Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A
|
|
|
if(Slave_Ports_Status_A[i].IS_Local_A == IS_Local_TRUE) { //Slave_Ports_Status_A[i].Broadcast_state == Broadcast_state_TO_REFRESH and
|
|
|
#if defined(DEBUG) || defined(DEBUG_CAN)
|
|
|
- if(DEBUG > 4) {
|
|
|
+ //if(DEBUG > 4) {
|
|
|
Serial.print(" ind:"); Serial.print(i); Serial.print("] IS_Local_A:");
|
|
|
Serial.print(Slave_Ports_Status_A[i].IS_Local_A);
|
|
|
Serial.print(" , ID:");
|
|
|
@@ -43,69 +43,82 @@
|
|
|
Serial.print(" , Exp_state_ttl"); Serial.println(Slave_Ports_Status_A[i].Exp_state_ttl);
|
|
|
//Serial.print("#2111 *_TEST_GLOBAL["); Serial.print(*_TEST_GLOBAL); Serial.println("] ");
|
|
|
// Serial.print(" #2111B &_TEST_GLOBAL"); Serial.print(_TEST_GLOBAL); Serial.println("] ");
|
|
|
- }
|
|
|
+ // }
|
|
|
#endif
|
|
|
-
|
|
|
- String message = "1CAN BCAST "; message.concat(i); message.concat("."); message.concat( Slave_Ports_Status_A[i].Port_ID ); message.concat(" >>> ");
|
|
|
- DISPLAY_array16_T DISPLAY_array16_AA="" ;
|
|
|
- message.toCharArray(DISPLAY_array16_AA, 16);
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ #if defined(DISABLE_TASK_TYPE_T_DISPLAY_queue_pop________)
|
|
|
+ #else
|
|
|
+
|
|
|
+ String message = "1CAN BCAST "; message.concat(i); message.concat("."); message.concat( Slave_Ports_Status_A[i].Port_ID ); message.concat(" >>> ");
|
|
|
+ DISPLAY_array16_T DISPLAY_array16_AA="" ;
|
|
|
+ message.toCharArray(DISPLAY_array16_AA, 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_AA , // DISPLAY_array16_I( "#53 BCAST " + char( Slave_Ports_Status_A[i].Port_ID ) , 2), //message,
|
|
|
+ DISPLAY_TARGET_DISPLAY128,
|
|
|
+ time , // time_seq_id_T time_seq_id_A;
|
|
|
+ time+ARDUINO_time_seq_id_A_INCREMENT, //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
|
|
|
|
|
|
|
|
|
- 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_AA , // DISPLAY_array16_I( "#53 BCAST " + char( Slave_Ports_Status_A[i].Port_ID ) , 2), //message,
|
|
|
- DISPLAY_TARGET_DISPLAY128,
|
|
|
- time , // time_seq_id_T time_seq_id_A;
|
|
|
- time+ARDUINO_time_seq_id_A_INCREMENT, //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
|
|
|
-
|
|
|
- );
|
|
|
Serial.println("#66A Prepared data");
|
|
|
|
|
|
-
|
|
|
- DISPLAY__CURSOR_Y_CHARS__SET(DISPLAY_PHYSICAL_CHAR_A,
|
|
|
- DISPLAY_CURSOR_Y_CHARS_CAN_DEBUG);
|
|
|
- DISPLAY_array16_T DISPLAY_array16_AAA="" ;
|
|
|
- //( "OUT I2C 0X40[2]" + encoderPos * 5 , 2), //message,
|
|
|
- _Slave_Ports_Protocol_CAN_broadcast_T CAN_broadcast_A={};
|
|
|
- // CAN_broadcast_A._CAN_REMOTE_ID = _CAN_REMOTE_ID_BROADCAST ;
|
|
|
- // CAN_broadcast_A._CAN_SENDER_ID = Active_ControllerID ;
|
|
|
- CAN_broadcast_A.Port_ID = Slave_Ports_Status_A[i].Port_ID ;
|
|
|
- CAN_broadcast_A.PortTypes = Slave_Ports_Status_A[i].PortTypes ;
|
|
|
- CAN_broadcast_A.Exp_state = Slave_Ports_Status_A[i].Exp_state ;
|
|
|
- CAN_broadcast_A.Exp_state_ttl = Slave_Ports_Status_A[i].Exp_state_ttl ;
|
|
|
- CAN_broadcast_A.Broadcast_state = Slave_Ports_Status_A[i].Broadcast_state ;
|
|
|
+ #if defined(DISABLE_TASK_TYPE_T_DISPLAY_queue_pop________)
|
|
|
+ #else
|
|
|
+ DISPLAY__CURSOR_Y_CHARS__SET(DISPLAY_PHYSICAL_CHAR_A,
|
|
|
+ DISPLAY_CURSOR_Y_CHARS_CAN_DEBUG);
|
|
|
+ #endif
|
|
|
+ DISPLAY_array16_T DISPLAY_array16_AAA="" ;
|
|
|
+ //( "OUT I2C 0X40[2]" + encoderPos * 5 , 2), //message,
|
|
|
+ _Slave_Ports_Protocol_CAN_broadcast_T CAN_broadcast_A={};
|
|
|
+ // CAN_broadcast_A._CAN_REMOTE_ID = _CAN_REMOTE_ID_BROADCAST ;
|
|
|
+ // CAN_broadcast_A._CAN_SENDER_ID = Active_ControllerID ;
|
|
|
+ CAN_broadcast_A.Port_ID = Slave_Ports_Status_A[i].Port_ID ;
|
|
|
+ CAN_broadcast_A.PortTypes = Slave_Ports_Status_A[i].PortTypes ;
|
|
|
+ CAN_broadcast_A.Exp_state = Slave_Ports_Status_A[i].Exp_state ;
|
|
|
+ CAN_broadcast_A.Exp_state_ttl = Slave_Ports_Status_A[i].Exp_state_ttl ;
|
|
|
+ CAN_broadcast_A.Broadcast_state = Slave_Ports_Status_A[i].Broadcast_state ;
|
|
|
|
|
|
// CAN_broadcast_A._CAN_8 = _CAN_8_EMPTY ;
|
|
|
|
|
|
- message = "2CAN BCAST "; message.concat(i); message.concat("."); message.concat(Slave_Ports_Status_A[i].Port_ID); message.concat(" >>> ");
|
|
|
-
|
|
|
- message.toCharArray(DISPLAY_array16_AAA, 16);
|
|
|
- DISPLAY__print(
|
|
|
- DISPLAY_A ,
|
|
|
- DISPLAY_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
- DISPLAY_PHYSICAL_CHAR_A,
|
|
|
- DISPLAY_pos_seq_A_NEXT,
|
|
|
- DISPLAY_array16_AAA,
|
|
|
- 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,
|
|
|
- { } //TASK_PORT_ASSOC_A Slave_Ports_Status_A[i].Port_ID
|
|
|
-
|
|
|
- );
|
|
|
|
|
|
+
|
|
|
+ #if defined(DISABLE_TASK_TYPE_T_DISPLAY_queue_pop________)
|
|
|
+ #else
|
|
|
+ message = "2CAN BCAST "; message.concat(i); message.concat("."); message.concat(Slave_Ports_Status_A[i].Port_ID); message.concat(" >>> ");
|
|
|
+
|
|
|
+ message.toCharArray(DISPLAY_array16_AAA, 16);
|
|
|
+ DISPLAY__print(
|
|
|
+ DISPLAY_A ,
|
|
|
+ DISPLAY_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
+ DISPLAY_PHYSICAL_CHAR_A,
|
|
|
+ DISPLAY_pos_seq_A_NEXT,
|
|
|
+ DISPLAY_array16_AAA,
|
|
|
+ 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,
|
|
|
+ { } //TASK_PORT_ASSOC_A Slave_Ports_Status_A[i].Port_ID
|
|
|
+
|
|
|
+ );
|
|
|
+ #endif
|
|
|
|
|
|
|
|
|
|
|
|
@@ -124,10 +137,7 @@
|
|
|
Serial.println("#139 deb CAN_MSG8_A_ptr");
|
|
|
CAN_data_debug(CAN_MSG8_A);
|
|
|
#endif
|
|
|
- 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);
|
|
|
+
|
|
|
|
|
|
//Serial.println("#135 deb CAN_broadcast_A9");
|
|
|
//byte CAN_broadcast_A9[8] = {0xFF, 0x101, 0x02, 0x03, 0x04, 0x05, 0x07};
|
|
|
@@ -138,36 +148,44 @@
|
|
|
Serial.println("#921 Message Sent Successfully!");
|
|
|
//String LCDarray1 = "Message Sent";
|
|
|
//String LCDarray2 = "Successfully";
|
|
|
- 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(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
|
|
|
+ );
|
|
|
+ #endif
|
|
|
#ifdef DEBUG_CAN
|
|
|
Serial.print("#155 after CAN_SEND update [Broadcast_state_FULL_FRESH] for i[");
|
|
|
Serial.print(i); Serial.println("] ");
|
|
|
Serial.print("#154 before Exp_state_ttl[");
|
|
|
- Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state_ttl)); Serial.print("] Broadcast_state[");
|
|
|
- Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Broadcast_state)); Serial.println("] ");
|
|
|
+ //Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state_ttl)); Serial.print("] Broadcast_state[");
|
|
|
+ //Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Broadcast_state)); Serial.println("] ");
|
|
|
#endif
|
|
|
|
|
|
// Slave_Ports_Status_A[i].Exp_state_ttl = Exp_state_ttl_IS_ACTIVE ;
|
|
|
Slave_Ports_Status_A[i].Broadcast_state = Broadcast_state_FULL_FRESH ;
|
|
|
#ifdef DEBUG_CAN
|
|
|
Serial.print("#164 after Exp_state_ttl[");
|
|
|
- Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state_ttl)); Serial.print("] Broadcast_state[");
|
|
|
- Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Broadcast_state)); Serial.println("] ");
|
|
|
+ //Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state_ttl)); Serial.print("] Broadcast_state[");
|
|
|
+ //Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Broadcast_state)); Serial.println("] ");
|
|
|
|
|
|
#endif
|
|
|
|
|
|
@@ -175,22 +193,25 @@
|
|
|
|
|
|
} else {
|
|
|
Serial.print("Error Sending Message... ["); Serial.print(sndStat); Serial.println("] ");
|
|
|
- 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(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
|
|
|
+ );
|
|
|
+ #endif
|
|
|
//String LCDarray1 = "Error Sending";
|
|
|
//String LCDarray2 = "Message...";
|
|
|
}
|
|
|
@@ -221,7 +242,7 @@
|
|
|
// delay(5000); // send data per 100ms
|
|
|
} else {
|
|
|
#if defined(DEBUG) //|| defined(DEBUG_CAN)
|
|
|
- if(DEBUG > 4) {
|
|
|
+ //if(DEBUG > 4) {
|
|
|
Serial.print("#147 BCAST NOT SENT ind:"); Serial.print(i); Serial.print("] IS_Local_A:");
|
|
|
Serial.print(Slave_Ports_Status_A[i].IS_Local_A);
|
|
|
Serial.print(" , ID:");
|
|
|
@@ -231,7 +252,7 @@
|
|
|
Serial.print(" , Exp state:"); Serial.print(Slave_Ports_Status_A[i].Exp_state);
|
|
|
Serial.print(" , Exp_state_ttl"); Serial.println(Slave_Ports_Status_A[i].Exp_state_ttl);
|
|
|
Serial.print("#2111 *_TEST_GLOBAL"); Serial.print(*_TEST_GLOBAL); Serial.println("]");
|
|
|
- }
|
|
|
+ // }
|
|
|
#endif
|
|
|
|
|
|
}
|