Browse Source

clang-format and add missing defconfig values

xmkb
Nick 4 years ago
parent
commit
162c6b77db
  1. 4
      app/boards/arm/bluemicro840/bluemicro840_v1_defconfig
  2. 4
      app/boards/arm/nrfmicro/nrfmicro_13_defconfig
  3. 22
      app/drivers/zephyr/battery_voltage_divider.c

4
app/boards/arm/bluemicro840/bluemicro840_v1_defconfig

@ -10,6 +10,10 @@ CONFIG_ARM_MPU=y
# enable GPIO # enable GPIO
CONFIG_GPIO=y CONFIG_GPIO=y
CONFIG_ADC=y
CONFIG_NEWLIB_LIBC=y
CONFIG_USE_DT_CODE_PARTITION=y CONFIG_USE_DT_CODE_PARTITION=y
CONFIG_MPU_ALLOW_FLASH_WRITE=y CONFIG_MPU_ALLOW_FLASH_WRITE=y

4
app/boards/arm/nrfmicro/nrfmicro_13_defconfig

@ -10,6 +10,10 @@ CONFIG_ARM_MPU=y
# enable GPIO # enable GPIO
CONFIG_GPIO=y CONFIG_GPIO=y
CONFIG_ADC=y
CONFIG_NEWLIB_LIBC=y
CONFIG_USE_DT_CODE_PARTITION=y CONFIG_USE_DT_CODE_PARTITION=y
CONFIG_MPU_ALLOW_FLASH_WRITE=y CONFIG_MPU_ALLOW_FLASH_WRITE=y

22
app/drivers/zephyr/battery_voltage_divider.c

@ -75,7 +75,8 @@ static int bvd_sample_fetch(struct device *dev, enum sensor_channel chan) {
if (rc == 0) { if (rc == 0) {
int32_t val = drv_data->adc_raw; int32_t val = drv_data->adc_raw;
adc_raw_to_millivolts(adc_ref_internal(drv_data->adc), drv_data->acc.gain, as->resolution, &val); 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; 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); LOG_DBG("ADC raw %d ~ %d mV => %d mV\n", drv_data->adc_raw, val, millivolts);
@ -100,8 +101,7 @@ static int bvd_sample_fetch(struct device *dev, enum sensor_channel chan) {
return rc; return rc;
} }
static int bvd_channel_get(struct device *dev, enum sensor_channel chan, static int bvd_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) {
struct sensor_value *val) {
struct bvd_data *drv_data = dev->driver_data; struct bvd_data *drv_data = dev->driver_data;
switch (chan) { switch (chan) {
@ -127,7 +127,6 @@ static const struct sensor_driver_api bvd_api = {
.channel_get = bvd_channel_get, .channel_get = bvd_channel_get,
}; };
static int bvd_init(struct device *dev) { static int bvd_init(struct device *dev) {
struct bvd_data *drv_data = dev->driver_data; struct bvd_data *drv_data = dev->driver_data;
const struct bvd_config *drv_cfg = dev->config_info; const struct bvd_config *drv_cfg = dev->config_info;
@ -150,8 +149,8 @@ static int bvd_init(struct device *dev) {
rc = gpio_pin_configure(drv_data->gpio, drv_cfg->power_gpios.pin, rc = gpio_pin_configure(drv_data->gpio, drv_cfg->power_gpios.pin,
GPIO_OUTPUT_INACTIVE | drv_cfg->power_gpios.flags); GPIO_OUTPUT_INACTIVE | drv_cfg->power_gpios.flags);
if (rc != 0) { if (rc != 0) {
LOG_ERR("Failed to control feed %s.%u: %d", LOG_ERR("Failed to control feed %s.%u: %d", drv_cfg->power_gpios.label,
drv_cfg->power_gpios.label, drv_cfg->power_gpios.pin, rc); drv_cfg->power_gpios.pin, rc);
return rc; return rc;
} }
} }
@ -185,12 +184,14 @@ static int bvd_init(struct device *dev) {
static struct bvd_data bvd_data; static struct bvd_data bvd_data;
static const struct bvd_config bvd_cfg = { static const struct bvd_config bvd_cfg = {
.io_channel = { .io_channel =
{
DT_INST_IO_CHANNELS_LABEL(0), DT_INST_IO_CHANNELS_LABEL(0),
DT_INST_IO_CHANNELS_INPUT(0), DT_INST_IO_CHANNELS_INPUT(0),
}, },
#if DT_INST_NODE_HAS_PROP(0, power_gpios) #if DT_INST_NODE_HAS_PROP(0, power_gpios)
.power_gpios = { .power_gpios =
{
DT_INST_GPIO_LABEL(0, power_gpios), DT_INST_GPIO_LABEL(0, power_gpios),
DT_INST_PIN(0, power_gpios), DT_INST_PIN(0, power_gpios),
DT_INST_FLAGS(0, power_gpios), DT_INST_FLAGS(0, power_gpios),
@ -200,6 +201,5 @@ static const struct bvd_config bvd_cfg = {
.full_ohm = DT_INST_PROP(0, full_ohms), .full_ohm = DT_INST_PROP(0, full_ohms),
}; };
DEVICE_AND_API_INIT(bvd_dev, DT_INST_LABEL(0), &bvd_init, DEVICE_AND_API_INIT(bvd_dev, DT_INST_LABEL(0), &bvd_init, &bvd_data, &bvd_cfg, POST_KERNEL,
&bvd_data, &bvd_cfg, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, CONFIG_SENSOR_INIT_PRIORITY, &bvd_api);
&bvd_api);

Loading…
Cancel
Save