summaryrefslogtreecommitdiffstats
path: root/movement
diff options
context:
space:
mode:
authorjoeycastillo <joeycastillo@utexas.edu>2022-10-23 15:05:28 -0500
committerjoeycastillo <joeycastillo@utexas.edu>2022-10-23 15:05:28 -0500
commit5c1e7170341e30532ea0a41230480881bffd2cd4 (patch)
tree8a2b21ac627cc95190fbc30670e9db6a409c5cf4 /movement
parent46ac8defdc94c1a998e553d880a542a1de7fd192 (diff)
downloadSensor-Watch-5c1e7170341e30532ea0a41230480881bffd2cd4.tar.gz
Sensor-Watch-5c1e7170341e30532ea0a41230480881bffd2cd4.tar.bz2
Sensor-Watch-5c1e7170341e30532ea0a41230480881bffd2cd4.zip
make this an if/then to please emscripten
Diffstat (limited to 'movement')
-rw-r--r--movement/movement.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/movement/movement.c b/movement/movement.c
index 7066df62..a464313e 100644
--- a/movement/movement.c
+++ b/movement/movement.c
@@ -208,11 +208,12 @@ void movement_move_to_face(uint8_t watch_face_index) {
}
void movement_move_to_next_face(void) {
-#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
+ uint16_t face_max;
+ if (MOVEMENT_SECONDARY_FACE_INDEX) {
+ face_max = (movement_state.current_watch_face < (int16_t)MOVEMENT_SECONDARY_FACE_INDEX) ? MOVEMENT_SECONDARY_FACE_INDEX : MOVEMENT_NUM_FACES;
+ } else {
+ face_max = MOVEMENT_NUM_FACES;
+ }
movement_move_to_face((movement_state.current_watch_face + 1) % face_max);
}