|
@@ -118,6 +118,13 @@
|
|
|
Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state_ttl)); Serial.print("] Exp_state[");
|
|
Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state_ttl)); Serial.print("] Exp_state[");
|
|
|
Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state)); Serial.print("] Broadcast_state[");
|
|
Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state)); 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].Broadcast_state)); Serial.println("] ");
|
|
|
|
|
+ Serial.print("#121 Exp_state[ ");
|
|
|
|
|
+ if(Slave_Ports_Status_A[i].Exp_state | Exp_state_SET ) Serial.print(" [ | SET ] ");
|
|
|
|
|
+ if(Slave_Ports_Status_A[i].Exp_state & Exp_state_SET ) Serial.print(" [ & SET ] ");
|
|
|
|
|
+ if(Slave_Ports_Status_A[i].Exp_state | Exp_state_ERROR ) Serial.print(" [ | ERR ] ");
|
|
|
|
|
+ if(Slave_Ports_Status_A[i].Exp_state & Exp_state_ERROR ) Serial.print(" [ & ERR ] ");
|
|
|
|
|
+ if (!( ( Slave_Ports_Status_A[i].Exp_state & Exp_state_SET ) ^ Exp_state_SET )) Serial.print(" [ ^ SET ] ");
|
|
|
|
|
+ if (!( ( Slave_Ports_Status_A[i].Exp_state & B00000000 ) ^ Exp_state_SET )) Serial.print(" [ + SET ] ");
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
// Slave_Ports_Status_A[i].Exp_state_ttl = Exp_state_ttl_IS_ACTIVE ;
|
|
// Slave_Ports_Status_A[i].Exp_state_ttl = Exp_state_ttl_IS_ACTIVE ;
|
|
@@ -163,11 +170,23 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef DEBUG_CAN || DEBUG
|
|
#ifdef DEBUG_CAN || DEBUG
|
|
|
- Serial.print("#126 after PWM state_ttl[");
|
|
|
|
|
|
|
+ Serial.println(""); Serial.println(i); Serial.print(" #126 after PWM Exp_state_ttl[");
|
|
|
Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state_ttl)); Serial.print("] Exp_state[");
|
|
Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state_ttl)); Serial.print("] Exp_state[");
|
|
|
Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state)); Serial.print("] Broadcast_state[");
|
|
Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state)); 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].Broadcast_state)); Serial.println("] ");
|
|
|
-
|
|
|
|
|
|
|
+ Serial.print("#170 Exp_state[ ");
|
|
|
|
|
+ if(Slave_Ports_Status_A[i].Exp_state | Exp_state_SET ) Serial.print(" [ | SET ] ");
|
|
|
|
|
+ if(Slave_Ports_Status_A[i].Exp_state & Exp_state_SET ) Serial.print(" [ & SET ] ");
|
|
|
|
|
+ if(Slave_Ports_Status_A[i].Exp_state | Exp_state_ERROR ) Serial.print(" [ | ERR ] ");
|
|
|
|
|
+ if(Slave_Ports_Status_A[i].Exp_state & Exp_state_ERROR ) Serial.print(" [ & ERR ] ");
|
|
|
|
|
+ if (!( ( Slave_Ports_Status_A[i].Exp_state & Exp_state_SET ) ^ Exp_state_SET )) Serial.print(" [ ^ SET ] ");
|
|
|
|
|
+ if (!( ( Slave_Ports_Status_A[i].Exp_state & B00000000 ) ^ Exp_state_SET )) Serial.print(" [ + SET ] ");
|
|
|
|
|
+ //if ((Slave_Ports_Status_A[i].Exp_state & Exp_state_SET) == (x & 0x0f)) {
|
|
|
|
|
+ // match
|
|
|
|
|
+ //}
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ Serial.println("] ");
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
