a.binder 5 anos atrás
pai
commit
aa29f75fa9

+ 14 - 9
SE/stuff/P5_Automation_can-dev-res/P5_Automation_can-dev-res.ino

@@ -451,7 +451,9 @@ void setup() {  //REMEMBER NOT INITIALIZE ANY VARIABLES OR ARRAYS
                     
                     if(ARDUINO_LOOP_LATENCY_COUNTER__MAIN_END_A == 0 ) {
                         ARDUINO_LOOP_LATENCY_COUNTER__MAIN_END_A = ARDUINO_LOOP_LATENCY__MAIN_END_A;
+                          #ifdef DEBUG
                           Serial.print("] COUNTER__MAIN_END_A["); Serial.print(ARDUINO_LOOP_LATENCY_COUNTER__MAIN_END_A); Serial.print("] C["); Serial.print(ARDUINO_LOOP_LATENCY__MAIN_END_A); Serial.println("] ");
+                          #endif
                     } else {
                         return ARDUINO_LOOP_LATENCY_COUNTER__MAIN_END_A-- ;
                     }
@@ -463,7 +465,9 @@ void setup() {  //REMEMBER NOT INITIALIZE ANY VARIABLES OR ARRAYS
                     static ARDUINO_LOOP_LATENCY_COUNTER_T  ARDUINO_LOOP_LATENCY_COUNTER__MAIN_A = ARDUINO_LOOP_LATENCY__MAIN_A;
                     
                     if(ARDUINO_LOOP_LATENCY_COUNTER__MAIN_A == 0 ) {
-                         Serial.print("] COUNTER__MAIN_A["); Serial.print(ARDUINO_LOOP_LATENCY_COUNTER__MAIN_A); Serial.print("] C["); Serial.print(ARDUINO_LOOP_LATENCY__MAIN_A); Serial.println("] "); 
+                         #ifdef DEBUG
+                         Serial.print("] COUNTER__MAIN_A["); Serial.print(ARDUINO_LOOP_LATENCY_COUNTER__MAIN_A); Serial.print("] C["); Serial.print(ARDUINO_LOOP_LATENCY__MAIN_A); Serial.println("] ");
+                         #endif 
                         ARDUINO_LOOP_LATENCY_COUNTER__MAIN_A = ARDUINO_LOOP_LATENCY__MAIN_A;
                     } else {
                         return ARDUINO_LOOP_LATENCY_COUNTER__MAIN_A-- ;
@@ -509,13 +513,14 @@ void loop() {
         }
             #ifndef DISABLE_LOOP
                 if(DEBUG_ACTION_TRIG == 1) {
-                Serial.print("#331_L1 main loop top   ARDUINO_FUNCT_INIT_RESULT__Slave_Ports_LOCAL_init  ");
-                Serial.println(ARDUINO_FUNCT_INIT_RESULT__Slave_Ports_LOCAL_init);
-              
-                  Serial.print("#331_L2 main loop top ARDUINO_FUNCT_INIT_RESULT__Slave_Ports_LOCAL_init=[");
-                     Serial.println(ARDUINO_FUNCT_INIT_RESULT__Slave_Ports_LOCAL_init);
-                     Serial.print("   true[");  Serial.print(true); Serial.print("]   false[");  Serial.print(false);
-                     Serial.println("] ");  
+                      #ifdef DEBUG
+                      Serial.print("#331_L1 main loop top   ARDUINO_FUNCT_INIT_RESULT__Slave_Ports_LOCAL_init  ");
+                      Serial.println(ARDUINO_FUNCT_INIT_RESULT__Slave_Ports_LOCAL_init);
+                        Serial.print("#331_L2 main loop top ARDUINO_FUNCT_INIT_RESULT__Slave_Ports_LOCAL_init=[");
+                           Serial.println(ARDUINO_FUNCT_INIT_RESULT__Slave_Ports_LOCAL_init);
+                           Serial.print("   true[");  Serial.print(true); Serial.print("]   false[");  Serial.print(false);
+                           Serial.println("] ");  
+                       #endif
                }
                Slave_Ports_Status__DISPLAY_TARGET(
                      Slave_Ports_Status_A ,
@@ -556,7 +561,7 @@ void loop() {
         
   delay(10);
   if(DEBUG_ACTION_TRIG != DEBUG_LAST_ACTION_TRIG)   {
-        Serial.print("#534   DEBUG_ACTION_TRIG[");Serial.print(DEBUG_ACTION_TRIG);Serial.println("] ");
+        Serial.print("#534   DEBUG_ACTION_TRIG[");Serial.print(DEBUG_ACTION_TRIG);Serial.print("] "); Serial.print("]  LAST_DEBUG_ACTION_TRIG[");Serial.print(DEBUG_LAST_ACTION_TRIG);Serial.println("] ");
      //   Serial.print("] COUNTER__MAIN_A["); Serial.print(ARDUINO_LOOP_LATENCY_COUNTER__MAIN_A);
      //   Serial.print("] COUNTER__MAIN_END_A["); Serial.print(ARDUINO_LOOP_LATENCY_COUNTER__MAIN_END_A);
   }

+ 8 - 3
SE/stuff/P5_Automation_can-dev-res/_DRIVER_STATUS/_DRIVER_STATUS_struct.h

@@ -7,10 +7,15 @@ typedef ARDUINO_ARRAY_INDEX_T ARDUINO_ARRAY_INDEX_DRIVER_T ; //DO NP INDEX GDIZE
 
 
 
+const ARDUINO_ARRAY_INDEX_DRIVER_STATUS_T  ARDUINO_ARRAY_INDEX_DRIVER_STATUS_ERROR       = B00000001 ; //like when function didnt found associated record for such port
+const ARDUINO_ARRAY_INDEX_DRIVER_STATUS_T  ARDUINO_ARRAY_INDEX_DRIVER_STATUS_TO_ADD      = B00000010 ; //like when function didnt found associated record for such port
+const ARDUINO_ARRAY_INDEX_DRIVER_STATUS_T  ARDUINO_ARRAY_INDEX_DRIVER_STATUS_TO_INIT_A   = B00000100 ; // to init - e.g. Adafruit_PWMServoDriver_A[i].Adafruit_PWMServoDriver_V = Adafruit_PWMServoDriver(Adafruit_PWMServoDriver_A[i].I2C_ADDRESS_A);  status inicjalizacji drivera
+const ARDUINO_ARRAY_INDEX_DRIVER_STATUS_T  ARDUINO_ARRAY_INDEX_DRIVER_STATUS_TO_SETUP_A  = B00001000 ; //like in setup loop Adafruit_PWMServoDriver_A[i].Adafruit_PWMServoDriver_V.begin(); status inicjalizacji drivera
+const ARDUINO_ARRAY_INDEX_DRIVER_STATUS_T  ARDUINO_ARRAY_INDEX_DRIVER_STATUS_TO_SETVAL_A = B00001000 ; //like Adafruit_PWMServoDriver_A[i].Adafruit_PWMServoDriver_V.setPWM(LocalPort, PWM_MIN, PWM_MAX); status inicjalizacji drivera
+
+
+
 
-const ARDUINO_ARRAY_INDEX_DRIVER_STATUS_T  ARDUINO_ARRAY_INDEX_DRIVER_STATUS_TO_INIT_A   = B00000001 ; // to init - e.g. Adafruit_PWMServoDriver_A[i].Adafruit_PWMServoDriver_V = Adafruit_PWMServoDriver(Adafruit_PWMServoDriver_A[i].I2C_ADDRESS_A);  status inicjalizacji drivera
-const ARDUINO_ARRAY_INDEX_DRIVER_STATUS_T  ARDUINO_ARRAY_INDEX_DRIVER_STATUS_TO_SETUP_A  = B00000010 ; //like in setup loop Adafruit_PWMServoDriver_A[i].Adafruit_PWMServoDriver_V.begin(); status inicjalizacji drivera
-const ARDUINO_ARRAY_INDEX_DRIVER_STATUS_T  ARDUINO_ARRAY_INDEX_DRIVER_STATUS_TO_SETVAL_A = B00000100 ; //like Adafruit_PWMServoDriver_A[i].Adafruit_PWMServoDriver_V.setPWM(LocalPort, PWM_MIN, PWM_MAX); status inicjalizacji drivera
 
 
 /*  

+ 23 - 3
SE/stuff/P5_Automation_can-dev-res/_I2C_driver_Adafruit_PWMServoDriver/_I2C_driver_Adafruit_PWMServoDriver_func.h

@@ -10,8 +10,10 @@
   
   
  
- void Adafruit_PWMServoDriver__add(Adafruit_PWMServoDriver_T* Adafruit_PWMServoDriver_A,
-        Adafruit_PWMServoDriver_ATTR_ARRAY_T  &Adafruit_PWMServoDriver_ATTR_ARRAY_A) {
+ ARDUINO_ARRAY_INDEX_DRIVER_STATUS_T Adafruit_PWMServoDriver__add(Adafruit_PWMServoDriver_T* Adafruit_PWMServoDriver_A,
+        Adafruit_PWMServoDriver_ATTR_ARRAY_T  &Adafruit_PWMServoDriver_ATTR_ARRAY_A , 
+        I2C_ADDRESS_T I2C_ADDRESS_A
+        ) {
      int i;
     //int *ptrNumber;
     for(i=1;i<=ARDUINO_ARRAY_INDEX_LIMIT_PORTS_I2C ; i++) {
@@ -19,9 +21,10 @@
             //Adafruit_PWMServoDriver_A[i].I2C_ADDRESS_A = I2C_ADDRESS_A;
             //Adafruit_PWMServoDriver _class_cntr = Adafruit_PWMServoDriver(I2C_ADDRESS_A) ;
             Adafruit_PWMServoDriver_A[i].Adafruit_PWMServoDriver_V = Adafruit_PWMServoDriver(Adafruit_PWMServoDriver_A[i].I2C_ADDRESS_A);
+            return ARDUINO_ARRAY_INDEX_DRIVER_STATUS_TO_INIT_A ;
         }
     }
-  
+    return ARDUINO_ARRAY_INDEX_DRIVER_STATUS_ERROR ;
  }
   
   
@@ -125,6 +128,23 @@ ARDUINO_ARRAY_PRIMARY_KET_T Adafruit_PWMServoDriver__get_PRIMARY_KET_T(Adafruit_
 
 
 
+
+ARDUINO_ARRAY_INDEX_DRIVER_STATUS_T  Adafruit_PWMServoDriver__get_DRIVER_STATUS_T(Adafruit_PWMServoDriver_T* Adafruit_PWMServoDriver_A,  
+ Adafruit_PWMServoDriver_ATTR_ARRAY_T  &Adafruit_PWMServoDriver_ATTR_ARRAY_A,
+I2C_ADDRESS_T I2C_ADDRESS_A) {
+ ARDUINO_ARRAY_PRIMARY_KET_T i;
+    for(i=1;i<=ARDUINO_ARRAY_INDEX_LIMIT_PORTS_I2C ; i++) {
+        if(Adafruit_PWMServoDriver_A[i].I2C_ADDRESS_A == I2C_ADDRESS_A ) {
+           return Adafruit_PWMServoDriver_A[i].ARDUINO_ARRAY_INDEX_DRIVER_STATUS_A;
+            break;
+        }
+    }
+    return ARDUINO_ARRAY_INDEX_DRIVER_STATUS_TO_ADD;
+  }
+
+
+
+
 void Adafruit_PWMServoDriver__print_status(Adafruit_PWMServoDriver_T* Adafruit_PWMServoDriver_A) {
  Serial.println("#99 Adafruit_PWMServoDriver__print_status ");
  ARDUINO_ARRAY_PRIMARY_KET_T i;

+ 15 - 1
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_I2C_func.h

@@ -20,7 +20,7 @@
     ) {     
     
     
-    #ifdef DISABLE_LOOP || DEBUG
+    #ifdef DISABLE_LOOP || DEBUG || DEBUG_I2C
         
      Serial.print("#234 _Slave_Ports_I2C_POP  _Slave_Ports_queue_pop["); Serial.print(_Slave_Ports_queue_pop);  Serial.println("]");
     #endif
@@ -73,6 +73,20 @@
                
                     if(Slave_Ports_Status_A[i].I2C_driver == I2C_driver_Adafruit_PWMServoDriver) {
                           //ARDUINO_ARRAY_PRIMARY_KET_T  Adafruit_PWMServoDriver__get_PRIMARY_KET_A = Adafruit_PWMServoDriver__get_PRIMARY_KET_T(
+                      
+                      //find port status
+                      if(ARDUINO_ARRAY_INDEX_DRIVER_STATUS_TO_ADD == Adafruit_PWMServoDriver__get_DRIVER_STATUS_T(
+                                Adafruit_PWMServoDriver_A, Adafruit_PWMServoDriver_ATTR_ARRAY_A, Slave_Ports_Status_A[i].Address)) {
+                                 Serial.println("#80 I2C ARDUINO_ARRAY_INDEX_DRIVER_STATUS_TO_ADD   "); 
+                                 
+                              if(ARDUINO_ARRAY_INDEX_DRIVER_STATUS_TO_INIT_A == Adafruit_PWMServoDriver__add(Adafruit_PWMServoDriver_A,Adafruit_PWMServoDriver_ATTR_ARRAY_A,Slave_Ports_Status_A[i].Address)) {
+                                       Serial.println("#83 I2C ARDUINO_ARRAY_INDEX_DRIVER_STATUS_TO_INIT_A   ");
+                              }
+                                 
+                        }
+                      
+                      
+                      
                        I2C_INDEX_DRIVER_T   I2C_INDEX_DRIVER_A = Adafruit_PWMServoDriver__get_PRIMARY_KET_T(
                                 Adafruit_PWMServoDriver_A, Slave_Ports_Status_A[i].Address);