rename types to be more c-like

diff --git a/movement/movement.c b/movement/movement.c
index 3417345c0ae2648283ff07b8d6085283d9d4d052..779674c7914ceae11f4d5004fbd01e889d8815ce 100644 (file)
--- a/movement/movement.c
+++ b/movement/movement.c
@@ -5,10 +5,10 @@
 #include "movement.h"
 #include "movement_config.h"
 
-LauncherState movement_state;
+movement_state_t movement_state;
 void * watch_face_contexts[MOVEMENT_NUM_FACES];
 const int32_t movement_screensaver_deadlines[8] = {INT_MAX, 3600, 7200, 21600, 43200, 86400, 172800, 604800};
-LauncherEvent event;
+movement_event_t event;
 
 void cb_mode_btn_interrupt();
 void cb_light_btn_interrupt();
@@ -166,16 +166,16 @@ bool app_loop() {
     return can_sleep && !movement_state.led_on;
 }
 
-LauncherEventType _figure_out_button_event(LauncherEventType button_down_event, uint8_t *down_timestamp) {
+movement_event_type_t _figure_out_button_event(movement_event_type_t button_down_event_type, uint8_t *down_timestamp) {
     watch_date_time date_time = watch_rtc_get_date_time();
     if (*down_timestamp) {
         uint8_t diff = ((61 + date_time.unit.second) - *down_timestamp) % 60;
         *down_timestamp = 0;
-        if (diff > 1) return button_down_event + 2;
-        else return button_down_event + 1;
+        if (diff > 1) return button_down_event_type + 2;
+        else return button_down_event_type + 1;
     } else {
         *down_timestamp = date_time.unit.second + 1;
-        return button_down_event;
+        return button_down_event_type;
     }
 }
 

diff --git a/movement/movement.h b/movement/movement.h
index 719a3d95a146ac61b0e9ccfce13cd91a1cf3c717..d78e0f443e93d19e680be12fec5a125cd8d0355d 100644 (file)
--- a/movement/movement.h
+++ b/movement/movement.h
@@ -19,7 +19,7 @@ typedef union {
         uint32_t led_green_color : 4;       // for general purpose illumination, the green LED value (0-15)
     } bit;
     uint32_t value;
-} LauncherSettings;
+} movement_settings_t;
 
 typedef enum {
     EVENT_NONE = 0,             // There is no event to report.
@@ -35,28 +35,28 @@ typedef enum {
     EVENT_ALARM_BUTTON_DOWN,    // The alarm button has been pressed, but not yet released.
     EVENT_ALARM_BUTTON_UP,      // The alarm button was pressed and released.
     EVENT_ALARM_LONG_PRESS,     // The alarm button was held for >2 seconds, and released.
-} LauncherEventType;
+} movement_event_type_t;
 
 typedef struct {
     uint8_t event_type;
     uint8_t subsecond;
-} LauncherEvent;
+} movement_event_t;
 
-typedef void (*watch_face_setup)(LauncherSettings *settings, void ** context_ptr);
-typedef void (*watch_face_activate)(LauncherSettings *settings, void *context);
-typedef bool (*watch_face_loop)(LauncherEvent event, LauncherSettings *settings, void *context);
-typedef void (*watch_face_resign)(LauncherSettings *settings, void *context);
+typedef void (*watch_face_setup)(movement_settings_t *settings, void ** context_ptr);
+typedef void (*watch_face_activate)(movement_settings_t *settings, void *context);
+typedef bool (*watch_face_loop)(movement_event_t event, movement_settings_t *settings, void *context);
+typedef void (*watch_face_resign)(movement_settings_t *settings, void *context);
 
 typedef struct {
     watch_face_setup setup;
     watch_face_activate activate;
     watch_face_loop loop;
     watch_face_resign resign;
-} WatchFace;
+} watch_face_t;
 
 typedef struct {
     // properties stored in BACKUP register
-    LauncherSettings movement_settings;
+    movement_settings_t movement_settings;
 
     // transient properties
     int16_t current_watch_face;
@@ -79,7 +79,7 @@ typedef struct {
     uint8_t tick_frequency;
     uint8_t last_second;
     uint8_t subsecond;
-} LauncherState;
+} movement_state_t;
 
 void movement_move_to_face(uint8_t watch_face_index);
 void movement_move_to_next_face();

diff --git a/movement/movement_config.h b/movement/movement_config.h
index 41066d19b840476a1942ad205366317c84efc041..172736f1464429a8f9f40dd0a731c9d6ff0a08e4 100644 (file)
--- a/movement/movement_config.h
+++ b/movement/movement_config.h
@@ -8,7 +8,7 @@
 
 #define MOVEMENT_NUM_FACES 3
 
-WatchFace watch_faces[MOVEMENT_NUM_FACES] = {
+watch_face_t watch_faces[MOVEMENT_NUM_FACES] = {
     simple_clock_face,
     preferences_face,
     set_time_face,

diff --git a/movement/watch_faces/clock/simple_clock_face.c b/movement/watch_faces/clock/simple_clock_face.c
index 97067b0f2195e7f6d8ba919a5f1c0cc5e2d83682..bdee7decccc1b74ee46d6c5e5a0d2ce03331697f 100644 (file)
--- a/movement/watch_faces/clock/simple_clock_face.c
+++ b/movement/watch_faces/clock/simple_clock_face.c
@@ -2,13 +2,13 @@
 #include "simple_clock_face.h"
 #include "watch.h"
 
-void simple_clock_face_setup(LauncherSettings *settings, void ** context_ptr) {
+void simple_clock_face_setup(movement_settings_t *settings, void ** context_ptr) {
     (void) settings;
     // the only context we need is the timestamp of the previous tick.
     if (*context_ptr == NULL) *context_ptr = malloc(sizeof(uint32_t));
 }
 
-void simple_clock_face_activate(LauncherSettings *settings, void *context) {
+void simple_clock_face_activate(movement_settings_t *settings, void *context) {
     if (settings->bit.clock_mode_24h) {
         watch_set_indicator(WATCH_INDICATOR_24H);
     }
@@ -17,7 +17,7 @@ void simple_clock_face_activate(LauncherSettings *settings, void *context) {
     *((uint32_t *)context) = 0xFFFFFFFF;
 }
 
-bool simple_clock_face_loop(LauncherEvent event, LauncherSettings *settings, void *context) {
+bool simple_clock_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
     printf("simple_clock_face_loop\n");
     const char weekdays[7][3] = {"SA", "SU", "MO", "TU", "WE", "TH", "FR"};
     char buf[11];
@@ -77,7 +77,7 @@ bool simple_clock_face_loop(LauncherEvent event, LauncherSettings *settings, voi
     return true;
 }
 
-void simple_clock_face_resign(LauncherSettings *settings, void *context) {
+void simple_clock_face_resign(movement_settings_t *settings, void *context) {
     (void) settings;
     (void) context;
 }

diff --git a/movement/watch_faces/clock/simple_clock_face.h b/movement/watch_faces/clock/simple_clock_face.h
index 59201a1f3244a6643c9021a29e161c70d425fd3d..3cdc09e872f8e8fd76c65806a5735593699d761d 100644 (file)
--- a/movement/watch_faces/clock/simple_clock_face.h
+++ b/movement/watch_faces/clock/simple_clock_face.h
@@ -3,10 +3,10 @@
 
 #include "movement.h"
 
-void simple_clock_face_setup(LauncherSettings *settings, void ** context_ptr);
-void simple_clock_face_activate(LauncherSettings *settings, void *context);
-bool simple_clock_face_loop(LauncherEvent event, LauncherSettings *settings, void *context);
-void simple_clock_face_resign(LauncherSettings *settings, void *context);
+void simple_clock_face_setup(movement_settings_t *settings, void ** context_ptr);
+void simple_clock_face_activate(movement_settings_t *settings, void *context);
+bool simple_clock_face_loop(movement_event_t event, movement_settings_t *settings, void *context);
+void simple_clock_face_resign(movement_settings_t *settings, void *context);
 
 uint8_t simple_clock_face_get_weekday(uint16_t day, uint16_t month, uint16_t year);
 

diff --git a/movement/watch_faces/complications/pulseometer_face.c b/movement/watch_faces/complications/pulseometer_face.c
index e38153d689488d18e84f5ff9f98b850a4e79c880..7c524b8dc2399efc56c8ffc8c325587378b9a947 100644 (file)
--- a/movement/watch_faces/complications/pulseometer_face.c
+++ b/movement/watch_faces/complications/pulseometer_face.c
@@ -6,17 +6,17 @@
 #define PULSOMETER_FACE_FREQUENCY_FACTOR (4ul) // refresh rate will be 2 to this power Hz (0 for 1 Hz, 2 for 4 Hz, etc.)
 #define PULSOMETER_FACE_FREQUENCY (1 << PULSOMETER_FACE_FREQUENCY_FACTOR)
 
-void pulseometer_face_setup(LauncherSettings *settings, void ** context_ptr) {
+void pulseometer_face_setup(movement_settings_t *settings, void ** context_ptr) {
     (void) settings;
     if (*context_ptr == NULL) *context_ptr = malloc(sizeof(PulsometerState));
 }
 
-void pulseometer_face_activate(LauncherSettings *settings, void *context) {
+void pulseometer_face_activate(movement_settings_t *settings, void *context) {
     (void) settings;
     memset(context, 0, sizeof(PulsometerState));
 }
 
-bool pulseometer_face_loop(LauncherEvent event, LauncherSettings *settings, void *context) {
+bool pulseometer_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
     printf("pulseometer_face_loop\n");
     (void) settings;
     PulsometerState *pulsometer_state = (PulsometerState *)context;
@@ -81,7 +81,7 @@ bool pulseometer_face_loop(LauncherEvent event, LauncherSettings *settings, void
     return true;
 }
 
-void pulseometer_face_resign(LauncherSettings *settings, void *context) {
+void pulseometer_face_resign(movement_settings_t *settings, void *context) {
     (void) settings;
     (void) context;
 }

diff --git a/movement/watch_faces/complications/pulseometer_face.h b/movement/watch_faces/complications/pulseometer_face.h
index 7b96259c30560efbe3c181b26372333112dc2bfe..f8e69d27c6332b2b03f7e5fae08c10fc6f350c21 100644 (file)
--- a/movement/watch_faces/complications/pulseometer_face.h
+++ b/movement/watch_faces/complications/pulseometer_face.h
@@ -9,10 +9,10 @@ typedef struct {
     int16_t ticks;
 } PulsometerState;
 
-void pulseometer_face_setup(LauncherSettings *settings, void ** context_ptr);
-void pulseometer_face_activate(LauncherSettings *settings, void *context);
-bool pulseometer_face_loop(LauncherEvent event, LauncherSettings *settings, void *context);
-void pulseometer_face_resign(LauncherSettings *settings, void *context);
+void pulseometer_face_setup(movement_settings_t *settings, void ** context_ptr);
+void pulseometer_face_activate(movement_settings_t *settings, void *context);
+bool pulseometer_face_loop(movement_event_t event, movement_settings_t *settings, void *context);
+void pulseometer_face_resign(movement_settings_t *settings, void *context);
 
 #define pulseometer_face { \
     pulseometer_face_setup, \

diff --git a/movement/watch_faces/settings/preferences_face.c b/movement/watch_faces/settings/preferences_face.c
index f499e36fe9bbda6eaa809f46103b8cb94828b6d5..18dff6cd369085aef052795bf3c1510ce37ee60e 100644 (file)
--- a/movement/watch_faces/settings/preferences_face.c
+++ b/movement/watch_faces/settings/preferences_face.c
@@ -5,18 +5,18 @@
 #define PREFERENCES_FACE_NUM_PREFEFENCES (5)
 const char preferences_face_titles[PREFERENCES_FACE_NUM_PREFEFENCES][11] = {"CL        ", "Bt  Beep  ", "SC        ", "Lt   grn  ", "Lt   red  "};
 
-void preferences_face_setup(LauncherSettings *settings, void ** context_ptr) {
+void preferences_face_setup(movement_settings_t *settings, void ** context_ptr) {
     (void) settings;
     if (*context_ptr == NULL) *context_ptr = malloc(sizeof(uint8_t));
 }
 
-void preferences_face_activate(LauncherSettings *settings, void *context) {
+void preferences_face_activate(movement_settings_t *settings, void *context) {
     (void) settings;
     *((uint8_t *)context) = 0;
     movement_request_tick_frequency(4); // we need to manually blink some pixels
 }
 
-bool preferences_face_loop(LauncherEvent event, LauncherSettings *settings, void *context) {
+bool preferences_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
     printf("preferences_face_loop\n");
     uint8_t current_page = *((uint8_t *)context);
     switch (event.event_type) {
@@ -112,7 +112,7 @@ bool preferences_face_loop(LauncherEvent event, LauncherSettings *settings, void
     return true;
 }
 
-void preferences_face_resign(LauncherSettings *settings, void *context) {
+void preferences_face_resign(movement_settings_t *settings, void *context) {
     (void) settings;
     (void) context;
     watch_set_led_off();

diff --git a/movement/watch_faces/settings/preferences_face.h b/movement/watch_faces/settings/preferences_face.h
index 218f99c2ba0f34397cd3fa33030464c383aad86b..c8f1a14e61644e86fdcc3901af1ba59940efb900 100644 (file)
--- a/movement/watch_faces/settings/preferences_face.h
+++ b/movement/watch_faces/settings/preferences_face.h
@@ -3,10 +3,10 @@
 
 #include "movement.h"
 
-void preferences_face_setup(LauncherSettings *settings, void ** context_ptr);
-void preferences_face_activate(LauncherSettings *settings, void *context);
-bool preferences_face_loop(LauncherEvent event, LauncherSettings *settings, void *context);
-void preferences_face_resign(LauncherSettings *settings, void *context);
+void preferences_face_setup(movement_settings_t *settings, void ** context_ptr);
+void preferences_face_activate(movement_settings_t *settings, void *context);
+bool preferences_face_loop(movement_event_t event, movement_settings_t *settings, void *context);
+void preferences_face_resign(movement_settings_t *settings, void *context);
 
 #define preferences_face { \
     preferences_face_setup, \

diff --git a/movement/watch_faces/settings/set_time_face.c b/movement/watch_faces/settings/set_time_face.c
index 36498611747af7443b2dccb2955981eac5aec9e8..7bb63d0b8f3595d1e53ddaf175b32759318d602d 100644 (file)
--- a/movement/watch_faces/settings/set_time_face.c
+++ b/movement/watch_faces/settings/set_time_face.c
@@ -5,18 +5,18 @@
 #define SET_TIME_FACE_NUM_SETTINGS (6)
 const char set_time_face_titles[SET_TIME_FACE_NUM_SETTINGS][3] = {"HR", "MN", "SE", "YR", "MO", "DA"};
 
-void set_time_face_setup(LauncherSettings *settings, void ** context_ptr) {
+void set_time_face_setup(movement_settings_t *settings, void ** context_ptr) {
     (void) settings;
     if (*context_ptr == NULL) *context_ptr = malloc(sizeof(uint8_t));
 }
 
-void set_time_face_activate(LauncherSettings *settings, void *context) {
+void set_time_face_activate(movement_settings_t *settings, void *context) {
     (void) settings;
     *((uint8_t *)context) = 0;
     movement_request_tick_frequency(4);
 }
 
-bool set_time_face_loop(LauncherEvent event, LauncherSettings *settings, void *context) {
+bool set_time_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
     uint8_t current_page = *((uint8_t *)context);
     const uint8_t days_in_month[12] = {31, 28, 31, 30, 31, 30, 30, 31, 30, 31, 30, 31};
     watch_date_time date_time = watch_rtc_get_date_time();
@@ -101,7 +101,7 @@ bool set_time_face_loop(LauncherEvent event, LauncherSettings *settings, void *c
     return true;
 }
 
-void set_time_face_resign(LauncherSettings *settings, void *context) {
+void set_time_face_resign(movement_settings_t *settings, void *context) {
     (void) settings;
     (void) context;
     watch_set_led_off();

diff --git a/movement/watch_faces/settings/set_time_face.h b/movement/watch_faces/settings/set_time_face.h
index 0c34d6b27c484b8c3d08bf3bad66517d2c527d59..b330d85217074582c981d4896b532437d2b160f8 100644 (file)
--- a/movement/watch_faces/settings/set_time_face.h
+++ b/movement/watch_faces/settings/set_time_face.h
@@ -3,10 +3,10 @@
 
 #include "movement.h"
 
-void set_time_face_setup(LauncherSettings *settings, void ** context_ptr);
-void set_time_face_activate(LauncherSettings *settings, void *context);
-bool set_time_face_loop(LauncherEvent event, LauncherSettings *settings, void *context);
-void set_time_face_resign(LauncherSettings *settings, void *context);
+void set_time_face_setup(movement_settings_t *settings, void ** context_ptr);
+void set_time_face_activate(movement_settings_t *settings, void *context);
+bool set_time_face_loop(movement_event_t event, movement_settings_t *settings, void *context);
+void set_time_face_resign(movement_settings_t *settings, void *context);
 
 #define set_time_face { \
     set_time_face_setup, \