a.binder před 5 roky
rodič
revize
369557c5f5

+ 1 - 0
SE/stuff/P5_Automation_can-dev-res-working-1930/P5_Automation_can-dev-res-working-1930.ino

@@ -370,6 +370,7 @@ const int DISPLAY_MENU_A__PROGMEM_CONSOLE_PRINT = 3 ;
 
 #include "_Slave_Ports_Protocol_CAN_func.h"
 #include "_Slave_Ports_Status_func.h"
+#include "TASK_TYPE_T_Set_Ports_Status_LIMITS_A__.h"
 
 #include "_CAN/_CAN_func.h"
 

+ 3 - 4
SE/stuff/P5_Automation_can-dev-res-working-1930/_DISPLAY_func_PRINT_PORT_ELEMENT.h

@@ -2,11 +2,10 @@ message = "";
 
 
           if(Slave_Ports_Status_DESCR_A[i].Port_ID > 0 ) {
-            message.concat(Slave_Ports_Status_DESCR_A[i].Port_ID_DESCR_A);
+            message.concat(i);  message.concat("."); message.concat(Slave_Ports_Status_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].ARDUINO_ARRAY_INDEX_A].Port_ID);  message.concat(".");  message.concat(Slave_Ports_Status_DESCR_A[i].Port_ID_DESCR_A);
           } else {
-                message.concat(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].ARDUINO_ARRAY_INDEX_A);
-                message.concat(".");
-                message.concat(Slave_Ports_Status_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].ARDUINO_ARRAY_INDEX_A].Port_ID )  ;
+               message.concat(i);  message.concat("."); message.concat(Slave_Ports_Status_A[DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].ARDUINO_ARRAY_INDEX_A].Port_ID);
+               
           } 
           message.concat(TAB_S);
           

+ 2 - 3
SE/stuff/P5_Automation_can-dev-res-working-1930/_LCD1602_func.h

@@ -4,8 +4,7 @@ void LCD_print_DISPLAY_MENU_A(  //DISPLAY_PHYSICAL_CHAR_T &DISPLAY_PHYSICAL_CHAR
         int DISPLAY_MENU_A //index of
         ) {
 
-  #if defined(DISABLE_PROGMEM_CONSOLE_PRINT)
-     #else
+  
     //todo menu
      for(int ii=0 ; ii< PROGMEM_CONSOLE_PRINT_LIMIT_A; ii++ ) {
         if(PROGMEM_CONSOLE_PRINT_A[ii].DISPLAY_ELEMENT_TO_REFRESH_A == true) {
@@ -30,7 +29,7 @@ void LCD_print_DISPLAY_MENU_A(  //DISPLAY_PHYSICAL_CHAR_T &DISPLAY_PHYSICAL_CHAR
         }
         
     }
-    #endif
+    
     
 
 }

+ 6 - 0
SE/stuff/P5_Automation_can-dev-res-working-1930/_Slave_Ports_I2C_func.h

@@ -6,6 +6,7 @@
 
 #define _Slave_Ports_I2C_func_h
 
+#include "TASK_TYPE_T_Set_Ports_Status_LIMITS_A__.h"
 
 void TASK_TYPE_T_Set_Port_Smooth_forward() {
 }
@@ -92,6 +93,11 @@ void TASK_TYPE_T_Set_Port_Smooth_forward() {
      #if defined(DEBUG) || defined(DEBUG_I2C_driver_Adafruit_PWMServoDriver)
                 Serial.print("#69PWC [i[");    Serial.print(i);    Serial.print("] I2CP[");   Serial.print(Slave_Ports_Status_A[i].I2C_port);   Serial.print("]TTL[");  Serial.print(Slave_Ports_Status_A[i].Exp_state_ttl);  Serial.println("] ");                 
             #endif
+            
+            //TASK_TYPE_T_Set_Ports_Status_LIMITS_A__ASSERT 
+            TASK_TYPE_T_Set_Ports_Status_LIMITS_A__ASSERT(i);
+            
+            
       if(Slave_Ports_Status_A[i].PortTypes & PortTypes_I2C) { //{2 BIN TEST
             if(Slave_Ports_Status_A[i].Exp_state_ttl > Exp_state_ttl_FRESH ) {
                     #if defined(DEBUG) || defined(DEBUG_I2C_driver_Adafruit_PWMServoDriver)

+ 3 - 1
SE/stuff/P5_Automation_can-dev-res-working-1930/_Slave_Ports_Status_func.h

@@ -1,4 +1,6 @@
 #include <limits.h>
+ 
+ 
  void Slave_Ports_Status_add_port(
  Slave_Ports_Status_T* Slave_Ports_Status_A , 
  Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_T &Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A,
@@ -79,7 +81,7 @@
                    
                 if((Slave_Ports_Status_A[i].Port_ID == Port_ID) and (Slave_Ports_Status_A[i]._Slave_ID == Active_ControllerID_HEX ))  {
                     found = true ;
-                        Serial.print("+D");Serial.print(i);
+                        SPFTFT2(found,index,i);
                         found_id = i;
                    }
             }

+ 13 - 0
SE/stuff/P5_Automation_can-dev-res-working-1930/_Slave_Ports_Status_struct.h

@@ -33,9 +33,22 @@ struct Slave_Ports_Status_DESCR_S {
      Port_ID_DESCR_T Port_ID_DESCR_A;
 } ;
 
+
+
 typedef Slave_Ports_Status_DESCR_S Slave_Ports_Status_DESCR_T ;
 Slave_Ports_Status_DESCR_T Slave_Ports_Status_DESCR_A[ARDUINO_ARRAY_INDEX_LIMIT_PORTS];
 
+
+struct TASK_TYPE_T_Set_Ports_Status_LIMITS_S {
+     Port_ID_T  Port_ID ;  
+     Exp_state_level_T Exp_state_level_MIN_A = 0;
+     Exp_state_level_T Exp_state_level_MAX_A = 255;
+} ;
+typedef TASK_TYPE_T_Set_Ports_Status_LIMITS_S TASK_TYPE_T_Set_Ports_Status_LIMITS_T ;
+TASK_TYPE_T_Set_Ports_Status_LIMITS_T TASK_TYPE_T_Set_Ports_Status_LIMITS_A[ARDUINO_ARRAY_INDEX_LIMIT_PORTS];
+
+
+
  struct Slave_Ports_Status_S {
   Port_ID_T  Port_ID ; //global id for device //const char * const _Protocol;
   int  _Slave_ID; //Device which orginated port   //remote id - use FF for broadcast

+ 2 - 0
SE/stuff/P5_Automation_can-dev-res-working-1930/_TASK_TYPES_struct.h

@@ -25,6 +25,8 @@ const TASK_TYPE_T TASK_TYPE_T_Broadcast_child_CHANGE___ = 0x12 ; //todo to repor
 const TASK_TYPE_T TASK_TYPE_T_Set_Port_Smooth_forward__ = 0x13 ; //todo to report some change of child device like HX711
 
 //const TASK_TYPE_T TASK_TYPE_T_PROGMEM_CONSOLE_PRINT____ = 0x14 ;
+const TASK_TYPE_T TASK_TYPE_T_Set_Ports_Status_DESCR_A___ = 0x15 ; //todo set port names
+const TASK_TYPE_T TASK_TYPE_T_Set_Ports_Status_LIMITS_A__ = 0x16 ; //todo set port names
 
 
 //const TASK_TYPE_T TASK_TYPE_T_Debug_Queue_Functions____ = 0x09 ;

+ 7 - 0
SE/stuff/P5_Automation_can-dev-res-working-1930/___CONFIG/0x11/config_Active_ControllerID_0x11.h

@@ -2,6 +2,13 @@
 //there kleep config of this id device#define HAS_TFT_ILI9163C 
 // #define HAS_LCD1602 
 #define HAS_ROTTARY_SW
+
+// rottary switch ports 
+#define ROTTARY_SW_sw PortA8 
+#define ROTTARY_SW_dt PortA10
+#define ROTTARY_SW_clk PortA9   
+
+#define HAS_CAN
 #define HAS_TFT_ILI9163C
 #define HAS_I2C_driver_Adafruit_PWMServoDriver 
 //#define DEBUG_I2C_driver_Adafruit_PWMServoDriver

+ 5 - 0
SE/stuff/P5_Automation_can-dev-res-working-1930/___CONFIG/0x11/config_Slave_Ports_LOCAL_0x11_init.h

@@ -35,6 +35,7 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                                 I2C_port_DEFAULT, //int I2C_port,
                                 I2C_driver_Adafruit_PWMServoDriver ,//int I2C_driver
                                 IS_Local_TRUE, Exp_state_level_INIT,
+                                 "SW LP",
                                 0,0 //time_seq_id, time_min_run  
                                 );
                                 
@@ -56,6 +57,7 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                                 I2C_port_DEFAULT, //int I2C_port,
                                 I2C_driver_Adafruit_PWMServoDriver ,//int I2C_driver
                                 IS_Local_TRUE, Exp_state_level_INIT,
+                                "SW LL",
                                 0,0 //time_seq_id, time_min_run  
                                 );
                                 
@@ -76,6 +78,7 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                                 I2C_port_DEFAULT, //int I2C_port,
                                 I2C_driver_Adafruit_PWMServoDriver ,//int I2C_driver
                                 IS_Local_TRUE, Exp_state_level_INIT,
+                                "SW PL",
                                 0,0 //time_seq_id, time_min_run  
                                 );
                                 
@@ -97,6 +100,7 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                                 I2C_port_DEFAULT, //int I2C_port,
                                 I2C_driver_Adafruit_PWMServoDriver ,//int I2C_driver
                                 IS_Local_TRUE, Exp_state_level_INIT,
+                                "SW PP",
                                 0,0// time_seq_id, time_min_run
                                 );
                                 
@@ -119,6 +123,7 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                                 I2C_port_DEFAULT, //int I2C_port,
                                 I2C_driver_Adafruit_PWMServoDriver ,//int I2C_driver
                                 IS_Local_TRUE, Exp_state_level_INIT,
+                                "Silnik",
                                 0,0// time_seq_id, time_min_run
                                 );
                                          

+ 6 - 5
SE/stuff/P5_Automation_can-dev-res-working-1930/___CONFIG/0x35/config_Slave_Ports_LOCAL_0x35_init.h

@@ -187,7 +187,7 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                                 I2C_port_NOT_I2C_A, //int I2C_port,
                                 I2C_driver_PHYSICAL_PORT_SERVO ,//int I2C_driver
                                 IS_Local_TRUE, Exp_state_level_INIT,
-                                "Halo X",
+                                "Halog3",
                                 0,0// time_seq_id, time_min_run
                                 );   
                              Slave_Ports_Status_add_port(
@@ -207,10 +207,10 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                                 I2C_port_NOT_I2C_A, //int I2C_port,
                                 I2C_driver_PHYSICAL_PORT_SERVO ,//int I2C_driver
                                 IS_Local_TRUE, Exp_state_level_INIT,
-                                "Halo Y",
+                                "Halo X",
                                 0,0// time_seq_id, time_min_run
                                 );   
-                                
+                                TASK_TYPE_T_Set_Ports_Status_LIMITS_A__SET(4,0,90);
                                 
                               Slave_Ports_Status_add_port(
                                 Slave_Ports_Status_A ,
@@ -229,10 +229,11 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                                 I2C_port_NOT_I2C_A, //int I2C_port,
                                 I2C_driver_PHYSICAL_PORT_SERVO ,//int I2C_driver
                                 IS_Local_TRUE, Exp_state_level_INIT,
-                                "Halo Z",
+                                "Halo Y",
                                 0,0// time_seq_id, time_min_run
                                 );   
-                                
+                                TASK_TYPE_T_Set_Ports_Status_LIMITS_A__SET(5,0,180);
+
                                 
                             Serial.println("#151ADD");
                             Serial.print(Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A);        

+ 3 - 1
SE/stuff/P5_Automation_can-dev-res-working-1930/___loop/__main_loop_end.h

@@ -135,7 +135,9 @@ if(ARDUINO_LOOP_LATENCY_COUNTER__MAIN_END(ARDUINO_LOOP_LATENCY__MAIN_END_A, ARDU
                                 
         
                                 DISPLAY_DEV.print("P:"); DISPLAY_DEV.print(Port11); DISPLAY_DEV.print(" "); DISPLAY_DEV.print(digitalRead(Port11)); //DISPLAY_DEV.print(analogRead(Port11));
-                                LCD_print_DISPLAY_MENU_A(DISPLAY_MENU_A__PROGMEM_CONSOLE_PRINT);
+                                #if defined(DISABLE_PROGMEM_CONSOLE_PRINT)
+                                 LCD_print_DISPLAY_MENU_A(DISPLAY_MENU_A__PROGMEM_CONSOLE_PRINT);
+                                #endif
                             }
                     #endif