a.binder %!s(int64=5) %!d(string=hai) anos
pai
achega
201055b9cd

+ 6 - 3
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_I2C_func.h

@@ -201,12 +201,15 @@
                                      #endif
                                                     
                                                     if(Slave_Ports_Status_A[i].Exp_state & Exp_state_ON_USE_LEVEL ) { //TODO BINTEST
-                                                        Adafruit_PWMServoDriver_A[I2C_INDEX_DRIVER_A].Adafruit_PWMServoDriver_V.setPWM(Slave_Ports_Status_A[i].LocalPort, Slave_Ports_Status_A[i].Exp_state_level_A, Slave_Ports_Status_A[i].Exp_state_level_A); //todo  Exp_state_ON_USE_LEVEL
+                                                        //Adafruit_PWMServoDriver_A[I2C_INDEX_DRIVER_A].Adafruit_PWMServoDriver_V.setPWM(Slave_Ports_Status_A[i].LocalPort, Slave_Ports_Status_A[i].Exp_state_level_A * 16, Slave_Ports_Status_A[i].Exp_state_level_A * 16); //todo  Exp_state_ON_USE_LEVEL
+                                                        Adafruit_PWMServoDriver_A[I2C_INDEX_DRIVER_A].Adafruit_PWMServoDriver_V.setPWM(Slave_Ports_Status_A[i].LocalPort,  Slave_Ports_Status_A[i].Exp_state_level_A, Slave_Ports_Status_A[i].Exp_state_level_A * 16); //todo  Exp_state_ON_USE_LEVEL
                                                         #if defined(DEBUG_I2C_driver_Adafruit_PWMServoDrive)
                                                         Serial.print("#149 I2C_driver ->Exp_state_ON_USE_LEVEL Exp_state [SET]"); Serial.print(Slave_Ports_Status_A[i].Exp_state); Serial.print("]   after   [");
-                                                        #endif 
+                                                        #endif
+                                                        Serial.print("[I2C_INDEX_DRIVER_A[");Serial.print(I2C_INDEX_DRIVER_A);Serial.print("] [LocalPort["); Serial.print(Slave_Ports_Status_A[i].LocalPort); Serial.print("]  "); 
+                                                        //Serial.print("[D209]Bef[");Serial.print(Slave_Ports_Status_A[i].Exp_state, BIN);Serial.print("]");
                                                         Slave_Ports_Status_A[i].Exp_state = Slave_Ports_Status_A[i].Exp_state | Exp_state_SET; //TODO BITTEST
-                                                        Serial.print(BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state)); Serial.println("]  ");
+                                                        //Serial.print("[D209]Aft[");Serial.print(Slave_Ports_Status_A[i].Exp_state , BIN);Serial.print("]");
                                                         Slave_Ports_Status_A[i].Exp_state_ttl = Exp_state_ttl_IS_ACTIVE ;
                                                     } else if(Slave_Ports_Status_A[i].Exp_state & Exp_state_ON ) { //TODO BINTEST
                                                         Adafruit_PWMServoDriver_A[I2C_INDEX_DRIVER_A].Adafruit_PWMServoDriver_V.setPWM(Slave_Ports_Status_A[i].LocalPort, 1000, 1000); //todo  Exp_state_ON_USE_LEVEL

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

@@ -244,7 +244,7 @@
                            //    message2.concat("R");// B:
                            // } else {
                            //   message2.concat(""); //T:
-                              message2.concat(Slave_Ports_Status_A[i].Exp_state_ttl )  ;
+                              message2.concat(Slave_Ports_Status_A[i].Exp_state_ttl/10 )  ;
                            //   message2.concat(""); //T:
                          // }
                    
@@ -256,7 +256,7 @@
                                       //    message2.concat(" B");
                                      //} else {
                                          message2.concat(" ");// B:
-                                          message2.concat(Slave_Ports_Status_A[i].Broadcast_state )  ;
+                                          message2.concat(Slave_Ports_Status_A[i].Broadcast_state/10 )  ;
                                           //message2.concat(" ");// B:
                                      //}
                                      
@@ -267,6 +267,18 @@
                                      } 
                                   //message2.concat(" ");
                                   
+                                  
+                                   if(Slave_Ports_Status_A[i].Exp_state & Exp_state_ON_USE_LEVEL ) {
+                                    message2.concat(" ["); message2.concat(Slave_Ports_Status_A[i].Exp_state_level_A); message2.concat("] ");
+                                      /*if(Slave_Ports_Status_A[i].Exp_state_level_A < 10 ) message2.concat(" [___] ");//E:
+                                      else if(Slave_Ports_Status_A[i].Exp_state_level_A < 100 )  message2.concat("  [#___] ");//E:
+                                      else if(Slave_Ports_Status_A[i].Exp_state_level_A < 1000 ) message2.concat("  [##__] ");//E:
+                                      else if(Slave_Ports_Status_A[i].Exp_state_level_A < 2000 ) message2.concat("  [###_] ");//E:
+                                      else if(Slave_Ports_Status_A[i].Exp_state_level_A >= 2000 ) message2.concat(" [####] ");//E:
+                                      */
+                                    }
+                                  
+                                  
                                   if(Slave_Ports_Status_A[i].Exp_state & Exp_state_SET ) {
                                       message2.concat("*");//E:
                                     
@@ -277,15 +289,7 @@
                             
                             
                             
-                                  if(Slave_Ports_Status_A[i].Exp_state & Exp_state_ON_USE_LEVEL ) {
-                                    message2.concat(" ["); message2.concat(Slave_Ports_Status_A[i].Exp_state_level_A); message2.concat("] ");
-                                      /*if(Slave_Ports_Status_A[i].Exp_state_level_A < 10 ) message2.concat(" [___] ");//E:
-                                      else if(Slave_Ports_Status_A[i].Exp_state_level_A < 100 )  message2.concat("  [#___] ");//E:
-                                      else if(Slave_Ports_Status_A[i].Exp_state_level_A < 1000 ) message2.concat("  [##__] ");//E:
-                                      else if(Slave_Ports_Status_A[i].Exp_state_level_A < 2000 ) message2.concat("  [###_] ");//E:
-                                      else if(Slave_Ports_Status_A[i].Exp_state_level_A >= 2000 ) message2.concat(" [####] ");//E:
-                                      */
-                                    }
+                                 
                             
                             
                             }

+ 1 - 1
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_Status_struct.h

@@ -16,7 +16,7 @@ const IS_gone_T IS_gone_FALSE = false ;
 #define I2C_port_DEFAULT 0x01
 
 
-typedef int Exp_state_level_T ;
+typedef byte Exp_state_level_T ;
 
  struct Slave_Ports_Status_S {
   Port_ID_T  Port_ID ; //global id for device //const char * const _Protocol;

+ 4 - 4
SE/stuff/P5_Automation_can-dev-res/___CONFIG/0x101/config_Slave_Ports_LOCAL_0x101_init.h

@@ -49,7 +49,7 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                                 0x40 ,  //int  Address,
                                 2 , //int  LocalPort,
                                 Exp_state_OFF, //int  Exp_state,
-                                Broadcast_state_FULL_FRESH , //Exp_state_ttl_TO_REFRESH, //int  Exp_state_ttl,
+                                Exp_state_ttl_TO_REFRESH , //Exp_state_ttl_TO_REFRESH, //int  Exp_state_ttl,
                                 Broadcast_state_FULL_FRESH, //Broadcast_state_TO_REFRESH, //int  Broadcast_state,
                                 I2C_port_DEFAULT, //int I2C_port,
                                 I2C_driver_Adafruit_PWMServoDriver ,//int I2C_driver
@@ -63,11 +63,11 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                                     Slave_Ports_Status_T_ARDUINO_ARRAY_INDEX_T_TO_DELETE_A,
                                     Slave_Ports_Status_T_ARDUINO_ARRAY_ASSOC_TABLE_S_Port_ID_A,
                                 3,  // int  Port_ID,
-                                Active_ControllerID ,  //int  _Slave_ID,
-                                PortTypes_P2M_EXP_I2C , //int  PortTypes,
+                                Active_ControllerID_HEX ,  //int  _Slave_ID,
+                                PortTypes_PWM_EXP_I2C , //int  PortTypes,
                                 0x40 ,  //int  Address,
                                 3 , //int  LocalPort,
-                                Exp_state_BLINK, //int  Exp_state,
+                                Exp_state_OFF, //Exp_state_BLINK, //int  Exp_state,
                                 Exp_state_ttl_TO_REFRESH, //int  Exp_state_ttl,
                                 Broadcast_state_TO_REFRESH, //int  Broadcast_state,
                                 I2C_port_DEFAULT, //int I2C_port,