Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sensor: adxl3xx: Move run-time ODR changes from cfg to data #83852

Merged
merged 1 commit into from
Jan 15, 2025
Merged

sensor: adxl3xx: Move run-time ODR changes from cfg to data #83852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions drivers/sensor/adi/adxl345/adxl345.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ static int adxl345_attr_set_odr(const struct device *dev,
const struct sensor_value *val)
{
enum adxl345_odr odr;
struct adxl345_dev_config *cfg = (struct adxl345_dev_config *)dev->config;
struct adxl345_dev_data *data = dev->data;
ubieda marked this conversation as resolved.
Show resolved Hide resolved

switch (val->val1) {
case 12:
Expand Down Expand Up @@ -257,7 +257,7 @@ static int adxl345_attr_set_odr(const struct device *dev,
int ret = adxl345_set_odr(dev, odr);

if (ret == 0) {
cfg->odr = odr;
data->odr = odr;
}

return ret;
Expand Down
1 change: 1 addition & 0 deletions drivers/sensor/adi/adxl345/adxl345.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ struct adxl345_dev_data {
struct adxl345_fifo_config fifo_config;
uint8_t is_full_res;
uint8_t selected_range;
enum adxl345_odr odr;
#ifdef CONFIG_ADXL345_TRIGGER
struct gpio_callback gpio_cb;

Expand Down
2 changes: 1 addition & 1 deletion drivers/sensor/adi/adxl345/adxl345_stream.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ static void adxl345_process_fifo_samples_cb(struct rtio *r, const struct rtio_sq
hdr->int_status = data->status1;
hdr->is_full_res = data->is_full_res;
hdr->selected_range = data->selected_range;
hdr->accel_odr = cfg->odr;
hdr->accel_odr = data->odr;
hdr->sample_set_size = sample_set_size;

uint32_t buf_avail = buf_len;
Expand Down
4 changes: 2 additions & 2 deletions drivers/sensor/adi/adxl372/adxl372.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ static int adxl372_attr_set_odr(const struct device *dev,
const struct sensor_value *val)
{
enum adxl372_odr odr;
struct adxl372_dev_config *cfg = (struct adxl372_dev_config *)dev->config;
struct adxl372_data *data = dev->data;

switch (val->val1) {
case 400:
Expand All @@ -575,7 +575,7 @@ static int adxl372_attr_set_odr(const struct device *dev,
int ret = adxl372_set_odr(dev, odr);

if (ret == 0) {
cfg->odr = odr;
data->odr = odr;
}

return ret;
Expand Down
1 change: 1 addition & 0 deletions drivers/sensor/adi/adxl372/adxl372.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ struct adxl372_data {
const struct adxl372_transfer_function *hw_tf;
struct adxl372_fifo_config fifo_config;
enum adxl372_act_proc_mode act_proc_mode;
enum adxl372_odr odr;
#ifdef CONFIG_ADXL372_TRIGGER
struct gpio_callback gpio_cb;

Expand Down
2 changes: 1 addition & 1 deletion drivers/sensor/adi/adxl372/adxl372_stream.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ static void adxl372_process_fifo_samples_cb(struct rtio *r, const struct rtio_sq
hdr->is_fifo = 1;
hdr->timestamp = data->timestamp;
hdr->int_status = data->status1;
hdr->accel_odr = cfg->odr;
hdr->accel_odr = data->odr;
hdr->sample_set_size = sample_set_size;

if ((cfg->fifo_config.fifo_format == ADXL372_X_FIFO) ||
Expand Down
Loading