]> git.earman.xyz Git - sensor-watch.git/commitdiff
remove tarot_face from legacy (is now in second movement)
authorJoey Castillo <joeycastillo@utexas.edu>
Sun, 6 Jul 2025 16:12:01 +0000 (12:12 -0400)
committerJoey Castillo <joeycastillo@utexas.edu>
Sun, 6 Jul 2025 16:12:01 +0000 (12:12 -0400)
legacy/watch_faces/complication/tarot_face.c [deleted file]
legacy/watch_faces/complication/tarot_face.h [deleted file]

diff --git a/legacy/watch_faces/complication/tarot_face.c b/legacy/watch_faces/complication/tarot_face.c
deleted file mode 100644 (file)
index ae81941..0000000
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022 Jeremy O'Brien
- * Base code copied from Spencer Bywater's probability face
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-// Emulator only: need time() to seed the random number generator.
-#if __EMSCRIPTEN__
-#include <time.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include "tarot_face.h"
-
-#define TAROT_ANIMATION_TICK_FREQUENCY 8
-#define FLIPPED_BIT_POS 7
-#define FLIPPED_MASK ((uint8_t)(1 << FLIPPED_BIT_POS))
-
-
-// --------------
-// Custom methods
-// --------------
-
-static char major_arcana[][7] = {
-    " FOOL ",
-    "Mgcian",
-    "HPrsts",
-    "En&prs", // Empress
-    "En&por", // Emperor
-    "Hiroph",
-    "Lovers",
-    "Chriot",
-    "Strgth",
-    "Hrn&it", // Hermit
-    " Frtun",
-    "Justce",
-    "Hangn&", // Hangman
-    " Death",
-    " tmprn",
-    " Devil",
-    " Tower",
-    "  Star",
-    "n&OON ", // Moon
-    "  Sun ",
-    "Jdgmnt",
-    " World",
-};
-#define NUM_MAJOR_ARCANA (sizeof(major_arcana) / sizeof(*major_arcana))
-
-static char suits[][7] = {
-    " wands",
-    "  cups",
-    "swords",
-    " coins",
-};
-
-#define NUM_MINOR_ARCANA 56
-#define NUM_CARDS_PER_SUIT 14
-
-#define NUM_TAROT_CARDS (NUM_MAJOR_ARCANA + NUM_MINOR_ARCANA)
-
-static void init_deck(tarot_state_t *state) {
-    memset(state->drawn_cards, 0xff, sizeof(state->drawn_cards));
-    state->current_card = 0;
-}
-
-static void tarot_display(tarot_state_t *state) {
-    char buf[12];
-    char *start_end_string;
-    uint8_t card;
-    bool flipped;
-
-    // deck is initialized; show current draw mode and return
-    if (state->drawn_cards[0] == 0xff) {
-        watch_clear_indicator(WATCH_INDICATOR_SIGNAL);
-        if (state->major_arcana_only) {
-            sprintf(buf, "TA%2dn&ajor", state->num_cards_to_draw);
-        } else {
-            sprintf(buf, "TA%2d   All", state->num_cards_to_draw);
-        }
-        watch_display_string(buf, 0);
-        return;
-    }
-
-    // show a special status if we're looking at the first or last card in the spread
-    if (state->current_card == 0) {
-        start_end_string = "St";
-    } else if (state->current_card == state->num_cards_to_draw - 1) {
-        start_end_string = "En";
-    } else {
-        start_end_string = "  ";
-    }
-
-    // figure out the card we're showing
-    card = state->drawn_cards[state->current_card];
-    flipped = (card & FLIPPED_MASK) ? true : false; // check flipped bit
-    card &= ~FLIPPED_MASK; // remove the flipped bit
-    if (card < NUM_MAJOR_ARCANA) {
-        // major arcana
-
-        // show start/end, no rank, card name
-        sprintf(buf, "%s  %s", start_end_string, major_arcana[card]);
-    } else {
-        // minor arcana
-        uint8_t suit = (card - NUM_MAJOR_ARCANA) / NUM_CARDS_PER_SUIT;
-        uint8_t rank = ((card - NUM_MAJOR_ARCANA) % NUM_CARDS_PER_SUIT) + 1;
-
-        // show start/end, rank + suit
-        sprintf(buf, "%s%2d%s", start_end_string, rank, suits[suit]);
-    }
-
-    watch_display_string(buf, 0);
-
-    if (flipped) {
-        watch_set_indicator(WATCH_INDICATOR_SIGNAL);
-    } else {
-        watch_clear_indicator(WATCH_INDICATOR_SIGNAL);
-    }
-}
-
-static uint8_t get_rand_num(uint8_t num_values) {
-    // Emulator: use rand. Hardware: use arc4random.
-#if __EMSCRIPTEN__
-    return rand() % num_values;
-#else
-    return arc4random_uniform(num_values);
-#endif
-}
-
-static uint8_t draw_one_card(tarot_state_t *state) {
-    if (state->major_arcana_only) {
-        return get_rand_num(NUM_MAJOR_ARCANA);
-    } else {
-        return get_rand_num(NUM_TAROT_CARDS);
-    }
-}
-
-static bool already_drawn(tarot_state_t *state, uint8_t drawn_card) {
-    for (int i = 0; state->drawn_cards[i] != 0xff && i < state->num_cards_to_draw; i++) {
-        if ((state->drawn_cards[i] & ~FLIPPED_MASK) == drawn_card) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-static void pick_cards(tarot_state_t *state) {
-    uint8_t card;
-
-    for (int i = 0; i < state->num_cards_to_draw; i++) {
-        card = draw_one_card(state);
-        while (already_drawn(state, card)) {
-            card = draw_one_card(state);
-        }
-        card |= get_rand_num(2) << FLIPPED_BIT_POS; // randomly flip the card
-        state->drawn_cards[i] = card;
-    }
-}
-
-static void display_animation(tarot_state_t *state) {
-    if (state->animation_frame == 0) {
-        watch_display_string("   ", 7);
-        watch_set_pixel(1, 4);
-        watch_set_pixel(1, 6);
-        state->animation_frame = 1;
-    } else if (state->animation_frame == 1) {
-        watch_clear_pixel(1, 4);
-        watch_clear_pixel(1, 6);
-        watch_set_pixel(2, 4);
-        watch_set_pixel(0, 6);
-        state->animation_frame = 2;
-    } else if (state->animation_frame == 2) {
-        watch_clear_pixel(2, 4);
-        watch_clear_pixel(0, 6);
-        watch_set_pixel(2, 5);
-        watch_set_pixel(0, 5);
-        state->animation_frame = 3;
-    } else if (state->animation_frame == 3) {
-        state->animation_frame = 0;
-        state->is_picking = false;
-        movement_request_tick_frequency(1);
-        tarot_display(state);
-    }
-}
-
-
-// ---------------------------
-// Standard watch face methods
-// ---------------------------
-void tarot_face_setup(uint8_t watch_face_index, void ** context_ptr) {
-    (void) watch_face_index;
-    if (*context_ptr == NULL) {
-        *context_ptr = malloc(sizeof(tarot_state_t));
-        memset(*context_ptr, 0, sizeof(tarot_state_t));
-    }
-    // Emulator only: Seed random number generator
-    #if __EMSCRIPTEN__
-    srand(time(NULL));
-    #endif
-}
-
-void tarot_face_activate(void *context) {
-    tarot_state_t *state = (tarot_state_t *)context;
-
-    watch_display_string("TA", 0);
-    init_deck(state);
-    state->num_cards_to_draw = 3;
-    state->major_arcana_only = true;
-}
-
-bool tarot_face_loop(movement_event_t event, void *context) {
-    tarot_state_t *state = (tarot_state_t *)context;
-
-    if (state->is_picking && event.event_type != EVENT_TICK) {
-        return true;
-    }
-
-    switch (event.event_type) {
-        case EVENT_ACTIVATE:
-            tarot_display(state);
-            break;
-        case EVENT_TICK:
-            if (state->is_picking) {
-                display_animation(state);
-            }
-            break;
-        case EVENT_LIGHT_BUTTON_UP:
-            if (state->drawn_cards[0] == 0xff) {
-                // deck is inited; cycle through # cards to draw
-                state->num_cards_to_draw++;
-                if (state->num_cards_to_draw > 10) {
-                    state->num_cards_to_draw = 3;
-                }
-            } else {
-                // cycle through the drawn cards
-                state->current_card = (state->current_card + 1) % state->num_cards_to_draw;
-            }
-            tarot_display(state);
-            break;
-        case EVENT_LIGHT_LONG_PRESS:
-            if (state->drawn_cards[0] == 0xff) {
-                // at main screen; cycle major arcana mode
-                state->major_arcana_only = !state->major_arcana_only;
-            } else {
-                // at card view screen; go back to draw screen
-                init_deck(state);
-            }
-            tarot_display(state);
-            break;
-        case EVENT_ALARM_BUTTON_UP:
-            // Draw cards
-            watch_display_string("      ", 4);
-            watch_clear_indicator(WATCH_INDICATOR_SIGNAL);
-            init_deck(state);
-            pick_cards(state);
-            state->is_picking = true;
-            // card picking animation begins on next tick and new cards will be displayed on completion
-            movement_request_tick_frequency(TAROT_ANIMATION_TICK_FREQUENCY);
-            break;
-        case EVENT_LOW_ENERGY_UPDATE:
-            watch_display_string("SLEEP ", 4);
-            break;
-        case EVENT_LIGHT_BUTTON_DOWN:
-            // don't light up every time light is hit
-            break;
-        default:
-            movement_default_loop_handler(event);
-            break;
-    }
-
-    return true;
-}
-
-void tarot_face_resign(void *context) {
-    (void) context;
-}
diff --git a/legacy/watch_faces/complication/tarot_face.h b/legacy/watch_faces/complication/tarot_face.h
deleted file mode 100644 (file)
index 8c83d51..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022 Jeremy O'Brien
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef TAROT_FACE_H_
-#define TAROT_FACE_H_
-
-/*
- * TAROT CARD watch face
- *
- * Draw from a deck of tarot cards. Can choose between major arcana only or
- * entire deck.
- *
- * In tarot reading, a card orientation can be upright or inverted, and the
- * interpertation of the card can change depending on this state. This face
- * lights the alarm indicator to show when a card is inverted. Just ignore it
- * if you prefer not to deal with card inversions.
- *
- * This face uses the terms "Wands", "Cups", "Swords" and "Coins" for the four
- * suits, and numbers to represent the 14 ranked cards, with the cards 11-14
- * representing the Page, the Knight, the Queen, and King respectively.
- *
- * Default draw is a 3-card major arcana spread.
- *
- * To make it easier to keep track of where you are in the list of drawn cards,
- * after drawing, "St" is shown for the 1st card in the spread and "En" is
- * shown for the last card.
- *
- * At any point, the mode button can be held to return to your first configured
- * watch face.
- *
- * When "Major" or "All" is shown:
- * - Light button: cycle # of cards to draw
- * - Light button (long press): toggle between major arcana and all cards
- * - Alarm button: shuffle deck and draw cards
- *
- * After cards are drawn/showing:
- * - Light button: view the next drawn card
- * - Alarm button: shuffle and re-draw new cards
- * - Light button (long press): go back to Draw screen, for choosing different draw parameters.
- */
-
-#include "movement.h"
-
-#define MAX_CARDS_TO_DRAW 10
-
-typedef struct {
-    uint8_t drawn_cards[MAX_CARDS_TO_DRAW];
-    uint8_t current_card;
-    uint8_t animation_frame;
-    uint8_t num_cards_to_draw;
-    bool major_arcana_only;
-    bool is_picking;
-} tarot_state_t;
-
-void tarot_face_setup(uint8_t watch_face_index, void ** context_ptr);
-void tarot_face_activate(void *context);
-bool tarot_face_loop(movement_event_t event, void *context);
-void tarot_face_resign(void *context);
-
-#define tarot_face ((const watch_face_t){ \
-    tarot_face_setup, \
-    tarot_face_activate, \
-    tarot_face_loop, \
-    tarot_face_resign, \
-    NULL, \
-})
-
-#endif // TAROT_FACE_H_