M5: uart0 'CARD' command

Author: twystd

m5-stack/Rev.0/TODO.md

@@ -11,6 +11,10 @@
    - [x] Wiegand 
    - [x] GPIO
    - [ ] UART
+      - [x] card
+      - [ ] keycode
+      - [ ] card + keycode
+      - [ ] error/ok
    - [ ] USB
       - [x] bootsel
 

m5-stack/Rev.0/coreS3/gpio/.gitignore m5-stack/Rev.0/coreS3/.gitignorem5-stack/Rev.0/coreS3/gpio/.gitignore renamed to m5-stack/Rev.0/coreS3/.gitignore

@@ -47,7 +47,7 @@ def button(b):
 def pressed(b):
     global touched
 
-    return touched.x >= b.x and touched.x <= (b.x + b.w) and touched.y >= b.y and touched.y <= (b.y + b.h):
+    return touched.x >= b.x and touched.x <= (b.x + b.w) and touched.y >= b.y and touched.y <= (b.y + b.h)
 
 
 def press(b):

m5-stack/Rev.0/coreS3/gpio/main.py

@@ -0,0 +1,18 @@
+PORT = /dev/tty.usbmodem142201
+# PORT = /dev/cu.usbmodem142201
+
+flash:
+	esptool --chip esp32s3 --port $(PORT) erase-flash
+	esptool --chip esp32s3 --port $(PORT) write_flash -z 0x0000 ~/Development/tools/m5/uiflow-e986468-esp32s3-spiram-16mb-cores3-v2.2.8-20250606.bin   
+
+format: 
+	# . .venv/bin/activate; black --line-length 120 .
+	black --line-length 120 .
+
+run:
+	ampy --port $(PORT) put main.py
+
+tty:
+	minicom -b 115200 -o -D $(PORT)
+
+

m5-stack/Rev.0/coreS3/uart/Makefile

@@ -0,0 +1,111 @@
+import os
+import sys
+import io
+import M5
+import time
+
+from collections import namedtuple
+from M5 import *
+from machine import Pin, UART
+from utility import print_error_msg
+
+Point = namedtuple("Point", "x y timestamp")
+Button = namedtuple("Button", "x y w h label pin")
+
+BLACK = 0x222222
+BACKGROUND = 0xEACDCD
+BORDER = 0xFC0000
+
+IO1 = Pin(1, Pin.OUT)
+IO2 = Pin(2, Pin.OUT)
+uart = UART(1, baudrate=115200, tx=43, rx=44)
+B10058399 = Button(32, 32, 256, 48, "10058399", IO2)
+B10058400 = Button(32, 112, 256, 48, "10058400", IO1)
+
+touched = None
+
+
+def setup():
+    global IO1, IO2
+    M5.begin()
+    IO1.value(True)
+    IO2.value(True)
+    screen()
+
+
+def screen():
+    Widgets.setRotation(1)
+    Widgets.fillScreen(BLACK)
+    button(B10058399)
+    button(B10058400)
+
+
+def button(b):
+    Widgets.Rectangle(b.x, b.y, b.w, b.h, BORDER, BACKGROUND)
+    Widgets.Label(b.label, b.x + 80, b.y + 14, 1.0, BLACK, BACKGROUND, Widgets.FONTS.DejaVu18)
+
+
+def pressed(b):
+    global touched
+
+    return touched.x >= b.x and touched.x <= (b.x + b.w) and touched.y >= b.y and touched.y <= (b.y + b.h)
+
+
+def press(b):
+    if b.pin.value():
+        b.pin.value(False)
+        return True
+
+    return False
+
+
+def release():
+    global IO1, IO2
+    if not IO2.value():
+        IO2.value(True)
+        print(f"released {B10058399.label}")
+
+    if not IO1.value():
+        IO1.value(True)
+        print(f"released {B10058400.label}")
+
+
+def loop():
+    global IO1, IO2, touched
+    M5.update()
+    if M5.Touch.getCount() > 0:
+        now = time.ticks_ms()
+        point = M5.Touch.getTouchPointRaw()
+
+        if touched is None:
+            touched = Point(point[0], point[1], now)
+        else:
+            dt = now - touched.timestamp
+            dx = point[0] - touched.x
+            dy = point[1] - touched.y
+            touched = Point(point[0], point[1], now)
+
+            if dt > 250 or abs(dx) > 10 or abs(dy) > 10:
+                if pressed(B10058399):
+                    uart.write("CARD 10058399\n")
+                    Speaker.tone(880, 125)  # A5
+
+                if pressed(B10058400):
+                    uart.write("CARD 10058400\n")
+                    Speaker.tone(1046, 125)  # C6'ish
+    else:
+        release()
+
+    time.sleep(0.05)
+
+
+if __name__ == "__main__":
+    try:
+        setup()
+        while True:
+            loop()
+    except (Exception, KeyboardInterrupt) as e:
+        try:
+            print_error_msg(e)
+        except ImportError:
+            print("please update to latest firmware")

m5-stack/Rev.0/coreS3/uart/main.py

@@ -10,6 +10,7 @@ extern const uint32_t MSG;
 extern const uint32_t MSG_LED;
 extern const uint32_t MSG_IO6;
 extern const uint32_t MSG_IO7;
+extern const uint32_t MSG_RX;
 extern const uint32_t MSG_TTY;
 extern const uint32_t MSG_TICK;
 extern const uint32_t MSG_WATCHDOG;

m5-stack/Rev.0/firmware/core/include/M5.h

@@ -4,8 +4,6 @@
 #include <pico/types.h>
 
 typedef struct constants {
-    uint LED;
-
     struct {
         uint gpio;
         PIO pio;
@@ -25,6 +23,18 @@ typedef struct constants {
         int sm;
     } wiegand;
 
+    uint LED;
+
+    struct {
+        uint tx;
+        uint rx;
+    } UART0;
+
+    struct {
+        uint tx;
+        uint rx;
+    } UART1;
+
     struct {
         uint IO6;
         uint IO7;

m5-stack/Rev.0/firmware/core/include/hwconfig.h

@@ -2,4 +2,8 @@
 
 #include <stdbool.h>
 
-extern bool uart_initialise();
+struct buffer;
+
+extern void UART_init();
+extern void UART_start();
+extern void UART_rx(struct buffer *);

m5-stack/Rev.0/firmware/core/include/uart.h

@@ -10,6 +10,7 @@
 #include <cli.h>
 #include <log.h>
 #include <sys.h>
+#include <uart.h>
 #include <wiegand.h>
 
 #define LOGTAG "SYS"
@@ -21,6 +22,7 @@ const uint32_t MSG = 0xf0000000;
 const uint32_t MSG_LED = 0x10000000;
 const uint32_t MSG_IO6 = 0x20000000;
 const uint32_t MSG_IO7 = 0x30000000;
+const uint32_t MSG_RX = 0x40000000;
 const uint32_t MSG_TTY = 0xc0000000;
 const uint32_t MSG_LOG = 0xd0000000;
 const uint32_t MSG_WATCHDOG = 0xe0000000;
@@ -166,6 +168,12 @@ void dispatch(uint32_t v) {
         }
     }
 
+    if ((v & MSG) == MSG_RX) {
+        struct buffer *b = (struct buffer *)(SRAM_BASE | (v & 0x0fffffff));
+
+        UART_rx(b);
+    }
+
     if ((v & MSG) == MSG_WATCHDOG) {
         watchdog_update();
     }