hueso/Sensor-Watch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge pull request #226 from rieck/lis2dw_monitor_face_fix

Browse Source 
Fix two bugs in lis2dw_monitor_face
This commit is contained in:
voloved
2026-07-28 09:06:46 -04:00
committed by GitHub
parent b78eaf80b1 bf25776a66
commit 288602c69f
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
watch-faces/sensor/lis2dw_monitor_face.c
+1 -5
View File
@@ -31,9 +31,6 @@
/* Display frequency */ /* Display frequency */
#define DISPLAY_FREQUENCY 8 #define DISPLAY_FREQUENCY 8
/* Settings */
#define NUM_SETTINGS 7
static void _settings_title_display(lis2dw_monitor_state_t *state, char *buf1, char *buf2) static void _settings_title_display(lis2dw_monitor_state_t *state, char *buf1, char *buf2)
{ {
char buf[10]; char buf[10];
@@ -387,7 +384,7 @@ static void _monitor_display(lis2dw_monitor_state_t *state)
{ {
char buf[10]; char buf[10];
snprintf(buf, sizeof(buf), " %C ", "XYZ"[state->axis]); snprintf(buf, sizeof(buf), " %c ", "XYZ"[state->axis]);
watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, buf, buf); watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, buf, buf);
snprintf(buf, sizeof(buf), "%2d", state->axis + 1); snprintf(buf, sizeof(buf), "%2d", state->axis + 1);
@@ -541,7 +538,6 @@ void lis2dw_monitor_face_setup(uint8_t watch_face_index, void **context_ptr)
/* Initialize settings */ /* Initialize settings */
uint8_t settings_page = 0; uint8_t settings_page = 0;
state->settings = malloc(NUM_SETTINGS * sizeof(lis2dw_settings_t));
state->settings[settings_page].display = _settings_mode_display; state->settings[settings_page].display = _settings_mode_display;
state->settings[settings_page].advance = _settings_mode_advance; state->settings[settings_page].advance = _settings_mode_advance;
settings_page++; settings_page++;
watch-faces/sensor/lis2dw_monitor_face.h
+4 -1
View File
@@ -56,13 +56,16 @@ typedef struct {
void (*advance)(void *); void (*advance)(void *);
} lis2dw_settings_t; } lis2dw_settings_t;
/* Number of settings pages */
#define NUM_SETTINGS 7
typedef struct { typedef struct {
uint8_t axis:2; /* Axis to display */ uint8_t axis:2; /* Axis to display */
lis2dw_reading_t reading; /* Current reading */ lis2dw_reading_t reading; /* Current reading */
lis2dw_monitor_page_t page; /* Displayed page */ lis2dw_monitor_page_t page; /* Displayed page */
lis2dw_device_state_t ds; /* Device state */ lis2dw_device_state_t ds; /* Device state */
uint8_t settings_page:3; /* Subpage in settings */ uint8_t settings_page:3; /* Subpage in settings */
lis2dw_settings_t *settings; /* Settings config */ lis2dw_settings_t settings[NUM_SETTINGS]; /* Settings config */
uint8_t show_title:6; /* Display face title */ uint8_t show_title:6; /* Display face title */
} lis2dw_monitor_state_t; } lis2dw_monitor_state_t;