diff options
| -rw-r--r-- | movement/movement.c | 10 | ||||
| -rw-r--r-- | movement/movement_config.h | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/movement/movement.c b/movement/movement.c index 558afc53..7066df62 100644 --- a/movement/movement.c +++ b/movement/movement.c @@ -52,7 +52,7 @@ // Default to no secondary face behaviour. #ifndef MOVEMENT_SECONDARY_FACE_INDEX -#define MOVEMENT_SECONDARY_FACE_INDEX MOVEMENT_NUM_FACES +#define MOVEMENT_SECONDARY_FACE_INDEX 0 #endif #if __EMSCRIPTEN__ @@ -208,7 +208,11 @@ void movement_move_to_face(uint8_t watch_face_index) { } 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); } @@ -424,7 +428,7 @@ bool app_loop(void) { && !movement_state.watch_face_changed) { if (movement_state.current_watch_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); } } diff --git a/movement/movement_config.h b/movement/movement_config.h index ef6fb6e8..19a501ea 100644 --- a/movement/movement_config.h +++ b/movement/movement_config.h @@ -44,6 +44,6 @@ const watch_face_t watch_faces[] = { * excludes these faces from the normal rotation. * 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_ |