Skip to content
Snippets Groups Projects
Commit e34e57c5 authored by Václav Jelínek's avatar Václav Jelínek
Browse files

Correct EV3 menu programs

parent 8edde21e
No related branches found
No related tags found
1 merge request!12Major update of menu visuals and example programs
Pipeline #108037 passed
......@@ -50,21 +50,21 @@ def ev3_color_run(robot, chosen_sensor_port):
color = robot.sensors.light[chosen_sensor_port].color()
robot.display.text("C: {}".format(color), 0, 18, 1)
if mode == 3:
r, g, b, off = robot.sensors.light[chosen_sensor_port].rgb()
r, g, b = robot.sensors.light[chosen_sensor_port].rgb()
robot.display.text("R: {}".format(r), 0, 18, 1)
robot.display.text("G: {}".format(g), 0, 26, 1)
robot.display.text("B: {}".format(b), 0, 34, 1)
robot.display.text("G: {}".format(g), 0, 28, 1)
robot.display.text("B: {}".format(b), 0, 38, 1)
if mode == 4:
r, g, b, off = robot.sensors.light[chosen_sensor_port].rgb_raw()
robot.display.text("R: {}".format(r), 0, 18, 1)
robot.display.text("G: {}".format(g), 0, 26, 1)
robot.display.text("B: {}".format(b), 0, 34, 1)
robot.display.text("Off: {}".format(off), 0, 42, 1)
robot.display.text("G: {}".format(g), 0, 28, 1)
robot.display.text("B: {}".format(b), 0, 38, 1)
robot.display.text("Off: {}".format(off), 0, 48, 1)
if mode == 5:
ref, off = robot.sensors.light[chosen_sensor_port].reflection_raw()
ref = robot.sensors.light[chosen_sensor_port].reflection_raw()
robot.display.text("R: {}".format(ref), 0, 18, 1)
robot.display.text("Off: {}".format(off), 0, 26, 1)
except:
except Exception as e:
print(e)
print(f"EV3 Color S{chosen_sensor_port+1} sensor not connected")
display_sensor_not_connected(robot)
return
......
......@@ -13,7 +13,7 @@ N_MODES = len(mode_str)
def ev3_gyro_run(robot, chosen_sensor_port):
robot.init_sensor(sensor_type=Sensor.EV3_GYRO, port=chosen_sensor_port)
robot.display.fill(0)
robot.display.centered_text(f"EV3 Gyro S{chosen_sensor_port+1}", 0, 1)
robot.display.centered_text("Connecting...", 16, 1)
......@@ -30,6 +30,8 @@ def ev3_gyro_run(robot, chosen_sensor_port):
display_incorrect_sensor(robot)
return
mode = 0
debounce = False
while True:
robot.display.fill(0)
robot.display.centered_text(f"EV3 Gyro S{chosen_sensor_port+1}", 0, 1)
......@@ -37,17 +39,17 @@ def ev3_gyro_run(robot, chosen_sensor_port):
try:
if mode == 0:
angle = robot.sensors.gyro[chosen_sensor_port].angle()
robot.display.text(f"Angle: {angle}°", 0, 16, 1)
robot.display.text(f"Angle: {angle}°", 0, 18, 1)
elif mode == 1:
angle, speed = robot.sensors.gyro[chosen_sensor_port].angle_and_speed()
robot.display.text(f"Angle: {angle}°", 0, 16, 1)
robot.display.text(f"Speed: {speed}", 0, 24, 1)
robot.display.text(f"Angle: {angle}°", 0, 18, 1)
robot.display.text(f"Speed: {speed}", 0, 28, 1)
elif mode == 2:
angle = robot.sensors.gyro[chosen_sensor_port].tilt_angle()
robot.display.text(f"Angle: {angle}°", 0, 16, 1)
robot.display.text(f"Angle: {angle}°", 0, 18, 1)
elif mode == 3:
speed = robot.sensors.gyro[chosen_sensor_port].tilt_speed()
robot.display.text(f"Speed: {speed}°", 0, 16, 1)
robot.display.text(f"Speed: {speed}°", 0, 18, 1)
except:
print(f"EV3 Gyro S{chosen_sensor_port+1} sensor not connected")
display_sensor_not_connected(robot)
......
......@@ -13,7 +13,7 @@ N_MODES = len(mode_str)
def ev3_ultra_run(robot, chosen_sensor_port):
robot.init_sensor(sensor_type=Sensor.EV3_ULTRASONIC, port=chosen_sensor_port)
robot.display.fill(0)
robot.display.centered_text(f"EV3 Ultrasonic S{chosen_sensor_port+1}", 0, 1)
robot.display.centered_text("Connecting...", 16, 1)
......@@ -30,6 +30,8 @@ def ev3_ultra_run(robot, chosen_sensor_port):
display_incorrect_sensor(robot)
return
mode = 0
debounce = False
while True:
robot.display.fill(0)
robot.display.centered_text(f"EV3 Ultrasonic S{chosen_sensor_port+1}", 0, 1)
......@@ -37,10 +39,10 @@ def ev3_ultra_run(robot, chosen_sensor_port):
try:
if mode == 0:
dist = robot.sensors.ultrasonic[chosen_sensor_port].distance()
robot.display.text(f"Dist: {dist:4d} mm", 0, 16, 1)
robot.display.text(f"Dist: {dist:4d} mm", 0, 18, 1)
else:
presence = robot.sensors.ultrasonic[chosen_sensor_port].presence()
robot.display.text(f"Pres: {presence}", 0, 16, 1)
robot.display.text(f"Pres: {presence}", 0, 18, 1)
except:
print(f"EV3 Ultrasonic S{chosen_sensor_port+1} sensor not connected")
display_sensor_not_connected(robot)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment