Removed rgb to test

bullwinkle3000 · Jan 15, 2024 · a74a9d0 · a74a9d0
1 parent a56be38
commit a74a9d0
Show file tree

Hide file tree

Showing 8 changed files with 153 additions and 137 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/config/boards/pillbug.overlay b/config/boards/pillbug.overlay
@@ -1,31 +1,31 @@
-#include <dt-bindings/led/led.h>
+//#include <dt-bindings/led/led.h>
 
 &pinctrl {
-    spi2_default: spi2_default {
-        group1 {
-            psels = <NRF_PSEL(SPIM_SCK, 0, 40)>,  // 1.8,
-                    <NRF_PSEL(SPIM_MOSI, 0, 6)>;    // 0.26
-
-        };
-    };
-
-    spi2_sleep: spi2_sleep {
-        group1 {
-            psels = <NRF_PSEL(SPIM_SCK, 0, 40)>,  // 1.8
-                    <NRF_PSEL(SPIM_MOSI, 0, 6)>;    // 0.26
-            low-power-enable;
-        };
-    };
+//    spi2_default: spi2_default {
+//        group1 {
+//            psels = <NRF_PSEL(SPIM_SCK, 0, 40)>,  // 1.8,
+//                    <NRF_PSEL(SPIM_MOSI, 0, 6)>;    // 0.26
+//
+//        };
+//    };
+//
+//    spi2_sleep: spi2_sleep {
+//        group1 {
+//            psels = <NRF_PSEL(SPIM_SCK, 0, 40)>,  // 1.8
+//                    <NRF_PSEL(SPIM_MOSI, 0, 6)>;    // 0.26
+//            low-power-enable;
+//        };
+//    };
 
-    i2c1_default: i2c1_default {
+    i2c0_default: i2c0_default {
         group1 {
             psels = <NRF_PSEL(TWIM_SDA, 0, 9)>,
                     <NRF_PSEL(TWIM_SCL, 0, 10)>;  // 0.6
 
         };
     };
 
-    i2c1_sleep: i2c1_sleep {
+    i2c0_sleep: i2c0_sleep {
         group1 {
             psels = <NRF_PSEL(TWIM_SDA, 0, 9)>,
                 <NRF_PSEL(TWIM_SCL, 0, 10)>;
@@ -34,11 +34,11 @@
     };
 };
 
-&i2c1 {
+&i2c0 {
 	status = "okay";
     compatible = "nordic,nrf-twi";
-    pinctrl-0 = <&i2c1_default>;
-    pinctrl-1 = <&i2c1_sleep>;
+    pinctrl-0 = <&i2c0_default>;
+    pinctrl-1 = <&i2c0_sleep>;
     pinctrl-names = "default", "sleep";
 
 	// 0.10 SDA
@@ -60,30 +60,30 @@
 	};
 };
 
-&spi2 {
-  compatible = "nordic,nrf-spim";
-  status = "okay";
-
-  pinctrl-0 = <&spi2_default>;
-  pinctrl-1 = <&spi2_sleep>;
-  pinctrl-names = "default", "sleep";
-
-  led_strip: ws2812@0 {
-    compatible = "worldsemi,ws2812-spi";
-
-    /* SPI */
-    reg = <0>; /* ignored, but necessary for SPI bindings */
-    spi-max-frequency = <4000000>;
-
-    /* WS2812 */
-    chain-length = <40>; /* number of LEDs */
-    spi-one-frame = <0x70>;
-    spi-zero-frame = <0x40>;
-    color-mapping = <LED_COLOR_ID_GREEN
-                          LED_COLOR_ID_RED
-                          LED_COLOR_ID_BLUE>;
-  };
-};
+//&spi2 {
+//  compatible = "nordic,nrf-spim";
+//  status = "okay";
+//
+//  pinctrl-0 = <&spi2_default>;
+//  pinctrl-1 = <&spi2_sleep>;
+//  pinctrl-names = "default", "sleep";
+//
+//  led_strip: ws2812@0 {
+//    compatible = "worldsemi,ws2812-spi";
+//
+//    /* SPI */
+//    reg = <0>; /* ignored, but necessary for SPI bindings */
+//    spi-max-frequency = <4000000>;
+//
+//    /* WS2812 */
+//    chain-length = <40>; /* number of LEDs */
+//    spi-one-frame = <0x70>;
+//    spi-zero-frame = <0x40>;
+//    color-mapping = <LED_COLOR_ID_GREEN
+//                          LED_COLOR_ID_RED
+//                          LED_COLOR_ID_BLUE>;
+//  };
+//};
 
 /// {
 //	chosen {

diff --git a/config/boards/shields/wyld_dm/wyld_dm.dtsi b/config/boards/shields/wyld_dm/wyld_dm.dtsi
@@ -1,5 +1,5 @@
 #include <dt-bindings/zmk/matrix_transform.h>
-#include <dt-bindings/led/led.h>
+//#include <dt-bindings/led/led.h>
 
 //&pinctrl {
 //    spi3_default: spi3_default {
@@ -87,7 +87,7 @@
         zmk,kscan = &kscan0;
         zmk,matrix_transform = &default_transform;
         zephyr,display = &oled;
-		zmk,underglow = &led_strip;
+//		zmk,underglow = &led_strip;
     };
 
     default_transform: keymap_transform_0 {

diff --git a/config/boards/shields/wyld_dm/wyld_dm.keymap b/config/boards/shields/wyld_dm/wyld_dm.keymap
@@ -9,7 +9,7 @@
 #include <dt-bindings/zmk/bt.h>
 #include <dt-bindings/zmk/outputs.h>
 #include <dt-bindings/zmk/ext_power.h>
-#include <dt-bindings/led/led.h>
+//#include <dt-bindings/led/led.h>
 #include <dt-bindings/zmk/mouse.h>
 
 #define QWERTY 0
@@ -70,8 +70,8 @@
 	};
 };
 
-&led_strip {
-    chain-length = <80>;
-};
+//&led_strip {
+//    chain-length = <80>;
+//};
 
 
diff --git a/config/boards/shields/wyld_dm/wyld_dm_right.conf b/config/boards/shields/wyld_dm/wyld_dm_right.conf
@@ -1,12 +1,12 @@
 #enable mouse emulation
-# CONFIG_ZMK_MOUSE=y
-# CONFIG_SPI=y
-# CONFIG_INPUT=y
+CONFIG_ZMK_MOUSE=y
+CONFIG_SPI=y
+CONFIG_INPUT=y
 
-# CONFIG_PMW3610=y
-# CONFIG_PMW3610_CPI=1600
-# CONFIG_PMW3610_ORIENTATION_0=y
-# CONFIG_PMW3610_SMART_ALGORITHM=y
+CONFIG_PMW3610=y
+CONFIG_PMW3610_CPI=1600
+CONFIG_PMW3610_ORIENTATION_0=y
+CONFIG_PMW3610_SMART_ALGORITHM=y
 
 CONFIG_ZMK_DISPLAY=y
 CONFIG_I2C=y

diff --git a/config/boards/shields/wyld_dm/wyld_dm_right.overlay b/config/boards/shields/wyld_dm/wyld_dm_right.overlay
@@ -43,20 +43,20 @@
     };
 };
 
-//&blackpill_spi {
-//    status = "okay";
-//    compatible = "nordic,nrf-spim";
-//    pinctrl-0 = <&blackpill_spi_default>;
-//    pinctrl-1 = <&blackpill_spi_sleep>;
-//    pinctrl-names = "default", "sleep";
-//    cs-gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
-//    trackball: trackball@0 {
-//        status = "okay";
-//        compatible = "pixart,pmw3610";
-//        reg = <0>;
-//        spi-max-frequency = <2000000>;
-//        irq-gpios = <&gpio0 24 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-////        scroll-layers = <1>; // optional indexes of drag scroll layers
-////        snipe-layers = <>; // optional indexes of snipe/precision layers
-//    };
-//};
+&blackpill_spi {
+    status = "okay";
+    compatible = "nordic,nrf-spim";
+    pinctrl-0 = <&blackpill_spi_default>;
+    pinctrl-1 = <&blackpill_spi_sleep>;
+    pinctrl-names = "default", "sleep";
+    cs-gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
+    trackball: trackball@0 {
+        status = "okay";
+        compatible = "pixart,pmw3610";
+        reg = <0>;
+        spi-max-frequency = <2000000>;
+        irq-gpios = <&gpio0 24 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+//        scroll-layers = <1>; // optional indexes of drag scroll layers
+//        snipe-layers = <>; // optional indexes of snipe/precision layers
+    };
+};
diff --git a/config/wyld_dm.conf b/config/wyld_dm.conf
@@ -23,13 +23,13 @@ CONFIG_ZMK_USB_LOGGING=n
 
 # CONFIG_SSD1306_REVERSE_MODE=y
 
-CONFIG_ZMK_RGB_UNDERGLOW=y
-CONFIG_WS2812_STRIP=y
-CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE=y
-CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER=n
-
-CONFIG_ZMK_RGB_UNDERGLOW_ON_START=y
-CONFIG_ZMK_RGB_UNDERGLOW_EFF_START=2
+# CONFIG_ZMK_RGB_UNDERGLOW=y
+# CONFIG_WS2812_STRIP=y
+# CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE=y
+# CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER=n
+#
+# CONFIG_ZMK_RGB_UNDERGLOW_ON_START=y
+# CONFIG_ZMK_RGB_UNDERGLOW_EFF_START=2
 # 
 CONFIG_EC11=y
 CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y