浏览代码

bit testst

a.binder 5 年之前
父节点
当前提交
58bd228f26

+ 3 - 3
SE/stuff/P5_Automation_can-dev-res/_DISPLAY_func.h

@@ -69,7 +69,7 @@ void DISPLAY__print_IMMEDIATE(
      DISPLAY_array16_T DISPLAY_array16_A,
       DISPLAY_TARGET_T DISPLAY_TARGET_A) {
         
-        if(DISPLAY_TARGET_A | DISPLAY_TARGET_DISPLAY128){
+        if(DISPLAY_TARGET_A & DISPLAY_TARGET_DISPLAY128){ //BIN TEST
         
                     #if defined(HAS_TFT_ILI9163C)
                                 #if defined(DEBUG)
@@ -90,7 +90,7 @@ void DISPLAY__print_IMMEDIATE(
                   
                     #endif
                              //   DISPLAY__print_ANY(DISPLAY_T_ARDUINO_ATTR_ARRAY_A, DISPLAY_PHYSICAL_CHAR_A, DISPLAY_pos_seq_A, DISPLAY_array16_A);     
-          } else if(DISPLAY_TARGET_A | DISPLAY_TARGET_ANY){
+          } else if(DISPLAY_TARGET_A & DISPLAY_TARGET_ANY){ //BIN TEST
                                         #if defined(DEBUG)
                                                 if(DEBUG > 6) {
                                                    Serial.print("#69B DISPLAY__print_IMMEDIATE [DEBUG] to DISPLAY__print_ANY  Seq["); Serial.print(DISPLAY_pos_seq_A , BIN);
@@ -142,7 +142,7 @@ void DISPLAY__print_IMMEDIATE(
                                      Serial.println("] ");
                     #endif
                     
-                    if(DISPLAY_pos_seq_A | DISPLAY_pos_seq_A_IMMEDIATE){
+                    if(DISPLAY_pos_seq_A & DISPLAY_pos_seq_A_IMMEDIATE){ ////BIN TEST
                             #if defined(DEBUG)
                                     if(DEBUG > 6) {
                                         Serial.print("#84 DISPLAY__print to DISPLAY__print_IMMEDIATE [DEBUG]  else  Seq["); Serial.print(DISPLAY_pos_seq_A , BIN);

+ 2 - 2
SE/stuff/P5_Automation_can-dev-res/_PortStates_struct.h

@@ -9,6 +9,6 @@ typedef  byte Exp_state_T ;
  //const  Exp_state_T Exp_state_TOGGLE     =  B10000000 ;
 const  Exp_state_T Exp_state_BLINK         =  B00000100 ;
 
- #define    Exp_state_OFF  0x01
- #define    Exp_state_ON  0x02
+ //const    Exp_state_OFF  0x01
+ //#define    Exp_state_ON  0x02
 

+ 2 - 2
SE/stuff/P5_Automation_can-dev-res/_PortTypes_struct.h

@@ -1,13 +1,13 @@
 //USED IN _Slave_Ports_Status_struct.h
 
 typedef  byte PortTypes_T ;
-
+ const  PortTypes_T PortTypes_NOT_SET       =  B00000000 ;
  const  PortTypes_T PortTypes_PWM           =  B00000001 ; 
  const  PortTypes_T PortTypes_I2C           =  B00000010 ; // 0x02
  const  PortTypes_T PortTypes_EXP           =  B00000100 ; // 0x03
  const  PortTypes_T PortTypes_SERVO         =  B00001000 ; // 0x03
 
- const  PortTypes_T PortTypes_P2M_EXP_I2C =  PortTypes_PWM + PortTypes_I2C + PortTypes_EXP  ; //0x07 ;
+ const  PortTypes_T PortTypes_P2M_EXP_I2C =  PortTypes_PWM | PortTypes_I2C | PortTypes_EXP  ; //0x07 ; //TODO BITTEST
 
 
 

+ 35 - 24
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_I2C_func.h

@@ -62,7 +62,7 @@
                
     int i;
     for(i=ARDUINO_ARRAY_INDEX_FIRST;i <= (ARDUINO_ARRAY_INDEX_FIRST + Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A) ;i++) {
-      if(Slave_Ports_Status_A[i].PortTypes | PortTypes_I2C) {
+      if(Slave_Ports_Status_A[i].PortTypes & PortTypes_I2C) { //BIN TEST
             if(Slave_Ports_Status_A[i].Exp_state_ttl == Exp_state_ttl_TO_REFRESH ) {
              #ifdef DEBUG
                 if(DEBUG > 4) {
@@ -124,11 +124,17 @@
                                                     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_OFF )   Serial.print(" [ | OFF ] ");
-                                                        if(Slave_Ports_Status_A[i].Exp_state &  Exp_state_OFF )   Serial.print(" [ & OFF ] ");                                                         
+                                                        if(Slave_Ports_Status_A[i].Exp_state &  Exp_state_OFF )   Serial.print(" [ & OFF ] ");     
+                                                        if(Slave_Ports_Status_A[i].Exp_state ==  Exp_state_OFF )   Serial.print(" [ = OFF ] ");    
+                                                        //if !( ( z & care_bits ) ^ match_bits )                                                 
                                                         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 & B11111111 ) ^ Exp_state_SET ))  Serial.print(" [ # SET ] ");
                                                            if (!( ( Slave_Ports_Status_A[i].Exp_state & Exp_state_OFF ) ^ Exp_state_OFF ))  Serial.print(" [ ^ OFF ] ");
                                                         if (!( ( Slave_Ports_Status_A[i].Exp_state & B00000000 ) ^ Exp_state_OFF ))  Serial.print(" [ + OFF ] ");
+                                                        if (!( ( Slave_Ports_Status_A[i].Exp_state & B11111111 ) ^ Exp_state_OFF ))  Serial.print(" [ # OFF ] ");
+                                                        if (!( ( Slave_Ports_Status_A[i].Exp_state & B11111110 ) ^ B00000001 ))  Serial.print(" [ < OFF ] ");
+                                                        if (!( ( Slave_Ports_Status_A[i].Exp_state & B00000001 ) ^ B11111110 ))  Serial.print(" [ > OFF ] ");
                                       #endif          
                       
                              //   Slave_Ports_Status_A[i].Exp_state_ttl = Exp_state_ttl_IS_ACTIVE ;
@@ -136,15 +142,15 @@
                                       
                                     
                                     
-                                    if(Slave_Ports_Status_A[i].PortTypes | PortTypes_SERVO) {
-                                                if(Slave_Ports_Status_A[i].Exp_state | Exp_state_ON) {
+                                    if(Slave_Ports_Status_A[i].PortTypes & PortTypes_SERVO) {
+                                                if(Slave_Ports_Status_A[i].Exp_state & Exp_state_ON) {
                                     
                                                          Adafruit_PWMServoDriver_A[I2C_INDEX_DRIVER_A].Adafruit_PWMServoDriver_V.setPWM(Slave_Ports_Status_A[i].LocalPort, 0, map(90, 0, 180, SERVOMIN, SERVOMAX));
-                                                         Slave_Ports_Status_A[i].Exp_state = Slave_Ports_Status_A[i].Exp_state + Exp_state_SET;
+                                                         Slave_Ports_Status_A[i].Exp_state = Slave_Ports_Status_A[i].Exp_state | Exp_state_SET; //TODO TEST
                                                          Slave_Ports_Status_A[i].Exp_state_ttl = Exp_state_ttl_IS_ACTIVE ;
-                                                } else if(Slave_Ports_Status_A[i].Exp_state | Exp_state_OFF)  {
+                                                } else if(Slave_Ports_Status_A[i].Exp_state & Exp_state_OFF)  {
                                                          Adafruit_PWMServoDriver_A[I2C_INDEX_DRIVER_A].Adafruit_PWMServoDriver_V.setPWM(Slave_Ports_Status_A[i].LocalPort, 0, map(0, 0, 180, SERVOMIN, SERVOMAX));
-                                                         Slave_Ports_Status_A[i].Exp_state = Slave_Ports_Status_A[i].Exp_state + Exp_state_SET;
+                                                         Slave_Ports_Status_A[i].Exp_state = Slave_Ports_Status_A[i].Exp_state | Exp_state_SET; //TODO TEST
                                                          Slave_Ports_Status_A[i].Exp_state_ttl = Exp_state_ttl_IS_ACTIVE ;
                                                 }
                                     } else {
@@ -152,22 +158,24 @@
                                                     if(Slave_Ports_Status_A[i].Exp_state == Exp_state_ON ) {
                                                         Adafruit_PWMServoDriver_A[I2C_INDEX_DRIVER_A].Adafruit_PWMServoDriver_V.setPWM(Slave_Ports_Status_A[i].LocalPort, 3000, 3000);
                                                         Serial.print("#77 I2C_driver Exp_state [ON]"); Serial.print(Slave_Ports_Status_A[i].Exp_state); Serial.println("] ");
-                                                        Slave_Ports_Status_A[i].Exp_state = Slave_Ports_Status_A[i].Exp_state + Exp_state_SET;
+                                                        Slave_Ports_Status_A[i].Exp_state = Slave_Ports_Status_A[i].Exp_state | Exp_state_SET; //TODO BITTEST
                                                         Slave_Ports_Status_A[i].Exp_state_ttl = Exp_state_ttl_IS_ACTIVE ;
                                                     } else if(Slave_Ports_Status_A[i].Exp_state == Exp_state_OFF ){
                                                         Adafruit_PWMServoDriver_A[I2C_INDEX_DRIVER_A].Adafruit_PWMServoDriver_V.setPWM(Slave_Ports_Status_A[i].LocalPort, 0, 0);
                                                         Serial.print("#77 I2C_driver Exp_state [OFF]"); Serial.print(Slave_Ports_Status_A[i].Exp_state); Serial.println("] ");
-                                                        Slave_Ports_Status_A[i].Exp_state = Slave_Ports_Status_A[i].Exp_state + Exp_state_SET;
+                                                        Slave_Ports_Status_A[i].Exp_state = Slave_Ports_Status_A[i].Exp_state | Exp_state_SET; //TODO BITTEST
                                                     } else if(Slave_Ports_Status_A[i].Exp_state == Exp_state_BLINK ){
+                                                             Serial.print("#168 I2C_driver [Exp_state_ERROR]  before]"); Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state)); Serial.println("]  after [");
                                                          Adafruit_PWMServoDriver_A[I2C_INDEX_DRIVER_A].Adafruit_PWMServoDriver_V.setPWM(Slave_Ports_Status_A[i].LocalPort, 0,2000);
                                                       //   delay(1000);
                                                          Adafruit_PWMServoDriver_A[I2C_INDEX_DRIVER_A].Adafruit_PWMServoDriver_V.setPWM(Slave_Ports_Status_A[i].LocalPort, 0,1000);
-                                                         Slave_Ports_Status_A[i].Exp_state = Slave_Ports_Status_A[i].Exp_state + Exp_state_ERROR;
+                                                         Slave_Ports_Status_A[i].Exp_state = Slave_Ports_Status_A[i].Exp_state | Exp_state_ERROR; //TODO BITTEST
+                                                           Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state)); Serial.println("]  ");
                                                          Slave_Ports_Status_A[i].Exp_state_ttl = Exp_state_ttl_IS_ACTIVE ;
                                                     } else {
                                                     
                                                      Serial.print("#7555 unsupp   I2C_driver Exp_state "); Serial.print(Slave_Ports_Status_A[i].Exp_state); Serial.println("] ");
-                                                     Slave_Ports_Status_A[i].Exp_state = Slave_Ports_Status_A[i].Exp_state + Exp_state_SET + Exp_state_ERROR;
+                                                     Slave_Ports_Status_A[i].Exp_state = Slave_Ports_Status_A[i].Exp_state | Exp_state_SET | Exp_state_ERROR; //TODO BITTEST
                                                      Slave_Ports_Status_A[i].Exp_state_ttl = Exp_state_ttl_IS_ACTIVE ;
                                                     }
                                      }           
@@ -179,17 +187,20 @@
                                             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("#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_OFF )   Serial.print(" [ | OFF ] ");
-                                                    if(Slave_Ports_Status_A[i].Exp_state &  Exp_state_OFF )   Serial.print(" [ & OFF ] ");                                                    
-                                                        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_OFF ) ^ Exp_state_OFF ))  Serial.print(" [ ^ OFF ] ");
-                                                        if (!( ( Slave_Ports_Status_A[i].Exp_state & B00000000 ) ^ Exp_state_OFF ))  Serial.print(" [ + OFF ] ");
-                                                        
+                                                    if(Slave_Ports_Status_A[i].Exp_state |  Exp_state_SET )   Serial.print(" [ | SET ] ");//blad
+                                                    if(Slave_Ports_Status_A[i].Exp_state &  Exp_state_SET )   Serial.print(" [ & SET ] ");//opcjonalnie set
+                                                    if(Slave_Ports_Status_A[i].Exp_state |  Exp_state_ERROR )   Serial.print(" [ | ERR ] ");//blad 
+                                                    if(Slave_Ports_Status_A[i].Exp_state &  Exp_state_ERROR )   Serial.print(" [ & ERR ] "); //opcjonalnie err
+                                                     if(Slave_Ports_Status_A[i].Exp_state |  Exp_state_OFF )   Serial.print(" [ | OFF ] ");//blad
+                                                    if(Slave_Ports_Status_A[i].Exp_state &  Exp_state_OFF )   Serial.print(" [ & OFF ] "); //dziala opcjonalnie off
+                                                    if(Slave_Ports_Status_A[i].Exp_state ==  Exp_state_OFF )   Serial.print(" [ = OFF ] "); //dziala only off                                              
+                                                        if (!( ( Slave_Ports_Status_A[i].Exp_state & Exp_state_SET ) ^ Exp_state_SET ))  Serial.print(" [ ^ SET ] ");//opcjonalnie ste
+                                                        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 & Exp_state_OFF ) ^ Exp_state_OFF ))  Serial.print(" [ ^ OFF ] ");//opcjonalnie off
+                                                        if (!( ( Slave_Ports_Status_A[i].Exp_state & B00000000 ) ^ Exp_state_OFF ))  Serial.print(" [ + OFF ] "); //not working
+                                                        if (!( ( Slave_Ports_Status_A[i].Exp_state & B11111111 ) ^ Exp_state_OFF ))  Serial.print(" [ # OFF ] ");//only off
+                                                        if (!( ( Slave_Ports_Status_A[i].Exp_state & B11111110 ) ^ B00000001 ))  Serial.print(" [ < OFF ] "); //not working
+                                                        if (!( ( Slave_Ports_Status_A[i].Exp_state & B00000001 ) ^ B11111110 ))  Serial.print(" [ > OFF ] "); //not working
                                                         
                                                         
                                                         //if ((Slave_Ports_Status_A[i].Exp_state & Exp_state_SET) == (x & 0x0f)) {
@@ -203,7 +214,7 @@
                                        
                             } else {
                                Serial.print("#6699 UNPLANNED I2C_driver ADDRES "); Serial.print(Slave_Ports_Status_A[i].Address); Serial.println("] ");
-                               Slave_Ports_Status_A[i].Exp_state = Slave_Ports_Status_A[i].Exp_state + Exp_state_SET + Exp_state_ERROR;
+                               Slave_Ports_Status_A[i].Exp_state = Slave_Ports_Status_A[i].Exp_state | Exp_state_SET | Exp_state_ERROR; //TODO BITTEST
                                Slave_Ports_Status_A[i].Exp_state_ttl = Exp_state_ttl_IS_ACTIVE ;
                             }
                             
@@ -211,7 +222,7 @@
                     
                     } else {
                           Serial.print("#61122  I2C_driver unsupported "); Serial.print(Slave_Ports_Status_A[i].I2C_driver); Serial.println("] ");
-                          Slave_Ports_Status_A[i].Exp_state = Slave_Ports_Status_A[i].Exp_state + Exp_state_SET + Exp_state_ERROR;
+                          Slave_Ports_Status_A[i].Exp_state = Slave_Ports_Status_A[i].Exp_state | Exp_state_SET | Exp_state_ERROR; //TODO BITTEST
                           Slave_Ports_Status_A[i].Exp_state_ttl = Exp_state_ttl_IS_ACTIVE ;
                     }
                 

+ 39 - 15
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_Status_func.h

@@ -34,16 +34,16 @@
           if(i == ARDUINO_ARRAY_INDEX_CORRUPT) {
                
                 // Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A ++;
-                          Slave_Ports_Status_A[i].Port_ID=0x00;
+                          Slave_Ports_Status_A[i].Port_ID=0;
                           Slave_Ports_Status_A[i]._Slave_ID=0x00;
-                          Slave_Ports_Status_A[i].PortTypes=0x00;
+                          Slave_Ports_Status_A[i].PortTypes=PortTypes_NOT_SET;
                           Slave_Ports_Status_A[i].Address=0x00;
-                          Slave_Ports_Status_A[i].LocalPort=0x00;
-                          Slave_Ports_Status_A[i].Exp_state=0x00;
+                          Slave_Ports_Status_A[i].LocalPort=0;
+                          Slave_Ports_Status_A[i].Exp_state=Exp_state_ERROR;
                           Slave_Ports_Status_A[i].Exp_state_ttl=0x00;
                           Slave_Ports_Status_A[i].Broadcast_state=0x00;
                           Slave_Ports_Status_A[i].I2C_port=0x00;
-                          Slave_Ports_Status_A[i].I2C_driver=0x00;
+                         // Slave_Ports_Status_A[i].I2C_driver=0x00;
                           Slave_Ports_Status_A[i].IS_Local_A=IS_Local_FALSE;
                 
                 
@@ -178,22 +178,16 @@
                   // DISPLAY_array16_AA = 0 ;*/
                    message2 = message  ; message2.concat(" ");//E:
                    String Exp_state_s  = BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state) ; // ="";    
-                    /*
-                    for ( size_t mask = 1 << ((sizeof(Slave_Ports_Status_A[i].Exp_state) * CHAR_BIT) - 1); mask; mask >>= 1 )
-                            {
-                            Exp_state_s.concat(Slave_Ports_Status_A[i].Exp_state & mask ? "1" : "0");//message2.concat(Slave_Ports_Status_A[i].Exp_state & mask ? "1" : "0");
-                            }
-                            */
-                    message2.concat(Exp_state_s.substring(1,8));
-                    //message2.concat(Exp_state_s);
+                    //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:
+                   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:
@@ -226,7 +220,37 @@
                  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: 
+                    
+                        Serial.print("#228 debug BIN  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(" ]   ");
                     }
+                     
                  
                  
                  message2.toCharArray(DISPLAY_array16_AB, message2.length());             

+ 3 - 3
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_broadcast_func.h

@@ -55,7 +55,7 @@
                           DISPLAY_A ,
                           DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
                           DISPLAY_PHYSICAL_CHAR_A, 
-                           DISPLAY_pos_seq_A_NEXT + DISPLAY_pos_seq_A_IMMEDIATE,
+                           DISPLAY_pos_seq_A_NEXT | DISPLAY_pos_seq_A_IMMEDIATE, //TODO BITTEST
                             DISPLAY_array16_I( "#53 BCAST  " + char( Slave_Ports_Status_A[i].Port_ID  ) , 2), //message,
                             DISPLAY_TARGET_DISPLAY128,
                            millis() , // time_seq_id_T time_seq_id_A;
@@ -138,7 +138,7 @@
                               DISPLAY__print( DISPLAY_A ,
                                                DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
                                                DISPLAY_PHYSICAL_CHAR_A, 
-                                                DISPLAY_pos_seq_A_NEXT + DISPLAY_pos_seq_A_IMMEDIATE,
+                                                DISPLAY_pos_seq_A_NEXT | DISPLAY_pos_seq_A_IMMEDIATE, //TODO BITTEST
                                                  DISPLAY_array16_I( "#92MSG Sent OK " + char( Slave_Ports_Status_A[i].Port_ID  ) , 2), //message,
                                                  DISPLAY_TARGET_DISPLAY128,
                                                 millis() , // time_seq_id_T time_seq_id_A;
@@ -173,7 +173,7 @@
                             DISPLAY__print( DISPLAY_A ,
                                                DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
                                                DISPLAY_PHYSICAL_CHAR_A, 
-                                                DISPLAY_pos_seq_A_NEXT + DISPLAY_pos_seq_A_IMMEDIATE,
+                                                DISPLAY_pos_seq_A_NEXT | DISPLAY_pos_seq_A_IMMEDIATE, //TODO BITTEST
                                                  DISPLAY_array16_I( "#107MSG ERROR " + char( Slave_Ports_Status_A[i].Port_ID  ) , 2), //message,
                                                  DISPLAY_TARGET_DISPLAY128,
                                                 millis() , // time_seq_id_T time_seq_id_A;

+ 3 - 3
SE/stuff/P5_Automation_can-dev-res/_bak/_DISPLAY_func.bakh.h

@@ -69,7 +69,7 @@ void DISPLAY__print_IMMEDIATE(
      DISPLAY_array16_T DISPLAY_array16_A,
       DISPLAY_TARGET_T DISPLAY_TARGET_A) {
         
-        if(DISPLAY_TARGET_A | DISPLAY_TARGET_DISPLAY128){
+        if(DISPLAY_TARGET_A & DISPLAY_TARGET_DISPLAY128){ //BIN TEST
         
                     #if defined(HAS_TFT_ILI9163C)
                                 #if defined(DEBUG)
@@ -90,7 +90,7 @@ void DISPLAY__print_IMMEDIATE(
                   
                     #endif
                              //   DISPLAY__print_ANY(DISPLAY_T_ARDUINO_ATTR_ARRAY_A, DISPLAY_PHYSICAL_CHAR_A, DISPLAY_pos_seq_A, DISPLAY_array16_A);     
-          } else if(DISPLAY_TARGET_A | DISPLAY_TARGET_ANY){
+          } else if(DISPLAY_TARGET_A & DISPLAY_TARGET_ANY){ //BIN TEST
                                         #if defined(DEBUG)
                                                 if(DEBUG > 6) {
                                                    Serial.print("#69B DISPLAY__print_IMMEDIATE [DEBUG] to DISPLAY__print_ANY  Seq["); Serial.print(DISPLAY_pos_seq_A , BIN);
@@ -142,7 +142,7 @@ void DISPLAY__print_IMMEDIATE(
                                      Serial.println("] ");
                     #endif
                     
-                    if(DISPLAY_pos_seq_A | DISPLAY_pos_seq_A_IMMEDIATE){
+                    if(DISPLAY_pos_seq_A & DISPLAY_pos_seq_A_IMMEDIATE){
                             #if defined(DEBUG)
                                     if(DEBUG > 6) {
                                         Serial.print("#84 DISPLAY__print to DISPLAY__print_IMMEDIATE [DEBUG]  else  Seq["); Serial.print(DISPLAY_pos_seq_A , BIN);