vik spi adapter for any situation where there is a board that has exi…

…sting spi devices

boards/arm/pinkies_out_v3/pinkies_out_v3.dts

@@ -109,9 +109,19 @@
     };
 };
 
+// Need to define this as 1, since we have an existing SPI device on this board
+// Starting point is normally 0, so we need to tell the vik_spi_adapter to start at 1 since
+// there is already a 0 on this board for the same bus
+#define VIK_SPI_REG_START 1
+// Need to specify the cs-gpios for this bus, as the same bus is used for VIK, so any SPI
+// VIK modules will need to know the existing CS gpios so it can append to them
+#define VIK_SPI_CS_PREFIX <&gpio0 21 GPIO_ACTIVE_LOW>
+
+// If this ever gets updated to a different SPI bus, update the corresponding "vik_spi: &spi0 {};"
+// in 3_0_0/vik_connector.dtsi and 3_1_0/vik_connector.dtsi
 &spi0 {
     status = "okay";
-    cs-gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
+    cs-gpios = VIK_SPI_CS_PREFIX;
     pinctrl-0 = <&spi0_default>;
     pinctrl-names = "default";
     clock-frequency = <DT_FREQ_M(2)>;

build.yaml

@@ -18,15 +18,15 @@ include:
   - board: [email protected]
     shield: arachnophobe vik_cirque_i2c
   - board: [email protected]
-    shield: arachnophobe vik_cirque_spi
+    shield: arachnophobe vik_spi_adapter vik_cirque_spi
   - board: [email protected]
     shield: arachnophobe vik_cirque_i2c
   - board: [email protected]
-    shield: arachnophobe vik_cirque_spi
+    shield: arachnophobe vik_spi_adapter vik_cirque_spi
   - board: [email protected]
     shield: arachnophobe vik_cirque_i2c
   - board: [email protected]
-    shield: arachnophobe vik_cirque_spi
+    shield: arachnophobe vik_spi_adapter vik_cirque_spi
   # - board: nice_nano_v2
   #   shield: barobord
   # - board: nice_nano_v2
@@ -38,41 +38,41 @@ include:
   - board: vikoto
     shield: ffkb_v1 vik_cirque_i2c
   - board: vikoto
-    shield: ffkb_v1 vik_cirque_spi
+    shield: ffkb_v1 vik_spi_adapter vik_cirque_spi
   - board: vikoto
     shield: ffkb_v1 vik_pmw3610
   - board: [email protected]
     shield: ffkb_v1 vik_cirque_i2c
   - board: [email protected]
-    shield: ffkb_v1 vik_cirque_spi
+    shield: ffkb_v1 vik_spi_adapter vik_cirque_spi
   - board: nice_nano_v2
     shield: ffkb_v2
   - board: vikoto
     shield: ffkb_v2
   - board: vikoto
     shield: ffkb_v2 vik_cirque_i2c
   - board: vikoto
-    shield: ffkb_v2 vik_cirque_spi
+    shield: ffkb_v2 vik_spi_adapter vik_cirque_spi
   - board: vikoto
     shield: ffkb_v2 vik_pmw3610
   - board: [email protected]
     shield: ffkb_v2 vik_cirque_i2c
   - board: [email protected]
-    shield: ffkb_v2 vik_cirque_spi
+    shield: ffkb_v2 vik_spi_adapter vik_cirque_spi
   - board: nice_nano_v2
     shield: ffkb_v3
   - board: vikoto
     shield: ffkb_v3
   - board: vikoto
     shield: ffkb_v3 vik_cirque_i2c
   - board: vikoto
-    shield: ffkb_v3 vik_cirque_spi
+    shield: ffkb_v3 vik_spi_adapter vik_cirque_spi
   - board: vikoto
     shield: ffkb_v3 vik_pmw3610
   - board: [email protected]
     shield: ffkb_v3 vik_cirque_i2c
   - board: [email protected]
-    shield: ffkb_v3 vik_cirque_spi
+    shield: ffkb_v3 vik_spi_adapter vik_cirque_spi
   # - board: nice_nano_v2
   #   shield: swweeep_left nice_view_adapter  nice_view
   # - board: nice_nano_v2
@@ -85,17 +85,17 @@ include:
   - board: vikoto
     shield: ffkb_lite_v1 vik_cirque_i2c
   - board: vikoto
-    shield: ffkb_lite_v1 vik_cirque_spi
+    shield: ffkb_lite_v1 vik_spi_adapter vik_cirque_spi
   - board: vikoto
     shield: ffkb_lite_v1 vik_pmw3610
   - board: [email protected]
     shield: ffkb_lite_v1 vik_cirque_i2c
   - board: [email protected]
-    shield: ffkb_lite_v1 vik_cirque_spi
+    shield: ffkb_lite_v1 vik_spi_adapter vik_cirque_spi
   - board: [email protected]
     shield: ffkb_lite_v1 vik_cirque_i2c
   - board: [email protected]
-    shield: ffkb_lite_v1 vik_cirque_spi
+    shield: ffkb_lite_v1 vik_spi_adapter vik_cirque_spi
 #     cmake-args: -DCONFIG_ZMK_USB_LOGGING=y
 #     artifact-name: ffkb_lite_v1_with_logging
   - board: vikoto
@@ -115,24 +115,24 @@ include:
   - board: nice_nano_v2
     shield: swweeep_right nice_view_adapter nice_view
   - board: vulpes_majora_v1
-    shield: vik_pmw3360_per56
+    shield: vik_spi_adapter vik_pmw3360_per56
   - board: nice_nano_v2
     shield: vulpes_minora_left
   - board: nice_nano_v2
     shield: vulpes_minora_right
   - board: nice_nano_v2
-    shield: vulpes_minora_right vik_cirque_spi
+    shield: vulpes_minora_right vik_spi_adapter vik_cirque_spi
   - board: nice_nano_v2
     shield: vulpes_minora_right vik_pmw3610
   - board: [email protected]
-    shield: vik_vikropad
+    shield: vik_spi_adapter vik_vikropad
   - board: [email protected]
-    shield: vik_vikropad
+    shield: vik_spi_adapter vik_vikropad
   - board: [email protected]
-    shield: vik_vikropad
+    shield: vik_spi_adapter vik_vikropad
   - board: [email protected]
-    shield: vik_vikropad
+    shield: vik_spi_adapter vik_vikropad
   - board: vikoto
-    shield: vik_vikropad
+    shield: vik_spi_adapter vik_vikropad
   - board: nice_nano_v2
     shield: settings_reset