Relabelled 'rx' in READ.pio - conflicts with RP2350 reserved word (cf. …

…#6)
uhppoted · Sep 9, 2024 · 30a9150 · 30a9150
1 parent b4f9d2e
commit 30a9150
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 20 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,7 +22,6 @@ jobs:
         cd raspberrypi
         git clone https://github.com/raspberrypi/pico-sdk.git --branch master
         cd pico-sdk
-        git checkout --detach 1.5.1
         git submodule update --init
 
     - name: Setup toolchain

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+### Updated
+1. Updated labels in READ.pio for RP2350 reserved words.
+
 
 ## [0.8.9](https://github.com/uhppoted/uhppoted-wiegand/releases/tag/v0.8.9) - 2024-09-06
 

diff --git a/TODO.md b/TODO.md
@@ -1,24 +1,9 @@
 # TODO
 
+- [x] Change _rx_ labels in PIO (cf. https://github.com/uhppoted/uhppoted-wiegand/issues/6)
+
 - (?) Make -Wimplicit-function-declaration an error
 
-- [x] Weird card after ACL revoking a card in the middle of a list
-- [x] Clear ACL
-
-- [x] Emulate keypad (cf. https://github.com/uhppoted/uhppoted-wiegand/issues/4)
-      - [x] 4-bit burst mode write
-      - [x] 4-bit burst mode read
-      - [x] controller passcodes
-      - [x] 8-bit burst mode write
-      - [x] 8-bit burst mode read
-      - [x] card + PIN writer
-      - [x] FIXME in acl.c
-      - [x] card + PIN read
-      - [x] CHANGELOG
-      - [x] Check mode == CONTROLLER/READER
-      - [x] README
-      - [x] Restructure emulator
-
 - [ ] PicoW+TCP/IP
       - [ ] Figure out SD card detect interrupt conflict
             - (?) Use GPIO poll

diff --git a/pico/core/src/READ.pio b/pico/core/src/READ.pio
@@ -5,10 +5,11 @@ loop:                 ; wait for D0 || D1
     in pins, 2        ;
     set y, 3
     mov x, isr        ;
-    jmp x != y rx     ;
+    jmp x != y rxd    ;
     jmp loop          ;
 
-rx: push block        ; push D0 and D1 to FIFO
+rxd:
+    push block        ; push D0 and D1 to FIFO
 
     set y,31          ; debounce/noise-gate
 lp: nop [31]          ;