10000 Seems to work. Breaks abort function? · WesleyJ-128/FLL_Python_Codebase@fd525bb · GitHub
[go: up one dir, main page]
Skip to content

Commit fd525bb

Browse files
WesleyJ-128WesleyJ-128
committed
Seems to work. Breaks abort function?
1 parent 26b27a9 commit fd525bb

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

‎FLLMaster/Main.py

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
#!/usr/bin/env python3
22
from MenuLib import init, initthread, runCurrentMission
33
from time import sleep
4+
from sys import stderr
45
loopIndex = 0
56

67
init('robot.cfg')
78
initthread()
89
from MenuLib import *
910
calibrate()
1011
robot.reflectCal()
12+
print("Finished Init", file=stderr)
1113

1214
def left():
13-
robot.btn.wait_for_released('left, right, up, down, enter')
1415
if not mission.is_alive():
1516
minusCount()
1617
display()
@@ -19,7 +20,6 @@ def left():
1920
minusCount()
2021
display()
2122
def right():
22-
robot.btn.wait_for_released('left, right, up, down, enter')
2323
if not mission.is_alive():
2424
addCount()
2525
display()
@@ -28,23 +28,20 @@ def right():
2828
minusCount()
2929
display()
3030
def down():
31-
robot.btn.wait_for_released('left, right, up, down, enter')
3231
if not mission.is_alive():
3332
calibrate()
3433
else:
3534
abort()
3635
minusCount()
3736
display()
3837
def up():
39-
robot.btn.wait_for_released('left, right, up, down, enter')
4038
if not mission.is_alive():
4139
robot.reflectCal()
4240
8000 else:
4341
abort()
4442
minusCount()
4543
display()
4644
def enter():
47-
robot.btn.wait_for_released('left, right, up, down, enter')
4845
if not mission.is_alive():
4946
run()
5047
addCount()
@@ -54,16 +51,22 @@ def enter():
5451
minusCount()
5552
display()
5653

54+
print("Functions Defined", file=stderr)
55+
5756
buttonMap = {
58-
'left': left(),
59-
'right': right(),
60-
'enter': enter(),
61-
'up': up(),
62-
'down': down()
57+
'left': left,
58+
'right': right,
59+
'enter': enter,
60+
'up': up,
61+
'down': down
6362
}
6463

64+
print("Map Defined", file=stderr)
65+
6566
while True:
66-
buttonMap[robot.btn.buttons_pressed]()
67+
buttonlist = robot.btn.buttons_pressed
68+
if buttonlist:
69+
buttonMap[buttonlist[0]]()
70+
loopIndex = (loopIndex + 1) % 100
6771
checkDrift()
68-
displaySensor()
69-
loopIndex = (loopIndex + 1) % 100
72+
displaySensor()

0 commit comments

Comments
 (0)
0