diff --git a/movement/make/Makefile b/movement/make/Makefile index b70d709..a09b4e3 100755 --- a/movement/make/Makefile +++ b/movement/make/Makefile @@ -49,7 +49,6 @@ SRCS += \ ../watch_faces/complication/totp_face.c \ ../watch_faces/complication/sunrise_sunset_face.c \ ../watch_faces/complication/countdown_face.c \ - ../watch_faces/complication/blinky_face.c \ # New watch faces go above this line. # Leave this line at the bottom of the file; it has all the targets for making your project. diff --git a/movement/movement_faces.h b/movement/movement_faces.h index ce810b8..f6caaf2 100644 --- a/movement/movement_faces.h +++ b/movement/movement_faces.h @@ -43,7 +43,6 @@ #include "hello_there_face.h" #include "sunrise_sunset_face.h" #include "countdown_face.h" -#include "blinky_face.h" // New includes go above this line. #endif // MOVEMENT_FACES_H_ diff --git a/movement/watch_faces/complication/blinky_face.c b/movement/watch_faces/complication/blinky_face.c deleted file mode 100644 index 4c17476..0000000 --- a/movement/watch_faces/complication/blinky_face.c +++ /dev/null @@ -1,107 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2022 Joey Castillo - * - * 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. - */ - -#include -#include -#include "blinky_face.h" -#include "watch.h" - -void blinky_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr) { - (void) settings; - (void) watch_face_index; - if (*context_ptr == NULL) { - *context_ptr = malloc(sizeof(blinky_face_state_t)); - memset(*context_ptr, 0, sizeof(blinky_face_state_t)); - } -} - -void blinky_face_activate(movement_settings_t *settings, void *context) { - (void) settings; - blinky_face_state_t *state = (blinky_face_state_t *)context; - state->active = false; -} - -static void _blinky_face_update_lcd(blinky_face_state_t *state) { - char buf[11]; - const char colors[][7] = {" red ", " Green", " Yello"}; - sprintf(buf, "BL %c%s", state->fast ? 'F' : 'S', colors[state->color]); - watch_display_string(buf, 0); -} - -bool blinky_face_loop(movement_event_t event, movement_settings_t *settings, void *context) { - (void) settings; - blinky_face_state_t *state = (blinky_face_state_t *)context; - - switch (event.event_type) { - case EVENT_ACTIVATE: - _blinky_face_update_lcd(state); - break; - case EVENT_MODE_BUTTON_UP: - movement_move_to_next_face(); - break; - case EVENT_LIGHT_BUTTON_UP: - if (!state->active) { - state->color = (state->color + 1) % 3; - _blinky_face_update_lcd(state); - } - break; - case EVENT_ALARM_BUTTON_UP: - if (!state->active) { - state->active = true; - watch_clear_display(); - movement_request_tick_frequency(state->fast ? 8 : 2); - } else { - state->active = false; - watch_set_led_off(); - _blinky_face_update_lcd(state); - } - break; - case EVENT_ALARM_LONG_PRESS: - if (!state->active) { - state->fast = !state->fast; - _blinky_face_update_lcd(state); - } - break; - case EVENT_TICK: - if (state->active) { - if (event.subsecond % 2 == 0) watch_set_led_off(); - else if (state->color == 0) watch_set_led_red(); - else if (state->color == 1) watch_set_led_green(); - else watch_set_led_yellow(); - } - break; - case EVENT_TIMEOUT: - if (!state->active) movement_move_to_face(0); - default: - break; - } - - return true; -} - -void blinky_face_resign(movement_settings_t *settings, void *context) { - (void) settings; - (void) context; - watch_set_led_off(); -} diff --git a/movement/watch_faces/complication/blinky_face.h b/movement/watch_faces/complication/blinky_face.h deleted file mode 100644 index e966ab1..0000000 --- a/movement/watch_faces/complication/blinky_face.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2022 Joey Castillo - * - * 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 BLINKY_FACE_H_ -#define BLINKY_FACE_H_ - -#include "movement.h" - -typedef struct { - bool active; - bool fast; - uint8_t color; -} blinky_face_state_t; - -void blinky_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr); -void blinky_face_activate(movement_settings_t *settings, void *context); -bool blinky_face_loop(movement_event_t event, movement_settings_t *settings, void *context); -void blinky_face_resign(movement_settings_t *settings, void *context); - -#define blinky_face ((const watch_face_t){ \ - blinky_face_setup, \ - blinky_face_activate, \ - blinky_face_loop, \ - blinky_face_resign, \ - NULL, \ -}) - -#endif // BLINKY_FACE_H_