arkadiusz binder 5 éve
szülő
commit
f9044f7516

+ 2 - 5
SE/stuff/P5_Automation_can-dev-res-working-1930/___SUBMODULES___/testing_pwm_amp/___CONFIG/0x20/config.h

@@ -91,11 +91,8 @@ void p5__config__individual__init(
                P5__TASK___ATTR (P5__TASK__CONFIG_A, P5__TASK__CONFIG__INDEX__CURRENT_A ,P5__TASK__CONFIG__INDEX__CURRENT__EXEC_A ,  P5__TASK__ATTR_A, P5__TASK__ATTR__INDEX__CURRENT_A ,  P5__TASK__ATTR__INDEX__CURRENT__EXEC_A  ,P5__TASK__TYPE__ATTRIBUTE_A , P5__TASK__CONFIG__NAME__ATTRIBUTE__LIMITS__MAX__DELTA_A, P5__TASK__CONFIG__INDEX__CURRENT__EXEC_A , P5__TASK__CONFIG__NAME__ATTRIBUTE__LIMITS__MAX__DELTA_A_V,  P5__TASK__ATTR_ACCTION__SET__INIT_A ) ;
     }
 
+    #include "config__assert.h"
 
-//testing asserts
-        //P5__TASK__CONFIG__NAME__INDEX_T P5__TASK__CONFIG__NAME__INDEX_A; //todo assert  refs
-        //        P5__TASK__TYPE__ASSERT_T P5__TASK__TYPE__ASSERT_A; //
-        //        P5__TASK__TYPE__SEQUENCE__ARRAY__ASSOC__INDEX_T P5__TASK__TYPE__SEQUENCE__ARRAY__ASSOC__INDEX_A ; //REKORD WZAJ REL
     P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A[P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A__CURRENT_A].P5__TASK__CONFIG__NAME__INDEX_A = P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A ;
     P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A[P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A__CURRENT_A].P5__TASK__TYPE__ASSERT_A = P5__TASK__TYPE__ASSERT__EQUALS_REFERENCE__ELEMENT__SUM__SEQUENCE_A ; //just testing
     P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A[P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A__CURRENT_A].P5__TASK__CONFIG__NAME__INDEX__ARRAY_A[3] ;
@@ -111,7 +108,7 @@ void p5__config__individual__init(
            P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A[P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A__CURRENT_A].P5__TASK__CONFIG__NAME__INDEX__ARRAY_A[2].P5__TASK__CONFIG__NAME__INDEX_A  = P5__TASK__CONFIG__NAME__ATTRIBUTE__LATENCY_TASK_EXEC_TIME_A;  //todo przyklad
            P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A[P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A__CURRENT_A].P5__TASK__TYPE__SEQUENCE__ARRAY__ASSOC__INDEX_A = 0 ;
            
- 
+    
 
 //    U8G2_SSD1306_128X32_UNIVISION_F_HW_I2C u8g2; u8g2.setCursor(7,20);u8g2.print("AT5");u8g2.sendBuffer();		
      

+ 0 - 0
SE/stuff/P5_Automation_can-dev-res-working-1930/___SUBMODULES___/testing_pwm_amp/___CONFIG/0x20/config__assert.h


+ 8 - 1
SE/stuff/P5_Automation_can-dev-res-working-1930/___SUBMODULES___/testing_pwm_amp/___P5_LIB/p5__struct.h

@@ -1,5 +1,10 @@
 #include <Arduino.h>
   
+  //TODO REGENERATE XSD FROM THAT
+  //TODO REINDEX ELEMENTS BASED ON CONFIG AND XSLT
+  //TODO REDEFINE ELEMENTS BY XSD - CONTROLLED
+  
+  
   
   
   
@@ -202,7 +207,9 @@ struct P5__TASK__TYPE__SEQUENCE__ARRAY__ASSOC_S {  //aby podlaczyc ze soba struk
       
         const P5__LIMITS_T P5__TASK__CONFIG__NAME__ASSERT__ARRAY__LIMIT = 10;
 
-      static P5__TASK__TYPE__SEQUENCE__ARRAY_T  P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A[P5__TASK__CONFIG__NAME__ASSERT__ARRAY__LIMIT]; //todo func
+
+      typedef P5__TASK__TYPE__SEQUENCE__ARRAY_T P5__TASK__CONFIG__NAME__ASSERT__ARRAY_T;
+      static P5__TASK__CONFIG__NAME__ASSERT__ARRAY_T  P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A[P5__TASK__CONFIG__NAME__ASSERT__ARRAY__LIMIT]; //todo func
       typedef P5__ARRAY__INDEX_T    P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A__CURRENT_T ;
       static P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A__CURRENT_T P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A__CURRENT_A = 2 ;
       typedef P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A__CURRENT_T  P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A__CURRENT__EXEC_T ;

+ 6 - 12
SE/stuff/P5_Automation_can-dev-res-working-1930/___SUBMODULES___/testing_pwm_amp/___P5_LIB/p5__swing.h

@@ -7,24 +7,18 @@
 
 
 bool P5__TASK__SWING(  //todo czy nie inny typ?
-     P5__TASK__CONFIG_T* P5__TASK__CONFIG_A,
-     P5__TASK__CONFIG__INDEX__CURRENT_T &P5__TASK__CONFIG__INDEX__CURRENT_A ,
-     P5__TASK__CONFIG__INDEX__CURRENT__EXEC_T &P5__TASK__CONFIG__INDEX__CURRENT__EXEC_A ,
-     P5__TASK__ATTR_T* P5__TASK__ATTR_A,
-     P5__TASK__ATTR__INDEX__CURRENT_T  &P5__TASK__ATTR__INDEX__CURRENT_A ,
-     P5__TASK__ATTR__INDEX__CURRENT__EXEC_T  &P5__TASK__ATTR__INDEX__CURRENT__EXEC_A ,
-      P5__TASK__CONFIG__NAME__ASSERT__ARRAY_T* P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A,
-      P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A__CURRENT_T &P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A__CURRENT_A, 
-      P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A__CURRENT__EXEC_T &P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A__CURRENT__EXEC_A , 
+     P5__TASK__CONFIG_T* P5__TASK__CONFIG_A, P5__TASK__CONFIG__INDEX__CURRENT_T &P5__TASK__CONFIG__INDEX__CURRENT_A ,P5__TASK__CONFIG__INDEX__CURRENT__EXEC_T &P5__TASK__CONFIG__INDEX__CURRENT__EXEC_A ,
+     P5__TASK__ATTR_T* P5__TASK__ATTR_A,P5__TASK__ATTR__INDEX__CURRENT_T  &P5__TASK__ATTR__INDEX__CURRENT_A ,P5__TASK__ATTR__INDEX__CURRENT__EXEC_T  &P5__TASK__ATTR__INDEX__CURRENT__EXEC_A ,
+      P5__TASK__CONFIG__NAME__ASSERT__ARRAY_T* P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A, P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A__CURRENT_T &P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A__CURRENT_A,  P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A__CURRENT__EXEC_T &P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A__CURRENT__EXEC_A , 
      P5__LATENCY_TASK_EXEC_TIME_T &P5__LATENCY_TASK_EXEC_TIME_A
     ) {
 
             //implemenetacja dyn asserts
              int i;
-             for(i=2;i<=P5__TASK__CONFIG__NAME__ASSERT__ARRAY__LIMIT ; i++) {
-                P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A[i]
+          //   for(i=2;i<=P5__TASK__CONFIG__NAME__ASSERT__ARRAY__LIMIT ; i++) {
+          //      P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A[i]
              
-             }
+            // }
             //read contexts attrs
 
     }

+ 1 - 3
SE/stuff/P5_Automation_can-dev-res-working-1930/___SUBMODULES___/testing_pwm_amp/___P5_LIB/p5__swing__loop.h

@@ -5,8 +5,6 @@ if(P5__TASK___ATTR (P5__TASK__CONFIG_A, P5__TASK__CONFIG__INDEX__CURRENT_A, P5__
         
             P5__TASK__SWING(P5__TASK__CONFIG_A , P5__TASK__CONFIG__INDEX__CURRENT_A , P5__TASK__CONFIG__INDEX__CURRENT__EXEC_A   ,
             P5__TASK__ATTR_A, P5__TASK__ATTR__INDEX__CURRENT_A , P5__TASK__ATTR__INDEX__CURRENT__EXEC_A ,
-            P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A,
-             P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A__CURRENT_A, 
-            P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A__CURRENT__EXEC_A,
+            P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A,   P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A__CURRENT_A, P5__TASK__CONFIG__NAME__ASSERT__ARRAY_A__CURRENT__EXEC_A,
             P5__LATENCY_TASK_EXEC_TIME_A);
 }

+ 1 - 3
SE/stuff/P5_Automation_can-dev/P5_Automation_can-dev.xpr

@@ -26,10 +26,8 @@
         <folder name="marlin">
             <folder path="../../../../../procesy5-dita-templates-druki/Applications/MarlinFirmware/Marlin-2.0.x/Marlin/"/>
         </folder>
-        <folder name="p5etc">
-            <folder path="../"/>
-        </folder>
         <folder path="../../../../Arduino/queue_test/"/>
+        <folder path="../../"/>
         <folder path="../P5_Automation_can-dev-2/"/>
         <folder path="../P5_Automation_can-dev-3/"/>
         <folder path="../P5_Automation_can-dev-res-working-1930/"/>