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

activity log improvements

Browse Source
This commit is contained in:
Joey Castillo 2025-03-15 21:39:32 -04:00
parent ef61a63e20
commit b9c886f045
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
watch-faces/sensor/activity_logging_face.c
View File

@ -36,7 +36,7 @@ static void _activity_logging_face_update_display(activity_logging_state_t *stat
char buf[8]; char buf[8];
uint32_t count = 0; uint32_t count = 0;
movement_activity_data_point *data_points = movement_get_data_log(&count); movement_activity_data_point *data_points = movement_get_data_log(&count);
int8_t pos = (count - 1 - state->display_index) % ACTIVITY_LOGGING_NUM_DATA_POINTS; int32_t pos = ((int32_t)count - 1 - (int32_t)state->display_index) % ACTIVITY_LOGGING_NUM_DATA_POINTS;
watch_date_time_t timestamp = movement_get_local_date_time(); watch_date_time_t timestamp = movement_get_local_date_time();
// round to previous 5 minute increment // round to previous 5 minute increment
@ -52,7 +52,7 @@ static void _activity_logging_face_update_display(activity_logging_state_t *stat
if (pos < 0) { if (pos < 0) {
// no data at this index // no data at this index
watch_display_text_with_fallback(WATCH_POSITION_TOP, "ACT L", "AC"); watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "LOG", "AC");
watch_display_text(WATCH_POSITION_BOTTOM, "no dat"); watch_display_text(WATCH_POSITION_BOTTOM, "no dat");
sprintf(buf, "%2d", state->display_index); sprintf(buf, "%2d", state->display_index);
watch_display_text(WATCH_POSITION_TOP_RIGHT, buf); watch_display_text(WATCH_POSITION_TOP_RIGHT, buf);
@ -66,14 +66,14 @@ static void _activity_logging_face_update_display(activity_logging_state_t *stat
timestamp.unit.hour %= 12; timestamp.unit.hour %= 12;
if (timestamp.unit.hour == 0) timestamp.unit.hour = 12; if (timestamp.unit.hour == 0) timestamp.unit.hour = 12;
} }
watch_display_text(WATCH_POSITION_TOP_LEFT, "AT"); watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "T*D", "AT");
sprintf(buf, "%2d", timestamp.unit.day); sprintf(buf, "%2d", timestamp.unit.day);
watch_display_text(WATCH_POSITION_TOP_RIGHT, buf); watch_display_text(WATCH_POSITION_TOP_RIGHT, buf);
sprintf(buf, "%2d%02d%02d", timestamp.unit.hour, timestamp.unit.minute, 0); sprintf(buf, "%2d%02d%02d", timestamp.unit.hour, timestamp.unit.minute, 0);
watch_display_text(WATCH_POSITION_BOTTOM, buf); watch_display_text(WATCH_POSITION_BOTTOM, buf);
} else { } else {
// we are displaying the number of accelerometer wakeups and orientation changes // we are displaying the number of accelerometer wakeups and orientation changes
watch_display_text(WATCH_POSITION_TOP, "AC"); watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "LOG", "AC");
sprintf(buf, "%2d", state->display_index); sprintf(buf, "%2d", state->display_index);
watch_display_text(WATCH_POSITION_TOP_RIGHT, buf); watch_display_text(WATCH_POSITION_TOP_RIGHT, buf);
sprintf(buf, "%-3u/%2d", data_points[pos].bit.orientation_changes > 999 ? 999 : data_points[pos].bit.orientation_changes, data_points[pos].bit.stationary_minutes); sprintf(buf, "%-3u/%2d", data_points[pos].bit.orientation_changes > 999 ? 999 : data_points[pos].bit.orientation_changes, data_points[pos].bit.stationary_minutes);