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

Correct ev3 color raw rgb values show and change display spacing

parent b35b889f
No related branches found
No related tags found
No related merge requests found
Pipeline #109839 passed
...@@ -88,4 +88,4 @@ I2C_MULTICUBE_FREQ = const(100000) ...@@ -88,4 +88,4 @@ I2C_MULTICUBE_FREQ = const(100000)
ESP_BAUDRATE = const(115200) # bps ESP_BAUDRATE = const(115200) # bps
ESP32_COMMAND_PIN = const(8) ESP32_COMMAND_PIN = const(8)
FW_VERSION = "5.11.2024" # Firmware version FW_VERSION = "6.11.2024" # Firmware version
\ No newline at end of file \ No newline at end of file
...@@ -38,31 +38,30 @@ def ev3_color_run(robot, chosen_sensor_port): ...@@ -38,31 +38,30 @@ def ev3_color_run(robot, chosen_sensor_port):
while True: while True:
robot.display.fill(0) robot.display.fill(0)
robot.display.centered_text(f"EV3 Color S{chosen_sensor_port+1}", 0, 1) robot.display.centered_text(f"EV3 Color S{chosen_sensor_port+1}", 0, 1)
robot.display.text(mode_str[mode], 0, 8, 1) robot.display.text(mode_str[mode], 0, 16, 1)
try: try:
if mode == 0: if mode == 0:
ref = robot.sensors.light[chosen_sensor_port].reflection() ref = robot.sensors.light[chosen_sensor_port].reflection()
robot.display.text("R: {}".format(ref), 0, 16, 1) robot.display.text("R: {}".format(ref), 0, 26, 1)
if mode == 1: if mode == 1:
ambient = robot.sensors.light[chosen_sensor_port].ambient() ambient = robot.sensors.light[chosen_sensor_port].ambient()
robot.display.text("A: {}".format(ambient), 0, 16, 1) robot.display.text("A: {}".format(ambient), 0, 26, 1)
if mode == 2: if mode == 2:
color = robot.sensors.light[chosen_sensor_port].color() color = robot.sensors.light[chosen_sensor_port].color()
robot.display.text("C: {}".format(color), 0, 16, 1) robot.display.text("C: {}".format(color), 0, 26, 1)
if mode == 3: if mode == 3:
r, g, b = robot.sensors.light[chosen_sensor_port].rgb() r, g, b = robot.sensors.light[chosen_sensor_port].rgb()
robot.display.text("R: {}".format(r), 0, 16, 1) robot.display.text("R: {}".format(r), 0, 26, 1)
robot.display.text("G: {}".format(g), 0, 26, 1) robot.display.text("G: {}".format(g), 0, 36, 1)
robot.display.text("B: {}".format(b), 0, 36, 1) robot.display.text("B: {}".format(b), 0, 46, 1)
if mode == 4: if mode == 4:
r, g, b, off = robot.sensors.light[chosen_sensor_port].rgb_raw() r, g, b = robot.sensors.light[chosen_sensor_port].rgb_raw()
robot.display.text("R: {}".format(r), 0, 16, 1) robot.display.text("R: {}".format(r), 0, 26, 1)
robot.display.text("G: {}".format(g), 0, 26, 1) robot.display.text("G: {}".format(g), 0, 36, 1)
robot.display.text("B: {}".format(b), 0, 36, 1) robot.display.text("B: {}".format(b), 0, 46, 1)
robot.display.text("Off: {}".format(off), 0, 46, 1)
if mode == 5: if mode == 5:
ref = robot.sensors.light[chosen_sensor_port].reflection_raw() ref = robot.sensors.light[chosen_sensor_port].reflection_raw()
robot.display.text("R: {}".format(ref), 0, 16, 1) robot.display.text("R: {}".format(ref), 0, 26, 1)
except Exception as e: except Exception as e:
print(e) print(e)
print(f"EV3 Color S{chosen_sensor_port+1} sensor not connected") print(f"EV3 Color S{chosen_sensor_port+1} sensor not connected")
......
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