|
|
@@ -37,54 +37,71 @@ 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[");
|
|
|
+ P5__TASK__ATTR_INT_T P5__TASK__CONFIG__NAME__ATTRIBUTE__LIMITS__CURRENT__DELTA_A_V ;
|
|
|
+ int P5__TASK__CONFIG__NAME__ATTRIBUTE__LIMITS__MAX__DELTA_A_V;
|
|
|
+ P5__TASK__ATTR_INT_T P5__TASK__CONFIG__NAME__ATTRIBUTE__HARDWARE_PIN__NUMBER_A_V ;
|
|
|
+ P5__TASK__CONFIG__NAME__ATTRIBUTE__HARDWARE_PIN__NUMBER_A_V = 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__HARDWARE_PIN__NUMBER_A , P5__TASK__CONFIG__INDEX__CURRENT__EXEC_A , P5__TASK__ATTR_INT__UNDEF_A , P5__TASK__ATTR_ACCTION__REPLY_A ) ;
|
|
|
+
|
|
|
+ P5__LIMITS_T P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_MIN_A = 150;
|
|
|
+ P5__LIMITS_T P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_MAX_A = 200; //TODO ASSERTS
|
|
|
+
|
|
|
+ Serial.print(" PWM@[");Serial.print(P5__TASK__CONFIG__NAME__ATTRIBUTE__HARDWARE_PIN__NUMBER_A_V);Serial.print("][");
|
|
|
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,
|
|
|
- P5__TASK__CONFIG__INDEX__CURRENT_A ,P5__TASK__CONFIG__INDEX__CURRENT__EXEC_A,
|
|
|
- P5__TASK__ATTR_A,
|
|
|
- P5__TASK__ATTR__INDEX__CURRENT_A , //5
|
|
|
- P5__TASK__ATTR__INDEX__CURRENT__EXEC_A ,//6
|
|
|
- P5__TASK__TYPE__ATTRIBUTE_A , //7
|
|
|
- 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__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);
|
|
|
- int P5__TASK___ATTR_R_NEW = P5__TASK___ATTR_R ;
|
|
|
+ P5__TASK__ATTR_INT_T P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V ;
|
|
|
+ P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V = 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 , //5
|
|
|
+ P5__TASK__ATTR__INDEX__CURRENT__EXEC_A ,//6
|
|
|
+ P5__TASK__TYPE__ATTRIBUTE_A , //7
|
|
|
+ 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__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__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V );
|
|
|
+ int P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V_NEW = P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V ;
|
|
|
|
|
|
|
|
|
P5__TASK__ATTR_INT_T P5__TASK__ATTR_INT_A_SWING_R;
|
|
|
- P5__TASK__ATTR_INT_A_SWING_R = P5__TASK___ATTR (
|
|
|
+ P5__TASK__ATTR_INT_A_SWING_R = 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__INDEX__SWING , P5__TASK__CONFIG__INDEX__CURRENT__EXEC_A , P5__TASK__ATTR_INT__UNDEF_A , P5__TASK__ATTR_ACCTION__REPLY_A ) ;
|
|
|
+ Serial.print("] ~V[");
|
|
|
+ Serial.print(P5__TASK__ATTR_INT_A_SWING_R);
|
|
|
+ //Serial.print("] ");
|
|
|
+
|
|
|
+ //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) {
|
|
|
+
|
|
|
+ P5__TASK__CONFIG__NAME__ATTRIBUTE__LIMITS__MAX__DELTA_A_V = 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 , //5
|
|
|
P5__TASK__ATTR__INDEX__CURRENT__EXEC_A ,//6
|
|
|
P5__TASK__TYPE__ATTRIBUTE_A , //7
|
|
|
- P5__TASK__CONFIG__NAME__INDEX__SWING , //8 , //P5__TASK__CONFIG__NAME__INDEX_A, // P5__TASK__TYPE__ATTRIBUTE_A ,
|
|
|
-
|
|
|
+ P5__TASK__CONFIG__NAME__ATTRIBUTE__LIMITS__MAX__DELTA_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__ATTR_ACCTION__REPLY_A // P5__TASK__ATTR_ACCTION__SET__INIT_A//11
|
|
|
) ;
|
|
|
- Serial.print("] ~V[");
|
|
|
- Serial.print(P5__TASK__ATTR_INT_A_SWING_R);
|
|
|
- //Serial.print("] ");
|
|
|
-
|
|
|
- //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 /10 )) > P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_MAX_A ) {
|
|
|
+
|
|
|
+ if(abs(P5__TASK__ATTR_INT_A_SWING_R * P5__LATENCY_TASK_EXEC_TIME_A /10 ) > P5__TASK__CONFIG__NAME__ATTRIBUTE__LIMITS__MAX__DELTA_A_V) {
|
|
|
+ if(P5__TASK__ATTR_INT_A_SWING_R > 0) {
|
|
|
+ P5__TASK__CONFIG__NAME__ATTRIBUTE__LIMITS__CURRENT__DELTA_A_V = P5__TASK__CONFIG__NAME__ATTRIBUTE__LIMITS__MAX__DELTA_A_V ;
|
|
|
+ } else {
|
|
|
+ P5__TASK__CONFIG__NAME__ATTRIBUTE__LIMITS__CURRENT__DELTA_A_V = - P5__TASK__CONFIG__NAME__ATTRIBUTE__LIMITS__MAX__DELTA_A_V ;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ P5__TASK__CONFIG__NAME__ATTRIBUTE__LIMITS__CURRENT__DELTA_A_V = (P5__TASK__ATTR_INT_A_SWING_R * P5__LATENCY_TASK_EXEC_TIME_A /10 ) ;
|
|
|
+ }
|
|
|
+
|
|
|
+ if(( P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V_NEW + P5__TASK__CONFIG__NAME__ATTRIBUTE__LIMITS__CURRENT__DELTA_A_V) > 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(" >-]");
|
|
|
+
|
|
|
+ Serial.print("["); Serial.print(P5__TASK__ATTR_INT_A_SWING_R); Serial.print("MAX >-]");
|
|
|
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 ,
|
|
|
@@ -93,11 +110,13 @@ void P5__TASK__PWM(
|
|
|
( P5__TASK__ATTR_INT_A_SWING_R * - 1 ), //P5__TASK__ATTR_INT_A , // 10 val P5__TASK__ATTR_INT_A
|
|
|
P5__TASK__ATTR_ACCTION__SET_A//11 acction
|
|
|
) ;
|
|
|
- //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 /10 )) < P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_MIN_A ) {
|
|
|
+ //P5__TASK__ATTR_INT_A_SWING_R = P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V ;
|
|
|
+ // P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V_NEW = P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V ;
|
|
|
+ } else if(( P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V_NEW + P5__TASK__CONFIG__NAME__ATTRIBUTE__LIMITS__CURRENT__DELTA_A_V ) < P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_MIN_A ) {
|
|
|
//set -
|
|
|
- Serial.print("[<-]");
|
|
|
+ Serial.print("MIN [<-]");
|
|
|
+ //P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V_NEW = P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_MIN_A ;
|
|
|
+
|
|
|
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 ,
|
|
|
@@ -106,18 +125,18 @@ void P5__TASK__PWM(
|
|
|
( P5__TASK__ATTR_INT_A_SWING_R * - 1 ), //P5__TASK__ATTR_INT_A , // 10 val P5__TASK__ATTR_INT_A
|
|
|
P5__TASK__ATTR_ACCTION__SET_A//11 acction
|
|
|
) ;
|
|
|
- //P5__TASK__ATTR_INT_A_SWING_R = P5__TASK___ATTR_R ;
|
|
|
- // P5__TASK___ATTR_R_NEW = P5__TASK___ATTR_R ;
|
|
|
+ //P5__TASK__ATTR_INT_A_SWING_R = P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V ;
|
|
|
+ // P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V_NEW = P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V ;
|
|
|
} 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 /10 ) + P5__TASK___ATTR_R_NEW) ;
|
|
|
+ Serial.print(" el.Vn["); Serial.print(P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V_NEW );
|
|
|
+ P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V_NEW = round((P5__TASK__CONFIG__NAME__ATTRIBUTE__LIMITS__CURRENT__DELTA_A_V ) + P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V_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("~~Sn"); Serial.print(P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V_NEW);
|
|
|
|
|
|
- Serial.print(" ==n["); Serial.print( P5__TASK___ATTR_R_NEW );Serial.print("] ");
|
|
|
+ Serial.print(" ==n["); Serial.print( P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V_NEW );Serial.print("] ");
|
|
|
|
|
|
}
|
|
|
- //P5__TASK___ATTR_R =
|
|
|
+ //P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V =
|
|
|
P5__TASK___ATTR (
|
|
|
P5__TASK__CONFIG_A,
|
|
|
P5__TASK__CONFIG__INDEX__CURRENT_A ,P5__TASK__CONFIG__INDEX__CURRENT__EXEC_A,
|
|
|
@@ -128,18 +147,18 @@ 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_R_NEW , //P5__TASK___ATTR_R + P5__TASK__ATTR_INT_A_SWING , // 10 P5__TASK__ATTR_INT_A
|
|
|
+ P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V_NEW , //P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V + P5__TASK__ATTR_INT_A_SWING , // 10 P5__TASK__ATTR_INT_A
|
|
|
P5__TASK__ATTR_ACCTION__SET_A//11
|
|
|
) ;
|
|
|
- analogWrite(P5__PWM__PIN__CONF, P5__TASK___ATTR_R_NEW );
|
|
|
+ analogWrite(P5__TASK__CONFIG__NAME__ATTRIBUTE__HARDWARE_PIN__NUMBER_A_V, P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V_NEW );
|
|
|
Serial.print(" ~[");
|
|
|
- Serial.print(P5__TASK___ATTR_R_NEW );
|
|
|
+ Serial.print(P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V_NEW );
|
|
|
Serial.print("] ");
|
|
|
} else {
|
|
|
//not swing
|
|
|
- analogWrite(P5__PWM__PIN__CONF, P5__TASK___ATTR_R);
|
|
|
+ analogWrite(P5__TASK__CONFIG__NAME__ATTRIBUTE__HARDWARE_PIN__NUMBER_A_V, P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V );
|
|
|
Serial.println("");Serial.print("!~[");
|
|
|
- Serial.print(P5__TASK___ATTR_R_NEW);Serial.print("](");Serial.print(P5__TASK__ATTR_INT_A_SWING_R);
|
|
|
+ Serial.print(P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V_NEW);Serial.print("](");Serial.print(P5__TASK__ATTR_INT_A_SWING_R);
|
|
|
Serial.print(") ");
|
|
|
|
|
|
}
|