a.binder 5 gadi atpakaļ
vecāks
revīzija
0f779bb129

+ 3 - 1
SE/stuff/P5_Automation_can-dev-res/_DISPLAY_init.h

@@ -9,7 +9,9 @@ int LCDtim = 250 ;//the value of delay time
         {    ARDUINO_ARRAY_INDEX_CURRENT_INIT ,
         {    ARDUINO_ARRAY_INDEX_CURRENT_INIT ,
              ARDUINO_ARRAY_INDEX_LAST_INIT ,
              ARDUINO_ARRAY_INDEX_LAST_INIT ,
              ARDUINO_ARRAY_COUNT_T_INIT ,
              ARDUINO_ARRAY_COUNT_T_INIT ,
-             ARDUINO_ARRAY_INDEX_LIMIT_PORTS}
+             ARDUINO_ARRAY_INDEX_LIMIT_DISPLAY, 
+             ARDUINO_ARRAY_INDEX_NEXT_INIT
+             }
     };
     };
     DISPLAY_ARDUINO_ARRAY_INDEX_TABLE_T        DISPLAY_ARDUINO_ARRAY_INDEX_TABLE_A[ARDUINO_ARRAY_INDEX_LIMIT_DISPLAY]        = {};
     DISPLAY_ARDUINO_ARRAY_INDEX_TABLE_T        DISPLAY_ARDUINO_ARRAY_INDEX_TABLE_A[ARDUINO_ARRAY_INDEX_LIMIT_DISPLAY]        = {};
     DISPLAY_ARDUINO_ARRAY_INDEX_T_TO_DELETE_T  DISPLAY_ARDUINO_ARRAY_INDEX_T_TO_DELETE_A[ARDUINO_ARRAY_INDEX_T_TO_DELETE_S_LIMIT]  = {};  
     DISPLAY_ARDUINO_ARRAY_INDEX_T_TO_DELETE_T  DISPLAY_ARDUINO_ARRAY_INDEX_T_TO_DELETE_A[ARDUINO_ARRAY_INDEX_T_TO_DELETE_S_LIMIT]  = {};  

+ 3 - 1
SE/stuff/P5_Automation_can-dev-res/_DISPLAY_struct.h

@@ -68,7 +68,9 @@ typedef struct DISPLAY_S DISPLAY_T ;
  
  
  
  
  
  
- typedef struct ARDUINO_ATTR_ARRAY_S DISPLAY_T_ARDUINO_ATTR_ARRAY_T[1]; //todo test if working
+ typedef struct ARDUINO_ATTR_ARRAY_S DISPLAY_T_ARDUINO_ATTR_ARRAY_T ;
+ 
+ 
 
 
  
  
 typedef struct ARDUINO_ARRAY_INDEX_TABLE_S         DISPLAY_ARDUINO_ARRAY_INDEX_TABLE_T ; //DEFAULT INDEX TABLE
 typedef struct ARDUINO_ARRAY_INDEX_TABLE_S         DISPLAY_ARDUINO_ARRAY_INDEX_TABLE_T ; //DEFAULT INDEX TABLE

+ 2 - 1
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_Status_func.h

@@ -42,7 +42,7 @@
                 ARDUINO_ATTR_ARRAY_S__commit_added_element(
                 ARDUINO_ATTR_ARRAY_S__commit_added_element(
                           Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A , 
                           Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A , 
                          Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A);
                          Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A);
-                
+                 int i = Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A ;
                 //ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A
                 //ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A
                                 
                                 
                  //Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A ++;   
                  //Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A ++;   
@@ -87,6 +87,7 @@
                                    Serial.print("#72 Port_Dspl[DEBUG] #COUNT["); Serial.print(Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A);
                                    Serial.print("#72 Port_Dspl[DEBUG] #COUNT["); Serial.print(Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A);
                                     Serial.print("] INDEX_LAST["); Serial.print( Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_LAST_A);
                                     Serial.print("] INDEX_LAST["); Serial.print( Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_LAST_A);
                                     Serial.print("] INDEX_CURRENT["); Serial.print( Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A);
                                     Serial.print("] INDEX_CURRENT["); Serial.print( Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A);
+                                    Serial.print("] NEXT_A["); Serial.print( Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A);
                                     
                                     
                                     
                                     
                                     
                                     

+ 4 - 1
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_Status_struct.h

@@ -79,5 +79,8 @@ typedef struct ARDUINO_ARRAY_ASSOC_TABLE_S         Slave_Ports_Status_T_ARDUINO_
         {    ARDUINO_ARRAY_INDEX_CURRENT_INIT ,
         {    ARDUINO_ARRAY_INDEX_CURRENT_INIT ,
              ARDUINO_ARRAY_INDEX_LAST_INIT ,
              ARDUINO_ARRAY_INDEX_LAST_INIT ,
              ARDUINO_ARRAY_COUNT_T_INIT ,
              ARDUINO_ARRAY_COUNT_T_INIT ,
-             ARDUINO_ARRAY_INDEX_LIMIT_PORTS }
+             ARDUINO_ARRAY_INDEX_LIMIT_PORTS , 
+             ARDUINO_ARRAY_INDEX_NEXT_INIT 
+
+              }
     ;
     ;

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

@@ -5,6 +5,8 @@ typedef int ARDUINO_ARRAY_ATTR_T ; //for controll arrays behaviour
 
 
 typedef ARDUINO_ARRAY_ATTR_T ARDUINO_ARRAY_INDEX_CURRENT_T ; //porzadkowo do przegladania co jest biezacym pointerem
 typedef ARDUINO_ARRAY_ATTR_T ARDUINO_ARRAY_INDEX_CURRENT_T ; //porzadkowo do przegladania co jest biezacym pointerem
 typedef ARDUINO_ARRAY_ATTR_T ARDUINO_ARRAY_INDEX_LAST_T ; //porzadkowo co jest ostatnim elementem
 typedef ARDUINO_ARRAY_ATTR_T ARDUINO_ARRAY_INDEX_LAST_T ; //porzadkowo co jest ostatnim elementem
+
+typedef ARDUINO_ARRAY_ATTR_T ARDUINO_ARRAY_INDEX_NEXT_T ; //porzadkowo co jest ostatnim elementem
 typedef ARDUINO_ARRAY_ATTR_T ARDUINO_ARRAY_COUNT_T ; //current count elements - porzadkowo
 typedef ARDUINO_ARRAY_ATTR_T ARDUINO_ARRAY_COUNT_T ; //current count elements - porzadkowo
 
 
 typedef ARDUINO_ARRAY_ATTR_T  ARDUINO_ARRAY_INDEX_LIMIT_T ;
 typedef ARDUINO_ARRAY_ATTR_T  ARDUINO_ARRAY_INDEX_LIMIT_T ;
@@ -17,6 +19,7 @@ struct ARDUINO_ATTR_ARRAY_S {
     ARDUINO_ARRAY_INDEX_LAST_T ARDUINO_ARRAY_INDEX_LAST_A ;
     ARDUINO_ARRAY_INDEX_LAST_T ARDUINO_ARRAY_INDEX_LAST_A ;
     ARDUINO_ARRAY_COUNT_T ARDUINO_ARRAY_COUNT_A ;
     ARDUINO_ARRAY_COUNT_T ARDUINO_ARRAY_COUNT_A ;
     ARDUINO_ARRAY_INDEX_LIMIT_T ARDUINO_ARRAY_INDEX_LIMIT_A;
     ARDUINO_ARRAY_INDEX_LIMIT_T ARDUINO_ARRAY_INDEX_LIMIT_A;
+    ARDUINO_ARRAY_INDEX_NEXT_T ARDUINO_ARRAY_INDEX_NEXT_A ;
 };
 };
 
 
 
 
@@ -44,7 +47,7 @@ const ARDUINO_ARRAY_INDEX_T  ARDUINO_ARRAY_INDEX_FIRST = 1  ; //for controll arr
 const ARDUINO_ARRAY_COUNT_T ARDUINO_ARRAY_COUNT_T_INIT = 0 ; //current count elements - porzadkowo
 const ARDUINO_ARRAY_COUNT_T ARDUINO_ARRAY_COUNT_T_INIT = 0 ; //current count elements - porzadkowo
 const ARDUINO_ARRAY_INDEX_CURRENT_T ARDUINO_ARRAY_INDEX_CURRENT_INIT = 0 ;  //
 const ARDUINO_ARRAY_INDEX_CURRENT_T ARDUINO_ARRAY_INDEX_CURRENT_INIT = 0 ;  //
 const ARDUINO_ARRAY_INDEX_LAST_T ARDUINO_ARRAY_INDEX_LAST_INIT = 0 ;
 const ARDUINO_ARRAY_INDEX_LAST_T ARDUINO_ARRAY_INDEX_LAST_INIT = 0 ;
-
+const ARDUINO_ARRAY_INDEX_NEXT_T ARDUINO_ARRAY_INDEX_NEXT_INIT = 1;
 
 
 const ARDUINO_ARRAY_INDEX_T ARDUINO_ATTR_ARRAY_S_INDEX = ARDUINO_ARRAY_INDEX_FIRST ;
 const ARDUINO_ARRAY_INDEX_T ARDUINO_ATTR_ARRAY_S_INDEX = ARDUINO_ARRAY_INDEX_FIRST ;
 
 

+ 2 - 1
SE/stuff/P5_Automation_can-dev-res/__main_struct_funct.h

@@ -26,10 +26,11 @@ void ARDUINO_ARRAY_ASSOC_TABLE_INIT(
 
 
 void ARDUINO_ATTR_ARRAY_S__commit_added_element(
 void ARDUINO_ATTR_ARRAY_S__commit_added_element(
     ARDUINO_ATTR_ARRAY_S &ARDUINO_ATTR_ARRAY_A , 
     ARDUINO_ATTR_ARRAY_S &ARDUINO_ATTR_ARRAY_A , 
-    ARDUINO_ARRAY_INDEX_CURRENT_T &ARDUINO_ARRAY_INDEX_CURRENT_A //current index
+    ARDUINO_ARRAY_INDEX_CURRENT_T ARDUINO_ARRAY_INDEX_CURRENT_A //current index
 ) { //when added new element call this func
 ) { //when added new element call this func
     ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_LAST_A = ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A ;
     ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_LAST_A = ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A ;
     ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A = ARDUINO_ARRAY_INDEX_CURRENT_A ;
     ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A = ARDUINO_ARRAY_INDEX_CURRENT_A ;
+    ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A = ARDUINO_ARRAY_INDEX_CURRENT_A + 1 ;
     ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A++ ;
     ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A++ ;
     //ARDUINO_ARRAY_INDEX_LIMIT_A; todo use limits
     //ARDUINO_ARRAY_INDEX_LIMIT_A; todo use limits
                 #if defined(DEBUG) 
                 #if defined(DEBUG)