diff --git a/esp32/src/buttons.json b/esp32/src/buttons.json deleted file mode 100644 index 887ba7e..0000000 --- a/esp32/src/buttons.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "buttons": [ - {"id": "start", "preset": "off"}, - {"id": "grab", "preset": "grab"}, - {"id": "spin1", "preset": "spin1"}, - {"id": "lift", "preset": "lift"}, - {"id": "flare", "preset": "flare"}, - {"id": "hook", "preset": "hook"}, - {"id": "roll1", "preset": "roll1"}, - {"id": "invertsplit", "preset": "invertsplit"}, - {"id": "pose1", "preset": "pose1"}, - {"id": "pose1", "preset": "pose2"}, - {"id": "roll2", "preset": "roll2"}, - {"id": "backbalance1", "preset": "backbalance1"}, - {"id": "beat1", "preset": "beat1"}, - {"id": "pose3", "preset": "pose3"}, - {"id": "roll3", "preset": "roll3"}, - {"id": "crouch", "preset": "crouch"}, - {"id": "pose4", "preset": "pose4"}, - {"id": "roll4", "preset": "roll4"}, - {"id": "backbendsplit", "preset": "backbendsplit"}, - {"id": "backbalance2", "preset": "backbalance2"}, - {"id": "backbalance3", "preset": "backbalance3"}, - {"id": "beat2", "preset": "beat2"}, - {"id": "straddle", "preset": "straddle"}, - {"id": "beat3", "preset": "beat3"}, - {"id": "frontbalance1", "preset": "frontbalance1"}, - {"id": "pose5", "preset": "pose5"}, - {"id": "pose6", "preset": "pose6"}, - {"id": "elbowhang", "preset": "elbowhang"}, - {"id": "elbowhangspin", "preset": "elbowhangspin"}, - {"id": "spin2", "preset": "spin2"}, - {"id": "dismount", "preset": "dismount"}, - {"id": "spin3", "preset": "spin3"}, - {"id": "fluff", "preset": "fluff"}, - {"id": "spin4", "preset": "spin4"}, - {"id": "flare2", "preset": "flare2"}, - {"id": "elbowhang", "preset": "elbowhang"}, - {"id": "elbowhangsplit2", "preset": "elbowhangsplit2"}, - {"id": "invert", "preset": "invert"}, - {"id": "roll5", "preset": "roll5"}, - {"id": "backbend", "preset": "backbend"}, - {"id": "pose7", "preset": "pose7"}, - {"id": "roll6", "preset": "roll6"}, - {"id": "seat", "preset": "seat"}, - {"id": "kneehang", "preset": "kneehang"}, - {"id": "legswoop", "preset": "legswoop"}, - {"id": "split", "preset": "split"}, - {"id": "foothang", "preset": "foothang"}, - {"id": "end", "preset": "end"} - ] -} - - - - - - \ No newline at end of file diff --git a/esp32/src/templates/index.html b/esp32/src/templates/index.html index a6931a8..8822ef3 100644 --- a/esp32/src/templates/index.html +++ b/esp32/src/templates/index.html @@ -65,7 +65,9 @@ - + + + diff --git a/esp32/test/test_uart_send_json.py b/esp32/test/test_uart_send_json.py deleted file mode 100644 index df58d02..0000000 --- a/esp32/test/test_uart_send_json.py +++ /dev/null @@ -1,64 +0,0 @@ -""" -ESP32-C6 test: send JSON messages to Pico over UART (GPIO17). -Settings use strips = [[pin, num_leds], ...]. Run with Pico connected on RX. - -Run with mpremote (from repo root): - ./esp32/run_test_uart_json.sh - # or - mpremote run esp32/test/test_uart_send_json.py - # or with port - mpremote connect /dev/ttyUSB0 run esp32/test/test_uart_send_json.py -""" -import machine -import time -import json - -UART_TX_PIN = 17 -UART_BAUD = 921600 -LED_PIN = 15 - - -def send_json(uart, obj): - line = json.dumps(obj) + "\n" - uart.write(line) - print("TX:", line.strip()) - - -def main(): - uart = machine.UART(1, baudrate=UART_BAUD, tx=UART_TX_PIN) - led = machine.Pin(LED_PIN, machine.Pin.OUT) - - # 1) Settings: one strip, pin 2, 10 LEDs (list of lists) - send_json(uart, { - "v": 1, - "settings": { - "strips": [[2, 10]], - "brightness": 30, - }, - }) - led.value(1) - time.sleep(0.2) - led.value(0) - time.sleep(0.3) - - # 2) led-controller format: light + settings.color (hex) - send_json(uart, {"light": "strip1", "settings": {"color": "#FF0000"}, "save": False}) - time.sleep(0.5) - - # 3) led-controller format: light + settings.r,g,b - send_json(uart, {"light": "strip1", "settings": {"r": 0, "g": 255, "b": 0}, "save": False}) - time.sleep(0.5) - - # 4) led-controller format: blue (hex) - send_json(uart, {"light": "strip1", "settings": {"color": "#0000FF"}, "save": False}) - time.sleep(0.5) - - # 5) Off (existing format) - send_json(uart, {"v": 1, "off": True}) - time.sleep(0.3) - - print("Done. Pico: settings -> red (hex) -> green (r,g,b) -> blue (hex) -> off.") - - -if __name__ == "__main__": - main() diff --git a/esp32/test/test_uart_tx.py b/esp32/test/test_uart_tx.py deleted file mode 100644 index a59ebed..0000000 --- a/esp32/test/test_uart_tx.py +++ /dev/null @@ -1,32 +0,0 @@ -""" -ESP32-C6 UART TX + LED test. Sends a few commands on GPIO17, blinks LED on GPIO15. -Run on device: exec(open('test/test_uart_tx').read()) or import test.test_uart_tx -Does not require Pico connected. -""" -import machine -import time - -UART_TX_PIN = 17 -LED_PIN = 15 - -def main(): - uart = machine.UART(1, baudrate=115200, tx=UART_TX_PIN) - led = machine.Pin(LED_PIN, machine.Pin.OUT) - - def send(cmd): - uart.write(cmd + "\n") - print("TX:", cmd) - - # Blink and send a short command sequence - commands = ["off", "fill 255 0 0", "fill 0 255 0", "fill 0 0 255", "off"] - for i, cmd in enumerate(commands): - led.value(1) - send(cmd) - time.sleep(0.3) - led.value(0) - time.sleep(0.2) - - print("Done. Connect Pico to see strip follow commands.") - -if __name__ == "__main__": - main()