From 844f2c76749cbc5ff611d8e69819af82b698089a Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 19 Sep 2020 19:14:59 -0500 Subject: Voltage divider driver initial implementation --- app/boards/arm/nice_nano/nice_nano.dts | 10 ++++++++++ app/boards/arm/nice_nano/nice_nano_defconfig | 4 ++++ 2 files changed, 14 insertions(+) (limited to 'app/boards/arm/nice_nano') diff --git a/app/boards/arm/nice_nano/nice_nano.dts b/app/boards/arm/nice_nano/nice_nano.dts index 2e9556b..18312ec 100644 --- a/app/boards/arm/nice_nano/nice_nano.dts +++ b/app/boards/arm/nice_nano/nice_nano.dts @@ -29,6 +29,16 @@ }; }; + vbatt { + compatible = "zmk,battery-voltage-divider"; + io-channels = <&adc 2>; + output-ohms = <2000000>; + full-ohms = <(2000000 + 806000)>; + }; +}; + +&adc { + status = "okay"; }; &gpio0 { diff --git a/app/boards/arm/nice_nano/nice_nano_defconfig b/app/boards/arm/nice_nano/nice_nano_defconfig index 393d61f..b727fe0 100644 --- a/app/boards/arm/nice_nano/nice_nano_defconfig +++ b/app/boards/arm/nice_nano/nice_nano_defconfig @@ -10,6 +10,10 @@ CONFIG_ARM_MPU=y # enable GPIO CONFIG_GPIO=y +CONFIG_ADC=y + +CONFIG_NEWLIB_LIBC=y + CONFIG_USE_DT_CODE_PARTITION=y CONFIG_MPU_ALLOW_FLASH_WRITE=y -- cgit v1.2.3 From 3082455aecc98532807aba3226321a94d2ed4b0c Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 23 Oct 2020 00:45:59 -0500 Subject: Refactor driver to use Sensor API --- app/boards/arm/nice_nano/nice_nano.dts | 1 + 1 file changed, 1 insertion(+) (limited to 'app/boards/arm/nice_nano') diff --git a/app/boards/arm/nice_nano/nice_nano.dts b/app/boards/arm/nice_nano/nice_nano.dts index 18312ec..72804e3 100644 --- a/app/boards/arm/nice_nano/nice_nano.dts +++ b/app/boards/arm/nice_nano/nice_nano.dts @@ -31,6 +31,7 @@ vbatt { compatible = "zmk,battery-voltage-divider"; + label = "VOLTAGE_DIVIDER"; io-channels = <&adc 2>; output-ohms = <2000000>; full-ohms = <(2000000 + 806000)>; -- cgit v1.2.3 From 8efcd80f3ae594a489339ac23de8890399f22f59 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 23 Oct 2020 00:57:32 -0500 Subject: Add missing ADC and fix formatting --- app/boards/arm/nice_nano/nice_nano.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/boards/arm/nice_nano') diff --git a/app/boards/arm/nice_nano/nice_nano.dts b/app/boards/arm/nice_nano/nice_nano.dts index 997d195..1819541 100644 --- a/app/boards/arm/nice_nano/nice_nano.dts +++ b/app/boards/arm/nice_nano/nice_nano.dts @@ -28,8 +28,8 @@ label = "Blue LED"; }; }; - - ext-power { + + ext-power { compatible = "zmk,ext-power-generic"; label = "EXT_POWER"; control-gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; -- cgit v1.2.3 From adb07926b1d6760e63e19134b338f8b1ba460483 Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 24 Oct 2020 18:52:34 -0500 Subject: Remove newlib dep --- app/boards/arm/nice_nano/nice_nano_defconfig | 2 -- 1 file changed, 2 deletions(-) (limited to 'app/boards/arm/nice_nano') diff --git a/app/boards/arm/nice_nano/nice_nano_defconfig b/app/boards/arm/nice_nano/nice_nano_defconfig index b727fe0..a888cb3 100644 --- a/app/boards/arm/nice_nano/nice_nano_defconfig +++ b/app/boards/arm/nice_nano/nice_nano_defconfig @@ -12,8 +12,6 @@ CONFIG_GPIO=y CONFIG_ADC=y -CONFIG_NEWLIB_LIBC=y - CONFIG_USE_DT_CODE_PARTITION=y CONFIG_MPU_ALLOW_FLASH_WRITE=y -- cgit v1.2.3 From a0087311038e9b21c2a45499e669d1300af16f83 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 26 Oct 2020 16:01:57 -0500 Subject: Implement Kconfig and enhance error checks --- app/boards/arm/nice_nano/Kconfig.defconfig | 3 +++ app/boards/arm/nice_nano/nice_nano_defconfig | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'app/boards/arm/nice_nano') diff --git a/app/boards/arm/nice_nano/Kconfig.defconfig b/app/boards/arm/nice_nano/Kconfig.defconfig index 0961ddd..205050a 100644 --- a/app/boards/arm/nice_nano/Kconfig.defconfig +++ b/app/boards/arm/nice_nano/Kconfig.defconfig @@ -25,4 +25,7 @@ config ZMK_BLE config ZMK_USB default y +config ZMK_BATTERY_VOLTAGE_DIVIDER + default y + endif # BOARD_NICE_NANO diff --git a/app/boards/arm/nice_nano/nice_nano_defconfig b/app/boards/arm/nice_nano/nice_nano_defconfig index a888cb3..393d61f 100644 --- a/app/boards/arm/nice_nano/nice_nano_defconfig +++ b/app/boards/arm/nice_nano/nice_nano_defconfig @@ -10,8 +10,6 @@ CONFIG_ARM_MPU=y # enable GPIO CONFIG_GPIO=y -CONFIG_ADC=y - CONFIG_USE_DT_CODE_PARTITION=y CONFIG_MPU_ALLOW_FLASH_WRITE=y -- cgit v1.2.3