remove fake / placeholder widgets

diff --git a/launcher/launcher_config.h b/launcher/launcher_config.h
index 5280b9893f43e917af2cf6b2f68fc1b8e1558489..ff65635070081170c51701bc4f2195b4c666d250 100644 (file)
--- a/launcher/launcher_config.h
+++ b/launcher/launcher_config.h
@@ -5,8 +5,6 @@
 #include "preferences_widget.h"
 #include "set_time_widget.h"
 #include "pulseometer_widget.h"
-#include "fake_widget_1.h"
-#include "fake_widget_2.h"
 
 #define LAUNCHER_NUM_WIDGETS 3
 

diff --git a/launcher/make/Makefile b/launcher/make/Makefile
index c6d1813745a549ff25b3dfcc806bc2f129e3b301..a1059bbda82dbb63618bb7a0fe84b417a379bda4 100755 (executable)
--- a/launcher/make/Makefile
+++ b/launcher/make/Makefile
@@ -7,7 +7,7 @@ include $(TOP)/make.mk
 # INCLUDES += \
 #   -I../ \
 #   -I../drivers/ \
-#   -I../utils/
+#   -I../widgets/fitness/
 INCLUDES += \
   -I../ \
   -I../widgets/ \
@@ -18,17 +18,15 @@ INCLUDES += \
 # If you add any other source files you wish to compile, add them after ../app.c
 # Note that you will need to add a backslash at the end of any line you wish to continue, i.e.
 # SRCS += \
-#   ../app.c \
-#   ../drivers/bmp280.c \
-#   ../utils/temperature.c
+#   ../launcher.c \
+#   ../drivers/lis2dh.c \
+#   ../widgets/fitness/step_count_widget.c
 SRCS += \
   ../launcher.c \
   ../widgets/clock/simple_clock_widget.c \
   ../widgets/settings/preferences_widget.c \
   ../widgets/settings/set_time_widget.c \
   ../widgets/complications/pulseometer_widget.c \
-  ../widgets/fake_widget_1.c \
-  ../widgets/fake_widget_2.c \
 
 # Leave this line at the bottom of the file; it has all the targets for making your project.
 include $(TOP)/rules.mk

diff --git a/launcher/widgets/fake_widget_1.c b/launcher/widgets/fake_widget_1.c
deleted file mode 100644 (file)
index bdc964e..0000000
--- a/launcher/widgets/fake_widget_1.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "fake_widget_1.h"
-#include "watch.h"
-
-void fake_widget_1_setup(LauncherSettings *settings, void ** context_ptr) {
-    (void) settings;
-    *context_ptr = NULL;
-}
-
-void fake_widget_1_activate(LauncherSettings *settings, void *context) {
-    (void) settings;
-    (void) context;
-}
-
-bool fake_widget_1_loop(LauncherEvent event, LauncherSettings *settings, void *context) {
-    printf("fake_widget_1_loop\n");
-    (void) settings;
-    (void) context;
-    watch_display_string("W1 d get01", 0);
-
-    switch (event.bit.event_type) {
-        case EVENT_MODE_BUTTON_UP:
-            launcher_move_to_next_widget();
-            return false;
-        case EVENT_LIGHT_BUTTON_UP:
-            launcher_illuminate_led();
-            break;
-        default:
-            break;
-    }
-
-    return true;
-}
-
-void fake_widget_1_resign(LauncherSettings *settings, void *context) {
-    (void) settings;
-    (void) context;
-}

diff --git a/launcher/widgets/fake_widget_1.h b/launcher/widgets/fake_widget_1.h
deleted file mode 100644 (file)
index d033b49..0000000
--- a/launcher/widgets/fake_widget_1.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef FAKE_WIDGET_1_H_
-#define FAKE_WIDGET_1_H_
-
-#include "launcher.h"
-
-void fake_widget_1_setup(LauncherSettings *settings, void ** context_ptr);
-void fake_widget_1_activate(LauncherSettings *settings, void *context);
-bool fake_widget_1_loop(LauncherEvent event, LauncherSettings *settings, void *context);
-void fake_widget_1_resign(LauncherSettings *settings, void *context);
-
-#define fake_widget_1 { \
-    fake_widget_1_setup, \
-    fake_widget_1_activate, \
-    fake_widget_1_loop, \
-    fake_widget_1_resign, \
-}
-
-#endif // FAKE_WIDGET_1_H_
\ No newline at end of file

diff --git a/launcher/widgets/fake_widget_2.c b/launcher/widgets/fake_widget_2.c
deleted file mode 100644 (file)
index 4677222..0000000
--- a/launcher/widgets/fake_widget_2.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "fake_widget_2.h"
-#include "watch.h"
-
-void fake_widget_2_setup(LauncherSettings *settings, void ** context_ptr) {
-    (void) settings;
-    *context_ptr = NULL;
-}
-
-void fake_widget_2_activate(LauncherSettings *settings, void *context) {
-    (void) settings;
-    (void) context;
-}
-
-bool fake_widget_2_loop(LauncherEvent event, LauncherSettings *settings, void *context) {
-    printf("fake_widget_2_loop\n");
-    (void) settings;
-    (void) context;
-    watch_display_string("W1 d get02", 0);
-
-    switch (event.bit.event_type) {
-        case EVENT_MODE_BUTTON_UP:
-            launcher_move_to_next_widget();
-            return false;
-        case EVENT_LIGHT_BUTTON_UP:
-            launcher_illuminate_led();
-            break;
-        default:
-            break;
-    }
-
-    return true;
-}
-
-void fake_widget_2_resign(LauncherSettings *settings, void *context) {
-    (void) settings;
-    (void) context;
-}

diff --git a/launcher/widgets/fake_widget_2.h b/launcher/widgets/fake_widget_2.h
deleted file mode 100644 (file)
index cf01969..0000000
--- a/launcher/widgets/fake_widget_2.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef FAKE_WIDGET_2_H_
-#define FAKE_WIDGET_2_H_
-
-#include "launcher.h"
-
-void fake_widget_2_setup(LauncherSettings *settings, void ** context_ptr);
-void fake_widget_2_activate(LauncherSettings *settings, void *context);
-bool fake_widget_2_loop(LauncherEvent event, LauncherSettings *settings, void *context);
-void fake_widget_2_resign(LauncherSettings *settings, void *context);
-
-#define fake_widget_2 { \
-    fake_widget_2_setup, \
-    fake_widget_2_activate, \
-    fake_widget_2_loop, \
-    fake_widget_2_resign, \
-}
-
-#endif // FAKE_WIDGET_2_H_
\ No newline at end of file