michaelh/zephyr
1
0
Fork 0
Code Releases Activity

samples: boards: nrf: battery: Convert to new DT macros

Browse source 
Reference properties through the path to vbatt.

Signed-off-by: Peter Bigot <peter.bigot@nordicsemi.no>
This commit is contained in:
Peter Bigot 2020-03-27 05:53:50 -05:00 • committed by Kumar Gala
commit 090088d015
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
samples/boards/nrf/battery/src/battery.c
View file

@ -20,6 +20,8 @@
LOG_MODULE_REGISTER(BATTERY, CONFIG_ADC_LOG_LEVEL); LOG_MODULE_REGISTER(BATTERY, CONFIG_ADC_LOG_LEVEL);
#define VBATT DT_PATH(vbatt)
#ifdef CONFIG_BOARD_NRF52_PCA20020 #ifdef CONFIG_BOARD_NRF52_PCA20020
/* This board uses a divider that reduces max voltage to /* This board uses a divider that reduces max voltage to
* reference voltage (600 mV). * reference voltage (600 mV).
@ -51,12 +53,19 @@ struct divider_config {
}; };
static const struct divider_config divider_config = { static const struct divider_config divider_config = {
.io_channel = DT_VOLTAGE_DIVIDER_VBATT_IO_CHANNELS, .io_channel = {
#ifdef DT_VOLTAGE_DIVIDER_VBATT_POWER_GPIOS DT_IO_CHANNELS_LABEL(VBATT),
.power_gpios = DT_VOLTAGE_DIVIDER_VBATT_POWER_GPIOS, DT_IO_CHANNELS_INPUT(VBATT),
},
#if DT_NODE_HAS_PROP(VBATT, power_gpios)
.power_gpios = {
DT_GPIO_LABEL(VBATT, power_gpios),
DT_GPIO_PIN(VBATT, power_gpios),
DT_GPIO_FLAGS(VBATT, power_gpios),
},
#endif #endif
.output_ohm = DT_VOLTAGE_DIVIDER_VBATT_OUTPUT_OHMS, .output_ohm = DT_PROP(VBATT, output_ohms),
.full_ohm = DT_VOLTAGE_DIVIDER_VBATT_FULL_OHMS, .full_ohm = DT_PROP(VBATT, full_ohms),
}; };
struct divider_data { struct divider_data {