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

tarot: reduce calls to watch_display_string()

Browse Source
This commit is contained in:
Jeremy O'Brien 2023-01-13 08:06:29 -05:00
parent 29d7d5bd40
commit 5e1f772138
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
movement/watch_faces/complication/tarot_face.c
View File

@ -86,6 +86,7 @@ static void init_deck(tarot_state_t *state) {
static void tarot_display(tarot_state_t *state) { static void tarot_display(tarot_state_t *state) {
char buf[12]; char buf[12];
char *start_end_string;
uint8_t card; uint8_t card;
bool flipped; bool flipped;
@ -103,40 +104,33 @@ static void tarot_display(tarot_state_t *state) {
// show a special status if we're looking at the first or last card in the spread // show a special status if we're looking at the first or last card in the spread
if (state->current_card == 0) { if (state->current_card == 0) {
sprintf(buf, "St"); start_end_string = "St";
} else if (state->current_card == state->num_cards_to_draw - 1) { } else if (state->current_card == state->num_cards_to_draw - 1) {
sprintf(buf, "En"); start_end_string = "En";
} else { } else {
sprintf(buf, " "); start_end_string = " ";
} }
watch_display_string(buf, 0);
// now display the actual card // figure out the card we're showing
card = state->drawn_cards[state->current_card]; card = state->drawn_cards[state->current_card];
flipped = (card & FLIPPED_MASK) ? true : false; // check flipped bit flipped = (card & FLIPPED_MASK) ? true : false; // check flipped bit
card &= ~FLIPPED_MASK; // remove the flipped bit card &= ~FLIPPED_MASK; // remove the flipped bit
if (card < NUM_MAJOR_ARCANA) { if (card < NUM_MAJOR_ARCANA) {
// major arcana // major arcana
// make sure we're not showing a rank
watch_display_string(" ", 2);
// card name // show start/end, no rank, card name
sprintf(buf, "%s", major_arcana[card]); sprintf(buf, "%s %s", start_end_string, major_arcana[card]);
watch_display_string(buf, 4);
} else { } else {
// minor arcana // minor arcana
uint8_t suit = (card - NUM_MAJOR_ARCANA) / NUM_CARDS_PER_SUIT; uint8_t suit = (card - NUM_MAJOR_ARCANA) / NUM_CARDS_PER_SUIT;
uint8_t num = ((card - NUM_MAJOR_ARCANA) % NUM_CARDS_PER_SUIT) + 1; uint8_t rank = ((card - NUM_MAJOR_ARCANA) % NUM_CARDS_PER_SUIT) + 1;
// show rank // show start/end, rank + suit
sprintf(buf, "%2d", num); sprintf(buf, "%s%2d%s", start_end_string, rank, suits[suit]);
watch_display_string(buf, 2);
// suit
sprintf(buf, "%s", suits[suit]);
watch_display_string(buf, 4);
} }
watch_display_string(buf, 0);
if (flipped) { if (flipped) {
watch_set_indicator(WATCH_INDICATOR_SIGNAL); watch_set_indicator(WATCH_INDICATOR_SIGNAL);
} else { } else {