be consistent

Author: mkalkbrenner

src/dmd_interface_sam.pio

@@ -4,11 +4,10 @@
 .define COLLAT 4
 .define DOTCLK 3
 .define SDATA 2
+.define FRAME_START_IRQ 4
 
 
 .program dmd_reader_sam
-
-
     ; initialize y with 16383, number of pixels (128x32x4) - 1 because counting starts at 0.
     set x, 31          ; x = 31 (max 5-bit value)
     in x, 5            ; shift in 5 bits, isr = 31
@@ -20,33 +19,26 @@
     mov y, isr         ; y = 16383
 
 .wrap_target
-
     mov x, y       ; load number of pixels
     mov isr, null  ; reset shift counter
 
-    irq clear 4
-    wait irq 4
-
-    wait 1 gpio RDATA   ; raising edge indicates a new frame
+    irq clear FRAME_START_IRQ
+    wait irq FRAME_START_IRQ
 
 dotloop:
     wait 0 gpio DOTCLK  ; falling edge
     in null, 3          ; left padding with 3 zeros
     wait 1 gpio DOTCLK  ; raising edge
     in pins 1           ; read pin data
     jmp x-- dotloop
-
 .wrap
 
-.program dmd_framedetect_sam
 
+.program dmd_framedetect_sam
 .wrap_target
-
-; synchronize on a new frame
     wait 0 gpio RDATA
     wait 1 gpio RDATA
-    irq 4
-
+    irq FRAME_START_IRQ
 .wrap
 
 

src/dmd_interface_whitestar.pio

@@ -4,11 +4,10 @@
 .define COLLAT 4
 .define DOTCLK 3
 .define SDATA 2
+.define FRAME_START_IRQ 4
 
 
 .program dmd_reader_whitestar
-
-
     ; initialize y with 8191, number of pixels ((128 x LSB + 128 x MSB) x 32) - 1  because counting starts at 0.
     set x, 31          ; x = 31 (max 5-bit value)
     in x, 5            ; shift in 5 bits, isr = 31
@@ -20,14 +19,11 @@
     mov y, isr         ; y = 8191
 
 .wrap_target
-
     mov x, y       ; load number of pixels
     mov isr, null  ; reset shift counter
 
-    irq clear 4
-    wait irq 4
-
-    wait 1 gpio RDATA   ; raising edge indicates a new frame
+    irq clear FRAME_START_IRQ
+    wait irq FRAME_START_IRQ
 
 dotloop:
     wait 0 gpio DOTCLK  ; falling edge
@@ -40,15 +36,12 @@ dotloop:
 ; It is ignored because we already read the specified amount of dots and now wait for a new frame.
 .wrap
 
-.program dmd_framedetect_whitestar
 
+.program dmd_framedetect_whitestar
 .wrap_target
-
-; synchronize on a new frame
     wait 0 gpio RDATA
     wait 1 gpio RDATA
-    irq 4
-
+    irq FRAME_START_IRQ
 .wrap
 
 

src/dmd_interface_wpc.pio

@@ -5,7 +5,7 @@
 .define COLLAT 4
 .define DOTCLK 3
 .define SDATA 2
-.define PLANE_START 4
+.define PLANE_START_IRQ 4
 
 
 .program dmd_reader_wpc
@@ -21,8 +21,8 @@
     mov x, y           ; load number of pixels per plane (128x32 - 1)
     mov isr, null      ; reset shift counter
 
-    irq clear PLANE_START
-    wait irq PLANE_START
+    irq clear PLANE_START_IRQ
+    wait irq PLANE_START_IRQ
 
 plane_loop:
     wait 0 gpio DOTCLK ; no DOTCLK period or faling edge of the previous
@@ -40,9 +40,10 @@ plane_loop:
     wait 1 gpio DE
     wait 0 gpio DOTCLK
     nop [31]
-    irq PLANE_START
+    irq PLANE_START_IRQ
 .wrap
 
+
 % c-sdk {
 static inline void dmd_reader_wpc_program_init(PIO pio, uint sm, uint offset) {
     pio_sm_config c = dmd_reader_wpc_program_get_default_config(offset);