Skip to content

Commit

Permalink
Return of underglow?
Browse files Browse the repository at this point in the history
  • Loading branch information
bullwinkle3000 committed Jan 20, 2024
1 parent fb23553 commit 363e8cd
Show file tree
Hide file tree
Showing 6 changed files with 79 additions and 74 deletions.
31 changes: 18 additions & 13 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

90 changes: 45 additions & 45 deletions config/boards/pillbug.overlay
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
//#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;
// };
// };
spi3_default: spi3_default {
group1 {
psels = <NRF_PSEL(SPIM_SCK, 0, 40)>, // 1.8,
<NRF_PSEL(SPIM_MOSI, 0, 6)>; // 0.26

};
};

spi3_sleep: spi3_sleep {
group1 {
psels = <NRF_PSEL(SPIM_SCK, 0, 40)>, // 1.8
<NRF_PSEL(SPIM_MOSI, 0, 6)>; // 0.26
low-power-enable;
};
};

i2c0_default: i2c0_default {
group1 {
Expand Down Expand Up @@ -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 = <LED_COLOR_ID_GREEN
// LED_COLOR_ID_RED
// LED_COLOR_ID_BLUE>;
// };
//};
&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;
// };
//};
/* 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 {
zmk,underglow = &led_strip;
};
};
2 changes: 1 addition & 1 deletion config/boards/shields/wyld_dm/wyld_dm.dtsi
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions config/boards/shields/wyld_dm/wyld_dm.keymap
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -70,8 +70,8 @@
};
};

//&led_strip {
// chain-length = <80>;
//};
&led_strip {
chain-length = <80>;
};


14 changes: 7 additions & 7 deletions config/wyld_dm.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions config/wyld_dm.keymap
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -70,8 +70,8 @@
};
};

//&led_strip {
// chain-length = <80>;
//};
&led_strip {
chain-length = <80>;
};


0 comments on commit 363e8cd

Please sign in to comment.