j/cable-length-cutter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bugs MANUAL mode, Adjustments new VFD

Browse Source 
fix bugs introduced with addition of manual mode:
    - fix stuck in target_reached state
    - fix bug switch to manual mode only in counting possible

new vfd
    - new 750W vfd has 1 speed select pin less -> limit used
      levels to 0-3
This commit is contained in:
jonny_l480 2022-08-20 14:00:51 +02:00
parent e9e1df9ea1
commit 68f97644be
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
main/control.cpp
View File

@ -98,6 +98,7 @@ bool page = false; //store page number currently displayed
int lengthNow = 0; //length measured in mm int lengthNow = 0; //length measured in mm
int lengthTarget = 3000; //target length in mm int lengthTarget = 3000; //target length in mm
int lengthDiff = 0; //length difference int lengthDiff = 0; //length difference
int lengthDiff_abs = 0; //length difference positive
int potiRead = 0; //voltage read from adc int potiRead = 0; //voltage read from adc
uint32_t timestamp_motorStarted = 0; //timestamp winding started uint32_t timestamp_motorStarted = 0; //timestamp winding started
@ -231,6 +232,15 @@ void task_control(void *pvParameter)
buzzer.beep(1, 700, 100); buzzer.beep(1, 700, 100);
} }
//TODO add preset switches //TODO add preset switches
//--- switch to manual motor control (2 buttons + poti) ---
if ( SW_PRESET2.state && (SW_PRESET1.state || SW_PRESET3.state) ) {
//beep when state changed
if (controlState != MANUAL) {
buzzer.beep(3, 100, 60);
}
//change to manual state
changeState(MANUAL);
}
@ -251,15 +261,10 @@ void task_control(void *pvParameter)
//--- start winding to length --- //--- start winding to length ---
if (SW_START.risingEdge) { if (SW_START.risingEdge) {
changeState(WINDING_START); changeState(WINDING_START);
vfd_setSpeedLevel(2); //start at low speed vfd_setSpeedLevel(0); //start at low speed
vfd_setState(true); //start motor vfd_setState(true); //start motor
timestamp_motorStarted = esp_log_timestamp(); //save time started timestamp_motorStarted = esp_log_timestamp(); //save time started
} }
//--- switch to manual motor control (2 buttons + poti) ---
else if ( SW_PRESET2.state && (SW_PRESET1.state || SW_PRESET3.state) ) {
changeState(MANUAL);
buzzer.beep(4, 100, 60);
}
break; break;
case WINDING_START: //wind slow for certain time case WINDING_START: //wind slow for certain time
@ -273,39 +278,35 @@ void task_control(void *pvParameter)
break; break;
case WINDING: //wind at dynamic speed case WINDING: //wind at dynamic speed
lengthDiff = abs(lengthDiff); lengthDiff_abs = abs(lengthDiff);
//adjust speed according to difference //adjust speed according to difference
if (lengthDiff < 10) { if (lengthDiff_abs < 10) {
vfd_setSpeedLevel(1); vfd_setSpeedLevel(0);
//TESTING: SIMULATE LENGTH INCREASE //TESTING: SIMULATE LENGTH INCREASE
//lengthNow += 1; //lengthNow += 1;
} else if (lengthDiff < 50) { } else if (lengthDiff_abs < 100) {
vfd_setSpeedLevel(2); vfd_setSpeedLevel(1);
//TESTING: SIMULATE LENGTH INCREASE //TESTING: SIMULATE LENGTH INCREASE
//lengthNow += 4; //lengthNow += 4;
} else if (lengthDiff < 200) { } else if (lengthDiff_abs < 500) {
vfd_setSpeedLevel(3); vfd_setSpeedLevel(2);
//TESTING: SIMULATE LENGTH INCREASE
//lengthNow += 6;
} else if (lengthDiff < 500) {
vfd_setSpeedLevel(4);
//TESTING: SIMULATE LENGTH INCREASE //TESTING: SIMULATE LENGTH INCREASE
//lengthNow += 50; //lengthNow += 50;
} else if (lengthDiff < 1000) {
vfd_setSpeedLevel(6);
//TESTING: SIMULATE LENGTH INCREASE
//lengthNow += 100;
} else { //more than last step } else { //more than last step
vfd_setSpeedLevel(7); vfd_setSpeedLevel(3);
//TESTING: SIMULATE LENGTH INCREASE //TESTING: SIMULATE LENGTH INCREASE
//lengthNow += 200; //lengthNow += 200;
} }
//TODO add timeout
checkStopCondition(); checkStopCondition();
//see "stop conditions" above that switches to TARGET_REACHED when targed reached //see "stop conditions" above that switches to TARGET_REACHED when targed reached
break; break;
case TARGET_REACHED: case TARGET_REACHED:
//nothing to do here yet //switch to counting state when no longer at or above target length
if ( lengthDiff < 0 ) {
changeState(COUNTING);
}
//see "stop conditions" above that switches to COUNTING when start button released //see "stop conditions" above that switches to COUNTING when start button released
break; break;
@ -317,12 +318,12 @@ void task_control(void *pvParameter)
} }
//P2 + P1 -> turn left //P2 + P1 -> turn left
else if ( SW_PRESET1.state && !SW_PRESET3.state ) { else if ( SW_PRESET1.state && !SW_PRESET3.state ) {
vfd_setSpeedLevel(2); //TODO: use poti input for level vfd_setSpeedLevel(1); //TODO: use poti input for level
vfd_setState(true, REV); vfd_setState(true, REV);
} }
//P2 + P3 -> turn right //P2 + P3 -> turn right
else if ( SW_PRESET2.state && !SW_PRESET1.state ) { else if ( SW_PRESET3.state && !SW_PRESET1.state ) {
vfd_setSpeedLevel(2); //TODO: use poti input for level vfd_setSpeedLevel(1); //TODO: use poti input for level
vfd_setState(true, FWD); vfd_setState(true, FWD);
} }
//no valid switch combination -> turn off motor //no valid switch combination -> turn off motor