From b00754c624f3396e8a60d1046bc32ef4487841e5 Mon Sep 17 00:00:00 2001 From: andytu101 Date: Wed, 30 Oct 2024 22:20:49 -0700 Subject: [PATCH] Done Got Firmware and app to work --- full_stack_Client.py | 101 ++++++++++++++++++++++ fullstack_firmware.py | 11 +++ fullstack_firmware/fullstack_firmware.ino | 38 ++++++++ 3 files changed, 150 insertions(+) create mode 100644 full_stack_Client.py create mode 100644 fullstack_firmware.py create mode 100644 fullstack_firmware/fullstack_firmware.ino diff --git a/full_stack_Client.py b/full_stack_Client.py new file mode 100644 index 00000000..46aa8236 --- /dev/null +++ b/full_stack_Client.py @@ -0,0 +1,101 @@ +import tkinter as tk +import tkinter.ttk as ttk + +from serial import Serial +from serial.tools.list_ports import comports +from tkinter.messagebox import showerror +from serial import SerialException +from threading import Thread, Lock # we'll use Lock later ;) + +class LockedSerial(Serial): + _lock: Lock = Lock() + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + def read(self, size=1) -> bytes: + with self._lock: + return super().read(size) + + def write(self, b: bytes, /) -> int | None: + with self._lock: + super().write(b) + + def close(self): + with self._lock: + super().close() + + +S_OK: int = 0xaa +S_ERR: int = 0xff +def detached_callback(f): + return lambda *args, **kwargs: Thread(target=f, args=args, kwargs=kwargs).start() + +class App(tk.Tk): + ser: LockedSerial + + def __init__(self): + super().__init__() + + self.title("LED Blinker") + + self.port = tk.StringVar() # add this + self.led = tk.BooleanVar() + + ttk.Checkbutton(self, text='Toggle LED', variable=self.led, command=self.update_led).pack() + ttk.Button(self, text='Send Invalid').pack() + ttk.Button(self, text='Disconnect', default='active').pack() + + SerialPortal(self) # and this + + # and finally this + def connect(self): + self.ser = LockedSerial(self.port.get()) + + @detached_callback + def update_led(self): + self.write(bytes([self.led.get()])) + + def disconnect(self): + self.ser.close() + + SerialPortal(self) # display portal to reconnect + + def send_invalid(self): + self.write(bytes([0x10])) + + def write(self, b: bytes): + try: + self.ser.write(b) + if int.from_bytes(self.ser.read(), 'big') == S_ERR: + showerror('Device Error', 'The device reported an invalid command.') + except SerialException: + showerror('Serial Error', 'Write failed.') + + def __enter__(self): + return self + + def __exit__(self, *_): + self.disconnect() + + + +class SerialPortal(tk.Toplevel): + def __init__(self, parent: App): + super().__init__(parent) + + self.parent = parent + self.parent.withdraw() # hide App until connected + + ttk.OptionMenu(self, parent.port, '', *[d.device for d in comports()]).pack() + ttk.Button(self, text='Connect', command=self.connect, default='active').pack() + + def connect(self): + self.parent.connect() + self.destroy() + self.parent.deiconify() # reveal App + +if __name__ == '__main__': + with App() as app: + app.mainloop() + diff --git a/fullstack_firmware.py b/fullstack_firmware.py new file mode 100644 index 00000000..a06481e8 --- /dev/null +++ b/fullstack_firmware.py @@ -0,0 +1,11 @@ +from serial import Serial, SerialException + +with Serial('/dev/cu.usbmodem1101', 9600) as ser: + ser.write(bytes([0x1])) + assert ser.read() == bytes([0xaa]) + + ser.write(bytes([0x0])) + assert ser.read() == bytes([0xaa]) + + ser.write(bytes([0x2])) + assert ser.read() == bytes([0xff]) \ No newline at end of file diff --git a/fullstack_firmware/fullstack_firmware.ino b/fullstack_firmware/fullstack_firmware.ino new file mode 100644 index 00000000..54db9ee8 --- /dev/null +++ b/fullstack_firmware/fullstack_firmware.ino @@ -0,0 +1,38 @@ +#include + +const int LED { 17 }; +// add these +const char S_OK { 0xaa }; +const char S_ERR { 0xff }; +void setup() { + pinMode(LED, OUTPUT); + + // register "on_receive" as callback for RX event + Serial.onEvent(ARDUINO_HW_CDC_RX_EVENT, on_receive); + Serial.begin(9600); +} + +void on_receive(void* event_handler_arg, esp_event_base_t event_base, int32_t event_id, void* event_data) { + // read one byte + char state { Serial.read() }; + + // guard byte is valid LED state + if (!(state == LOW || state == HIGH)) { + // invalid byte received + // report error + Serial.write(S_ERR); + return; + } + + // update LED with valid state + digitalWrite(LED, state); + Serial.write(S_OK); +} + + + + +void loop() { + // Serial.println("Hello, World!"); + // delay(1000);v +} \ No newline at end of file