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

accel: count orientation changes with TC2 instead of waking up

Browse Source
This commit is contained in:
joeycastillo
2024-11-18 23:50:21 -05:00
parent 548260b13e
commit c6af677b79
4 changed files with 46 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
watch-faces/demo/accel_interrupt_count_face.c
View File

@@ -33,7 +33,6 @@
// hacky: we're just tapping into Movement's global state.
// we should make better API for this.
extern uint32_t orientation_changes;
extern uint8_t stationary_minutes;
static void _accel_interrupt_count_face_update_display(accel_interrupt_count_state_t *state) {
@@ -48,7 +47,8 @@ static void _accel_interrupt_count_face_update_display(accel_interrupt_count_sta
else watch_display_text(WATCH_POSITION_TOP_RIGHT, " A");
// Orientation changes / active minutes
sprintf(buf, "%-3lu/%2d", orientation_changes > 999 ? 999 : orientation_changes, stationary_minutes);
uint16_t orientation_changes = tc_count16_get_count(2);
sprintf(buf, "%-3u/%2d", orientation_changes > 999 ? 999 : orientation_changes, stationary_minutes);
watch_display_text(WATCH_POSITION_BOTTOM, buf);
}

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

@@ -27,12 +27,12 @@
#include "activity_logging_face.h"
#include "filesystem.h"
#include "watch.h"
#include "tc.h"
#ifdef HAS_ACCELEROMETER
// hacky: we're just tapping into Movement's global state.
// we should make better API for this.
extern uint32_t orientation_changes;
extern uint8_t stationary_minutes;
static void _activity_logging_face_log_data(activity_logging_state_t *state) {
@@ -45,7 +45,7 @@ static void _activity_logging_face_log_data(activity_logging_state_t *state) {
data_point.bit.hour = date_time.unit.hour;
data_point.bit.minute = date_time.unit.minute;
data_point.bit.stationary_minutes = stationary_minutes;
data_point.bit.orientation_changes = orientation_changes;
data_point.bit.orientation_changes = tc_count16_get_count(2); // orientation changes are counted in TC2
// print size of thing
printf("Size of data point: %d\n", sizeof(activity_logging_data_point_t));
if (filesystem_append_file("activity.dat", (char *)&data_point, sizeof(activity_logging_data_point_t))) {
@@ -57,7 +57,8 @@ static void _activity_logging_face_log_data(activity_logging_state_t *state) {
state->data[pos].reg = data_point.reg;
state->data_points++;
orientation_changes = 0;
// reset the number of orientation changes.
tc_count16_set_count(2, 0);
}
static void _activity_logging_face_update_display(activity_logging_state_t *state, bool clock_mode_24h) {