From cf5c56c4f1023c3d6b3911e2f57724e54dfd6842 Mon Sep 17 00:00:00 2001 From: Nick Winans Date: Sat, 24 Jul 2021 23:41:03 -0500 Subject: [PATCH] feat(boards): Use the nRF VDDH driver for the nice!nano v2 --- app/boards/arm/nice_nano/Kconfig.defconfig | 13 ++++++++++++- app/boards/arm/nice_nano/nice_nano_v2.dts | 6 +----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app/boards/arm/nice_nano/Kconfig.defconfig b/app/boards/arm/nice_nano/Kconfig.defconfig index 0728bf00..876002bf 100644 --- a/app/boards/arm/nice_nano/Kconfig.defconfig +++ b/app/boards/arm/nice_nano/Kconfig.defconfig @@ -25,7 +25,18 @@ config ZMK_BLE config ZMK_USB default y +endif # BOARD_NICE_NANO || BOARD_NICE_NANO_V2 + +if BOARD_NICE_NANO + config ZMK_BATTERY_VOLTAGE_DIVIDER default y -endif # BOARD_NICE_NANO || BOARD_NICE_NANO_V2 +endif # BOARD_NICE_NANO + +if BOARD_NICE_NANO_V2 + +config ZMK_BATTERY_NRF_VDDH + default y + +endif # BOARD_NICE_NANO_V2 diff --git a/app/boards/arm/nice_nano/nice_nano_v2.dts b/app/boards/arm/nice_nano/nice_nano_v2.dts index 7c044b4d..b17f4787 100644 --- a/app/boards/arm/nice_nano/nice_nano_v2.dts +++ b/app/boards/arm/nice_nano/nice_nano_v2.dts @@ -16,11 +16,7 @@ }; vbatt { - compatible = "zmk,battery-voltage-divider"; + compatible = "zmk,battery-nrf-vddh"; label = "BATTERY"; - io-channels = <&adc (0x0D - 1)>; - // Multiply ADC result by 5 - full-ohms = <5>; - output-ohms = <1>; }; };