johannes.payr/pizzabox-teensy
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cleaning up.

Browse source
This commit is contained in:
jpunkt 2022-01-14 22:47:58 +01:00
parent 24bf68cf93
commit 35a723a057
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main.cpp
View file

@ -156,9 +156,9 @@ void zero_motor(Motor &mot1, Motor &mot2, int zero_pin, int end_pin) {
mot1.run(127, false); mot1.run(127, false);
} }
mot1.stop(false); mot1.stop(false);
delay(20); // TODO evaluate delay(200);
mot2.stop(false); mot2.stop(false);
delay(10); delay(100);
mot1.stop(true); mot1.stop(true);
mot2.stop(true); mot2.stop(true);
} else if (digitalRead(end_pin)) { } else if (digitalRead(end_pin)) {
@ -168,9 +168,9 @@ void zero_motor(Motor &mot1, Motor &mot2, int zero_pin, int end_pin) {
mot2.run(55, true); mot2.run(55, true);
} }
mot2.stop(false); mot2.stop(false);
delay(20); delay(200);
mot1.stop(false); mot1.stop(false);
delay(10); delay(100);
mot1.stop(true); mot1.stop(true);
mot2.stop(true); mot2.stop(true);
} }
@ -423,7 +423,7 @@ void serial_rewind() {
ssp.readEot(); ssp.readEot();
Serial.println("Received REWIND"); Serial.println("Received REWIND");
zero_motor(vert_up, vert_down, VERT_END_INNER, VERT_END_OUTER); zero_motor(vert_up, vert_down, VERT_END_INNER, VERT_END_OUTER);
// TODO enable zero_motor(hor_left, hor_right, HOR_END_OUTER, HOR_END_INTER); zero_motor(horz_left, horz_right, HORZ_END_OUTER, HORZ_END_INNER);
serial_received(); serial_received();
} }
@ -469,7 +469,7 @@ void serial_userinteract() {
while ((timeout == 0) || (t < timeout)) while ((timeout == 0) || (t < timeout))
{ {
blink(leds, UI_ON_MS, UI_OFF_MS); blink(leds, UI_ON_MS, UI_OFF_MS);
// TODO use bitmask
if (enabled_btns[0]) btn_blue.update(); if (enabled_btns[0]) btn_blue.update();
if (enabled_btns[1]) btn_red.update(); if (enabled_btns[1]) btn_red.update();
if (enabled_btns[2]) btn_yellow.update(); if (enabled_btns[2]) btn_yellow.update();