a.binder před 5 roky
rodič
revize
633c6e3e0d

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

@@ -87,7 +87,7 @@
 //#define DEBUG_QUEUE_ASSERT
 //#define DEBUG_QUEUE_WAIT 500
 //#define DEBUG_STRUCT_INIT
-#define DEBUG_STORAGE_QUEUE_TEST 
+//#define DEBUG_STORAGE_QUEUE_TEST 
 
 //#define HAS__PCINT_setup //to allow interrupts
 
@@ -222,7 +222,7 @@
 
 
 #if defined(HAS__PCINT_setup)
-    #include "_PCINT/_PCINT_struct.h"
+    #include "_PCINT/_PCINT_struct.h"  //pins MYPIN1 MYPIN2 MYPIN3
 #endif
 
 
@@ -314,13 +314,13 @@
   
 
 #if defined(HAS_ROTTARY_SW)
- #include "_ROTTARY_SW/_ROTTARY_SW_init.h"
+ #include "_ROTTARY_SW/_ROTTARY_SW_init.h"  //empty
 #endif
 
 
 
 #if defined(HAS__PCINT_setup)
-    #include "_PCINT/_PCINT_init.h"
+     #include "_PCINT/_PCINT_init.h"
 #endif
 
 #include "___CONFIG/config_Slave_Ports_LOCAL_init.h"
@@ -486,6 +486,10 @@ void setup() {  //REMEMBER NOT INITIALIZE ANY VARIABLES OR ARRAYS
                 }
 
 
+
+
+
+
 void loop() {
 
 
@@ -552,8 +556,8 @@ void loop() {
                     DISPLAY_pos_seq_A_NEXT | DISPLAY_pos_seq_A_IMMEDIATE ,
                     "PORTS:",
                     DISPLAY_TARGET_DISPLAY128,
-                   millis(),
-                    millis() + ARDUINO_time_seq_id_A_INCREMENT
+                   time,
+                    time + ARDUINO_time_seq_id_A_INCREMENT
                      //queue
                     ,Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
                     TASK_TYPE_T__EMPTY__JUST_PASSED_ARG__,

+ 2 - 0
SE/stuff/P5_Automation_can-dev-res/_DISPLAY_struct.h

@@ -89,6 +89,8 @@ typedef struct ARDUINO_ARRAY_INDEX_T_TO_DELETE_S   DISPLAY_ARDUINO_ARRAY_INDEX_T
  typedef ARDUINO_FUNCT_INIT_RESULT_T ARDUINO_FUNCT_INIT_RESULT_Slave_Ports_queue__add_DISPLAY_T ;
  
  const DISPLAY_CURSOR_Y_CHARS_T DISPLAY_CURSOR_Y_CHARS_CAN_DEBUG = 8 ; //todo 10 linia do debugu?? CAN
+ const DISPLAY_CURSOR_Y_CHARS_T DISPLAY_CURSOR_Y_CHARS_ROTTARY_SW_DEBUG = 9 ; //todo 10 linia do debugu?? CAN
+
  const DISPLAY_CURSOR_Y_CHARS_T DISPLAY_CURSOR_Y_CHARS_DEBUG = 10 ; //todo 10 linia do debugu??
  
  

+ 2 - 2
SE/stuff/P5_Automation_can-dev-res/_ROTTARY_SW/_ROTTARY_SW_func.h

@@ -1,7 +1,7 @@
 
 
 
-#ifndef defined(HAS_ROTTARY_SW)
+#ifndef HAS_ROTTARY_SW
     #error Need to have HAS_ROTTARY_SW
 #endif
 
@@ -12,7 +12,7 @@
 
  // You can assign any number of functions to different pins. How cool is that?
 void ROTTARY_SW_sw_INT() {
-  // Serial.println("ROTTARY_SW_sw_INT TRIG");
+   Serial.println("ROTTARY_SW_sw_INT TRIG");
 }
 
 /*

+ 9 - 7
SE/stuff/P5_Automation_can-dev-res/_ROTTARY_SW/_ROTTARY_SW_loop.h

@@ -5,27 +5,29 @@
  
     Serial.print(" ROT_SW[");  Serial.print(encoderPos);  Serial.print("] ");  
     oldEncPos = encoderPos;
-    
+    int pwmVal = encoderPos * 5 ;
+    if (pwmVal == 0 ) pwmVal = 1; 
     if(not(I2C_INDEX_DRIVER_A > 0)) {
-    I2C_INDEX_DRIVER_A = Adafruit_PWMServoDriver__get_PRIMARY_KET_T(Adafruit_PWMServoDriver_A,  I2C_ADDRESS_0x40) ;
+    //I2C_INDEX_DRIVER_A = Adafruit_PWMServoDriver__get_PRIMARY_KET_T(Adafruit_PWMServoDriver_A,  I2C_ADDRESS_0x40) ;
+     I2C_INDEX_DRIVER_A = Adafruit_PWMServoDriver__get_PRIMARY_KET_T(   Adafruit_PWMServoDriver_A,Adafruit_PWMServoDriver_ATTR_ARRAY_A ,   0x40);
     }
      Serial.print("#550 CLK_AAdafruit_PWMServoDriver: #[");  Serial.print(encoderPos);
      Serial.print("] I2C_INDEX_DRIVER_A [");  Serial.print(I2C_INDEX_DRIVER_A); 
       Serial.println(" ] ");   
      //Adafruit_PWMServoDriver_0X40.setPWM(1, 0, map(encoderPos, 0, 180, SERVOMIN, SERVOMAX));
     // Adafruit_PWMServoDriver_0X40.setPWM(2, encoderPos * 5, encoderPos * 50);
-        Adafruit_PWMServoDriver_A[I2C_INDEX_DRIVER_A].Adafruit_PWMServoDriver_V.setPWM(2, encoderPos * 5, encoderPos * 50);
+     if(I2C_INDEX_DRIVER_A>0)  Adafruit_PWMServoDriver_A[I2C_INDEX_DRIVER_A].Adafruit_PWMServoDriver_V.setPWM(2, pwmVal, pwmVal * 10);
 
 
 //DISPLAY_DEV.print("#550 CLK_AAdafruit_PWMServoD");
 
 
 DISPLAY__CURSOR_Y_CHARS__SET(DISPLAY_PHYSICAL_CHAR_A, 
-                                DISPLAY_CURSOR_Y_CHARS_DEBUG);
+                                DISPLAY_CURSOR_Y_CHARS_ROTTARY_SW_DEBUG);
           DISPLAY_array16_T  DISPLAY_array16_AA="" ;
           //( "OUT I2C 0X40[2]" + encoderPos * 5 , 2), //message,                
           String message = "OUT I2C 0X40[2] V:";
-              message.concat(String(encoderPos * 5));
+              message.concat(String(pwmVal));
               message.toCharArray(DISPLAY_array16_AA, message.length());
                      DISPLAY__print(
                           DISPLAY_A ,
@@ -34,8 +36,8 @@ DISPLAY__CURSOR_Y_CHARS__SET(DISPLAY_PHYSICAL_CHAR_A,
                            DISPLAY_pos_seq_A_NEXT | DISPLAY_pos_seq_A_IMMEDIATE,
                             DISPLAY_array16_AA,
                             DISPLAY_TARGET_DISPLAY128,
-                           millis() , // time_seq_id_T time_seq_id_A;
-                           millis()+5000, //time_min_run_T time_min_run_A;
+                          time, // time_seq_id_T time_seq_id_A;
+                           time+5000, //time_min_run_T time_min_run_A;
                           //queue
                          Slave_Ports_Status_QUEUE_A,Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
                          TASK_TYPE_T_Slave_Ports_broadcast____  ,  //TASK_TYPE_A,

+ 2 - 2
SE/stuff/P5_Automation_can-dev-res/_ROTTARY_SW/_ROTTARY_SW_setup.h

@@ -19,7 +19,7 @@
     #ifdef DISABLE_LOOP || DEBUG
              Serial.println("will  attachPinChangeInterrupt(ROTTARY_SW_dt, ROTTARY_SW_dt_INT, RISING)");
     #endif
- // attachPinChangeInterrupt(ROTTARY_SW_dt, ROTTARY_SW_dt_INT, RISING); //FALLING //RISING 
+  attachPinChangeInterrupt(ROTTARY_SW_dt, ROTTARY_SW_dt_INT, RISING); //FALLING //RISING 
     #ifdef DISABLE_LOOP || DEBUG
              Serial.println("will  pinMode(ROTTARY_SW_dt, INPUT_PULLUP)");
     #endif
@@ -27,7 +27,7 @@
    #ifdef DISABLE_LOOP || DEBUG
              Serial.println("will  attachPinChangeInterrupt(ROTTARY_SW_clk, ROTTARY_SW_clk_INT, RISING)");
     #endif
-//  attachPinChangeInterrupt(ROTTARY_SW_clk, ROTTARY_SW_clk_INT, RISING); //CHANGE
+  attachPinChangeInterrupt(ROTTARY_SW_clk, ROTTARY_SW_clk_INT, RISING); //CHANGE
   #ifdef DISABLE_LOOP || DEBUG
              Serial.println("pinMode(ROTTARY_SW_clk, INPUT_PULLUP)");
     #endif

+ 22 - 12
SE/stuff/P5_Automation_can-dev-res/_TFT_ILI9163C_func.h

@@ -162,22 +162,32 @@ void  DISPLAY_DEV_CTRL__println(DISPLAY_PHYSICAL_CHAR_T &DISPLAY_PHYSICAL_CHAR_A
                                      }
                                  #endif
                                 
-                                
-                                
+                                int bufi;
+                                char buf[1];
                                 for(i = 1 ; i<= parts; i++) {
                                     //myString.substring(from, to)
                                     substr_end = substr_begin + DISPLAY_PHYSICAL_CHAR_A.DISPLAY_PHYSICAL_X_CHARS_A ;
-                                    DISPLAY_DEV.print(message.substring(substr_begin, substr_end));
+                                        DISPLAY_DEV.print(message.substring(substr_begin, substr_end));
                                        /*BUG TODO ERROR IF UNCOMMENTED*/
-                                       #if defined(DEBUG)
-                                       if(DEBUG > 6) {  
-                                              Serial.print("#112 msg part["); Serial.print(i);
-                                             Serial.print("]  beg["); Serial.print(substr_begin);
-                                             Serial.print("]  end["); Serial.print(substr_end);
-                                             Serial.print("]  frag["); Serial.print(message.substring(substr_begin, substr_end));
-                                             Serial.print("] yC["); Serial.print( DISPLAY_PHYSICAL_CHAR_A.DISPLAY_PHYSICAL_X_CHARS_A);
-                                             Serial.println("] ");
-                                            } 
+                                       
+                                       
+                                       
+                                       
+                                      /* for(bufi = 0; bufi <= 16; bufi++) {
+                                           message.substring(substr_begin + bufi, substr_begin + bufi + 1).toCharArray(buf,1);
+                                            //DISPLAY_DEV.print(buf.substring(bufi, bufi+1));
+                                            DISPLAY_DEV.print(buf[0]);
+                                       }
+                                       */
+                                        #if defined(DEBUG)
+                                          if(DEBUG > 6) {  
+                                                Serial.print("#112 msg part["); Serial.print(i);
+                                               Serial.print("]  beg["); Serial.print(substr_begin);
+                                               Serial.print("]  end["); Serial.print(substr_end);
+                                               Serial.print("]  frag["); Serial.print(message.substring(substr_begin, substr_end));
+                                               Serial.print("] yC["); Serial.print( DISPLAY_PHYSICAL_CHAR_A.DISPLAY_PHYSICAL_X_CHARS_A);
+                                               Serial.println("] ");
+                                              } 
                                          #endif
                                          
                                         substr_begin = substr_end + 1;

+ 3 - 3
SE/stuff/P5_Automation_can-dev-res/___CONFIG/0x101/config_Active_ControllerID_0x101.h

@@ -1,12 +1,12 @@
 
 //there kleep config of this id device#define HAS_TFT_ILI9163C 
 // #define HAS_LCD1602 
-//#define HAS_ROTTARY_SW
+#define HAS_ROTTARY_SW
 #define HAS_TFT_ILI9163C
 #define HAS_I2C_driver_Adafruit_PWMServoDriver 
 #define DEBUG_I2C_driver_Adafruit_PWMServoDriver
-//#define HAS__PCINT_setup //to allow interrupts
-
+#define HAS__PCINT_setup //to allow interrupts
+//#error
 //#define DEBUG 5 
 
 //#define DISABLE_LOOP //To debug and disable any output