a

SE/stuff/P5_Automation_can-dev-res-working-1930/P5_Automation_can.xsd

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+    vc:minVersion="1.1" xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
+    targetNamespace="http://procesy5.pl/stuff/P5_Automation_can/P5_Automation_can.xsd"
+    xmlns:p5can="http://procesy5.pl/stuff/P5_Automation_can/P5_Automation_can.xsd"> </xs:schema>

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

@@ -339,6 +339,8 @@ void DISPLAY__print_menu(DISPLAY_T* DISPLAY_A ,
         int minXselector_context ; 
         int menuYoffset = DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_SIZE_Y_CHARS_MIN_A ;
         
+        int next_tab_pos;
+       // int tab_pos_size = DISPLAY_char24_TAB_SIZE;
         
         if(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_SELECTOR_STATUS_A | DISPLAY_MENU_SELECTOR_MENU_FLAG)  {
             minXselector_context = 1 ;
@@ -351,11 +353,9 @@ void DISPLAY__print_menu(DISPLAY_T* DISPLAY_A ,
         if(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_SIZE_Y_CHARS_MAX_A == 0) maxY = DISPLAY_PHYSICAL_CHAR_A.DISPLAY_PHYSICAL_Y_PX_A ;
         else maxY = DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_SIZE_Y_CHARS_MAX_A * DISPLAY_PHYSICAL_CHAR_A.DISPLAY_textsize_y_A ;
         
-                // DISPLAY_DEV.setCursor((DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_SIZE_X_CHARS_MIN_A * DISPLAY_PHYSICAL_CHAR_A.DISPLAY_textsize_x_A),
-                  //         (DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_SIZE_Y_CHARS_MIN_A * DISPLAY_PHYSICAL_CHAR_A.DISPLAY_textsize_y_A)); //[ARDUINO_ATTR_ARRAY_S_INDEX]
-           
-                    
-                        /* Serial.print("[#314 - XMIN["); Serial.print(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_SIZE_X_CHARS_MIN_A * DISPLAY_PHYSICAL_CHAR_A.DISPLAY_textsize_x_A); Serial.print("] "); 
+                        // DISPLAY_DEV.setCursor((DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_SIZE_X_CHARS_MIN_A * DISPLAY_PHYSICAL_CHAR_A.DISPLAY_textsize_x_A),
+                         //(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_SIZE_Y_CHARS_MIN_A * DISPLAY_PHYSICAL_CHAR_A.DISPLAY_textsize_y_A)); //[ARDUINO_ATTR_ARRAY_S_INDEX]
+                         /* Serial.print("[#314 - XMIN["); Serial.print(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_SIZE_X_CHARS_MIN_A * DISPLAY_PHYSICAL_CHAR_A.DISPLAY_textsize_x_A); Serial.print("] "); 
                          Serial.print(" YMIN["); Serial.print(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_SIZE_Y_CHARS_MIN_A * DISPLAY_PHYSICAL_CHAR_A.DISPLAY_textsize_y_A); Serial.print("] ");
                          Serial.print(" XMAX["); Serial.print(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_SIZE_X_CHARS_MAX_A * DISPLAY_PHYSICAL_CHAR_A.DISPLAY_textsize_x_A); Serial.print("] ");
                          Serial.print(" YMAX["); Serial.print(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_SIZE_Y_CHARS_MAX_A * DISPLAY_PHYSICAL_CHAR_A.DISPLAY_textsize_y_A); Serial.print("] ");
@@ -365,12 +365,8 @@ void DISPLAY__print_menu(DISPLAY_T* DISPLAY_A ,
                          Serial.print(" maxY["); Serial.print(maxY); Serial.print("] ");
                          Serial.print(" color["); Serial.print(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_COLOR_A); Serial.print("] ");
                          Serial.print(" setMX["); Serial.print(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_SIZE_X_CHARS_MAX_A); Serial.print("] "); 
-                          Serial.println(" ");*/
+                         Serial.println(" ");*/
                       
-                
-                
-           
-                        
                     #if defined(DISPLAY__print_menu_DELAY)
                     Serial.print("D");
                     delay(DISPLAY__print_menu_DELAY);
@@ -465,8 +461,16 @@ void DISPLAY__print_menu(DISPLAY_T* DISPLAY_A ,
                                                   //DISPLAY_DEV.print(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].DISPLAY_char_A);
                                                   //DISPLAY_DEV.print("test 123");
                                                   //DISPLAY_DEV.print("test 123");
+                                                  next_tab_pos = 1 ; //DISPLAY_PHYSICAL_CHAR_A.DISPLAY_textsize_x_A * 6
                                                   for (int iA = 0; iA < 24; iA++) {
-                                                          DISPLAY_DEV.print(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].DISPLAY_char24_A[iA]);
+                                                          if(iA % DISPLAY_char24_TAB_SIZE == 0) next_tab_pos++ ;
+                                                          
+                                                          if(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].DISPLAY_char24_A[iA] == TAB) {
+                                                          //move cursor to optimal tab pos
+                                                          DISPLAY_DEV.setCursor( (next_tab_pos * DISPLAY_char24_TAB_SIZE * DISPLAY_PHYSICAL_CHAR_A.DISPLAY_textsize_x_A ) , maxYi );
+                                                          } else  {
+                                                            DISPLAY_DEV.print(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[DISPLAY_MENU_ITEM_INDEX_A].DISPLAY_MENU_ITEM_A[i].DISPLAY_char24_A[iA]);
+                                                          }
                                                   }
                                                   
                                                           

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

@@ -134,7 +134,7 @@ struct DISPLAY_MENU_ITEM_S { //elementy menu
      //czy nie jest do usuniecia itp ...
      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_string_T DISPLAY_string_A;
+//     DISPLAY_string_T DISPLAY_string_A;
      DISPLAY_COLOR_T DISPLAY_COLOR_A ;
      DISPLAY_MENU_SELECTOR_STATUS_T DISPLAY_MENU_SELECTOR_STATUS_A ; //opcja kontekstu selektora
      time_seq_id_T time_seq_id_A ;  //to controll latency
@@ -243,5 +243,6 @@ typedef byte DISPLAY__print_loop_ACTION_T ;
 const DISPLAY__print_loop_ACTION_T DISPLAY__print_loop_ACTION_ADD = B00000001 ;
 const DISPLAY__print_loop_ACTION_T DISPLAY__print_loop_ACTION_POP = B00000010 ;
 
+const DISPLAY_CURSOR_T DISPLAY_char24_TAB_SIZE =    3 ;
     
     

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

@@ -97,11 +97,8 @@
                #if defined(DISABLE_TASK_TYPE_T_Broadcast_state_LOW)
                   #else
                    _Slave_Ports_queue__add(
-                   Slave_Ports_Status_QUEUE_A,
-                     
-                     
-               Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
-                     TASK_TYPE_T_Broadcast_state_LOW______  ,TASK_PORT_ASSOC_EMPTY ,time_seq_id, time_seq_id + 50000  , ARDUINO_ARRAY_INDEX_NOT_SET ) ;
+                   Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
+                     TASK_TYPE_T_Broadcast_state_LOW______  ,TASK_PORT_ASSOC_EMPTY ,time_seq_id, time_seq_id + 30000  , ARDUINO_ARRAY_INDEX_NOT_SET ) ;
                   #endif
                      
                } else {
@@ -144,9 +141,14 @@
    {
                  String   title ;
                  String message ;
-                 title = "Ports of 0x" ; 
-                //title.concat(Active_ControllerID_HEX);          
-                   title.concat(" ");
+                 title = "Ports: " ;
+                 title.concat(Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A);
+                 
+                  
+                 title.concat(TAB);
+                 title.concat("Device: 0x") ;
+                title.concat(Active_ControllerID_HEX);          
+                   title.concat(TAB);
                              
                     int i;
                       
@@ -158,9 +160,9 @@
                              
 
                    
-        DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[1].DISPLAY_CURSOR_X_CHARS_A = 0 ;
+          DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[1].DISPLAY_CURSOR_X_CHARS_A = 0 ;
           DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[1].DISPLAY_CURSOR_Y_CHARS_A = 0 ;
-           DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[1].DISPLAY_string_A = title ;
+          //DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[1].DISPLAY_string_A = title ;
           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 ;
           title.toCharArray(DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[1].DISPLAY_char24_A, title.length());
@@ -178,15 +180,10 @@
              if(Slave_Ports_Status_A[i].Port_ID > 0 ) {
             
                    
-                  
-                    
-                   
-                   
-                       
-                     ///// message.concat(i);
+                      message.concat(i);
                       message.concat(".");
                       message.concat(Slave_Ports_Status_A[i].Port_ID )  ; 
-                      message.concat(" ");
+                      message.concat(TAB);
                       
                        if(Slave_Ports_Status_A[i].PortTypes & PortTypes_SERVO ) {
                             message.concat("S");
@@ -195,25 +192,27 @@
                             message.concat("3");
                        }
                       
+                       message.concat(TAB);
+                       
                          if(Slave_Ports_Status_A[i].IS_gone_A == IS_gone_TRUE) {
                              message.concat(" [---] ");
                          } else {
-                              message.concat(" ");//E:
-                      
-                              message.concat(" ");// B:
+                             
+                             
                                
                                    message.concat(Slave_Ports_Status_A[i].Exp_state_ttl/10 )  ;
                       
-                                              message.concat(" ");// B:
+                                              message.concat(TAB);// B:
                                                message.concat(Slave_Ports_Status_A[i].Broadcast_state/10 )  ;
                                            if(Slave_Ports_Status_A[i].IS_Local_A == IS_Local_TRUE) {
-                                               message.concat(" L");// B:
+                                               message.concat("L");// B:
                                           } else if(Slave_Ports_Status_A[i].IS_Local_A == IS_Local_FALSE) {
-                                               message.concat(" R");// B:
+                                               message.concat("R");// B:
                                           } 
+                                            message.concat(TAB);
                                         if(Slave_Ports_Status_A[i].Exp_state & Exp_state_ON_USE_LEVEL ) {
-                                         message.concat(" ["); 
-                                         //message.concat(Slave_Ports_Status_A[i].Exp_state_level_A);
+                                         message.concat("["); 
+                                         message.concat(Slave_Ports_Status_A[i].Exp_state_level_A);
                                           message.concat("] ");
                                            /*if(Slave_Ports_Status_A[i].Exp_state_level_A < 10 ) message2.concat(" [___] ");//E:
                                            else if(Slave_Ports_Status_A[i].Exp_state_level_A < 100 )  message2.concat("  [#___] ");//E:
@@ -223,28 +222,18 @@
                                            */
                                          }
                                          
+                                         message.concat(TAB);
                                          
                                        if(Slave_Ports_Status_A[i].Exp_state & Exp_state_SET_REQ_SEND ) {
                                         message.concat(">*");//E:
                                        } else if(Slave_Ports_Status_A[i].Exp_state & Exp_state_SET ) {
-                                        message.concat("*");//E:
-                                         
-                                          } else  if (!( ( Slave_Ports_Status_A[i].Exp_state & Exp_state_SET ) ^ Exp_state_SET ))  {
+                                        message.concat("*");//E:  
+                                       } else  if (!( ( Slave_Ports_Status_A[i].Exp_state & Exp_state_SET ) ^ Exp_state_SET ))  {
                                           message.concat(" ** ");//E:
-                                          } else {
+                                       } else {
                                            message.concat(" ?");//E: 
-                                 
-                                 
-                                 
-                                      
-                                 
-                                 
-                                 }
-                               
-                                 
-                          
-                 
-                        
+                                       }
+                           
              // String message = "P ";  message.concat(Slave_Ports_Status_A[i].Port_ID)  ;  message.concat(" ");
              
                 if(i >= (ARDUINO_ARRAY_INDEX_LIMIT_DISPLAY_MENU_ITEM_A - 1)) {
@@ -257,9 +246,9 @@
              
                 DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i+1].DISPLAY_CURSOR_X_CHARS_A =  0 ;
                 DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i+1].DISPLAY_CURSOR_Y_CHARS_A = i ;
-                DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i+1].DISPLAY_string_A = message ;
-                 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_string_A = message ;
+                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].ARDUINO_ARRAY_INDEX_A = i  ;
                                 
                  message.toCharArray( DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i+1].DISPLAY_char24_A, message.length() );

SE/stuff/P5_Automation_can-dev-res-working-1930/___main/__main_struct.h

@@ -23,7 +23,7 @@ The example above defines two variables with in the same storage class.
 
 */
 
-
+//http://procesy5.pl/stuff/P5_Automation_can/P5_Automation_can.xsd
 //GLOBAL TYPES
 typedef int GARBAGE_TO_REMOVE_ASSOC_T ; //Old not usable pointer to remove
 const GARBAGE_TO_REMOVE_ASSOC_T GARBAGE_TO_REMOVE_ASSOC_EMPTY = 0 ;
@@ -255,6 +255,10 @@ const ARDUINO_ARRAY_INDEX_T ARDUINO_ATTR_ARRAY_S_INDEX = ARDUINO_ARRAY_INDEX_FIR
 
 
 
+typedef char ARDUINO_CHAR_T;
+
+const ARDUINO_CHAR_T TAB =  "|" ;
+
 
 #define ArrayElementSize(x) (sizeof()/sizeof(x[0]))
 #define         ELEMENTS(x) (sizeof(x) / sizeof(x[0]))
@@ -290,4 +294,4 @@ class MyObject{
 
 MyObject anObject;  //create an instance of MyObject 
   
-  */
+  */

SE/stuff/P5_Automation_can-dev/P5_Automation_can-dev.xpr

@@ -7,13 +7,15 @@
     <projectTree name="P5_Automation_can-dev.xpr">
         <folder name="Arduino">
             <folder path="../../../../Arduino/"/>
-            <folder path="../../../../Arduino/libraries/TFT_ILI9163C/"/>
         </folder>
         <folder path="../../../../Arduino/queue_test/"/>
         <folder path="../P5_Automation_can-dev-2/"/>
         <folder path="../P5_Automation_can-dev-3/"/>
+        <folder path="../P5_Automation_can-dev-res-working-1930/"/>
+        <folder path="../P5_Automation_can-dev-res-zjeb-059/"/>
         <folder path="../P5_Automation_can-dev-res/"/>
         <folder path="."/>
         <folder path="../P5_Automation_can-single/"/>
+        <folder path="../../../../../procesy5-dita-templates-druki/Imaginaerum/"/>
     </projectTree>
 </project>