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

disable settings hiding by default

Browse Source
This commit is contained in:
joeycastillo 2022-10-23 14:59:03 -05:00
parent b51f7b6f36
commit 46ac8defdc
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
movement/movement.c
View File

@ -52,7 +52,7 @@
// Default to no secondary face behaviour. // Default to no secondary face behaviour.
#ifndef MOVEMENT_SECONDARY_FACE_INDEX #ifndef MOVEMENT_SECONDARY_FACE_INDEX
#define MOVEMENT_SECONDARY_FACE_INDEX MOVEMENT_NUM_FACES #define MOVEMENT_SECONDARY_FACE_INDEX 0
#endif #endif
#if __EMSCRIPTEN__ #if __EMSCRIPTEN__
@ -208,7 +208,11 @@ void movement_move_to_face(uint8_t watch_face_index) {
} }
void movement_move_to_next_face(void) { void movement_move_to_next_face(void) {
uint16_t face_max = movement_state.current_watch_face < ((int16_t)MOVEMENT_SECONDARY_FACE_INDEX) ? MOVEMENT_SECONDARY_FACE_INDEX : MOVEMENT_NUM_FACES; #if MOVEMENT_SECONDARY_FACE_INDEX
uint16_t face_max = (movement_state.current_watch_face < (int16_t)MOVEMENT_SECONDARY_FACE_INDEX) ? MOVEMENT_SECONDARY_FACE_INDEX : MOVEMENT_NUM_FACES;
#else
uint16_t face_max = MOVEMENT_NUM_FACES;
#endif
movement_move_to_face((movement_state.current_watch_face + 1) % face_max); movement_move_to_face((movement_state.current_watch_face + 1) % face_max);
} }
@ -424,7 +428,7 @@ bool app_loop(void) {
&& !movement_state.watch_face_changed) { && !movement_state.watch_face_changed) {
if (movement_state.current_watch_face != 0) { if (movement_state.current_watch_face != 0) {
movement_move_to_face(0); movement_move_to_face(0);
} else if (MOVEMENT_SECONDARY_FACE_INDEX != MOVEMENT_NUM_FACES) { } else if (MOVEMENT_SECONDARY_FACE_INDEX) {
movement_move_to_face(MOVEMENT_SECONDARY_FACE_INDEX); movement_move_to_face(MOVEMENT_SECONDARY_FACE_INDEX);
} }
} }

2
movement/movement_config.h
View File

@ -44,6 +44,6 @@ const watch_face_t watch_faces[] = {
* excludes these faces from the normal rotation. * excludes these faces from the normal rotation.
* Usually it makes sense to set this to the preferences face. * Usually it makes sense to set this to the preferences face.
*/ */
#define MOVEMENT_SECONDARY_FACE_INDEX (MOVEMENT_NUM_FACES - 2) #define MOVEMENT_SECONDARY_FACE_INDEX 0 // or (MOVEMENT_NUM_FACES - 2)
#endif // MOVEMENT_CONFIG_H_ #endif // MOVEMENT_CONFIG_H_