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

Change/Add sw pulldown resistors, Fix MANUAL mode

Browse Source 
Analog In only pins have no internal pullup resistors.
thus two preset switches need pulldown resistors on pcb to be soldered
and switch to 3v instead of GND
- changed in connection plan
- changed switch config in config.cpp (no pullup, inverted)

Fix manual mode:
previously there was a bugged change loop when pressing all 3 buttons
- made mode switch more clear
This commit is contained in:
jonny_ji7 2022-08-20 08:51:52 +02:00 committed by jonny_l480
parent dddd54b03a
commit e9e1df9ea1
4 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
connection-plan.drawio
View File

File diff suppressed because one or more lines are too long

BIN
connection-plan.drawio.pdf
View File

Binary file not shown.

14
main/config.cpp
View File

@ -2,13 +2,13 @@
//--- inputs ---
//create objects for switches at bottom screw temerinals
gpio_evaluatedSwitch SW_START(GPIO_SW_START, true, false); //pullup true, not inverted (switch to GND, pullup on receiver pcb)
gpio_evaluatedSwitch SW_RESET(GPIO_SW_RESET, true, false); //pullup true, not inverted (switch to GND, pullup on receiver pcb)
gpio_evaluatedSwitch SW_SET(GPIO_SW_SET, true, false); //pullup true, not inverted (switch to GND, pullup on receiver pcb)
gpio_evaluatedSwitch SW_PRESET1(GPIO_SW_PRESET1, true, false); //pullup true, not inverted (switch to GND, pullup on receiver pcb)
gpio_evaluatedSwitch SW_PRESET2(GPIO_SW_PRESET2, true, false); //pullup true, not inverted (switch to GND, pullup on receiver pcb)
gpio_evaluatedSwitch SW_PRESET3(GPIO_SW_PRESET3, true, false); //pullup true, not inverted (switch to GND, pullup on receiver pcb)
//create and configure objects for evaluated switches
gpio_evaluatedSwitch SW_START(GPIO_SW_START, true, false); //pullup true, not inverted (switch to GND, internal pullup used)
gpio_evaluatedSwitch SW_RESET(GPIO_SW_RESET, true, false); //pullup true, not inverted (switch to GND, internal pullup used)
gpio_evaluatedSwitch SW_SET(GPIO_SW_SET, true, false); //pullup true, not inverted (switch to GND, internal pullup used)
gpio_evaluatedSwitch SW_PRESET1(GPIO_SW_PRESET1, true, false); //pullup true, not inverted (switch to GND, internal pullup used)
gpio_evaluatedSwitch SW_PRESET2(GPIO_SW_PRESET2, false, true); //pullup false, INVERTED (switch to 3V3, pulldown on pcb soldered)
gpio_evaluatedSwitch SW_PRESET3(GPIO_SW_PRESET3, false, true); //pullup false, INVERTED (switch to 3V3, pulldown on pcb soldered)
//create buzzer object with gap between queued events of 100ms

18
main/control.cpp
View File

@ -309,21 +309,25 @@ void task_control(void *pvParameter)
//see "stop conditions" above that switches to COUNTING when start button released
break;
case MANUAL:
case MANUAL: //manually control motor via preset buttons + poti
//exit manual mode if preset2 released
if ( SW_PRESET2.state == false ) {
changeState(COUNTING);
buzzer.beep(1, 1000, 100);
}
//P2 + P1 -> turn left
if ( SW_PRESET2.state && SW_PRESET1.state && !SW_PRESET3.state ) {
else if ( SW_PRESET1.state && !SW_PRESET3.state ) {
vfd_setSpeedLevel(2); //TODO: use poti input for level
vfd_setState(true, REV);
}
//P2 + P3 -> turn right
else if ( SW_PRESET2.state && SW_PRESET2.state && !SW_PRESET1.state ) {
else if ( SW_PRESET2.state && !SW_PRESET1.state ) {
vfd_setSpeedLevel(2); //TODO: use poti input for level
vfd_setState(true, FWD);
}
else { //no switch combination matches anymore
//no valid switch combination -> turn off motor
else {
vfd_setState(false);
changeState(COUNTING);
buzzer.beep(1, 1000, 100);
}
}
@ -345,6 +349,8 @@ void task_control(void *pvParameter)
// 1234 5678
//TODO: blink disp2 when set button pressed
//TODO: blink disp2 when preset button pressed (exept manual mode)
//TODO: write "MAN CTL" to disp2 when in manual mode
//--- write to display ---
//max7219_clear(&display); //results in flickering display if same value anyways