michaelh/zephyr
1
0
Fork 0
Code Releases Activity

ADXL362: Add separate activity/inactivity triggers

Browse source 
This patch modifies the ADXL362 driver to use the new
SENSOR_TRIG_MOTION trigger for activity detection
and SENSOR_TRIG_STATIONARY for inactivity detection.

Signed-off-by: Maximilian Deubel <maximilian.deubel@nordicsemi.no>
This commit is contained in:
Maximilian Deubel 2022-06-23 09:38:51 +02:00 • committed by Maureen Helm
commit 1c1c72ea08
3 changed files with 38 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/sensor/adxl362/adxl362.h
View file

@ -197,8 +197,10 @@ struct adxl362_data {
struct gpio_callback gpio_cb;
struct k_mutex trigger_mutex;
sensor_trigger_handler_t th_handler;
struct sensor_trigger th_trigger;
sensor_trigger_handler_t inact_handler;
struct sensor_trigger inact_trigger;
sensor_trigger_handler_t act_handler;
struct sensor_trigger act_trigger;
sensor_trigger_handler_t drdy_handler;
struct sensor_trigger drdy_trigger;

31
drivers/sensor/adxl362/adxl362_trigger.c
View file

@ -29,10 +29,15 @@ static void adxl362_thread_cb(const struct device *dev)
}
k_mutex_lock(&drv_data->trigger_mutex, K_FOREVER);
if (drv_data->th_handler != NULL) {
if (ADXL362_STATUS_CHECK_INACT(status_buf) ||
ADXL362_STATUS_CHECK_ACTIVITY(status_buf)) {
drv_data->th_handler(dev, &drv_data->th_trigger);
if (drv_data->inact_handler != NULL) {
if (ADXL362_STATUS_CHECK_INACT(status_buf)) {
drv_data->inact_handler(dev, &drv_data->inact_trigger);
}
}
if (drv_data->act_handler != NULL) {
if (ADXL362_STATUS_CHECK_ACTIVITY(status_buf)) {
drv_data->act_handler(dev, &drv_data->act_trigger);
}
}
@ -82,13 +87,21 @@ int adxl362_trigger_set(const struct device *dev,
uint8_t int_mask, int_en, status_buf;
switch (trig->type) {
case SENSOR_TRIG_THRESHOLD:
case SENSOR_TRIG_MOTION:
k_mutex_lock(&drv_data->trigger_mutex, K_FOREVER);
drv_data->th_handler = handler;
drv_data->th_trigger = *trig;
drv_data->act_handler = handler;
drv_data->act_trigger = *trig;
k_mutex_unlock(&drv_data->trigger_mutex);
int_mask = ADXL362_INTMAP1_ACT |
ADXL362_INTMAP1_INACT;
int_mask = ADXL362_INTMAP1_ACT;
/* Clear activity and inactivity interrupts */
adxl362_get_status(dev, &status_buf);
break;
case SENSOR_TRIG_STATIONARY:
k_mutex_lock(&drv_data->trigger_mutex, K_FOREVER);
drv_data->inact_handler = handler;
drv_data->inact_trigger = *trig;
k_mutex_unlock(&drv_data->trigger_mutex);
int_mask = ADXL362_INTMAP1_INACT;
/* Clear activity and inactivity interrupts */
adxl362_get_status(dev, &status_buf);
break;

15
samples/sensor/adxl362/src/main.c
View file

@ -22,8 +22,11 @@ static void trigger_handler(const struct device *dev,
}
k_sem_give(&sem);
break;
case SENSOR_TRIG_THRESHOLD:
printf("Threshold trigger\n");
case SENSOR_TRIG_MOTION:
printf("Motion trigger\n");
break;
case SENSOR_TRIG_STATIONARY:
printf("Stationary trigger\n");
break;
default:
printf("Unknown trigger\n");
@ -43,7 +46,13 @@ void main(void)
if (IS_ENABLED(CONFIG_ADXL362_TRIGGER)) {
struct sensor_trigger trig = { .chan = SENSOR_CHAN_ACCEL_XYZ };
trig.type = SENSOR_TRIG_THRESHOLD;
trig.type = SENSOR_TRIG_MOTION;
if (sensor_trigger_set(dev, &trig, trigger_handler)) {
printf("Trigger set error\n");
return;
}
trig.type = SENSOR_TRIG_STATIONARY;
if (sensor_trigger_set(dev, &trig, trigger_handler)) {
printf("Trigger set error\n");
return;