arkadiusz binder 5 anos atrás
pai
commit
da1ece1c2c

+ 10 - 5
SE/stuff/P5_Automation_can-dev-res-working-1930/___SUBMODULES___/testing_pwm_amp/___P5_LIB/p5__pwm.h

@@ -37,7 +37,12 @@ void P5__TASK__PWM(
       //  P5__TASK__TYPE__ASSOC_T P5__TASK__TYPE__ASSOC_A
     ) {
        // P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A
+       
+       P5__LIMITS_T P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_MIN_A = 125;
+        P5__LIMITS_T P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_MAX_A = 255; //TODO ASSERTS
+
          Serial.print(" PWM[");
+         Serial.print(" *£[");Serial.print(P5__LATENCY_TASK_EXEC_TIME_A);  Serial.print("] ");
         int P5__TASK___ATTR_R ;
         P5__TASK___ATTR_R = P5__TASK___ATTR (
                 P5__TASK__CONFIG_A,
@@ -49,7 +54,7 @@ void P5__TASK__PWM(
                      P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A , //8 , //P5__TASK__CONFIG__NAME__INDEX_A,  // P5__TASK__TYPE__ATTRIBUTE_A ,
 
                      P5__TASK__CONFIG__INDEX__CURRENT__EXEC_A ,//9.5P5__TASK__TYPE__ASSOC_A// 
-                     P5__TASK__ATTR_INT__UNDEF_A , // 10 P5__TASK__ATTR_INT_A 
+                     P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_MIN_A  , // 10 P5__TASK__ATTR_INT_A 
                      P5__TASK__ATTR_ACCTION__SET__INIT_A//11
                 ) ;
                   Serial.print(" V[");  Serial.print(P5__TASK___ATTR_R);  
@@ -76,7 +81,7 @@ void P5__TASK__PWM(
             
             //P5__TASK__ATTR_INT_A_SWING_R = P5__TASK__ATTR_INT_A_SWING_R * P5__LATENCY_TASK_EXEC_TIME_A;
             if(P5__TASK__ATTR_INT_A_SWING_R != 0) {
-                if(( P5__TASK___ATTR_R_NEW + (P5__TASK__ATTR_INT_A_SWING_R *  P5__LATENCY_TASK_EXEC_TIME_A  )) > 255) {
+                if(( P5__TASK___ATTR_R_NEW + (P5__TASK__ATTR_INT_A_SWING_R *  P5__LATENCY_TASK_EXEC_TIME_A /10  )) > P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_MAX_A ) {
                     //P5__TASK__ATTR_INT_A_SWING_R = 1;
                     //set -
                      Serial.print("["); Serial.print(P5__TASK__ATTR_INT_A_SWING_R); Serial.print(" >-]");
@@ -90,7 +95,7 @@ void P5__TASK__PWM(
                       ) ;
                         //P5__TASK__ATTR_INT_A_SWING_R = P5__TASK___ATTR_R ;
                        //  P5__TASK___ATTR_R_NEW = P5__TASK___ATTR_R ;
-                } else if(( P5__TASK___ATTR_R_NEW + (P5__TASK__ATTR_INT_A_SWING_R *  P5__LATENCY_TASK_EXEC_TIME_A)) < 1) {
+                } else if(( P5__TASK___ATTR_R_NEW + (P5__TASK__ATTR_INT_A_SWING_R *  P5__LATENCY_TASK_EXEC_TIME_A /10 )) < P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_MIN_A ) {
                    //set -
                     Serial.print("[<-]");
                     P5__TASK___ATTR (
@@ -105,10 +110,10 @@ void P5__TASK__PWM(
                       // P5__TASK___ATTR_R_NEW = P5__TASK___ATTR_R ;
                 }  else {
                     Serial.print("el.Vn[");  Serial.print(P5__TASK___ATTR_R_NEW ); 
-                       P5__TASK___ATTR_R_NEW = round((P5__TASK__ATTR_INT_A_SWING_R  *  P5__LATENCY_TASK_EXEC_TIME_A ) + P5__TASK___ATTR_R_NEW) ;
+                       P5__TASK___ATTR_R_NEW = round((P5__TASK__ATTR_INT_A_SWING_R  *  P5__LATENCY_TASK_EXEC_TIME_A /10 ) + P5__TASK___ATTR_R_NEW) ;
                       Serial.print("] ~~S[");   Serial.print(P5__TASK__ATTR_INT_A_SWING_R); 
                        Serial.print("~~Sn"); Serial.print(P5__TASK___ATTR_R_NEW);  
-                         Serial.print(" *£[");Serial.print(P5__LATENCY_TASK_EXEC_TIME_A);  
+                          
                       Serial.print("  ==n["); Serial.print( P5__TASK___ATTR_R_NEW );Serial.print("] "); 
 
                 } 

+ 2 - 13
SE/stuff/P5_Automation_can-dev-res-working-1930/___SUBMODULES___/testing_pwm_amp/___P5_LIB/p5__task__loop.h

@@ -31,17 +31,6 @@
     P5__TASK__CONFIG__INDEX__CURRENT__EXEC_A ++ ;
     if( P5__TASK__CONFIG__INDEX__CURRENT__EXEC_A > P5__TASK__CONFIG__LIMIT) {
         P5__TASK__CONFIG__INDEX__CURRENT__EXEC_A = 2;
-            
-        P5__LATENCY_TASK_EXEC_TIME_A = round( P5__LATENCY_TASK_EXEC_TICK_A * P5__LATENCY_TASK_EXEC_TICKS_A/1) ;
-            if(P5__LATENCY_TASK_EXEC_DIFF_TICKS_A > 0)
-                P5__LATENCY_TASK_EXEC_DIFF_RESULT_A += abs(P5__LATENCY_TASK_EXEC_TIME_A - P5__LATENCY_TASK_EXEC_DIFF_TICKS_A );
-                P5__LATENCY_TASK_EXEC_DIFF_COUNT_A = P5__LATENCY_TASK_EXEC_TICKS_A ;
-                P5__LATENCY_TASK_EXEC_DIFF_TICKS_A = P5__LATENCY_TASK_EXEC_TIME_A ;
-            
-        
-          Serial.println();	
-          Serial.print(" NX[£"); Serial.print(P5__LATENCY_TASK_EXEC_TIME_A);Serial.print("]...[");	 Serial.print( P5__LATENCY_TASK_EXEC_TICKS_A);Serial.print("]D[");
-            Serial.print(P5__LATENCY_TASK_EXEC_DIFF_RESULT_A);
-            Serial.print("] ");                P5__LATENCY_TASK_EXEC_TICKS_A = 1 ;
-
+          Serial.print("NX[");   
+     
     }

+ 4 - 3
SE/stuff/P5_Automation_can-dev-res-working-1930/___SUBMODULES___/testing_pwm_amp/testing_pwm_amp.ino

@@ -123,7 +123,7 @@ void loop(void) {
   // delay(100);
    if(P5__LATENCY_TASK_EXEC_TIME_TIMESTAMP_A < millis() ) {
         P5__LATENCY_TASK_EXEC_TIME_TIMESTAMP_A = millis() +  P5__LATENCY_TASK_EXEC_TICK_A ;
-            P5__LATENCY_TASK_EXEC_TIME_A = round( P5__LATENCY_TASK_EXEC_TICK_A * P5__LATENCY_TASK_EXEC_TICKS_A/P5__LATENCY_TASK_EXEC_TICK_A ) ;
+            P5__LATENCY_TASK_EXEC_TIME_A =  2000 /  P5__LATENCY_TASK_EXEC_TICKS_A  ;///  P5__LATENCY_TASK_EXEC_TICK_A
             if(P5__LATENCY_TASK_EXEC_DIFF_TICKS_A > 0)
                 P5__LATENCY_TASK_EXEC_DIFF_RESULT_A += abs(P5__LATENCY_TASK_EXEC_TIME_A - P5__LATENCY_TASK_EXEC_DIFF_TICKS_A );
                 P5__LATENCY_TASK_EXEC_DIFF_COUNT_A = P5__LATENCY_TASK_EXEC_TICKS_A ;
@@ -131,9 +131,10 @@ void loop(void) {
             
         
           Serial.println();	
-          Serial.print(" NX[£"); Serial.print(P5__LATENCY_TASK_EXEC_TIME_A);Serial.print("]...[");	 Serial.print( P5__LATENCY_TASK_EXEC_TICKS_A);Serial.print("]D[");
+          Serial.print("  £"); Serial.print(P5__LATENCY_TASK_EXEC_TIME_A);Serial.print("]...[");	 Serial.print( P5__LATENCY_TASK_EXEC_TICKS_A);Serial.print("]D[");
             Serial.print(P5__LATENCY_TASK_EXEC_DIFF_RESULT_A);
-            Serial.print("] ");                P5__LATENCY_TASK_EXEC_TICKS_A = 1 ;
+            Serial.print("] ");             
+              P5__LATENCY_TASK_EXEC_TICKS_A = 1 ;
 
    } else   P5__LATENCY_TASK_EXEC_TICKS_A ++ ;