From: joeycastillo <joeycastillo@utexas.edu>
Date: Wed, 25 Jan 2023 15:26:31 +0000 (-0600)
Subject: Merge branch 'main' into default-handler
X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=4412b5d08f90084a8e677bea4792851e6d82bdf3;p=sensor-watch.git

Merge branch 'main' into default-handler
---

4412b5d08f90084a8e677bea4792851e6d82bdf3
diff --cc movement/watch_faces/complication/alarm_face.c
index 4c0befd,52a6c54..479f2f1
--- a/movement/watch_faces/complication/alarm_face.c
+++ b/movement/watch_faces/complication/alarm_face.c
@@@ -445,8 -448,7 +445,8 @@@ bool alarm_face_loop(movement_event_t e
          movement_move_to_face(0);
          break;
      default:
 +        movement_default_loop_handler(event, settings);
-       break;
+         break;
      }
  
      return true;
diff --cc movement/watch_faces/complication/tarot_face.c
index ec42865,39feaf1..403a92d
--- a/movement/watch_faces/complication/tarot_face.c
+++ b/movement/watch_faces/complication/tarot_face.c
@@@ -246,8 -244,13 +244,10 @@@ bool tarot_face_loop(movement_event_t e
              tarot_display(state);
              break;
          case EVENT_TICK:
-             display_animation(state);
+             if (state->is_picking) {
+                 display_animation(state);
+             }
              break;
 -        case EVENT_MODE_BUTTON_UP:
 -            movement_move_to_next_face();
 -            break;
          case EVENT_LIGHT_BUTTON_UP:
              if (state->drawn_cards[0] == 0xff) {
                  // deck is inited; cycle through # cards to draw