Arkadiusz Binder 5 years ago
parent
commit
d414b8a9d7

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

@@ -108,6 +108,7 @@
 //#define DEBUG_LATENCY_MARKER
 //#define DEBUG_LATENCY_MARKER
 
 
 //ports assign config
 //ports assign config
+#define PortA7 A7  //for local PIR sensor
 #define PortA8 A8  //for rottary sw
 #define PortA8 A8  //for rottary sw
 #define PortA9 A9  //for rottary sw dt
 #define PortA9 A9  //for rottary sw dt
 #define PortA10 A10  //for rottary sw clk
 #define PortA10 A10  //for rottary sw clk
@@ -142,7 +143,8 @@ etc. To deactivate the Serial printing, define the macro empty:
 #include "___CONFIG/config_Active_Controller_EEPROM.h" //there kleep id of device
 #include "___CONFIG/config_Active_Controller_EEPROM.h" //there kleep id of device
 
 
 #include "___CONFIG/config_Active_ControllerID.h" //there kleep id of device
 #include "___CONFIG/config_Active_ControllerID.h" //there kleep id of device
-
+    //config active should once update id
+EEPROM_Active_ControllerID_read_T EEPROM_Active_ControllerID_read_A = EEPROM_Active_ControllerID_read();
 
 
 #define HAS__jm_Scheduler //to allow planned actions blink etc
 #define HAS__jm_Scheduler //to allow planned actions blink etc
 
 

+ 5 - 4
SE/stuff/P5_Automation_can-dev-res-working-1930/_DISPLAY_func.h

@@ -512,10 +512,11 @@ void DISPLAY__print_menu(DISPLAY_T* DISPLAY_A ,
                                                   
                                                   
                                                   
                                                   
                                                   //EOF MESSAGE
                                                   //EOF MESSAGE
-                                                  
-                                                  
-                                                  #include "_DISPLAY_func_PRINT_PORT_ELEMENT.h"
-                                                            
+                                                  if(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].DISPLAY_MENU_ITEM_CLASS_A ==  DISPLAY_MENU_ITEM_CLASS_MENU_TITLE) {
+                                                    #include "_DISPLAY_func_PRINT_CLASS_MENU_TITLE.h"
+                                                  } else {
+                                                    #include "_DISPLAY_func_PRINT_PORT_ELEMENT.h"
+                                                  }
                                                             for (int iA = 0; iA < 24; iA++) {
                                                             for (int iA = 0; iA < 24; iA++) {
                                                                     if(iA % DISPLAY_char24_TAB_SIZE == 0) next_tab_pos++ ;
                                                                     if(iA % DISPLAY_char24_TAB_SIZE == 0) next_tab_pos++ ;
                                                                     
                                                                     

+ 8 - 0
SE/stuff/P5_Automation_can-dev-res-working-1930/_DISPLAY_func_PRINT_CLASS_MENU_TITLE.h

@@ -0,0 +1,8 @@
+message = "Ports: ";
+
+ message.concat(Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A);
+
+         message.concat(TAB_S);
+          message.concat("Dev:0x") ;
+         message.concat(String(EEPROM_Active_ControllerID_read_A , HEX));
+            message.concat(TAB_S);

+ 6 - 1
SE/stuff/P5_Automation_can-dev-res-working-1930/_DISPLAY_struct.h

@@ -79,6 +79,10 @@ const DISPLAY_MENU_ITEM_FLAG_T DISPLAY_MENU_ITEM_FLAG_EMPTY = B00000000;
 const DISPLAY_MENU_ITEM_FLAG_T DISPLAY_MENU_ITEM_FLAG_DELETED      = B00000010;
 const DISPLAY_MENU_ITEM_FLAG_T DISPLAY_MENU_ITEM_FLAG_DELETED      = B00000010;
 const DISPLAY_MENU_ITEM_FLAG_T DISPLAY_MENU_ITEM_FLAG_INITIALIZED  = B10000001;
 const DISPLAY_MENU_ITEM_FLAG_T DISPLAY_MENU_ITEM_FLAG_INITIALIZED  = B10000001;
 
 
+typedef byte DISPLAY_MENU_ITEM_CLASS_T ;
+const DISPLAY_MENU_ITEM_CLASS_T DISPLAY_MENU_ITEM_CLASS_UNSET = B00000000; //for title
+const DISPLAY_MENU_ITEM_CLASS_T DISPLAY_MENU_ITEM_CLASS_MENU_TITLE = B00000001; //for title
+const DISPLAY_MENU_ITEM_CLASS_T DISPLAY_MENU_ITEM_CLASS_ITEM = B00000010;//for std item
 
 
 
 
 typedef ARDUINO_ARRAY_ATTR_T DISPLAY_MENU_ITEM_INDEX_T ;//which index
 typedef ARDUINO_ARRAY_ATTR_T DISPLAY_MENU_ITEM_INDEX_T ;//which index
@@ -132,6 +136,7 @@ typedef DISPLAY_char_T DISPLAY_char24_T[DISPLAY_char24_T_SIZE] ;
 struct DISPLAY_MENU_ITEM_S { //elementy menu
 struct DISPLAY_MENU_ITEM_S { //elementy menu
      DISPLAY_MENU_ITEM_FLAG_T DISPLAY_MENU_ITEM_FLAG_A = DISPLAY_MENU_ITEM_FLAG_EMPTY ;
      DISPLAY_MENU_ITEM_FLAG_T DISPLAY_MENU_ITEM_FLAG_A = DISPLAY_MENU_ITEM_FLAG_EMPTY ;
      //czy nie jest do usuniecia itp ...
      //czy nie jest do usuniecia itp ...
+    DISPLAY_MENU_ITEM_CLASS_T DISPLAY_MENU_ITEM_CLASS_A = DISPLAY_MENU_ITEM_CLASS_UNSET; //
      DISPLAY_CURSOR_X_CHARS_T DISPLAY_CURSOR_X_CHARS_A; //gdzie sie wyswietla
      DISPLAY_CURSOR_X_CHARS_T DISPLAY_CURSOR_X_CHARS_A; //gdzie sie wyswietla
      DISPLAY_CURSOR_Y_CHARS_T DISPLAY_CURSOR_Y_CHARS_A ;//gdzie sie wyswietla
      DISPLAY_CURSOR_Y_CHARS_T DISPLAY_CURSOR_Y_CHARS_A ;//gdzie sie wyswietla
      #if defined(USE_DISPLAY_string_T)
      #if defined(USE_DISPLAY_string_T)
@@ -280,4 +285,4 @@ DISPLAY_char_PT DISPLAY_char_P(  String message ) {//DISPLAY_char24_T DISPLAY_ch
 //DISPLAY_char24_T DISPLAY_char_PV(  DISPLAY_char_PT DISPLAY_char_PA ) {//DISPLAY_char24_T DISPLAY_char24_A
 //DISPLAY_char24_T DISPLAY_char_PV(  DISPLAY_char_PT DISPLAY_char_PA ) {//DISPLAY_char24_T DISPLAY_char24_A
    //return DISPLAY_char_PA;
    //return DISPLAY_char_PA;
 //}
 //}
-    
+    

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

@@ -37,6 +37,7 @@
         
         
         if( IS_Local_A == IS_Local_TRUE and _Slave_ID != EEPROM_Active_ControllerID_read_A ) {
         if( IS_Local_A == IS_Local_TRUE and _Slave_ID != EEPROM_Active_ControllerID_read_A ) {
             Serial.print(" [IGN]["); Serial.print(_Slave_ID) ; Serial.print("] ");
             Serial.print(" [IGN]["); Serial.print(_Slave_ID) ; Serial.print("] ");
+            return false;
         } else {
         } else {
             Serial.print(" [P+["); Serial.print(_Slave_ID); Serial.print("] ");
             Serial.print(" [P+["); Serial.print(_Slave_ID); Serial.print("] ");
         }
         }
@@ -178,6 +179,7 @@
           #endif
           #endif
           DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[1].DISPLAY_COLOR_A =  0x0004 ;
           DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[1].DISPLAY_COLOR_A =  0x0004 ;
           DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[1].DISPLAY_MENU_ITEM_FLAG_A = DISPLAY_MENU_ITEM_FLAG_INITIALIZED ;
           DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[1].DISPLAY_MENU_ITEM_FLAG_A = DISPLAY_MENU_ITEM_FLAG_INITIALIZED ;
+          DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[1].DISPLAY_MENU_ITEM_CLASS_A = DISPLAY_MENU_ITEM_CLASS_MENU_TITLE ;
           //DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[1].DISPLAY_char_PA = 
           //DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[1].DISPLAY_char_PA = 
           #if defined(USE_DISPLAY_char_PA)
           #if defined(USE_DISPLAY_char_PA)
           //DISPLAY_char_P(title,*DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[1].DISPLAY_char_PA );
           //DISPLAY_char_P(title,*DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[1].DISPLAY_char_PA );
@@ -228,6 +230,8 @@
                 #endif
                 #endif
                 DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i+1].DISPLAY_COLOR_A = BLACK  ;
                 DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i+1].DISPLAY_COLOR_A = BLACK  ;
                 DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i+1].DISPLAY_MENU_ITEM_FLAG_A = DISPLAY_MENU_ITEM_FLAG_INITIALIZED  ;
                 DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i+1].DISPLAY_MENU_ITEM_FLAG_A = DISPLAY_MENU_ITEM_FLAG_INITIALIZED  ;
+                DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i+1].DISPLAY_MENU_ITEM_CLASS_A = DISPLAY_MENU_ITEM_CLASS_ITEM ;
+
                 DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i+1].ARDUINO_ARRAY_INDEX_A = i  ;
                 DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i+1].ARDUINO_ARRAY_INDEX_A = i  ;
                            #if defined(USE_MESSAGE_OLD)
                            #if defined(USE_MESSAGE_OLD)
                 message.toCharArray(DISPLAY_char24_A, message.length());
                 message.toCharArray(DISPLAY_char24_A, message.length());
@@ -269,4 +273,4 @@
    }  
    }  
    
    
    
    
- 
+ 

+ 4 - 4
SE/stuff/P5_Automation_can-dev-res-working-1930/___CONFIG/0x13/config_Slave_Ports_LOCAL_0x13_init.h

@@ -1,4 +1,4 @@
-
+/*
 ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
 ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                 Slave_Ports_Status_T* Slave_Ports_Status_A ,
                 Slave_Ports_Status_T* Slave_Ports_Status_A ,
                 Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_T &Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A ,
                 Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_T &Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A ,
@@ -10,7 +10,7 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                 time_seq_id_T time_seq_id,  time_min_run_T time_min_run
                 time_seq_id_T time_seq_id,  time_min_run_T time_min_run
                 //,*DISPLAY_PHYSICAL_CHAR_A //DISPLAY_PHYSICAL_CHAR_T 
                 //,*DISPLAY_PHYSICAL_CHAR_A //DISPLAY_PHYSICAL_CHAR_T 
                 ) {
                 ) {
-
+*/
    //DISPLAY_T_ARDUINO_ATTR_ARRAY_A[ARDUINO_ATTR_ARRAY_S_INDEX].ARDUINO_ARRAY_INDEX_CURRENT_INIT ++;
    //DISPLAY_T_ARDUINO_ATTR_ARRAY_A[ARDUINO_ATTR_ARRAY_S_INDEX].ARDUINO_ARRAY_INDEX_CURRENT_INIT ++;
      #if defined(DEBUG) 
      #if defined(DEBUG) 
                                   if(DEBUG > 6) {  
                                   if(DEBUG > 6) {  
@@ -113,6 +113,6 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                  );
                  );
                 #endif 
                 #endif 
                     
                     
-    return true ;
+  //  return true ;
 
 
-}
+//}

+ 1 - 1
SE/stuff/P5_Automation_can-dev-res-working-1930/___CONFIG/config_Slave_Ports_LOCAL_init.h

@@ -34,7 +34,7 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
      #endif
      #endif
       
       
       #include "0x11/config_Slave_Ports_LOCAL_0x11_init.h"
       #include "0x11/config_Slave_Ports_LOCAL_0x11_init.h"
-      
+      #include "0x13/config_Slave_Ports_LOCAL_0x13_init.h"
       #include "0x15/config_Slave_Ports_LOCAL_0x15_init.h"
       #include "0x15/config_Slave_Ports_LOCAL_0x15_init.h"
       
       
                /*   Slave_Ports_Status_add_port(
                /*   Slave_Ports_Status_add_port(

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

@@ -128,6 +128,13 @@ if(ARDUINO_LOOP_LATENCY_COUNTER__MAIN_END(ARDUINO_LOOP_LATENCY__MAIN_END_A, ARDU
                                       ,Slave_Ports_Status_A 
                                       ,Slave_Ports_Status_A 
                                        );
                                        );
                   
                   
+    
+                            //debug analpir
+                            DISPLAY_DEV.fillRect( 0, ( DISPLAY_CURSOR_Y_CHARS_DEBUG * DISPLAY_PHYSICAL_CHAR_A.DISPLAY_textsize_y_A ) , DISPLAY_PHYSICAL_CHAR_A.DISPLAY_PHYSICAL_X_PX_A , DISPLAY_PHYSICAL_CHAR_A.DISPLAY_textsize_y_A , RED );
+                            DISPLAY_DEV.setCursor(0 , DISPLAY_CURSOR_Y_CHARS_DEBUG * DISPLAY_PHYSICAL_CHAR_A.DISPLAY_textsize_y_A );
+                            
+    
+                            DISPLAY_DEV.print("P:"); DISPLAY_DEV.print(PortA7); DISPLAY_DEV.print(" "); DISPLAY_DEV.print(analogRead(PortA7));
                     #endif
                     #endif
                     
                     
               #else 
               #else 
@@ -164,4 +171,4 @@ if(ARDUINO_LOOP_LATENCY_COUNTER__MAIN_END_A <= ARDUINO_LOOP_LATENCY_COUNTER_INIT
 */
 */
   //_LCD_print_buffors_list(_LCD_print_buffors) ;
   //_LCD_print_buffors_list(_LCD_print_buffors) ;
   //_LCD_print_screens_list(_LCD_print_screens);
   //_LCD_print_screens_list(_LCD_print_screens);
-  
+