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

fix(boards): move battery node from nrf52840_m2 to M60 overlay

Browse source
This commit is contained in:
hyx0329 2024-02-28 14:38:15 +08:00
parent aa4feeed4d
commit dc5a02f4e8
No known key found for this signature in database
GPG key ID: B8C58C7455264351
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/boards/arm/nrf52840_m2/nrf52840_m2.dts
View file

@ -16,7 +16,6 @@
zephyr,sram = &sram0; zephyr,sram = &sram0;
zephyr,flash = &flash0; zephyr,flash = &flash0;
zephyr,console = &cdc_acm_uart; zephyr,console = &cdc_acm_uart;
zmk,battery = &vbatt;
}; };
leds { leds {
@ -32,13 +31,6 @@
}; };
}; };
vbatt: vbatt {
compatible = "zmk,battery-voltage-divider";
io-channels = <&adc 0>;
output-ohms = <1000000>;
full-ohms = <(1000000 + 1000000)>;
};
}; };
&adc { &adc {

8
app/boards/shields/m60/m60.overlay
View file

@ -10,6 +10,7 @@
chosen { chosen {
zmk,kscan = &kscan0; zmk,kscan = &kscan0;
zmk,matrix-transform = &default_transform; zmk,matrix-transform = &default_transform;
zmk,battery = &vbatt;
}; };
kscan0: kscan { kscan0: kscan {
@ -55,5 +56,12 @@ RC(6,4) RC(6,3) RC(6,2) RC(6,1) RC(6,0) RC(5,7) RC(5,6) RC(5,5) RC(5,4) RC
RC(6,5) RC(6,6) RC(6,7) RC(7,0) RC(7,1) RC(7,2) RC(7,3) RC(7,4) RC(6,5) RC(6,6) RC(6,7) RC(7,0) RC(7,1) RC(7,2) RC(7,3) RC(7,4)
>; >;
}; };
vbatt: vbatt {
compatible = "zmk,battery-voltage-divider";
io-channels = <&adc 0>;
output-ohms = <1000000>;
full-ohms = <(1000000 + 1000000)>;
};
}; };