kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixup! address review comments

Browse source 
* remove redundant default name
* configure battery to use internal VDDHDIV5 ADC source
* use spi3 peripheral for backlight
* set bias-pull-down on pwm0 during sleep to avoid floating LED driver gate
This commit is contained in:
Chris Andreae 2023-11-11 13:22:24 +09:00
parent 1de68bfc44
commit 42a2b66138
No known key found for this signature in database
GPG key ID: 3AA9D181B3ABD33F
5 changed files with 24 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/boards/arm/glove80/Kconfig.defconfig
View file

@ -9,9 +9,6 @@ config BOARD
config ZMK_SPLIT_BLE_ROLE_CENTRAL config ZMK_SPLIT_BLE_ROLE_CENTRAL
default y default y
config ZMK_KEYBOARD_NAME
default "Glove80"
endif # BOARD_GLOVE80_LH endif # BOARD_GLOVE80_LH
if BOARD_GLOVE80_RH if BOARD_GLOVE80_RH
@ -35,12 +32,6 @@ config ZMK_BLE
config ZMK_USB config ZMK_USB
default y default y
config ZMK_BATTERY_VOLTAGE_DIVIDER
default y
config ZMK_BATTERY_NRF_VDDH
default y
config ZMK_KSCAN_MATRIX_WAIT_BETWEEN_OUTPUTS config ZMK_KSCAN_MATRIX_WAIT_BETWEEN_OUTPUTS
default 5 default 5

18
app/boards/arm/glove80/glove80_lh-pinctrl.dtsi
View file

@ -4,19 +4,15 @@
*/ */
&pinctrl { &pinctrl {
spi1_default: spi1_default { spi3_default: spi3_default {
group1 { group1 {
psels = <NRF_PSEL(SPIM_MOSI, 0, 27)>, // WS2812_VEXT_DATA psels = <NRF_PSEL(SPIM_MOSI, 0, 27)>; // WS2812_VEXT_DATA
<NRF_PSEL(SPIM_SCK, 0, 13)>, // not connected
<NRF_PSEL(SPIM_MISO, 0, 14)>; // not connected
}; };
}; };
spi1_sleep: spi1_sleep { spi3_sleep: spi3_sleep {
group1 { group1 {
psels = <NRF_PSEL(SPIM_MOSI, 0, 27)>, psels = <NRF_PSEL(SPIM_MOSI, 0, 27)>;
<NRF_PSEL(SPIM_SCK, 0, 13)>,
<NRF_PSEL(SPIM_MISO, 0, 14)>;
low-power-enable; low-power-enable;
}; };
}; };
@ -30,21 +26,21 @@
pwm0_sleep: pwm0_sleep { pwm0_sleep: pwm0_sleep {
group1 { group1 {
psels = <NRF_PSEL(PWM_OUT0, 1, 15)>; psels = <NRF_PSEL(PWM_OUT0, 1, 15)>;
low-power-enable; bias-pull-down;
}; };
}; };
uart0_default: uart0_default { uart0_default: uart0_default {
group1 { group1 {
psels = <NRF_PSEL(UART_TX, 0, 22)>, // EXT1 psels = <NRF_PSEL(UART_TX, 0, 22)>, // EXT1
<NRF_PSEL(UART_RX, 0, 21)>; // EXT2 <NRF_PSEL(UART_RX, 0, 21)>; // EXT2
}; };
}; };
uart0_sleep: uart0_sleep { uart0_sleep: uart0_sleep {
group1 { group1 {
psels = <NRF_PSEL(UART_TX, 0, 22)>, psels = <NRF_PSEL(UART_TX, 0, 22)>,
<NRF_PSEL(UART_RX, 0, 21)>; <NRF_PSEL(UART_RX, 0, 21)>;
low-power-enable; low-power-enable;
}; };
}; };

18
app/boards/arm/glove80/glove80_lh.dts
View file

@ -35,26 +35,18 @@
init-delay-ms = <100>; init-delay-ms = <100>;
}; };
vbatt: vbatt-divider { vbatt: vbatt {
compatible = "zmk,battery-voltage-divider";
label = "BATTERY";
io-channels = <&adc 5>;
output-ohms = <820000>;
full-ohms = <(1500000 + 820000)>;
};
vbatt-vddh {
compatible = "zmk,battery-nrf-vddh"; compatible = "zmk,battery-nrf-vddh";
label = "BATTERY-VDDH"; label = "BATTERY";
}; };
}; };
&spi1 { &spi3 {
compatible = "nordic,nrf-spim"; compatible = "nordic,nrf-spim";
status = "okay"; status = "okay";
pinctrl-0 = <&spi1_default>; pinctrl-0 = <&spi3_default>;
pinctrl-1 = <&spi1_sleep>; pinctrl-1 = <&spi3_sleep>;
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
led_strip: ws2812@0 { led_strip: ws2812@0 {

18
app/boards/arm/glove80/glove80_rh-pinctrl.dtsi
View file

@ -4,19 +4,15 @@
*/ */
&pinctrl { &pinctrl {
spi1_default: spi1_default { spi3_default: spi3_default {
group1 { group1 {
psels = <NRF_PSEL(SPIM_MOSI, 0, 13)>, // WS2812_VEXT_DATA psels = <NRF_PSEL(SPIM_MOSI, 0, 13)>; // WS2812_VEXT_DATA
<NRF_PSEL(SPIM_SCK, 0, 27)>, // no connection
<NRF_PSEL(SPIM_MISO, 0, 14)>; // no connection
}; };
}; };
spi1_sleep: spi1_sleep { spi3_sleep: spi3_sleep {
group1 { group1 {
psels = <NRF_PSEL(SPIM_MOSI, 0, 13)>, psels = <NRF_PSEL(SPIM_MOSI, 0, 13)>;
<NRF_PSEL(SPIM_SCK, 0, 27)>,
<NRF_PSEL(SPIM_MISO, 0, 14)>;
low-power-enable; low-power-enable;
}; };
}; };
@ -30,21 +26,21 @@
pwm0_sleep: pwm0_sleep { pwm0_sleep: pwm0_sleep {
group1 { group1 {
psels = <NRF_PSEL(PWM_OUT0, 0, 16)>; psels = <NRF_PSEL(PWM_OUT0, 0, 16)>;
low-power-enable; bias-pull-down;
}; };
}; };
uart0_default: uart0_default { uart0_default: uart0_default {
group1 { group1 {
psels = <NRF_PSEL(UART_TX, 0, 21)>, // EXT1 psels = <NRF_PSEL(UART_TX, 0, 21)>, // EXT1
<NRF_PSEL(UART_RX, 0, 24)>; // EXT2 <NRF_PSEL(UART_RX, 0, 24)>; // EXT2
}; };
}; };
uart0_sleep: uart0_sleep { uart0_sleep: uart0_sleep {
group1 { group1 {
psels = <NRF_PSEL(UART_TX, 0, 21)>, psels = <NRF_PSEL(UART_TX, 0, 21)>,
<NRF_PSEL(UART_RX, 0, 24)>; <NRF_PSEL(UART_RX, 0, 24)>;
low-power-enable; low-power-enable;
}; };
}; };

18
app/boards/arm/glove80/glove80_rh.dts
View file

@ -36,26 +36,18 @@
init-delay-ms = <100>; init-delay-ms = <100>;
}; };
vbatt: vbatt-divider { vbatt: vbatt {
compatible = "zmk,battery-voltage-divider";
label = "BATTERY";
io-channels = <&adc 5>;
output-ohms = <820000>;
full-ohms = <(1500000 + 820000)>;
};
vbatt-vddh {
compatible = "zmk,battery-nrf-vddh"; compatible = "zmk,battery-nrf-vddh";
label = "BATTERY-VDDH"; label = "BATTERY";
}; };
}; };
&spi1 { &spi3 {
compatible = "nordic,nrf-spim"; compatible = "nordic,nrf-spim";
status = "okay"; status = "okay";
pinctrl-0 = <&spi1_default>; pinctrl-0 = <&spi3_default>;
pinctrl-1 = <&spi1_sleep>; pinctrl-1 = <&spi3_sleep>;
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
led_strip: ws2812@0 { led_strip: ws2812@0 {