a.binder 5 лет назад
Родитель
Сommit
011598ff86

+ 6 - 6
SE/stuff/P5_Automation_can-dev-res/P5_Automation_can-dev-res.ino

@@ -156,9 +156,8 @@
 #endif
 
 #include "Queue.h"
- 
+#include "TPQ.h"
  Queue<int> _Slave_Ports_queue = Queue<int>(10);
-
  
 
  #if Active_ControllerID == _ControllerID 
@@ -276,10 +275,6 @@
 #include "_DISPLAY_init.h"
 
 
-
-
-
-
   
 
 #if defined(HAS_ROTTARY_SW)
@@ -319,6 +314,11 @@
     #endif
 
 
+
+
+
+
+
 void setup() {
     Serial.begin(115200);
 //    Serial.begin(9600);

+ 46 - 2
SE/stuff/P5_Automation_can-dev-res/_I2C_driver_Adafruit_PWMServoDriver_func.h

@@ -3,8 +3,52 @@
  
  
   Adafruit_PWMServoDriver  Adafruit_PWMServoDriver_0X40 = Adafruit_PWMServoDriver(0x40);
+  
+  
+  
+  
+  
+struct Adafruit_PWMServoDriver_S {
+        I2C_ADDRESS_T I2C_ADDRESS_A;
+        Adafruit_PWMServoDriver *Adafruit_PWMServoDriver_V ;
+    };
+  
+  typedef struct Adafruit_PWMServoDriver_S Adafruit_PWMServoDriver_T;
+  
+  Adafruit_PWMServoDriver_T Adafruit_PWMServoDriver_A[10] = {};
+  
+  
+ Adafruit_PWMServoDriver Adafruit_PWMServoDriver_init(Adafruit_PWMServoDriver_T* Adafruit_PWMServoDriver_A, I2C_ADDRESS_T I2C_ADDRESS_A ) {
+    int i;
+    for(i=1;i<=ARDUINO_ARRAY_INDEX_LIMIT_PORTS i++) {
+        if(Adafruit_PWMServoDriver_A.I2C_ADDRESS_A == 0) {
+            Adafruit_PWMServoDriver_A[i].I2C_ADDRESS_A = I2C_ADDRESS_A;
+            *Adafruit_PWMServoDriver_A[i].Adafruit_PWMServoDriver_V = Adafruit_PWMServoDriver(I2C_ADDRESS_A);
+            break;
+        }
+    }
+  }
+
+
+ Adafruit_PWMServoDriver Adafruit_PWMServoDriver_setPWMFreq(Adafruit_PWMServoDriver_T* Adafruit_PWMServoDriver_A,I2C_ADDRESS_T I2C_ADDRESS_A) {
+  
+  }
 
 
+
+ Adafruit_PWMServoDriver Adafruit_PWMServoDriver_setPWM(Adafruit_PWMServoDriver_T* Adafruit_PWMServoDriver_A, I2C_ADDRESS_T I2C_ADDRESS_A) {
+  
+  }
+
+
+
+
+ Adafruit_PWMServoDriver Adafruit_PWMServoDriver_begin(Adafruit_PWMServoDriver_T* Adafruit_PWMServoDriver_A,I2C_ADDRESS_T I2C_ADDRESS_A) {
+  
+  }
+
+
+/*
 Adafruit_PWMServoDriver Adafruit_PWMServoDriver_F(I2C_ADDRESS_T I2C_ADDRESS_A) {
     return * new Adafruit_PWMServoDriver(I2C_ADDRESS_A);
 }
@@ -13,12 +57,12 @@ struct Adafruit_PWMServoDriver_S {
         Adafruit_PWMServoDriver *Adafruit_PWMServoDriver_V ;
     };
 
-typedef struct Adafruit_PWMServoDriver_S Adafruit_PWMServoDriver_T;
+
 
 Adafruit_PWMServoDriver_T Adafruit_PWMServoDriver_A = {
     &Adafruit_PWMServoDriver_F(0x41)
 } ; 
-
+*/
 /*
 Adafruit_PWMServoDriver *Adafruit_PWMServoDriver_T[10];
 

+ 5 - 1
SE/stuff/P5_Automation_can-dev-res/_I2C_driver_Adafruit_PWMServoDriver_init.h

@@ -14,4 +14,8 @@ Adafruit_PWMServoDriver  Adafruit_PWMServoDriver_0X41 = Adafruit_PWMServoDriver(
         {    Adafruit_PWMServoDriver_A = Adafruit_PWMServoDriver(0x41) }
     } ;
     
-    */
+    */
+    
+   // TPQ<Adafruit_PWMServoDriver> Adafruit_PWMServoDriver_TPQ = TPQ<Adafruit_PWMServoDriver>(10);
+    
+    //Adafruit_PWMServoDriver_TPQ.push(Adafruit_PWMServoDriver Adafruit_PWMServoDriver_Q = Adafruit_PWMServoDriver(0x40));

+ 9 - 0
SE/stuff/P5_Automation_can-dev-res/___DEBUG_DISABLE_INIT__0x101.h

@@ -0,0 +1,9 @@
+/*Queue<Adafruit_PWMServoDriver> Adafruit_PWMServoDriver_A = Queue<Adafruit_PWMServoDriver>(10);
+
+
+
+Adafruit_PWMServoDriver_A.push(Adafruit_PWMServoDriver(0x40));
+
+*/
+
+

+ 4 - 0
SE/stuff/P5_Automation_can-dev-res/__main_struct.h

@@ -105,6 +105,10 @@ int degrees;
 
 ARDUINO_ARRAY_time_min_run_MIN_T  ARDUINO_ARRAY_time_min_run_MIN_A; 
 
+
+#define ArrayElementSize(x) (sizeof()/sizeof(x[0]))
+
+
 /* n = digitalRead(encoder0PinA);
   if ((encoder0PinALast == LOW) && (n == HIGH)) {
     if (digitalRead(encoder0PinB) == LOW) {