summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/boards/arm/bluemicro840/Kconfig.defconfig3
-rw-r--r--app/boards/arm/bluemicro840/bluemicro840_v1.dts12
-rw-r--r--app/boards/arm/nice_nano/Kconfig.defconfig3
-rw-r--r--app/boards/arm/nice_nano/nice_nano.dts12
-rw-r--r--app/boards/arm/nrfmicro/Kconfig.defconfig3
-rw-r--r--app/boards/arm/nrfmicro/nrfmicro_13.dts12
-rw-r--r--app/boards/shields/reviung41/Kconfig.defconfig9
-rw-r--r--app/boards/shields/reviung41/Kconfig.shield5
-rw-r--r--app/boards/shields/reviung41/boards/nice_nano.overlay28
-rw-r--r--app/boards/shields/reviung41/reviung41.conf3
-rw-r--r--app/boards/shields/reviung41/reviung41.keymap72
-rw-r--r--app/boards/shields/reviung41/reviung41.overlay52
-rw-r--r--app/drivers/zephyr/CMakeLists.txt1
-rw-r--r--app/drivers/zephyr/Kconfig6
-rw-r--r--app/drivers/zephyr/battery_voltage_divider.c215
-rw-r--r--app/drivers/zephyr/dts/bindings/zmk,battery-voltage-divider.yaml14
-rw-r--r--app/src/kscan_mock.c2
17 files changed, 451 insertions, 1 deletions
diff --git a/app/boards/arm/bluemicro840/Kconfig.defconfig b/app/boards/arm/bluemicro840/Kconfig.defconfig
index 566b5a4..2b55e17 100644
--- a/app/boards/arm/bluemicro840/Kconfig.defconfig
+++ b/app/boards/arm/bluemicro840/Kconfig.defconfig
@@ -27,4 +27,7 @@ config ZMK_BLE
config ZMK_USB
default y
+config ZMK_BATTERY_VOLTAGE_DIVIDER
+ default y
+
endif # BOARD_BLUEMICRO840_V1
diff --git a/app/boards/arm/bluemicro840/bluemicro840_v1.dts b/app/boards/arm/bluemicro840/bluemicro840_v1.dts
index c693662..32aa2e6 100644
--- a/app/boards/arm/bluemicro840/bluemicro840_v1.dts
+++ b/app/boards/arm/bluemicro840/bluemicro840_v1.dts
@@ -29,6 +29,18 @@
};
};
+ vbatt {
+ compatible = "zmk,battery-voltage-divider";
+ label = "VOLTAGE_DIVIDER";
+ io-channels = <&adc 7>;
+ output-ohms = <2000000>;
+ full-ohms = <(2000000 + 806000)>;
+ };
+
+};
+
+&adc {
+ status = "okay";
};
&gpio0 {
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.dts b/app/boards/arm/nice_nano/nice_nano.dts
index 0538b1d..1819541 100644
--- a/app/boards/arm/nice_nano/nice_nano.dts
+++ b/app/boards/arm/nice_nano/nice_nano.dts
@@ -34,6 +34,18 @@
label = "EXT_POWER";
control-gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
};
+
+ vbatt {
+ compatible = "zmk,battery-voltage-divider";
+ label = "VOLTAGE_DIVIDER";
+ io-channels = <&adc 2>;
+ output-ohms = <2000000>;
+ full-ohms = <(2000000 + 806000)>;
+ };
+};
+
+&adc {
+ status = "okay";
};
&gpiote {
diff --git a/app/boards/arm/nrfmicro/Kconfig.defconfig b/app/boards/arm/nrfmicro/Kconfig.defconfig
index 7957b4a..a3c02c2 100644
--- a/app/boards/arm/nrfmicro/Kconfig.defconfig
+++ b/app/boards/arm/nrfmicro/Kconfig.defconfig
@@ -35,6 +35,9 @@ if BOARD_NRFMICRO_13
config BOARD_NRFMICRO_CHARGER
default y
+config ZMK_BATTERY_VOLTAGE_DIVIDER
+ default y
+
endif # BOARD_NRFMICRO_13
endif # BOARD_NRFMICRO_11 || BOARD_NRFMICRO_11_FLIPPED || BOARD_NRFMICRO_13
diff --git a/app/boards/arm/nrfmicro/nrfmicro_13.dts b/app/boards/arm/nrfmicro/nrfmicro_13.dts
index ef43946..5ae11ba 100644
--- a/app/boards/arm/nrfmicro/nrfmicro_13.dts
+++ b/app/boards/arm/nrfmicro/nrfmicro_13.dts
@@ -31,6 +31,18 @@
label = "EXT_POWER";
control-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
};
+
+ vbatt {
+ compatible = "zmk,battery-voltage-divider";
+ label = "VOLTAGE_DIVIDER";
+ io-channels = <&adc 2>;
+ output-ohms = <2000000>;
+ full-ohms = <(2000000 + 820000)>;
+ };
+};
+
+&adc {
+ status = "okay";
};
&gpio0 {
diff --git a/app/boards/shields/reviung41/Kconfig.defconfig b/app/boards/shields/reviung41/Kconfig.defconfig
new file mode 100644
index 0000000..0625cb2
--- /dev/null
+++ b/app/boards/shields/reviung41/Kconfig.defconfig
@@ -0,0 +1,9 @@
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+if SHIELD_REVIUNG41
+
+config ZMK_KEYBOARD_NAME
+ default "Reviung41"
+
+endif
diff --git a/app/boards/shields/reviung41/Kconfig.shield b/app/boards/shields/reviung41/Kconfig.shield
new file mode 100644
index 0000000..e51f9e6
--- /dev/null
+++ b/app/boards/shields/reviung41/Kconfig.shield
@@ -0,0 +1,5 @@
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+config SHIELD_REVIUNG41
+ def_bool $(shields_list_contains,reviung41)
diff --git a/app/boards/shields/reviung41/boards/nice_nano.overlay b/app/boards/shields/reviung41/boards/nice_nano.overlay
new file mode 100644
index 0000000..a05d0eb
--- /dev/null
+++ b/app/boards/shields/reviung41/boards/nice_nano.overlay
@@ -0,0 +1,28 @@
+&spi1 {
+ compatible = "nordic,nrf-spi";
+ status = "okay";
+ mosi-pin = <6>;
+ // Unused pins, needed for SPI definition, but not used by the ws2812 driver itself.
+ sck-pin = <5>;
+ miso-pin = <7>;
+
+ led_strip: ws2812@0 {
+ compatible = "worldsemi,ws2812-spi";
+ label = "WS2812";
+
+ /* SPI */
+ reg = <0>; /* ignored, but necessary for SPI bindings */
+ spi-max-frequency = <4000000>;
+
+ /* WS2812 */
+ chain-length = <11>; /* arbitrary; change at will */
+ spi-one-frame = <0x70>;
+ spi-zero-frame = <0x40>;
+ };
+};
+
+/ {
+ chosen {
+ zmk,underglow = &led_strip;
+ };
+};
diff --git a/app/boards/shields/reviung41/reviung41.conf b/app/boards/shields/reviung41/reviung41.conf
new file mode 100644
index 0000000..289f070
--- /dev/null
+++ b/app/boards/shields/reviung41/reviung41.conf
@@ -0,0 +1,3 @@
+# Uncomment the following lines to enable RGB underglow
+# CONFIG_ZMK_RGB_UNDERGLOW=y
+# CONFIG_WS2812_STRIP=y
diff --git a/app/boards/shields/reviung41/reviung41.keymap b/app/boards/shields/reviung41/reviung41.keymap
new file mode 100644
index 0000000..26b4093
--- /dev/null
+++ b/app/boards/shields/reviung41/reviung41.keymap
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/keys.h>
+#include <dt-bindings/zmk/bt.h>
+#include <dt-bindings/zmk/rgb.h>
+
+/ {
+ keymap {
+ compatible = "zmk,keymap";
+
+ default_layer {
+// -------------------------------------------------------------------------------------
+// | TAB | Q | W | E | R | T | | Y | U | I | O | P | BKSP |
+// | CTRL | A | S | D | F | G | | H | J | K | L | ; | ' |
+// | SHFT | Z | X | C | V | B | | N | M | , | . | / | SHFT(RET) |
+// | ALT | LWR | SPC | RSE | ALT |
+ bindings = <
+ &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BKSP
+ &kp LCTL &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN &kp QUOT
+ &kp LSFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp CMMA &kp DOT &kp FSLH &mt RSFT RET
+ &kp LALT &mo 1 &kp SPC &mo 2 &kp RALT
+ >;
+ };
+
+ lower_layer {
+// ----------------------------------------------------------------------------------
+// | | ! | @ | # | $ | % | | ^ | & | * | ( | ) | DEL |
+// | | _ | + | { | } | "|" | | LFT | DWN | UP | RGT | ` | ~ |
+// | | ESC | GUI | ALT | CAPS| " | | HOME| END | PGUP| PGDN| PRSC| SHFT(RET) |
+// | | | RET | ADJ | |
+ bindings = <
+ &trans &kp BANG &kp ATSN &kp HASH &kp CURU &kp PRCT &kp CRRT &kp AMPS &kp NUM_8 &kp LPRN &kp RPRN &kp DEL
+ &trans &kp MINUS &kp KPLS &kp LCUR &kp RCUR &kp PIPE &kp LARW &kp DARW &kp UARW &kp RARW &kp GRAV &kp GRAV
+ &trans &kp ESC &kp LGUI &kp LALT &kp CLCK &kp QUOT &kp HOME &kp END &kp PGUP &kp PGDN &kp PRSC &mt RSFT RET
+ &trans &trans &kp RET &mo 3 &trans
+ >;
+ };
+
+ raise_layer {
+// -----------------------------------------------------------------------------------------
+// | | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | DEL |
+// | | - | = | [ | ] | \ | | F1 | F2 | F3 | F4 | F5 | F6 |
+// | | ESC | GUI | ALT | CAPS| " | | F7 | F8 | F9 | F10 | F11 | F12 |
+// | | ADJ | BKSP | | |
+ bindings = <
+ &trans &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &kp DEL
+ &trans &kp MINUS &kp EQL &kp LBKT &kp RBKT &kp BSLH &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6
+ &trans &kp ESC &kp LGUI &kp RALT &kp CLCK &kp QUOT &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12
+ &trans &mo 3 &kp BKSP &trans &trans
+ >;
+ };
+
+ adjust_layer {
+// -----------------------------------------------------------------------------------------
+// | RGB BRI+ | RGB SAT+ | RGB HUE+ | RGB ANI+ | | RGB TOG | | BT1 | BT2 | BT3 | BT4 | BT5 | BT CLR |
+// | RGB BRI- | RGB SAT- | RGB HUE- | RGB ANI+ | | | | | | | | | |
+// | | | | | | | | RESET | | | | | |
+// | | | | | |
+ bindings = <
+ &rgb_ug RGB_BRI &rgb_ug RGB_SAI &rgb_ug RGB_HUI &rgb_ug RGB_EFF &none &rgb_ug RGB_TOG &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_CLR
+ &rgb_ug RGB_BRD &rgb_ug RGB_SAD &rgb_ug RGB_HUD &rgb_ug RGB_EFR &none &none &none &none &none &none &none &none
+ &none &none &none &none &none &none &reset &none &none &none &none &none
+ &trans &trans &tog 3 &trans &trans
+ >;
+ };
+ };
+};
diff --git a/app/boards/shields/reviung41/reviung41.overlay b/app/boards/shields/reviung41/reviung41.overlay
new file mode 100644
index 0000000..06270ca
--- /dev/null
+++ b/app/boards/shields/reviung41/reviung41.overlay
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <dt-bindings/zmk/matrix-transform.h>
+
+/ {
+ chosen {
+ zmk,kscan = &kscan0;
+ zmk,matrix_transform = &default_transform;
+ };
+
+ default_transform: keymap_transform_0 {
+ compatible = "zmk,matrix-transform";
+ columns = <6>;
+ rows = <7>;
+
+ map = <
+RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5)
+RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5)
+RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4) RC(5,5)
+ RC(6,0) RC(6,1) RC(6,2) RC(6,3) RC(6,4)
+ >;
+ };
+
+ kscan0: kscan_0 {
+ compatible = "zmk,kscan-gpio-matrix";
+ label = "KSCAN";
+ diode-direction = "col2row";
+
+ col-gpios
+ = <&pro_micro_d 4 GPIO_ACTIVE_HIGH>
+ , <&pro_micro_d 5 GPIO_ACTIVE_HIGH>
+ , <&pro_micro_d 6 GPIO_ACTIVE_HIGH>
+ , <&pro_micro_d 7 GPIO_ACTIVE_HIGH>
+ , <&pro_micro_d 8 GPIO_ACTIVE_HIGH>
+ , <&pro_micro_d 9 GPIO_ACTIVE_HIGH>
+ ;
+
+ row-gpios
+ = <&pro_micro_a 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&pro_micro_a 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&pro_micro_a 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&pro_micro_a 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&pro_micro_d 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&pro_micro_d 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&pro_micro_d 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ ;
+ };
+};
diff --git a/app/drivers/zephyr/CMakeLists.txt b/app/drivers/zephyr/CMakeLists.txt
index 8778ded..fc43fb8 100644
--- a/app/drivers/zephyr/CMakeLists.txt
+++ b/app/drivers/zephyr/CMakeLists.txt
@@ -9,4 +9,5 @@ if(CONFIG_ZMK_KSCAN_GPIO_DRIVER)
zephyr_library_sources_ifdef(CONFIG_EC11 ec11.c)
zephyr_library_sources_ifdef(CONFIG_EC11_TRIGGER ec11_trigger.c)
+ zephyr_library_sources_ifdef(CONFIG_ZMK_BATTERY_VOLTAGE_DIVIDER battery_voltage_divider.c)
endif()
diff --git a/app/drivers/zephyr/Kconfig b/app/drivers/zephyr/Kconfig
index 0534cab..6b177fb 100644
--- a/app/drivers/zephyr/Kconfig
+++ b/app/drivers/zephyr/Kconfig
@@ -21,6 +21,12 @@ config ZMK_KSCAN_INIT_PRIORITY
help
Keyboard scan device driver initialization priority.
+config ZMK_BATTERY_VOLTAGE_DIVIDER
+ bool "ZMK battery voltage divider"
+ select ADC
+ help
+ Enable ZMK battery voltage divider driver for battery monitoring.
+
menuconfig EC11
bool "EC11 Incremental Encoder Sensor"
depends on GPIO
diff --git a/app/drivers/zephyr/battery_voltage_divider.c b/app/drivers/zephyr/battery_voltage_divider.c
new file mode 100644
index 0000000..37ac024
--- /dev/null
+++ b/app/drivers/zephyr/battery_voltage_divider.c
@@ -0,0 +1,215 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#define DT_DRV_COMPAT zmk_battery_voltage_divider
+
+#include <device.h>
+#include <drivers/gpio.h>
+#include <drivers/adc.h>
+#include <drivers/sensor.h>
+#include <logging/log.h>
+
+LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
+
+struct io_channel_config {
+ const char *label;
+ uint8_t channel;
+};
+
+struct gpio_channel_config {
+ const char *label;
+ uint8_t pin;
+ uint8_t flags;
+};
+
+struct bvd_config {
+ struct io_channel_config io_channel;
+ struct gpio_channel_config power_gpios;
+ uint32_t output_ohm;
+ uint32_t full_ohm;
+};
+
+struct bvd_data {
+ struct device *adc;
+ struct device *gpio;
+ struct adc_channel_cfg acc;
+ struct adc_sequence as;
+ uint16_t adc_raw;
+ uint16_t voltage;
+ uint8_t state_of_charge;
+};
+
+static uint8_t lithium_ion_mv_to_pct(int16_t bat_mv) {
+ // Simple linear approximation of a battery based off adafruit's discharge graph:
+ // https://learn.adafruit.com/li-ion-and-lipoly-batteries/voltages
+
+ if (bat_mv >= 4200) {
+ return 100;
+ } else if (bat_mv <= 3450) {
+ return 0;
+ }
+
+ return bat_mv * 2 / 15 - 459;
+}
+
+static int bvd_sample_fetch(struct device *dev, enum sensor_channel chan) {
+ struct bvd_data *drv_data = dev->driver_data;
+ const struct bvd_config *drv_cfg = dev->config_info;
+ struct adc_sequence *as = &drv_data->as;
+
+ // Make sure selected channel is supported
+ if (chan != SENSOR_CHAN_GAUGE_VOLTAGE && chan != SENSOR_CHAN_GAUGE_STATE_OF_CHARGE) {
+ return -ENOTSUP;
+ }
+
+ int rc = 0;
+
+ // Enable power GPIO if present
+ if (drv_data->gpio) {
+ rc = gpio_pin_set(drv_data->gpio, drv_cfg->power_gpios.pin, 1);
+
+ if (rc != 0) {
+ LOG_DBG("Failed to enable ADC power GPIO: %d", rc);
+ return rc;
+ }
+ }
+
+ // Read ADC
+ rc = adc_read(drv_data->adc, as);
+ as->calibrate = false;
+
+ if (rc == 0) {
+ int32_t val = drv_data->adc_raw;
+
+ adc_raw_to_millivolts(adc_ref_internal(drv_data->adc), drv_data->acc.gain, as->resolution,
+ &val);
+
+ uint16_t millivolts = val * (uint64_t)drv_cfg->full_ohm / drv_cfg->output_ohm;
+ LOG_DBG("ADC raw %d ~ %d mV => %d mV\n", drv_data->adc_raw, val, millivolts);
+ uint8_t percent = lithium_ion_mv_to_pct(millivolts);
+ LOG_DBG("Percent: %d", percent);
+
+ drv_data->voltage = millivolts;
+ drv_data->state_of_charge = percent;
+ } else {
+ LOG_DBG("Failed to read ADC: %d", rc);
+ }
+
+ // Disable power GPIO if present
+ if (drv_data->gpio) {
+ int rc2 = gpio_pin_set(drv_data->gpio, drv_cfg->power_gpios.pin, 0);
+
+ if (rc2 != 0) {
+ LOG_DBG("Failed to disable ADC power GPIO: %d", rc2);
+ return rc2;
+ }
+ }
+
+ return rc;
+}
+
+static int bvd_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) {
+ struct bvd_data *drv_data = dev->driver_data;
+
+ switch (chan) {
+ case SENSOR_CHAN_GAUGE_VOLTAGE:
+ val->val1 = drv_data->voltage / 1000;
+ val->val2 = (drv_data->voltage % 1000) * 1000U;
+ break;
+
+ case SENSOR_CHAN_GAUGE_STATE_OF_CHARGE:
+ val->val1 = drv_data->state_of_charge;
+ val->val2 = 0;
+ break;
+
+ default:
+ return -ENOTSUP;
+ }
+
+ return 0;
+}
+
+static const struct sensor_driver_api bvd_api = {
+ .sample_fetch = bvd_sample_fetch,
+ .channel_get = bvd_channel_get,
+};
+
+static int bvd_init(struct device *dev) {
+ struct bvd_data *drv_data = dev->driver_data;
+ const struct bvd_config *drv_cfg = dev->config_info;
+
+ drv_data->adc = device_get_binding(drv_cfg->io_channel.label);
+
+ if (drv_data->adc == NULL) {
+ LOG_ERR("ADC %s failed to retrieve", drv_cfg->io_channel.label);
+ return -ENODEV;
+ }
+
+ int rc = 0;
+
+ if (drv_cfg->power_gpios.label) {
+ drv_data->gpio = device_get_binding(drv_cfg->power_gpios.label);
+ if (drv_data->gpio == NULL) {
+ LOG_ERR("Failed to get GPIO %s", drv_cfg->power_gpios.label);
+ return -ENODEV;
+ }
+ rc = gpio_pin_configure(drv_data->gpio, drv_cfg->power_gpios.pin,
+ GPIO_OUTPUT_INACTIVE | drv_cfg->power_gpios.flags);
+ if (rc != 0) {
+ LOG_ERR("Failed to control feed %s.%u: %d", drv_cfg->power_gpios.label,
+ drv_cfg->power_gpios.pin, rc);
+ return rc;
+ }
+ }
+
+ drv_data->as = (struct adc_sequence){
+ .channels = BIT(0),
+ .buffer = &drv_data->adc_raw,
+ .buffer_size = sizeof(drv_data->adc_raw),
+ .oversampling = 4,
+ .calibrate = true,
+ };
+
+#ifdef CONFIG_ADC_NRFX_SAADC
+ drv_data->acc = (struct adc_channel_cfg){
+ .gain = ADC_GAIN_1_5,
+ .reference = ADC_REF_INTERNAL,
+ .acquisition_time = ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, 40),
+ .input_positive = SAADC_CH_PSELP_PSELP_AnalogInput0 + drv_cfg->io_channel.channel,
+ };
+
+ drv_data->as.resolution = 12;
+#else
+#error Unsupported ADC
+#endif
+
+ rc = adc_channel_setup(drv_data->adc, &drv_data->acc);
+ LOG_DBG("AIN%u setup returned %d", drv_cfg->io_channel.channel, rc);
+
+ return rc;
+}
+
+static struct bvd_data bvd_data;
+static const struct bvd_config bvd_cfg = {
+ .io_channel =
+ {
+ DT_INST_IO_CHANNELS_LABEL(0),
+ DT_INST_IO_CHANNELS_INPUT(0),
+ },
+#if DT_INST_NODE_HAS_PROP(0, power_gpios)
+ .power_gpios =
+ {
+ DT_INST_GPIO_LABEL(0, power_gpios),
+ DT_INST_PIN(0, power_gpios),
+ DT_INST_FLAGS(0, power_gpios),
+ },
+#endif
+ .output_ohm = DT_INST_PROP(0, output_ohms),
+ .full_ohm = DT_INST_PROP(0, full_ohms),
+};
+
+DEVICE_AND_API_INIT(bvd_dev, DT_INST_LABEL(0), &bvd_init, &bvd_data, &bvd_cfg, POST_KERNEL,
+ CONFIG_SENSOR_INIT_PRIORITY, &bvd_api);
diff --git a/app/drivers/zephyr/dts/bindings/zmk,battery-voltage-divider.yaml b/app/drivers/zephyr/dts/bindings/zmk,battery-voltage-divider.yaml
new file mode 100644
index 0000000..3f391d7
--- /dev/null
+++ b/app/drivers/zephyr/dts/bindings/zmk,battery-voltage-divider.yaml
@@ -0,0 +1,14 @@
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+description: Battery SoC monitoring using voltage divider
+
+compatible: "zmk,battery-voltage-divider"
+
+include: voltage-divider.yaml
+
+properties:
+ label:
+ required: true
+ type: string
+ \ No newline at end of file
diff --git a/app/src/kscan_mock.c b/app/src/kscan_mock.c
index e9c15a0..f1614f1 100644
--- a/app/src/kscan_mock.c
+++ b/app/src/kscan_mock.c
@@ -18,7 +18,7 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
struct kscan_mock_data {
kscan_callback_t callback;
- u8_t event_index;
+ u32_t event_index;
struct k_delayed_work work;
struct device *dev;
};