|
|
@@ -8,7 +8,7 @@ void TASK_TYPE_T_Broadcast_state_LOW(Slave_Ports_Status_T* Slave_Ports_Status_A,
|
|
|
} else {
|
|
|
if(Slave_Ports_Status_A[i].Broadcast_state > Broadcast_state_LOW ) {
|
|
|
Slave_Ports_Status_A[i].Broadcast_state = Broadcast_state_LOW ;
|
|
|
- Serial.print(" #11[BCAST][SET][LOW][");Serial.print(i);Serial.print("] ");
|
|
|
+ Serial.print(F(" #11[BCAST][SET][LOW]["));Serial.print(i);Serial.print(F("] "));
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -49,7 +49,7 @@ void TASK_TYPE_T_Broadcast_state_LOW(Slave_Ports_Status_T* Slave_Ports_Status_A,
|
|
|
*/
|
|
|
) {
|
|
|
#if defined(DEBUG_TASK_TYPE_T_Slave_Ports_broadcast____)
|
|
|
- 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("] ");
|
|
|
+ Serial.print(F("#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(F("] "));
|
|
|
#else
|
|
|
SPFTFT2(task,broadcast,251);
|
|
|
#endif
|
|
|
@@ -57,21 +57,21 @@ void TASK_TYPE_T_Broadcast_state_LOW(Slave_Ports_Status_T* Slave_Ports_Status_A,
|
|
|
for(i=ARDUINO_ARRAY_INDEX_FIRST;i<= Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A ;i++) { //Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A // ARDUINO_ARRAY_INDEX_LIMIT_PORTS
|
|
|
if(Slave_Ports_Status_A[i].IS_Local_A == IS_Local_TRUE) {
|
|
|
#if defined(DEBUG_TASK_TYPE_T_Slave_Ports_broadcast____)
|
|
|
- Serial.print(" Broadcast_state[");Serial.print(Slave_Ports_Status_A[i].Broadcast_state);Serial.print("] Broadcast_state_FRESH["); Serial.print(Broadcast_state_FRESH); Serial.print("] ");
|
|
|
+ Serial.print(F(" Broadcast_state["));Serial.print(Slave_Ports_Status_A[i].Broadcast_state);Serial.print(F("] Broadcast_state_FRESH[")); Serial.print(Broadcast_state_FRESH); Serial.print(F("] "));
|
|
|
#endif
|
|
|
if(Slave_Ports_Status_A[i].Broadcast_state <= Broadcast_state_FRESH) {
|
|
|
|
|
|
|
|
|
#if defined(DEBUG) || defined(DEBUG_CAN) || defined(DEBUG_TASK_TYPE_T_Slave_Ports_broadcast____)
|
|
|
//if(DEBUG > 4) {
|
|
|
- Serial.print("#43 ind:"); Serial.print(i); Serial.print("] IS_Local_A:");
|
|
|
+ Serial.print(F("#43 ind:")); Serial.print(i); Serial.print(F("] IS_Local_A:"));
|
|
|
Serial.print(Slave_Ports_Status_A[i].IS_Local_A);
|
|
|
- Serial.print(" , ID:");
|
|
|
- Serial.print(Slave_Ports_Status_A[i].Port_ID, HEX); Serial.print(" , PortTypes:");
|
|
|
- Serial.print(Slave_Ports_Status_A[i].PortTypes, HEX); Serial.print(" , Addr:"); Serial.print(Slave_Ports_Status_A[i].Address, HEX);
|
|
|
- Serial.print(" , Local:"); Serial.print(Slave_Ports_Status_A[i].LocalPort);
|
|
|
- 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(F(" , ID:"));
|
|
|
+ Serial.print(Slave_Ports_Status_A[i].Port_ID, HEX); Serial.print(F(" , PortTypes:"));
|
|
|
+ Serial.print(Slave_Ports_Status_A[i].PortTypes, HEX); Serial.print(F(" , Addr:")); Serial.print(Slave_Ports_Status_A[i].Address, HEX);
|
|
|
+ Serial.print(F(" , Local:")); Serial.print(Slave_Ports_Status_A[i].LocalPort);
|
|
|
+ Serial.print(F(" , Exp state:")); Serial.print(Slave_Ports_Status_A[i].Exp_state);
|
|
|
+ Serial.print(F(" , 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("] ");
|
|
|
// }
|
|
|
@@ -131,7 +131,7 @@ void TASK_TYPE_T_Broadcast_state_LOW(Slave_Ports_Status_T* Slave_Ports_Status_A,
|
|
|
#endif
|
|
|
|
|
|
#if defined(DEBUG_TASK_TYPE_T_Slave_Ports_broadcast____)
|
|
|
- Serial.println("#66A Prepared data");
|
|
|
+ Serial.println(F("#66A Prepared data"));
|
|
|
#endif
|
|
|
|
|
|
#if defined(DISABLE_TASK_TYPE_T_DISPLAY_queue_pop________)
|
|
|
@@ -217,7 +217,7 @@ void TASK_TYPE_T_Broadcast_state_LOW(Slave_Ports_Status_T* Slave_Ports_Status_A,
|
|
|
CAN_MSG8_A_ptr(CAN_broadcast_A,CAN_MSG8_A);
|
|
|
|
|
|
// #if defined(DEBUG_CAN) || defined(DEBUG_TASK_TYPE_T_Slave_Ports_broadcast____)
|
|
|
- Serial.println("#139 deb CAN_MSG8_A_ptr");
|
|
|
+ Serial.println(F("#139 deb CAN_MSG8_A_ptr"));
|
|
|
// #endif
|
|
|
|
|
|
|
|
|
@@ -232,7 +232,7 @@ void TASK_TYPE_T_Broadcast_state_LOW(Slave_Ports_Status_T* Slave_Ports_Status_A,
|
|
|
if(sndStat == CAN_OK){
|
|
|
Slave_Ports_Status_A[i].Broadcast_state = Broadcast_state_FULL_FRESH ;
|
|
|
#if defined(DEBUG_TASK_TYPE_T_Slave_Ports_broadcast____)
|
|
|
- Serial.println("#921 Message Sent Successfully!");
|
|
|
+ Serial.println(F("#921 Message Sent Successfully!"));
|
|
|
#endif
|
|
|
//String LCDarray1 = "Message Sent";
|
|
|
//String LCDarray2 = "Successfully";
|
|
|
@@ -281,9 +281,9 @@ void TASK_TYPE_T_Broadcast_state_LOW(Slave_Ports_Status_T* Slave_Ports_Status_A,
|
|
|
|
|
|
#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[");
|
|
|
- Serial.print(i); Serial.println("] ");
|
|
|
- Serial.print("#154 before Exp_state_ttl[");
|
|
|
+ Serial.print(F("#155 after CAN_SEND update [Broadcast_state_FULL_FRESH] for i["));
|
|
|
+ Serial.print(i); Serial.println(F("] "));
|
|
|
+ Serial.print(F("#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("] ");
|
|
|
#endif
|
|
|
@@ -291,7 +291,7 @@ void TASK_TYPE_T_Broadcast_state_LOW(Slave_Ports_Status_T* Slave_Ports_Status_A,
|
|
|
// Slave_Ports_Status_A[i].Exp_state_ttl = Exp_state_ttl_IS_ACTIVE ;
|
|
|
|
|
|
#if defined(DEBUG_CAN) || defined(DEBUG_TASK_TYPE_T_Slave_Ports_broadcast____)
|
|
|
- Serial.print("#164 after Exp_state_ttl[");
|
|
|
+ Serial.print(F("#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("] ");
|
|
|
|
|
|
@@ -301,7 +301,7 @@ void TASK_TYPE_T_Broadcast_state_LOW(Slave_Ports_Status_T* Slave_Ports_Status_A,
|
|
|
|
|
|
} else {
|
|
|
#if defined(DEBUG_TASK_TYPE_T_Slave_Ports_broadcast____)
|
|
|
- Serial.print("Error Sending Message... ["); Serial.print(sndStat); Serial.println("] ");
|
|
|
+ Serial.print(F("Error Sending Message... [")); Serial.print(sndStat); Serial.println(F("] "));
|
|
|
#endif
|
|
|
#if defined(DISABLE_TASK_TYPE_T_DISPLAY_queue_pop________)
|
|
|
#else
|
|
|
@@ -342,7 +342,7 @@ void TASK_TYPE_T_Broadcast_state_LOW(Slave_Ports_Status_T* Slave_Ports_Status_A,
|
|
|
|
|
|
} else if(Slave_Ports_Status_A[i].Broadcast_state > Broadcast_state_FRESH) { //if Bcast to refresh
|
|
|
|
|
|
- Serial.print("#238[BCAST]--[");Serial.print(Slave_Ports_Status_A[i].Broadcast_state);Serial.print("] ");
|
|
|
+ Serial.print(F("#238[BCAST]--["));Serial.print(Slave_Ports_Status_A[i].Broadcast_state);Serial.print(F("] "));
|
|
|
|
|
|
INT_SAFE_DECREMENT_TO_LIMIT(Broadcast_state_TO_REFRESH, Slave_Ports_Status_A[i].Broadcast_state,(TASK_TYPE_T_Slave_Ports_broadcast____time_min_run_MIN_A_INCREMENT_A / 1000) );
|
|
|
//Slave_Ports_Status_A[i].Broadcast_state = Slave_Ports_Status_A[i].Broadcast_state - (TASK_TYPE_T_Slave_Ports_broadcast____time_min_run_MIN_A_INCREMENT_A / 1000) ; //(TASK_TYPE_T_Slave_Ports_broadcast____time_min_run_MIN_A_INCREMENT_A / 1000)
|
|
|
@@ -350,9 +350,9 @@ void TASK_TYPE_T_Broadcast_state_LOW(Slave_Ports_Status_T* Slave_Ports_Status_A,
|
|
|
}
|
|
|
} else if(Slave_Ports_Status_A[i].IS_Local_A == IS_Local_FALSE and Slave_Ports_Status_A[i]._Slave_ID > 0 and Slave_Ports_Status_A[i].Port_ID > 0 ) {
|
|
|
|
|
|
- Serial.print("#331[BCAST][ELSE]"); Serial.print(i); Serial.print("] IS_Local_A:");
|
|
|
+ Serial.print(F("#331[BCAST][ELSE]")); Serial.print(i); Serial.print(F("] IS_Local_A:"));
|
|
|
Serial.print(Slave_Ports_Status_A[i].IS_Local_A);
|
|
|
- Serial.print("] "); Serial.print("[DELETE PORT?]");
|
|
|
+ Serial.print(F("] ")); Serial.print(F("[DELETE PORT?]"));
|
|
|
|
|
|
if((Slave_Ports_Status_A[i].Broadcast_state - (TASK_TYPE_T_Slave_Ports_broadcast____time_min_run_MIN_A_INCREMENT_A / 2000) ) < 0 ) //( TASK_TYPE_T_Slave_Ports_broadcast____time_min_run_MIN_A_INCREMENT_A / 1000 )
|
|
|
Slave_Ports_Status_A[i].IS_gone_A = IS_gone_TRUE ;
|
|
|
@@ -366,15 +366,15 @@ void TASK_TYPE_T_Broadcast_state_LOW(Slave_Ports_Status_T* Slave_Ports_Status_A,
|
|
|
} else { //if(Slave_Ports_Status_A[i].IS_Local_A == IS_Local_TRUE) {
|
|
|
#if defined(DEBUG) //|| defined(DEBUG_CAN) || defined(DEBUG_TASK_TYPE_T_Slave_Ports_broadcast____)
|
|
|
//if(DEBUG > 4) {
|
|
|
- Serial.print("#147 BCAST NOT SENT ind:"); Serial.print(i); Serial.print("] IS_Local_A:");
|
|
|
+ Serial.print(F("#147 BCAST NOT SENT ind:")); Serial.print(i); Serial.print(F("] IS_Local_A:"));
|
|
|
Serial.print(Slave_Ports_Status_A[i].IS_Local_A);
|
|
|
- Serial.print(" , ID:");
|
|
|
- Serial.print(Slave_Ports_Status_A[i].Port_ID, HEX); Serial.print(" , PortTypes:");
|
|
|
- Serial.print(Slave_Ports_Status_A[i].PortTypes, HEX); Serial.print(" , Addr:"); Serial.print(Slave_Ports_Status_A[i].Address, HEX);
|
|
|
- Serial.print(" , Local:"); Serial.print(Slave_Ports_Status_A[i].LocalPort);
|
|
|
- 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("]");
|
|
|
+ Serial.print(F(" , ID:"));
|
|
|
+ Serial.print(Slave_Ports_Status_A[i].Port_ID, HEX); Serial.print(F(" , PortTypes:"));
|
|
|
+ Serial.print(Slave_Ports_Status_A[i].PortTypes, HEX); Serial.print(F(" , Addr:")); Serial.print(Slave_Ports_Status_A[i].Address, HEX);
|
|
|
+ Serial.print(F(" , Local:")); Serial.print(Slave_Ports_Status_A[i].LocalPort);
|
|
|
+ Serial.print(F(" , Exp state:")); Serial.print(Slave_Ports_Status_A[i].Exp_state);
|
|
|
+ Serial.print(F(" , Exp_state_ttl")); Serial.println(Slave_Ports_Status_A[i].Exp_state_ttl);
|
|
|
+ Serial.print(F("#2111 *_TEST_GLOBAL")); Serial.print(*_TEST_GLOBAL); Serial.println(F("]"));
|
|
|
// }
|
|
|
#endif
|
|
|
|