|
|
@@ -44,9 +44,10 @@ void P5__TASK__PWM(
|
|
|
|
|
|
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("] ");
|
|
|
+ SPFTL(TASK_PWM);
|
|
|
+ //Serial.print(" PWM@[");
|
|
|
+ SPFT2(ATTRIBUTE_HARDWARE_PIN__NUMBER,P5__TASK__CONFIG__NAME__ATTRIBUTE__HARDWARE_PIN__NUMBER_A_V);
|
|
|
+ SPFT2(ATTRIBUTE_LATENCY_TASK_EXEC_TIME,P5__LATENCY_TASK_EXEC_TIME_A);
|
|
|
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,
|
|
|
@@ -61,14 +62,15 @@ void P5__TASK__PWM(
|
|
|
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 );
|
|
|
+ SPFT2(ATTRIBUTE_STATUS__OUTPUT__LEVEL,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__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);
|
|
|
+ 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__ATTRIBUTE__SWING__FREQUENCY_A , P5__TASK__CONFIG__INDEX__CURRENT__EXEC_A , P5__TASK__ATTR_INT__UNDEF_A , P5__TASK__ATTR_ACCTION__REPLY_A ) ;
|
|
|
+ SPFT2(ATTRIBUTE_SWING__FREQUENCY,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;
|
|
|
@@ -100,12 +102,11 @@ void P5__TASK__PWM(
|
|
|
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("MAX >-]");
|
|
|
+ SPFT2(ATTRIBUTE_SWING__FREQUENCY, "MX[->]");
|
|
|
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__NAME__ATTRIBUTE__SWING__FREQUENCY_A ,
|
|
|
P5__TASK__CONFIG__INDEX__CURRENT__EXEC_A , //9 ref
|
|
|
( 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
|
|
|
@@ -114,13 +115,12 @@ void P5__TASK__PWM(
|
|
|
// 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("MIN [<-]");
|
|
|
+ SPFT2(ATTRIBUTE_SWING__FREQUENCY, "MN[<-]");
|
|
|
//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 ,
|
|
|
- P5__TASK__CONFIG__NAME__INDEX__SWING ,
|
|
|
+ P5__TASK__CONFIG__NAME__ATTRIBUTE__SWING__FREQUENCY_A ,
|
|
|
P5__TASK__CONFIG__INDEX__CURRENT__EXEC_A , //9 ref
|
|
|
( 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
|
|
|
@@ -128,12 +128,11 @@ void P5__TASK__PWM(
|
|
|
//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__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V_NEW );
|
|
|
+ SPFT2(ATTRIBUTE_STATUS__OUTPUT__LEVEL,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__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V_NEW);
|
|
|
-
|
|
|
- Serial.print(" ==n["); Serial.print( P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V_NEW );Serial.print("] ");
|
|
|
+ SPFT2(ATTRIBUTE_SWING__FREQUENCY,P5__TASK__ATTR_INT_A_SWING_R);
|
|
|
+ SPFT2(ATTRIBUTE_STATUS__OUTPUT__LEVEL,P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V_NEW);
|
|
|
+
|
|
|
|
|
|
}
|
|
|
//P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V =
|
|
|
@@ -151,15 +150,12 @@ void P5__TASK__PWM(
|
|
|
P5__TASK__ATTR_ACCTION__SET_A//11
|
|
|
) ;
|
|
|
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__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V_NEW );
|
|
|
- Serial.print("] ");
|
|
|
+ SPFT2(ATTRIBUTE_STATUS__OUTPUT__LEVEL,P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V_NEW );
|
|
|
} else {
|
|
|
//not swing
|
|
|
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__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V_NEW);Serial.print("](");Serial.print(P5__TASK__ATTR_INT_A_SWING_R);
|
|
|
- Serial.print(") ");
|
|
|
+ SPFT2(ATTRIBUTE_STATUS__OUTPUT__LEVEL, P5__TASK__CONFIG__NAME__ATTRIBUTE__STATUS__OUTPUT__LEVEL_A_V);
|
|
|
+ SPFT2(ATTRIBUTE_SWING__FREQUENCY,P5__TASK__ATTR_INT_A_SWING_R);
|
|
|
|
|
|
}
|
|
|
}
|