diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8488c0f..1cd9a82 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -9,8 +9,13 @@ - - + + + + + + + @@ -536,7 +541,6 @@ - @@ -561,6 +565,7 @@ - \ No newline at end of file diff --git a/config/boards/pillbug.overlay b/config/boards/pillbug.overlay index 7bc6b8d..134840f 100644 --- a/config/boards/pillbug.overlay +++ b/config/boards/pillbug.overlay @@ -1,21 +1,21 @@ -//#include +#include &pinctrl { -// spi2_default: spi2_default { -// group1 { -// psels = , // 1.8, -// ; // 0.26 -// -// }; -// }; -// -// spi2_sleep: spi2_sleep { -// group1 { -// psels = , // 1.8 -// ; // 0.26 -// low-power-enable; -// }; -// }; + spi3_default: spi3_default { + group1 { + psels = , // 1.8, + ; // 0.26 + + }; + }; + + spi3_sleep: spi3_sleep { + group1 { + psels = , // 1.8 + ; // 0.26 + low-power-enable; + }; + }; i2c0_default: i2c0_default { group1 { @@ -61,33 +61,33 @@ }; }; -//&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 = ; -// }; -//}; +&spi3 { + compatible = "nordic,nrf-spim"; + status = "okay"; + + pinctrl-0 = <&spi3_default>; + pinctrl-1 = <&spi3_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>; -/// { -// chosen { -// zmk,underglow = &led_strip; -// }; -//}; \ No newline at end of file + /* WS2812 */ + chain-length = <40>; /* number of LEDs */ + spi-one-frame = <0x70>; + spi-zero-frame = <0x40>; + color-mapping = ; + }; +}; + +/ { + chosen { + zmk,underglow = &led_strip; + }; +}; \ No newline at end of file diff --git a/config/boards/shields/wyld_dm/wyld_dm.dtsi b/config/boards/shields/wyld_dm/wyld_dm.dtsi index 35766ef..b9cdf9c 100644 --- a/config/boards/shields/wyld_dm/wyld_dm.dtsi +++ b/config/boards/shields/wyld_dm/wyld_dm.dtsi @@ -1,5 +1,5 @@ #include -//#include +#include //&pinctrl { // spi3_default: spi3_default { diff --git a/config/boards/shields/wyld_dm/wyld_dm.keymap b/config/boards/shields/wyld_dm/wyld_dm.keymap index a46dde8..8646d2e 100644 --- a/config/boards/shields/wyld_dm/wyld_dm.keymap +++ b/config/boards/shields/wyld_dm/wyld_dm.keymap @@ -9,7 +9,7 @@ #include #include #include -//#include +#include #include #define QWERTY 0 @@ -70,8 +70,8 @@ }; }; -//&led_strip { -// chain-length = <80>; -//}; +&led_strip { + chain-length = <80>; +}; diff --git a/config/wyld_dm.conf b/config/wyld_dm.conf index 3be9721..f274a05 100644 --- 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 diff --git a/config/wyld_dm.keymap b/config/wyld_dm.keymap index a46dde8..8646d2e 100644 --- a/config/wyld_dm.keymap +++ b/config/wyld_dm.keymap @@ -9,7 +9,7 @@ #include #include #include -//#include +#include #include #define QWERTY 0 @@ -70,8 +70,8 @@ }; }; -//&led_strip { -// chain-length = <80>; -//}; +&led_strip { + chain-length = <80>; +};