|
|
@@ -198,7 +198,7 @@
|
|
|
DISPLAY_array16_T DISPLAY_array16_AA="" ;
|
|
|
DISPLAY_array16_T DISPLAY_array16_AB="" ;
|
|
|
|
|
|
- if(Slave_Ports_Status_A[i].Port_ID > 0 and not(Slave_Ports_Status_A[i].IS_gone_A == IS_gone_TRUE)) {
|
|
|
+ if(Slave_Ports_Status_A[i].Port_ID > 0 ) {
|
|
|
|
|
|
#if defined(DEBUG)
|
|
|
if(DEBUG > 2) {
|
|
|
@@ -221,86 +221,90 @@
|
|
|
message.concat(".");
|
|
|
message.concat(Slave_Ports_Status_A[i].Port_ID ) ;
|
|
|
message.concat(" ");
|
|
|
-
|
|
|
- message2 = message ; message2.concat(" ");//E:
|
|
|
- //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);
|
|
|
-
|
|
|
- /*
|
|
|
- if(Slave_Ports_Status_A[i].Exp_state & Exp_state_ERROR ) {
|
|
|
- message2 = message ; message2.concat(" ERR ");//E:
|
|
|
-
|
|
|
- } else {
|
|
|
- if(Slave_Ports_Status_A[i].Exp_state & Exp_state_ON ) message2 = message ; message2.concat(" ON ");//E:
|
|
|
- if(Slave_Ports_Status_A[i].Exp_state & Exp_state_OFF ) message2 = message ; message2.concat(" OFF ");//E:
|
|
|
- }
|
|
|
- */
|
|
|
- message2.concat(" ");// B:
|
|
|
- //if(Slave_Ports_Status_A[i].Exp_state_ttl & Exp_state_ttl_TO_REFRESH ) {
|
|
|
- // message2.concat("R");// B:
|
|
|
- // } else {
|
|
|
- // message2.concat(""); //T:
|
|
|
- message2.concat(Slave_Ports_Status_A[i].Exp_state_ttl ) ;
|
|
|
- // message2.concat(""); //T:
|
|
|
- // }
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- // if(Slave_Ports_Status_A[i].Broadcast_state > Broadcast_state_FRESH ) {
|
|
|
- //message2.concat(" R ");// B:
|
|
|
- // message2.concat(" B");
|
|
|
- //} else {
|
|
|
- message2.concat(" ");// B:
|
|
|
- message2.concat(Slave_Ports_Status_A[i].Broadcast_state ) ;
|
|
|
- //message2.concat(" ");// B:
|
|
|
- //}
|
|
|
-
|
|
|
- if(Slave_Ports_Status_A[i].IS_Local_A == IS_Local_TRUE) {
|
|
|
- message2.concat(" L");// B:
|
|
|
- } else if(Slave_Ports_Status_A[i].IS_Local_A == IS_Local_FALSE) {
|
|
|
- message2.concat(" R");// B:
|
|
|
- }
|
|
|
- //message2.concat(" ");
|
|
|
|
|
|
- if(Slave_Ports_Status_A[i].Exp_state & Exp_state_SET ) {
|
|
|
- message2.concat("*");//E:
|
|
|
-
|
|
|
- } else if (!( ( Slave_Ports_Status_A[i].Exp_state & Exp_state_SET ) ^ Exp_state_SET )) {
|
|
|
- message2.concat(" ** ");//E:
|
|
|
+ if(Slave_Ports_Status_A[i].IS_gone_A == IS_gone_TRUE) {
|
|
|
+ message2.concat(" [---] ");
|
|
|
} else {
|
|
|
- message2.concat(" ?");//E:
|
|
|
-
|
|
|
+ message2 = message ; message2.concat(" ");//E:
|
|
|
+ //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);
|
|
|
+
|
|
|
+ /*
|
|
|
+ if(Slave_Ports_Status_A[i].Exp_state & Exp_state_ERROR ) {
|
|
|
+ message2 = message ; message2.concat(" ERR ");//E:
|
|
|
+
|
|
|
+ } else {
|
|
|
+ if(Slave_Ports_Status_A[i].Exp_state & Exp_state_ON ) message2 = message ; message2.concat(" ON ");//E:
|
|
|
+ if(Slave_Ports_Status_A[i].Exp_state & Exp_state_OFF ) message2 = message ; message2.concat(" OFF ");//E:
|
|
|
+ }
|
|
|
+ */
|
|
|
+ message2.concat(" ");// B:
|
|
|
+ //if(Slave_Ports_Status_A[i].Exp_state_ttl & Exp_state_ttl_TO_REFRESH ) {
|
|
|
+ // message2.concat("R");// B:
|
|
|
+ // } else {
|
|
|
+ // message2.concat(""); //T:
|
|
|
+ message2.concat(Slave_Ports_Status_A[i].Exp_state_ttl ) ;
|
|
|
+ // message2.concat(""); //T:
|
|
|
+ // }
|
|
|
+
|
|
|
|
|
|
- #if defined(DEBUG) > 7
|
|
|
- Serial.print("#228 debug BIN #i["); Serial.print(i); Serial.print("] Exp_state_s["); Serial.print(Exp_state_s); Serial.print("] exp_state["); Serial.print(Slave_Ports_Status_A[i].Exp_state); Serial.print("] BIN["); Serial.print(Slave_Ports_Status_A[i].Exp_state, BIN); Serial.print("] [ ");
|
|
|
-
|
|
|
- if(Slave_Ports_Status_A[i].Exp_state & Exp_state_SET ) Serial.print(" [ & SET ] "); //dziala opcjonalnie off
|
|
|
- if(Slave_Ports_Status_A[i].Exp_state == Exp_state_SET ) Serial.print(" [ = SET ] "); //dziala only off
|
|
|
- if (!( ( Slave_Ports_Status_A[i].Exp_state & Exp_state_SET ) ^ Exp_state_SET )) Serial.print(" [ ^ SET ] ");//opcjonalnie off
|
|
|
- if (!( ( Slave_Ports_Status_A[i].Exp_state & B00000000 ) ^ Exp_state_SET )) Serial.print(" [ + SET ] "); //not working
|
|
|
- if (!( ( Slave_Ports_Status_A[i].Exp_state & B11111111 ) ^ Exp_state_SET )) Serial.print(" [ # SET ] ");//only off
|
|
|
-
|
|
|
-
|
|
|
- Serial.print("#238 debug BIN PortTypes["); Serial.print(Slave_Ports_Status_A[i].PortTypes);Serial.print("] BIN["); Serial.print(Slave_Ports_Status_A[i].PortTypes, BIN); Serial.print("] [ ");
|
|
|
- if(Slave_Ports_Status_A[i].PortTypes & PortTypes_PWM ) Serial.print(" [ & PWM ] "); //dziala opcjonalnie off
|
|
|
- if(Slave_Ports_Status_A[i].PortTypes == PortTypes_PWM ) Serial.print(" [ = PWM ] "); //dziala only off
|
|
|
- if(Slave_Ports_Status_A[i].PortTypes & PortTypes_PWM ) Serial.print(" [ & PWM ] "); //dziala opcjonalnie off
|
|
|
- if(Slave_Ports_Status_A[i].PortTypes == PortTypes_PWM ) Serial.print(" [ = PWM ] "); //dziala only off
|
|
|
- if (!( ( Slave_Ports_Status_A[i].PortTypes & PortTypes_PWM ) ^ PortTypes_PWM )) Serial.print(" [ ^ PWM ] ");//opcjonalnie off
|
|
|
- if (!( ( Slave_Ports_Status_A[i].PortTypes & B00000000 ) ^ PortTypes_PWM )) Serial.print(" [ + PWM ] "); //not working
|
|
|
- if (!( ( Slave_Ports_Status_A[i].PortTypes & B11111111 ) ^ PortTypes_PWM )) Serial.print(" [ # PWM ] ");//only off
|
|
|
- if (!( ( Slave_Ports_Status_A[i].PortTypes & B11111110 ) ^ B00000001 )) Serial.print(" [ < PWM ] "); //not working
|
|
|
- if (!( ( Slave_Ports_Status_A[i].PortTypes & B00000001 ) ^ B11111110 )) Serial.print(" [ > PWM ] "); //not working
|
|
|
- Serial.println(" ]");
|
|
|
- Serial.print(" ] #248 OFF+ON["); Serial.print(BIN8_to_STRING( Exp_state_OFF + Exp_state_ON ));
|
|
|
- Serial.print(" ] OFF || ON["); Serial.print(BIN8_to_STRING( Exp_state_OFF || Exp_state_ON )); Serial.println(" ] ");
|
|
|
- Serial.print(" ] #248 OFF+SET["); Serial.print(BIN8_to_STRING( Exp_state_OFF + Exp_state_SET ));
|
|
|
- Serial.print(" ] #251 OFF || SET["); Serial.print(BIN8_to_STRING( Exp_state_OFF | Exp_state_SET )); Serial.println(" ] ");
|
|
|
- #else
|
|
|
- Serial.print("#255 will message2 Exp_state["); Serial.print(Slave_Ports_Status_A[i].Exp_state, BIN); Serial.println("] ");
|
|
|
- #endif
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
+ // if(Slave_Ports_Status_A[i].Broadcast_state > Broadcast_state_FRESH ) {
|
|
|
+ //message2.concat(" R ");// B:
|
|
|
+ // message2.concat(" B");
|
|
|
+ //} else {
|
|
|
+ message2.concat(" ");// B:
|
|
|
+ message2.concat(Slave_Ports_Status_A[i].Broadcast_state ) ;
|
|
|
+ //message2.concat(" ");// B:
|
|
|
+ //}
|
|
|
+
|
|
|
+ if(Slave_Ports_Status_A[i].IS_Local_A == IS_Local_TRUE) {
|
|
|
+ message2.concat(" L");// B:
|
|
|
+ } else if(Slave_Ports_Status_A[i].IS_Local_A == IS_Local_FALSE) {
|
|
|
+ message2.concat(" R");// B:
|
|
|
+ }
|
|
|
+ //message2.concat(" ");
|
|
|
+
|
|
|
+ if(Slave_Ports_Status_A[i].Exp_state & Exp_state_SET ) {
|
|
|
+ message2.concat("*");//E:
|
|
|
+
|
|
|
+ } else if (!( ( Slave_Ports_Status_A[i].Exp_state & Exp_state_SET ) ^ Exp_state_SET )) {
|
|
|
+ message2.concat(" ** ");//E:
|
|
|
+ } else {
|
|
|
+ message2.concat(" ?");//E:
|
|
|
+
|
|
|
+ }
|
|
|
+ #if defined(DEBUG) > 7
|
|
|
+ Serial.print("#228 debug BIN #i["); Serial.print(i); Serial.print("] Exp_state_s["); Serial.print(Exp_state_s); Serial.print("] exp_state["); Serial.print(Slave_Ports_Status_A[i].Exp_state); Serial.print("] BIN["); Serial.print(Slave_Ports_Status_A[i].Exp_state, BIN); Serial.print("] [ ");
|
|
|
+
|
|
|
+ if(Slave_Ports_Status_A[i].Exp_state & Exp_state_SET ) Serial.print(" [ & SET ] "); //dziala opcjonalnie off
|
|
|
+ if(Slave_Ports_Status_A[i].Exp_state == Exp_state_SET ) Serial.print(" [ = SET ] "); //dziala only off
|
|
|
+ if (!( ( Slave_Ports_Status_A[i].Exp_state & Exp_state_SET ) ^ Exp_state_SET )) Serial.print(" [ ^ SET ] ");//opcjonalnie off
|
|
|
+ if (!( ( Slave_Ports_Status_A[i].Exp_state & B00000000 ) ^ Exp_state_SET )) Serial.print(" [ + SET ] "); //not working
|
|
|
+ if (!( ( Slave_Ports_Status_A[i].Exp_state & B11111111 ) ^ Exp_state_SET )) Serial.print(" [ # SET ] ");//only off
|
|
|
+
|
|
|
+
|
|
|
+ Serial.print("#238 debug BIN PortTypes["); Serial.print(Slave_Ports_Status_A[i].PortTypes);Serial.print("] BIN["); Serial.print(Slave_Ports_Status_A[i].PortTypes, BIN); Serial.print("] [ ");
|
|
|
+ if(Slave_Ports_Status_A[i].PortTypes & PortTypes_PWM ) Serial.print(" [ & PWM ] "); //dziala opcjonalnie off
|
|
|
+ if(Slave_Ports_Status_A[i].PortTypes == PortTypes_PWM ) Serial.print(" [ = PWM ] "); //dziala only off
|
|
|
+ if(Slave_Ports_Status_A[i].PortTypes & PortTypes_PWM ) Serial.print(" [ & PWM ] "); //dziala opcjonalnie off
|
|
|
+ if(Slave_Ports_Status_A[i].PortTypes == PortTypes_PWM ) Serial.print(" [ = PWM ] "); //dziala only off
|
|
|
+ if (!( ( Slave_Ports_Status_A[i].PortTypes & PortTypes_PWM ) ^ PortTypes_PWM )) Serial.print(" [ ^ PWM ] ");//opcjonalnie off
|
|
|
+ if (!( ( Slave_Ports_Status_A[i].PortTypes & B00000000 ) ^ PortTypes_PWM )) Serial.print(" [ + PWM ] "); //not working
|
|
|
+ if (!( ( Slave_Ports_Status_A[i].PortTypes & B11111111 ) ^ PortTypes_PWM )) Serial.print(" [ # PWM ] ");//only off
|
|
|
+ if (!( ( Slave_Ports_Status_A[i].PortTypes & B11111110 ) ^ B00000001 )) Serial.print(" [ < PWM ] "); //not working
|
|
|
+ if (!( ( Slave_Ports_Status_A[i].PortTypes & B00000001 ) ^ B11111110 )) Serial.print(" [ > PWM ] "); //not working
|
|
|
+ Serial.println(" ]");
|
|
|
+ Serial.print(" ] #248 OFF+ON["); Serial.print(BIN8_to_STRING( Exp_state_OFF + Exp_state_ON ));
|
|
|
+ Serial.print(" ] OFF || ON["); Serial.print(BIN8_to_STRING( Exp_state_OFF || Exp_state_ON )); Serial.println(" ] ");
|
|
|
+ Serial.print(" ] #248 OFF+SET["); Serial.print(BIN8_to_STRING( Exp_state_OFF + Exp_state_SET ));
|
|
|
+ Serial.print(" ] #251 OFF || SET["); Serial.print(BIN8_to_STRING( Exp_state_OFF | Exp_state_SET )); Serial.println(" ] ");
|
|
|
+ #else
|
|
|
+ Serial.print("#255 will message2 Exp_state["); Serial.print(Slave_Ports_Status_A[i].Exp_state, BIN); Serial.println("] ");
|
|
|
+ #endif
|
|
|
+ }
|
|
|
|
|
|
|
|
|
#if defined(DISPLAY_array16_T_is_DISPLAY_string_T)
|
