From f29ae36bfdd3f9113aa8d248d51b8549ed2abf01 Mon Sep 17 00:00:00 2001
From: 4pplet <4pplet@protonmail.com>
Date: Fri, 13 Nov 2020 21:39:58 +0100
Subject: [PATCH] combined vbat_sense_en pin and vbatt. Changed function calles
 in bvd_cfg = {     .power_gpios =         { to be able to compile. Typos?

combined vbat_sense_en pin and vbatt. Changed function calles in bvd_cfg = {     .power_gpios =         { to be able to compile. Typos?
---
 app/boards/arm/cyber60/cyber60.dts           | 10 +++-------
 app/drivers/zephyr/battery_voltage_divider.c |  4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/boards/arm/cyber60/cyber60.dts b/app/boards/arm/cyber60/cyber60.dts
index 929dec82..5e554460 100644
--- a/app/boards/arm/cyber60/cyber60.dts
+++ b/app/boards/arm/cyber60/cyber60.dts
@@ -18,20 +18,16 @@
 		zmk,kscan = &kscan0;
 		zmk,matrix_transform = &default_transform;
 	};
-/*
-	vbat-sense-en {
-		label = "VBAT_SENSE_EN";
-		control-gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
-	};
-*/
+
 	vbatt {
 		compatible = "zmk,battery-voltage-divider";
 		label = "BATTERY";
 		io-channels = <&adc 1>;
 		output-ohms = <100000>;
 		full-ohms = <(100000 + 100000)>;
+		power-gpios = <&gpio1 15 1>; // the 1 indicates active high?
 	};
-
+	
 	leds {
 		compatible = "gpio-leds";
 		red_led: led_3 {
diff --git a/app/drivers/zephyr/battery_voltage_divider.c b/app/drivers/zephyr/battery_voltage_divider.c
index b94e2a27..d634dfd9 100644
--- a/app/drivers/zephyr/battery_voltage_divider.c
+++ b/app/drivers/zephyr/battery_voltage_divider.c
@@ -205,8 +205,8 @@ static const struct bvd_config bvd_cfg = {
     .power_gpios =
         {
             DT_INST_GPIO_LABEL(0, power_gpios),
-            DT_INST_PIN(0, power_gpios),
-            DT_INST_FLAGS(0, power_gpios),
+            DT_INST_GPIO_PIN(0, power_gpios),
+            DT_INST_GPIO_FLAGS(0, power_gpios),
         },
 #endif
     .output_ohm = DT_INST_PROP(0, output_ohms),