mirror/second-movement
3
0
Fork 0
mirror of https://github.com/joeycastillo/second-movement.git synced 2026-08-18 03:11:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop the unused timeout parameter from lis2dw_read_fifo

Browse Source 
The FIFO read no longer waits on a timeout, so the parameter was
ignored by the function. Adapt the signature and its callers, and
remove the now-orphaned LIS2DW_FIFO_TIMEOUT macro.
This commit is contained in:
Konrad Rieck
2026-08-05 09:01:59 +02:00
parent 6f9d58bd93
commit 09ca2d913e
4 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/watch_faces/sensor/accelerometer_data_acquisition_face.c
View File

@ -448,13 +448,13 @@ static void start_reading(accelerometer_data_acquisition_state_t *state) {
state->records[state->pos++] = record; state->records[state->pos++] = record;
lis2dw_fifo_t fifo; lis2dw_fifo_t fifo;
lis2dw_read_fifo(&fifo, LIS2DW_FIFO_TIMEOUT); // dump the fifo, this starts a fresh round of data in continue_reading lis2dw_read_fifo(&fifo); // dump the fifo, this starts a fresh round of data in continue_reading
} }
static void continue_reading(accelerometer_data_acquisition_state_t *state) { static void continue_reading(accelerometer_data_acquisition_state_t *state) {
printf("Continue reading\n"); printf("Continue reading\n");
lis2dw_fifo_t fifo; lis2dw_fifo_t fifo;
lis2dw_read_fifo(&fifo, LIS2DW_FIFO_TIMEOUT); lis2dw_read_fifo(&fifo);
fifo.count = min(fifo.count, 25); // hacky, but we need a consistent data rate; if we got a 26th data point, chuck it. fifo.count = min(fifo.count, 25); // hacky, but we need a consistent data rate; if we got a 26th data point, chuck it.
uint8_t offset = 4 * (25 - fifo.count); // also hacky: we're sometimes short at the start. align to beginning of next second. uint8_t offset = 4 * (25 - fifo.count); // also hacky: we're sometimes short at the start. align to beginning of next second.

2
watch-faces/sensor/lis2dw_monitor_face.c
View File

@ -420,7 +420,7 @@ static void _monitor_update(lis2dw_monitor_state_t *state)
lis2dw_fifo_t fifo; lis2dw_fifo_t fifo;
float x = 0, y = 0, z = 0; float x = 0, y = 0, z = 0;
lis2dw_read_fifo(&fifo, LIS2DW_FIFO_TIMEOUT / DISPLAY_FREQUENCY); lis2dw_read_fifo(&fifo);
if (fifo.count == 0) { if (fifo.count == 0) {
return; return;
} }

5
watch-library/shared/driver/lis2dw.c
View File

@ -277,8 +277,7 @@ inline void lis2dw_disable_fifo(void) {
#endif #endif
} }
bool lis2dw_read_fifo(lis2dw_fifo_t *fifo_data, uint32_t timeout) { bool lis2dw_read_fifo(lis2dw_fifo_t *fifo_data) {
// timeout is in terms of 1/RTC_CNT_HZ seconds (likely 128 timeouts is one second)
#ifdef I2C_SERCOM #ifdef I2C_SERCOM
uint8_t temp = watch_i2c_read8(LIS2DW_ADDRESS, LIS2DW_REG_FIFO_SAMPLE); uint8_t temp = watch_i2c_read8(LIS2DW_ADDRESS, LIS2DW_REG_FIFO_SAMPLE);
bool overrun = !!(temp & LIS2DW_FIFO_SAMPLE_OVERRUN); bool overrun = !!(temp & LIS2DW_FIFO_SAMPLE_OVERRUN);
@ -291,7 +290,6 @@ bool lis2dw_read_fifo(lis2dw_fifo_t *fifo_data, uint32_t timeout) {
fifo_data->count = 32; fifo_data->count = 32;
} }
(void) timeout; /* unused now; kept in the signature for legacy callers */
/* Read the whole FIFO in one burst. With address auto-increment (IF_ADD_INC) /* Read the whole FIFO in one burst. With address auto-increment (IF_ADD_INC)
the pointer walks OUT_X_L..OUT_Z_H and rolls over into the next FIFO slot, the pointer walks OUT_X_L..OUT_Z_H and rolls over into the next FIFO slot,
so count*6 bytes returns the samples back-to-back. On this little-endian so count*6 bytes returns the samples back-to-back. On this little-endian
@ -305,7 +303,6 @@ bool lis2dw_read_fifo(lis2dw_fifo_t *fifo_data, uint32_t timeout) {
return overrun; return overrun;
#else #else
(void) fifo_data; (void) fifo_data;
(void) timeout;
return false; return false;
#endif #endif
} }

4
watch-library/shared/driver/lis2dw.h
View File

@ -301,8 +301,6 @@ typedef enum {
#define LIS2DW_CTRL7_VAL_HP_REF_MODE 0b00000010 #define LIS2DW_CTRL7_VAL_HP_REF_MODE 0b00000010
#define LIS2DW_CTRL7_VAL_LPASS_ON6D 0b00000001 #define LIS2DW_CTRL7_VAL_LPASS_ON6D 0b00000001
#define LIS2DW_FIFO_TIMEOUT 100 // timeout is in terms of 1/RTC_CNT_HZ seconds (likely 128 timeouts is one second)
bool lis2dw_begin(void); bool lis2dw_begin(void);
uint8_t lis2dw_get_device_id(void); uint8_t lis2dw_get_device_id(void);
@ -347,7 +345,7 @@ void lis2dw_enable_fifo(void);
void lis2dw_disable_fifo(void); void lis2dw_disable_fifo(void);
bool lis2dw_read_fifo(lis2dw_fifo_t *fifo_data, uint32_t timeout); bool lis2dw_read_fifo(lis2dw_fifo_t *fifo_data);
void lis2dw_clear_fifo(void); void lis2dw_clear_fifo(void);