removed redundant code

src/dmd_interface_whitestar.h → src/dmd_interface.h

@@ -1,24 +1,27 @@
-#ifndef DMD_INTERFACE_WHITESTAR_H
-#define DMD_INTERFACE_WHITESTAR_H
+#ifndef DMD_INTERFACE_H
+#define DMD_INTERFACE_H
 
+#include "dmd_interface_desega.pio.h"
+#include "dmd_interface_sam.pio.h"
+#include "dmd_interface_spike.pio.h"
 #include "dmd_interface_whitestar.pio.h"
+#include "dmd_interface_wpc.pio.h"
 #include "dmd_reader_pins.h"
 #include "hardware/gpio.h"
 #include "hardware/pio.h"
 
-void dmd_reader_whitestar_program_init(PIO pio, uint sm, uint offset) {
-  pio_sm_config c = dmd_reader_whitestar_program_get_default_config(offset);
-
+// Init the DMD reader (dots) PIO program, common for all DMD types.
+void dmd_reader_program_init(PIO pio, uint sm, uint offset, pio_sm_config c) {
   // Set the IN pin, we don't use any other
   sm_config_set_in_pins(&c, SDATA);
 
-  // Set the pin direction at the PIO
-  pio_sm_set_consecutive_pindirs(pio, sm, SDATA, 2, false);  // SDATA, DOTCLK
-
   // Connect these GPIOs to this PIO block
   pio_gpio_init(pio, DOTCLK);
   pio_gpio_init(pio, SDATA);
 
+  // Set the pin direction at the PIO
+  pio_sm_set_consecutive_pindirs(pio, sm, SDATA, 2, false);  // SDATA, DOTCLK
+
   // Shifting to left matches the customary MSB-first ordering of SPI.
   sm_config_set_in_shift(&c,
                          false,  // Shift-to-right = false
@@ -33,18 +36,24 @@ void dmd_reader_whitestar_program_init(PIO pio, uint sm, uint offset) {
   pio_sm_init(pio, sm, offset, &c);
 }
 
-void dmd_framedetect_whitestar_program_init(PIO pio, uint sm, uint offset) {
-  pio_sm_config c =
-      dmd_framedetect_whitestar_program_get_default_config(offset);
-
-  // Set the pin direction at the PIO
-  pio_sm_set_consecutive_pindirs(pio, sm, RDATA, 1, false);
-
-  // Connect these GPIOs to this PIO block
-  pio_gpio_init(pio, RDATA);
+// Init the framedetect PIO program.
+void dmd_framedetect_program_init(PIO pio, uint sm, uint offset,
+                                  pio_sm_config c, const uint* input_pins,
+                                  uint num_input_pins, uint jump_pin) {
+  if (jump_pin >= 0) {
+    // Pin is used for jump control
+    sm_config_set_jmp_pin(&c, jump_pin);
+  }
+
+  for (uint i = 0; i < num_input_pins; i++) {
+    // Connect that GPIO to this PIO block
+    pio_gpio_init(pio, input_pins[i]);
+    // Set the pin direction at the PIO
+    pio_sm_set_consecutive_pindirs(pio, sm, input_pins[i], 1, false);
+  }
 
   // Load our configuration, do not yet start the program
   pio_sm_init(pio, sm, offset, &c);
 }
 
-#endif  // DMD_INTERFACE_WHITESTAR_H
+#endif  // DMD_INTERFACE_H