kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add interrupt triggering to BVD and VDDH

Browse source
This commit is contained in:
ReFil 2024-03-21 14:32:59 +00:00
parent fee7faf809
commit ef20c7f473
2 changed files with 128 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
app/module/drivers/sensor/battery/battery_nrf_vddh.c
View file

@ -33,8 +33,47 @@ struct vddh_data {
struct adc_channel_cfg acc; struct adc_channel_cfg acc;
struct adc_sequence as; struct adc_sequence as;
struct battery_value value; struct battery_value value;
#if DT_INST_NODE_HAS_PROP(0, chg_gpios)
const struct device *dev;
const struct sensor_trigger *data_ready_trigger;
struct gpio_callback gpio_cb;
sensor_trigger_handler_t data_ready_handler;
struct k_work work;
#endif
}; };
#if DT_INST_NODE_HAS_PROP(0, chg_gpios)
static void set_int(const struct device *dev, const bool en) {
const struct vddh_config *drv_cfg = dev->config;
int ret =
gpio_pin_interrupt_configure_dt(&drv_cfg->chg, en ? GPIO_INT_EDGE_BOTH : GPIO_INT_DISABLE);
if (ret < 0) {
LOG_ERR("can't set interrupt");
}
}
static int vddh_trigger_set(const struct device *dev, const struct sensor_trigger *trig,
sensor_trigger_handler_t handler) {
struct vddh_data *drv_data = dev->data;
set_int(dev, false);
if (trig->type != SENSOR_TRIG_DATA_READY) {
return -ENOTSUP;
}
drv_data->data_ready_trigger = trig;
drv_data->data_ready_handler = handler;
set_int(dev, true);
return 0;
}
static void vddh_int_cb(const struct device *dev) {
struct vddh_data *drv_data = dev->data;
drv_data->data_ready_handler(dev, drv_data->data_ready_trigger);
LOG_DBG("Setting int on %d", 0);
set_int(dev, true);
}
#endif
static int vddh_sample_fetch(const struct device *dev, enum sensor_channel chan) { static int vddh_sample_fetch(const struct device *dev, enum sensor_channel chan) {
// Make sure selected channel is supported // Make sure selected channel is supported
if (chan != SENSOR_CHAN_GAUGE_VOLTAGE && chan != SENSOR_CHAN_GAUGE_STATE_OF_CHARGE && if (chan != SENSOR_CHAN_GAUGE_VOLTAGE && chan != SENSOR_CHAN_GAUGE_STATE_OF_CHARGE &&
@ -44,7 +83,6 @@ static int vddh_sample_fetch(const struct device *dev, enum sensor_channel chan)
} }
struct vddh_data *drv_data = dev->data; struct vddh_data *drv_data = dev->data;
const struct vddh_config *drv_cfg = dev->config;
struct adc_sequence *as = &drv_data->as; struct adc_sequence *as = &drv_data->as;
int rc = adc_read(adc, as); int rc = adc_read(adc, as);
@ -69,6 +107,7 @@ static int vddh_sample_fetch(const struct device *dev, enum sensor_channel chan)
drv_data->value.state_of_charge); drv_data->value.state_of_charge);
#if DT_INST_NODE_HAS_PROP(0, chg_gpios) #if DT_INST_NODE_HAS_PROP(0, chg_gpios)
const struct vddh_config *drv_cfg = dev->config;
int raw = gpio_pin_get_dt(&drv_cfg->chg); int raw = gpio_pin_get_dt(&drv_cfg->chg);
if (raw == -EIO || raw == -EWOULDBLOCK) { if (raw == -EIO || raw == -EWOULDBLOCK) {
LOG_DBG("Failed to read chg status: %d", raw); LOG_DBG("Failed to read chg status: %d", raw);
@ -89,14 +128,28 @@ static int vddh_channel_get(const struct device *dev, enum sensor_channel chan,
return battery_channel_get(&drv_data->value, chan, val); return battery_channel_get(&drv_data->value, chan, val);
} }
#if DT_INST_NODE_HAS_PROP(0, chg_gpios)
static void vddh_work_cb(struct k_work *work) {
struct vddh_data *drv_data = CONTAINER_OF(work, struct vddh_data, work);
vddh_int_cb(drv_data->dev);
}
static void vddh_gpio_cb(const struct device *port, struct gpio_callback *cb, uint32_t pins) {
struct vddh_data *drv_data = CONTAINER_OF(cb, struct vddh_data, gpio_cb);
set_int(drv_data->dev, false);
k_work_submit(&drv_data->work);
}
#endif
static const struct sensor_driver_api vddh_api = { static const struct sensor_driver_api vddh_api = {
#if DT_INST_NODE_HAS_PROP(0, chg_gpios)
.trigger_set = vddh_trigger_set,
#endif
.sample_fetch = vddh_sample_fetch, .sample_fetch = vddh_sample_fetch,
.channel_get = vddh_channel_get, .channel_get = vddh_channel_get,
}; };
static int vddh_init(const struct device *dev) { static int vddh_init(const struct device *dev) {
struct vddh_data *drv_data = dev->data; struct vddh_data *drv_data = dev->data;
const struct vddh_config *drv_cfg = dev->config;
if (!device_is_ready(adc)) { if (!device_is_ready(adc)) {
LOG_ERR("ADC device is not ready %s", adc->name); LOG_ERR("ADC device is not ready %s", adc->name);
@ -128,6 +181,7 @@ static int vddh_init(const struct device *dev) {
LOG_DBG("VDDHDIV5 setup returned %d", rc); LOG_DBG("VDDHDIV5 setup returned %d", rc);
#if DT_INST_NODE_HAS_PROP(0, chg_gpios) #if DT_INST_NODE_HAS_PROP(0, chg_gpios)
const struct vddh_config *drv_cfg = dev->config;
if (!device_is_ready(drv_cfg->chg.port)) { if (!device_is_ready(drv_cfg->chg.port)) {
LOG_ERR("GPIO port for chg reading is not ready"); LOG_ERR("GPIO port for chg reading is not ready");
return -ENODEV; return -ENODEV;
@ -137,6 +191,15 @@ static int vddh_init(const struct device *dev) {
LOG_ERR("Failed to set chg feed %u: %d", drv_cfg->chg.pin, rc); LOG_ERR("Failed to set chg feed %u: %d", drv_cfg->chg.pin, rc);
return rc; return rc;
} }
drv_data->dev = dev;
gpio_init_callback(&drv_data->gpio_cb, vddh_gpio_cb, BIT(drv_cfg->chg.pin));
int ret = gpio_add_callback(drv_cfg->chg.port, &drv_data->gpio_cb);
if (ret < 0) {
LOG_ERR("Failed to set chg callback: %d", ret);
return -EIO;
}
k_work_init(&drv_data->work, vddh_work_cb);
#endif // DT_INST_NODE_HAS_PROP(0, chg_gpios) #endif // DT_INST_NODE_HAS_PROP(0, chg_gpios)
return rc; return rc;

63
app/module/drivers/sensor/battery/battery_voltage_divider.c
View file

@ -35,8 +35,47 @@ struct bvd_data {
struct adc_channel_cfg acc; struct adc_channel_cfg acc;
struct adc_sequence as; struct adc_sequence as;
struct battery_value value; struct battery_value value;
#if DT_INST_NODE_HAS_PROP(0, chg_gpios)
const struct device *dev;
const struct sensor_trigger *data_ready_trigger;
struct gpio_callback gpio_cb;
sensor_trigger_handler_t data_ready_handler;
struct k_work work;
#endif
}; };
#if DT_INST_NODE_HAS_PROP(0, chg_gpios)
static void set_int(const struct device *dev, const bool en) {
const struct bvd_config *drv_cfg = dev->config;
int ret =
gpio_pin_interrupt_configure_dt(&drv_cfg->chg, en ? GPIO_INT_EDGE_BOTH : GPIO_INT_DISABLE);
if (ret < 0) {
LOG_ERR("can't set interrupt");
}
}
static int bvd_trigger_set(const struct device *dev, const struct sensor_trigger *trig,
sensor_trigger_handler_t handler) {
struct bvd_data *drv_data = dev->data;
set_int(dev, false);
if (trig->type != SENSOR_TRIG_DATA_READY) {
return -ENOTSUP;
}
drv_data->data_ready_trigger = trig;
drv_data->data_ready_handler = handler;
set_int(dev, true);
return 0;
}
static void bvd_int_cb(const struct device *dev) {
struct bvd_data *drv_data = dev->data;
drv_data->data_ready_handler(dev, drv_data->data_ready_trigger);
LOG_DBG("Setting int on %d", 0);
set_int(dev, true);
}
#endif
static int bvd_sample_fetch(const struct device *dev, enum sensor_channel chan) { static int bvd_sample_fetch(const struct device *dev, enum sensor_channel chan) {
struct bvd_data *drv_data = dev->data; struct bvd_data *drv_data = dev->data;
const struct bvd_config *drv_cfg = dev->config; const struct bvd_config *drv_cfg = dev->config;
@ -116,7 +155,22 @@ static int bvd_channel_get(const struct device *dev, enum sensor_channel chan,
return battery_channel_get(&drv_data->value, chan, val); return battery_channel_get(&drv_data->value, chan, val);
} }
#if DT_INST_NODE_HAS_PROP(0, chg_gpios)
static void bvd_work_cb(struct k_work *work) {
struct bvd_data *drv_data = CONTAINER_OF(work, struct bvd_data, work);
bvd_int_cb(drv_data->dev);
}
static void bvd_gpio_cb(const struct device *port, struct gpio_callback *cb, uint32_t pins) {
struct bvd_data *drv_data = CONTAINER_OF(cb, struct bvd_data, gpio_cb);
set_int(drv_data->dev, false);
k_work_submit(&drv_data->work);
}
#endif
static const struct sensor_driver_api bvd_api = { static const struct sensor_driver_api bvd_api = {
#if DT_INST_NODE_HAS_PROP(0, chg_gpios)
.trigger_set = bvd_trigger_set,
#endif
.sample_fetch = bvd_sample_fetch, .sample_fetch = bvd_sample_fetch,
.channel_get = bvd_channel_get, .channel_get = bvd_channel_get,
}; };
@ -154,6 +208,15 @@ static int bvd_init(const struct device *dev) {
LOG_ERR("Failed to set chg feed %u: %d", drv_cfg->chg.pin, rc); LOG_ERR("Failed to set chg feed %u: %d", drv_cfg->chg.pin, rc);
return rc; return rc;
} }
drv_data->dev = dev;
gpio_init_callback(&drv_data->gpio_cb, bvd_gpio_cb, BIT(drv_cfg->chg.pin));
int ret = gpio_add_callback(drv_cfg->chg.port, &drv_data->gpio_cb);
if (ret < 0) {
LOG_ERR("Failed to set chg callback: %d", ret);
return -EIO;
}
k_work_init(&drv_data->work, bvd_work_cb);
#endif // DT_INST_NODE_HAS_PROP(0, chg_gpios) #endif // DT_INST_NODE_HAS_PROP(0, chg_gpios)
drv_data->as = (struct adc_sequence){ drv_data->as = (struct adc_sequence){