Skip to content

Commit d5154b3

Browse files
davidakerrdavidakerr
committed
include missing face includes
1 parent 3aad4c7 commit d5154b3

File tree

1 file changed

+12
-82
lines changed

1 file changed

+12
-82
lines changed

‎src/ui/ui.c‎

Lines changed: 12 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
#include "ui.h"
77
#include "ui_helpers.h"
8-
#include "app_hal.h"
98

109
#include "./faces/34_2_dial/34_2_dial.h"
1110
#include "./faces/75_2_dial/75_2_dial.h"
@@ -20,6 +19,15 @@
2019
#include "./faces/tix_resized/tix_resized.h"
2120
#include "./faces/wfb_resized/wfb_resized.h"
2221

22+
#include "./faces/174/174.h"
23+
#include "./faces/228/228.h"
24+
#include "./faces/1041/1041.h"
25+
#include "./faces/1167/1167.h"
26+
#include "./faces/1169/1169.h"
27+
#include "./faces/2051/2051.h"
28+
#include "./faces/2151/2151.h"
29+
#include "./faces/3589/3589.h"
30+
2331
///////////////////// VARIABLES ////////////////////
2432
void pulseCall_Animation(lv_obj_t *TargetObject, int delay);
2533
void ui_event_clockScreen(lv_event_t *e);
@@ -2800,134 +2808,56 @@ void ui_watchfaces_init(void)
28002808
numFaces = 0;
28012809
registerWatchface_cb("Default", &digital_preview, &ui_clockScreen); // register the default watchface
28022810

2803-
// Register other watchfaces by initializing them and passing the register callback
2804-
#ifdef ENABLE_FACE_34_2_DIAL
2811+
// register other watchfaces by initializing them and passing the register callback
28052812
init_face_34_2_dial(registerWatchface_cb);
2806-
#endif
2807-
#ifdef ENABLE_FACE_75_2_DIAL
28082813
init_face_75_2_dial(registerWatchface_cb);
2809-
#endif
2810-
#ifdef ENABLE_FACE_79_2_DIAL
28112814
init_face_79_2_dial(registerWatchface_cb);
2812-
#endif
2813-
#ifdef ENABLE_FACE_116_2_DIAL
28142815
init_face_116_2_dial(registerWatchface_cb);
2815-
#endif
2816-
#ifdef ENABLE_FACE_756_2_DIAL
28172816
init_face_756_2_dial(registerWatchface_cb);
2818-
#endif
2819-
#ifdef ENABLE_FACE_B_W_RESIZED
28202817
init_face_b_w_resized(registerWatchface_cb);
2821-
#endif
2822-
#ifdef ENABLE_FACE_KENYA
28232818
init_face_kenya(registerWatchface_cb);
2824-
#endif
2825-
#ifdef ENABLE_FACE_PIXEL_RESIZED
28262819
init_face_pixel_resized(registerWatchface_cb);
2827-
#endif
2828-
#ifdef ENABLE_FACE_RADAR
28292820
init_face_radar(registerWatchface_cb);
2830-
#endif
2831-
#ifdef ENABLE_FACE_SMART_RESIZED
28322821
init_face_smart_resized(registerWatchface_cb);
2833-
#endif
2834-
#ifdef ENABLE_FACE_TIX_RESIZED
28352822
init_face_tix_resized(registerWatchface_cb);
2836-
#endif
2837-
#ifdef ENABLE_FACE_WFB_RESIZED
28382823
init_face_wfb_resized(registerWatchface_cb);
2839-
#endif
28402824

2841-
#ifdef ENABLE_FACE_174
28422825
init_face_174(registerWatchface_cb);
2843-
#endif
2844-
#ifdef ENABLE_FACE_228
28452826
init_face_228(registerWatchface_cb);
2846-
#endif
2847-
#ifdef ENABLE_FACE_1041
28482827
init_face_1041(registerWatchface_cb);
2849-
#endif
2850-
#ifdef ENABLE_FACE_1167
28512828
init_face_1167(registerWatchface_cb);
2852-
#endif
2853-
#ifdef ENABLE_FACE_1169
28542829
init_face_1169(registerWatchface_cb);
2855-
#endif
2856-
#ifdef ENABLE_FACE_2051
28572830
init_face_2051(registerWatchface_cb);
2858-
#endif
2859-
#ifdef ENABLE_FACE_2151
28602831
init_face_2151(registerWatchface_cb);
2861-
#endif
2862-
#ifdef ENABLE_FACE_3589
28632832
init_face_3589(registerWatchface_cb);
2864-
#endif
2833+
28652834
}
28662835

28672836
void ui_update_watchfaces(int second, int minute, int hour, bool mode, bool am, int day, int month, int year, int weekday,
28682837
int temp, int icon, int battery, bool connection, int steps, int distance, int kcal, int bpm, int oxygen)
28692838
{
2870-
#ifdef ENABLE_FACE_34_2_DIAL
2839+
28712840
update_check_34_2_dial(ui_home, second, minute, hour, mode, am, day, month, year, weekday, temp, icon, battery, connection, steps, distance, kcal, bpm, oxygen);
2872-
#endif
2873-
#ifdef ENABLE_FACE_75_2_DIAL
28742841
update_check_75_2_dial(ui_home, second, minute, hour, mode, am, day, month, year, weekday, temp, icon, battery, connection, steps, distance, kcal, bpm, oxygen);
2875-
#endif
2876-
#ifdef ENABLE_FACE_79_2_DIAL
28772842
update_check_79_2_dial(ui_home, second, minute, hour, mode, am, day, month, year, weekday, temp, icon, battery, connection, steps, distance, kcal, bpm, oxygen);
2878-
#endif
2879-
#ifdef ENABLE_FACE_116_2_DIAL
28802843
update_check_116_2_dial(ui_home, second, minute, hour, mode, am, day, month, year, weekday, temp, icon, battery, connection, steps, distance, kcal, bpm, oxygen);
2881-
#endif
2882-
#ifdef ENABLE_FACE_756_2_DIAL
28832844
update_check_756_2_dial(ui_home, second, minute, hour, mode, am, day, month, year, weekday, temp, icon, battery, connection, steps, distance, kcal, bpm, oxygen);
2884-
#endif
2885-
#ifdef ENABLE_FACE_B_W_RESIZED
28862845
update_check_b_w_resized(ui_home, second, minute, hour, mode, am, day, month, year, weekday, temp, icon, battery, connection, steps, distance, kcal, bpm, oxygen);
2887-
#endif
2888-
#ifdef ENABLE_FACE_KENYA
28892846
update_check_kenya(ui_home, second, minute, hour, mode, am, day, month, year, weekday, temp, icon, battery, connection, steps, distance, kcal, bpm, oxygen);
2890-
#endif
2891-
#ifdef ENABLE_FACE_PIXEL_RESIZED
28922847
update_check_pixel_resized(ui_home, second, minute, hour, mode, am, day, month, year, weekday, temp, icon, battery, connection, steps, distance, kcal, bpm, oxygen);
2893-
#endif
2894-
#ifdef ENABLE_FACE_RADAR
28952848
update_check_radar(ui_home, second, minute, hour, mode, am, day, month, year, weekday, temp, icon, battery, connection, steps, distance, kcal, bpm, oxygen);
2896-
#endif
2897-
#ifdef ENABLE_FACE_SMART_RESIZED
28982849
update_check_smart_resized(ui_home, second, minute, hour, mode, am, day, month, year, weekday, temp, icon, battery, connection, steps, distance, kcal, bpm, oxygen);
2899-
#endif
2900-
#ifdef ENABLE_FACE_TIX_RESIZED
29012850
update_check_tix_resized(ui_home, second, minute, hour, mode, am, day, month, year, weekday, temp, icon, battery, connection, steps, distance, kcal, bpm, oxygen);
2902-
#endif
2903-
#ifdef ENABLE_FACE_WFB_RESIZED
29042851
update_check_wfb_resized(ui_home, second, minute, hour, mode, am, day, month, year, weekday, temp, icon, battery, connection, steps, distance, kcal, bpm, oxygen);
2905-
#endif
29062852

2907-
#ifdef ENABLE_FACE_174
29082853
update_check_174(ui_home, second, minute, hour, mode, am, day, month, year, weekday, temp, icon, battery, connection, steps, distance, kcal, bpm, oxygen);
2909-
#endif
2910-
#ifdef ENABLE_FACE_228
29112854
update_check_228(ui_home, second, minute, hour, mode, am, day, month, year, weekday, temp, icon, battery, connection, steps, distance, kcal, bpm, oxygen);
2912-
#endif
2913-
#ifdef ENABLE_FACE_1041
29142855
update_check_1041(ui_home, second, minute, hour, mode, am, day, month, year, weekday, temp, icon, battery, connection, steps, distance, kcal, bpm, oxygen);
2915-
#endif
2916-
#ifdef ENABLE_FACE_1167
29172856
update_check_1167(ui_home, second, minute, hour, mode, am, day, month, year, weekday, temp, icon, battery, connection, steps, distance, kcal, bpm, oxygen);
2918-
#endif
2919-
#ifdef ENABLE_FACE_1169
29202857
update_check_1169(ui_home, second, minute, hour, mode, am, day, month, year, weekday, temp, icon, battery, connection, steps, distance, kcal, bpm, oxygen);
2921-
#endif
2922-
#ifdef ENABLE_FACE_2051
29232858
update_check_2051(ui_home, second, minute, hour, mode, am, day, month, year, weekday, temp, icon, battery, connection, steps, distance, kcal, bpm, oxygen);
2924-
#endif
2925-
#ifdef ENABLE_FACE_2151
29262859
update_check_2151(ui_home, second, minute, hour, mode, am, day, month, year, weekday, temp, icon, battery, connection, steps, distance, kcal, bpm, oxygen);
2927-
#endif
2928-
#ifdef ENABLE_FACE_3589
29292860
update_check_3589(ui_home, second, minute, hour, mode, am, day, month, year, weekday, temp, icon, battery, connection, steps, distance, kcal, bpm, oxygen);
2930-
#endif
29312861
}
29322862

29332863
void ui_games_init(void)

0 commit comments

Comments
 (0)