summaryrefslogtreecommitdiff
path: root/src/displayapp
diff options
context:
space:
mode:
Diffstat (limited to 'src/displayapp')
-rw-r--r--src/displayapp/Apps.h4
-rw-r--r--src/displayapp/DisplayApp.cpp9
-rw-r--r--src/displayapp/fonts/jetbrains_mono_42.c258
-rw-r--r--src/displayapp/screens/ApplicationList.cpp4
-rw-r--r--src/displayapp/screens/Motion.cpp20
-rw-r--r--src/displayapp/screens/Motion.h2
-rw-r--r--src/displayapp/screens/Steps.cpp72
-rw-r--r--src/displayapp/screens/Steps.h39
-rw-r--r--src/displayapp/screens/settings/SettingSteps.cpp102
-rw-r--r--src/displayapp/screens/settings/SettingSteps.h32
-rw-r--r--src/displayapp/screens/settings/Settings.cpp2
11 files changed, 529 insertions, 15 deletions
diff --git a/src/displayapp/Apps.h b/src/displayapp/Apps.h
index 358ea1f7..338ef629 100644
--- a/src/displayapp/Apps.h
+++ b/src/displayapp/Apps.h
@@ -4,8 +4,8 @@ namespace Pinetime {
namespace Applications {
enum class Apps {
None, Launcher, Clock, SysInfo, FirmwareUpdate, FirmwareValidation, NotificationsPreview, Notifications, FlashLight, BatteryInfo,
- Music, Paint, Paddle, Twos, HeartRate, Navigation, StopWatch, Motion,
- QuickSettings, Settings, SettingWatchFace, SettingTimeFormat, SettingDisplay, SettingWakeUp
+ Music, Paint, Paddle, Twos, HeartRate, Navigation, StopWatch, Motion, Steps,
+ QuickSettings, Settings, SettingWatchFace, SettingTimeFormat, SettingDisplay, SettingWakeUp, SettingSteps
};
}
}
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index 36f93a91..ffc5d3fc 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -24,6 +24,7 @@
#include "displayapp/screens/Twos.h"
#include "displayapp/screens/FlashLight.h"
#include "displayapp/screens/BatteryInfo.h"
+#include "displayapp/screens/Steps.h"
#include "drivers/Cst816s.h"
#include "drivers/St7789.h"
@@ -36,6 +37,7 @@
#include "displayapp/screens/settings/SettingTimeFormat.h"
#include "displayapp/screens/settings/SettingWakeUp.h"
#include "displayapp/screens/settings/SettingDisplay.h"
+#include "displayapp/screens/settings/SettingSteps.h"
using namespace Pinetime::Applications;
using namespace Pinetime::Applications::Display;
@@ -270,6 +272,10 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
currentScreen = std::make_unique<Screens::SettingDisplay>(this, settingsController);
returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
break;
+ case Apps::SettingSteps:
+ currentScreen = std::make_unique<Screens::SettingSteps>(this, settingsController);
+ returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+ break;
case Apps::BatteryInfo:
currentScreen = std::make_unique<Screens::BatteryInfo>(this, batteryController);
returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
@@ -308,6 +314,9 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
case Apps::Motion:
currentScreen = std::make_unique<Screens::Motion>(this, motionController);
break;
+ case Apps::Steps:
+ currentScreen = std::make_unique<Screens::Steps>(this, motionController, settingsController);
+ break;
}
currentApp = app;
}
diff --git a/src/displayapp/fonts/jetbrains_mono_42.c b/src/displayapp/fonts/jetbrains_mono_42.c
new file mode 100644
index 00000000..6f25f5ab
--- /dev/null
+++ b/src/displayapp/fonts/jetbrains_mono_42.c
@@ -0,0 +1,258 @@
+/*******************************************************************************
+ * Size: 42 px
+ * Bpp: 1
+ * Opts:
+ ******************************************************************************/
+
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
+#include "lvgl/lvgl.h"
+#endif
+
+#ifndef JETBRAINS_MONO_42
+#define JETBRAINS_MONO_42 1
+#endif
+
+#if JETBRAINS_MONO_42
+
+/*-----------------
+ * BITMAPS
+ *----------------*/
+
+/*Store the image of the glyphs*/
+static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
+ /* U+0025 "%" */
+ 0x1f, 0x80, 0x7, 0x3f, 0xc0, 0xe, 0x7f, 0xe0,
+ 0x1c, 0xf0, 0xf0, 0x1c, 0xe0, 0x70, 0x38, 0xe0,
+ 0x70, 0x70, 0xe0, 0x70, 0x70, 0xe0, 0x70, 0xe0,
+ 0xe0, 0x71, 0xc0, 0xe0, 0x71, 0xc0, 0xf0, 0xf3,
+ 0x80, 0x7f, 0xe7, 0x0, 0x3f, 0xc7, 0x0, 0x1f,
+ 0x8e, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x3c, 0x0,
+ 0x0, 0x38, 0x0, 0x0, 0x71, 0xf8, 0x0, 0xe3,
+ 0xfc, 0x0, 0xe7, 0xfe, 0x1, 0xcf, 0xf, 0x3,
+ 0x8e, 0x7, 0x3, 0x8e, 0x7, 0x7, 0xe, 0x7,
+ 0xe, 0xe, 0x7, 0xe, 0xe, 0x7, 0x1c, 0xe,
+ 0x7, 0x38, 0xf, 0xf, 0x38, 0x7, 0xfe, 0x70,
+ 0x3, 0xfc, 0xe0, 0x1, 0xf8,
+
+ /* U+0030 "0" */
+ 0x3, 0xf8, 0x1, 0xff, 0xc0, 0xff, 0xfe, 0x1f,
+ 0x7, 0xc7, 0xc0, 0x7c, 0xf0, 0x7, 0xbc, 0x0,
+ 0x7f, 0x80, 0xf, 0xf0, 0x1, 0xfe, 0x0, 0x3f,
+ 0xc0, 0x7, 0xf8, 0x0, 0xff, 0xe, 0x1f, 0xe3,
+ 0xe3, 0xfc, 0x7c, 0x7f, 0x8f, 0x8f, 0xf0, 0xe1,
+ 0xfe, 0x0, 0x3f, 0xc0, 0x7, 0xf8, 0x0, 0xff,
+ 0x0, 0x1f, 0xe0, 0x3, 0xfc, 0x0, 0x7f, 0x80,
+ 0xf, 0xf0, 0x1, 0xef, 0x0, 0x79, 0xf0, 0x1f,
+ 0x1f, 0x7, 0xc3, 0xff, 0xf8, 0x1f, 0xfc, 0x0,
+ 0xfe, 0x0,
+
+ /* U+0031 "1" */
+ 0x3, 0xf0, 0x0, 0xfe, 0x0, 0x3f, 0xc0, 0x1f,
+ 0xf8, 0x7, 0xcf, 0x1, 0xf1, 0xe0, 0x3c, 0x3c,
+ 0x7, 0x7, 0x80, 0x80, 0xf0, 0x0, 0x1e, 0x0,
+ 0x3, 0xc0, 0x0, 0x78, 0x0, 0xf, 0x0, 0x1,
+ 0xe0, 0x0, 0x3c, 0x0, 0x7, 0x80, 0x0, 0xf0,
+ 0x0, 0x1e, 0x0, 0x3, 0xc0, 0x0, 0x78, 0x0,
+ 0xf, 0x0, 0x1, 0xe0, 0x0, 0x3c, 0x0, 0x7,
+ 0x80, 0x0, 0xf0, 0x0, 0x1e, 0x0, 0x3, 0xc0,
+ 0x0, 0x78, 0xf, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xf8,
+
+ /* U+0032 "2" */
+ 0x3, 0xf8, 0x1, 0xff, 0xc0, 0x7f, 0xfe, 0x1f,
+ 0x7, 0xc7, 0xc0, 0x3c, 0xf0, 0x7, 0xbc, 0x0,
+ 0x7f, 0x80, 0xf, 0xf0, 0x1, 0xe0, 0x0, 0x3c,
+ 0x0, 0x7, 0x80, 0x1, 0xf0, 0x0, 0x3c, 0x0,
+ 0xf, 0x80, 0x1, 0xe0, 0x0, 0x7c, 0x0, 0x1f,
+ 0x0, 0x7, 0xc0, 0x1, 0xf0, 0x0, 0x7e, 0x0,
+ 0xf, 0x80, 0x3, 0xe0, 0x0, 0xf8, 0x0, 0x3e,
+ 0x0, 0xf, 0x80, 0x3, 0xe0, 0x0, 0xf8, 0x0,
+ 0x3e, 0x0, 0x7, 0xff, 0xfe, 0xff, 0xff, 0xdf,
+ 0xff, 0xf8,
+
+ /* U+0033 "3" */
+ 0x7f, 0xff, 0x8f, 0xff, 0xf1, 0xff, 0xfe, 0x0,
+ 0x3, 0xc0, 0x0, 0xf0, 0x0, 0x3c, 0x0, 0xf,
+ 0x0, 0x3, 0xc0, 0x0, 0xf0, 0x0, 0x3e, 0x0,
+ 0x7, 0x80, 0x1, 0xfe, 0x0, 0x3f, 0xf0, 0x7,
+ 0xff, 0x0, 0x3, 0xf0, 0x0, 0x1e, 0x0, 0x3,
+ 0xc0, 0x0, 0x3c, 0x0, 0x7, 0x80, 0x0, 0xf0,
+ 0x0, 0x1e, 0x0, 0x3, 0xfc, 0x0, 0x7f, 0x80,
+ 0xf, 0xf0, 0x1, 0xef, 0x0, 0x79, 0xf0, 0x1f,
+ 0x1f, 0x7, 0xc3, 0xff, 0xf0, 0x1f, 0xfc, 0x0,
+ 0xfe, 0x0,
+
+ /* U+0034 "4" */
+ 0x0, 0x1e, 0x0, 0xf, 0x80, 0x3, 0xc0, 0x1,
+ 0xe0, 0x0, 0x78, 0x0, 0x3c, 0x0, 0x1f, 0x0,
+ 0x7, 0x80, 0x3, 0xc0, 0x1, 0xf0, 0x0, 0x78,
+ 0x0, 0x3e, 0x0, 0xf, 0x0, 0x7, 0x80, 0xf3,
+ 0xe0, 0x3c, 0xf0, 0xf, 0x7c, 0x3, 0xde, 0x0,
+ 0xff, 0x0, 0x3f, 0xc0, 0xf, 0xf0, 0x3, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0, 0x3,
+ 0xc0, 0x0, 0xf0, 0x0, 0x3c, 0x0, 0xf, 0x0,
+ 0x3, 0xc0, 0x0, 0xf0, 0x0, 0x3c,
+
+ /* U+0035 "5" */
+ 0x7f, 0xff, 0x9f, 0xff, 0xe7, 0xff, 0xf9, 0xe0,
+ 0x0, 0x78, 0x0, 0x1e, 0x0, 0x7, 0x80, 0x1,
+ 0xe0, 0x0, 0x78, 0x0, 0x1e, 0x0, 0x7, 0x8f,
+ 0x81, 0xef, 0xf8, 0x7f, 0xff, 0x1f, 0x87, 0xe7,
+ 0xc0, 0x79, 0xe0, 0x1f, 0x0, 0x3, 0xc0, 0x0,
+ 0xf0, 0x0, 0x3c, 0x0, 0xf, 0x0, 0x3, 0xc0,
+ 0x0, 0xf0, 0x0, 0x3c, 0x0, 0xf, 0xf0, 0x3,
+ 0xde, 0x1, 0xe7, 0x80, 0x78, 0xf8, 0x7e, 0x3f,
+ 0xff, 0x3, 0xff, 0x80, 0x3f, 0x0,
+
+ /* U+0036 "6" */
+ 0x0, 0x3c, 0x0, 0x7, 0x80, 0x0, 0x78, 0x0,
+ 0xf, 0x0, 0x1, 0xe0, 0x0, 0x1e, 0x0, 0x3,
+ 0xc0, 0x0, 0x3c, 0x0, 0x7, 0x80, 0x0, 0x70,
+ 0x0, 0xf, 0x0, 0x1, 0xe7, 0xc0, 0x1f, 0xff,
+ 0x3, 0xff, 0xfc, 0x3f, 0xf, 0xc7, 0xc0, 0x3e,
+ 0x78, 0x1, 0xe7, 0x80, 0x1f, 0xf0, 0x0, 0xff,
+ 0x0, 0xf, 0xf0, 0x0, 0xff, 0x0, 0xf, 0xf0,
+ 0x0, 0xff, 0x0, 0xf, 0xf8, 0x1, 0xe7, 0x80,
+ 0x1e, 0x7c, 0x3, 0xe3, 0xf0, 0xfc, 0x1f, 0xff,
+ 0x80, 0xff, 0xf0, 0x1, 0xf8, 0x0,
+
+ /* U+0037 "7" */
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0x0, 0x1e, 0xf0, 0x1, 0xef, 0x0, 0x1e, 0xf0,
+ 0x3, 0xcf, 0x0, 0x3c, 0x0, 0x3, 0x80, 0x0,
+ 0x78, 0x0, 0x7, 0x80, 0x0, 0xf0, 0x0, 0xf,
+ 0x0, 0x0, 0xf0, 0x0, 0x1e, 0x0, 0x1, 0xe0,
+ 0x0, 0x3c, 0x0, 0x3, 0xc0, 0x0, 0x3c, 0x0,
+ 0x7, 0x80, 0x0, 0x78, 0x0, 0x7, 0x80, 0x0,
+ 0xf0, 0x0, 0xf, 0x0, 0x1, 0xe0, 0x0, 0x1e,
+ 0x0, 0x1, 0xe0, 0x0, 0x3c, 0x0, 0x3, 0xc0,
+ 0x0, 0x7c, 0x0, 0x7, 0x80, 0x0,
+
+ /* U+0038 "8" */
+ 0x1, 0xf8, 0x0, 0xff, 0xf0, 0x1f, 0xff, 0x83,
+ 0xf0, 0xfc, 0x3c, 0x3, 0xc7, 0xc0, 0x3e, 0x78,
+ 0x1, 0xe7, 0x80, 0x1e, 0x78, 0x1, 0xe7, 0x80,
+ 0x1e, 0x3c, 0x3, 0xc3, 0xe0, 0x7c, 0x1f, 0xf,
+ 0x80, 0xff, 0xf0, 0x3, 0xfc, 0x0, 0x7f, 0xe0,
+ 0xf, 0xff, 0x3, 0xe0, 0x7c, 0x3c, 0x3, 0xc7,
+ 0x80, 0x1e, 0xf0, 0x0, 0xff, 0x0, 0xf, 0xf0,
+ 0x0, 0xff, 0x0, 0xf, 0xf0, 0x0, 0xff, 0x80,
+ 0x1f, 0x7c, 0x3, 0xe7, 0xe0, 0x7e, 0x3f, 0xff,
+ 0xc0, 0xff, 0xf0, 0x3, 0xfc, 0x0,
+
+ /* U+0039 "9" */
+ 0x3, 0xf8, 0x0, 0xff, 0xf0, 0x1f, 0xff, 0x83,
+ 0xe0, 0xfc, 0x7c, 0x3, 0xe7, 0x80, 0x1e, 0xf8,
+ 0x1, 0xff, 0x0, 0xf, 0xf0, 0x0, 0xff, 0x0,
+ 0xf, 0xf0, 0x0, 0xff, 0x0, 0xf, 0xf8, 0x1,
+ 0xf7, 0x80, 0x1e, 0x7c, 0x3, 0xe3, 0xe0, 0x7e,
+ 0x3f, 0xff, 0xc1, 0xff, 0xfc, 0x7, 0xe7, 0x80,
+ 0x0, 0xf8, 0x0, 0xf, 0x0, 0x1, 0xe0, 0x0,
+ 0x1e, 0x0, 0x3, 0xc0, 0x0, 0x3c, 0x0, 0x7,
+ 0x80, 0x0, 0xf8, 0x0, 0xf, 0x0, 0x1, 0xe0,
+ 0x0, 0x1e, 0x0, 0x3, 0xc0, 0x0,
+
+ /* U+003A ":" */
+ 0x7d, 0xff, 0xff, 0xff, 0xef, 0x80, 0x0, 0x0,
+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1,
+ 0xf7, 0xff, 0xff, 0xff, 0xbe
+};
+
+
+/*---------------------
+ * GLYPH DESCRIPTION
+ *--------------------*/
+
+static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
+ {.bitmap_index = 0, .adv_w = 0, .box_w = 0, .box_h = 0, .ofs_x = 0, .ofs_y = 0} /* id = 0 reserved */,
+ {.bitmap_index = 0, .adv_w = 403, .box_w = 24, .box_h = 31, .ofs_x = 1, .ofs_y = 0},
+ {.bitmap_index = 93, .adv_w = 403, .box_w = 19, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
+ {.bitmap_index = 167, .adv_w = 403, .box_w = 19, .box_h = 31, .ofs_x = 4, .ofs_y = 0},
+ {.bitmap_index = 241, .adv_w = 403, .box_w = 19, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
+ {.bitmap_index = 315, .adv_w = 403, .box_w = 19, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
+ {.bitmap_index = 389, .adv_w = 403, .box_w = 18, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
+ {.bitmap_index = 459, .adv_w = 403, .box_w = 18, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
+ {.bitmap_index = 529, .adv_w = 403, .box_w = 20, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
+ {.bitmap_index = 607, .adv_w = 403, .box_w = 20, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
+ {.bitmap_index = 685, .adv_w = 403, .box_w = 20, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
+ {.bitmap_index = 763, .adv_w = 403, .box_w = 20, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
+ {.bitmap_index = 841, .adv_w = 403, .box_w = 7, .box_h = 24, .ofs_x = 9, .ofs_y = 0}
+};
+
+/*---------------------
+ * CHARACTER MAPPING
+ *--------------------*/
+
+
+
+/*Collect the unicode lists and glyph_id offsets*/
+static const lv_font_fmt_txt_cmap_t cmaps[] =
+{
+ {
+ .range_start = 37, .range_length = 1, .glyph_id_start = 1,
+ .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
+ },
+ {
+ .range_start = 48, .range_length = 11, .glyph_id_start = 2,
+ .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
+ }
+};
+
+
+
+/*--------------------
+ * ALL CUSTOM DATA
+ *--------------------*/
+
+#if LV_VERSION_CHECK(8, 0, 0)
+/*Store all the custom data of the font*/
+static lv_font_fmt_txt_glyph_cache_t cache;
+static const lv_font_fmt_txt_dsc_t font_dsc = {
+#else
+static lv_font_fmt_txt_dsc_t font_dsc = {
+#endif
+ .glyph_bitmap = glyph_bitmap,
+ .glyph_dsc = glyph_dsc,
+ .cmaps = cmaps,
+ .kern_dsc = NULL,
+ .kern_scale = 0,
+ .cmap_num = 2,
+ .bpp = 1,
+ .kern_classes = 0,
+ .bitmap_format = 0,
+#if LV_VERSION_CHECK(8, 0, 0)
+ .cache = &cache
+#endif
+};
+
+
+/*-----------------
+ * PUBLIC FONT
+ *----------------*/
+
+/*Initialize a public general font descriptor*/
+#if LV_VERSION_CHECK(8, 0, 0)
+const lv_font_t jetbrains_mono_42 = {
+#else
+lv_font_t jetbrains_mono_42 = {
+#endif
+ .get_glyph_dsc = lv_font_get_glyph_dsc_fmt_txt, /*Function pointer to get glyph's data*/
+ .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt, /*Function pointer to get glyph's bitmap*/
+ .line_height = 31, /*The maximum line height required by the font*/
+ .base_line = 0, /*Baseline measured from the bottom of the line*/
+#if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
+ .subpx = LV_FONT_SUBPX_NONE,
+#endif
+#if LV_VERSION_CHECK(7, 4, 0)
+ .underline_position = -7,
+ .underline_thickness = 2,
+#endif
+ .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+};
+
+
+
+#endif /*#if JETBRAINS_MONO_42*/
+
diff --git a/src/displayapp/screens/ApplicationList.cpp b/src/displayapp/screens/ApplicationList.cpp
index 056d128c..3fd8d737 100644
--- a/src/displayapp/screens/ApplicationList.cpp
+++ b/src/displayapp/screens/ApplicationList.cpp
@@ -47,7 +47,7 @@ std::unique_ptr<Screen> ApplicationList::CreateScreen1() {
{Symbols::stopWatch, Apps::StopWatch},
{Symbols::music, Apps::Music},
{Symbols::map, Apps::Navigation},
- {Symbols::shoe, Apps::Motion},
+ {Symbols::shoe, Apps::Steps},
{Symbols::heartBeat, Apps::HeartRate},
{"", Apps::None},
}
@@ -62,7 +62,7 @@ std::unique_ptr<Screen> ApplicationList::CreateScreen2() {
{Symbols::paintbrush, Apps::Paint},
{Symbols::paddle, Apps::Paddle},
{"2", Apps::Twos},
- {"", Apps::None},
+ {"M", Apps::Motion},
{"", Apps::None},
{"", Apps::None},
}
diff --git a/src/displayapp/screens/Motion.cpp b/src/displayapp/screens/Motion.cpp
index ed4b8198..96460659 100644
--- a/src/displayapp/screens/Motion.cpp
+++ b/src/displayapp/screens/Motion.cpp
@@ -3,9 +3,6 @@
#include "../DisplayApp.h"
using namespace Pinetime::Applications::Screens;
-extern lv_font_t jetbrains_mono_extrabold_compressed;
-extern lv_font_t jetbrains_mono_bold_20;
-
Motion::Motion(Pinetime::Applications::DisplayApp *app, Controllers::MotionController& motionController) : Screen(app), motionController{motionController} {
chart = lv_chart_create(lv_scr_act(), NULL);
@@ -29,13 +26,16 @@ Motion::Motion(Pinetime::Applications::DisplayApp *app, Controllers::MotionContr
lv_chart_init_points(chart, ser3, 0);
lv_chart_refresh(chart); /*Required after direct set*/
+ label = lv_label_create(lv_scr_act(), NULL);
+ lv_label_set_text_fmt(label, "X #FF0000 %d# Y #008000 %d# Z #FFFF00 %d#", 0, 0, 0);
+ lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
+ lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 10);
+ lv_label_set_recolor(label, true);
+
labelStep = lv_label_create(lv_scr_act(), NULL);
lv_obj_align(labelStep, chart, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
- lv_label_set_text(labelStep, "Steps: ");
+ lv_label_set_text(labelStep, "Steps ---");
- labelStepValue = lv_label_create(lv_scr_act(), NULL);
- lv_obj_align(labelStepValue, labelStep, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
- lv_label_set_text(labelStepValue, "-");
}
Motion::~Motion() {
@@ -47,8 +47,10 @@ bool Motion::Refresh() {
lv_chart_set_next(chart, ser2, motionController.Y());
lv_chart_set_next(chart, ser3, motionController.Z());
- snprintf(nbStepsBuffer, nbStepsBufferSize, "%lu", motionController.NbSteps());
- lv_label_set_text(labelStepValue, nbStepsBuffer);
+ lv_label_set_text_fmt(labelStep, "Steps %lu", motionController.NbSteps());
+
+ lv_label_set_text_fmt(label, "X #FF0000 %d# Y #008000 %d# Z #FFFF00 %d#", motionController.X() / 0x10, motionController.Y() / 0x10, motionController.Z() / 0x10);
+ lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 10);
return running;
}
diff --git a/src/displayapp/screens/Motion.h b/src/displayapp/screens/Motion.h
index ad1341a8..6ba0fd6d 100644
--- a/src/displayapp/screens/Motion.h
+++ b/src/displayapp/screens/Motion.h
@@ -26,9 +26,9 @@ namespace Pinetime {
lv_chart_series_t * ser1;
lv_chart_series_t * ser2;
lv_chart_series_t * ser3;
+ lv_obj_t * label;
lv_obj_t* labelStep;
- lv_obj_t* labelStepValue;
static constexpr uint8_t nbStepsBufferSize = 9;
char nbStepsBuffer[nbStepsBufferSize+1];
bool running = true;
diff --git a/src/displayapp/screens/Steps.cpp b/src/displayapp/screens/Steps.cpp
new file mode 100644
index 00000000..b485c975
--- /dev/null
+++ b/src/displayapp/screens/Steps.cpp
@@ -0,0 +1,72 @@
+#include "Steps.h"
+#include <lvgl/lvgl.h>
+#include "../DisplayApp.h"
+#include "Symbols.h"
+
+using namespace Pinetime::Applications::Screens;
+
+Steps::Steps(
+ Pinetime::Applications::DisplayApp *app,
+ Controllers::MotionController& motionController,
+ Controllers::Settings &settingsController)
+ : Screen(app),
+ motionController{motionController},
+ settingsController{settingsController} {
+
+ stepsArc = lv_arc_create(lv_scr_act(), nullptr);
+
+ lv_obj_set_style_local_bg_opa(stepsArc, LV_ARC_PART_BG, LV_STATE_DEFAULT, LV_OPA_0);
+ lv_obj_set_style_local_border_width(stepsArc, LV_ARC_PART_BG, LV_STATE_DEFAULT, 2);
+ lv_obj_set_style_local_radius(stepsArc, LV_ARC_PART_BG, LV_STATE_DEFAULT, 0);
+ lv_obj_set_style_local_line_color(stepsArc, LV_ARC_PART_INDIC, LV_STATE_DEFAULT, lv_color_hex(0x0000FF));
+ lv_arc_set_end_angle(stepsArc, 200);
+ lv_obj_set_size(stepsArc, 220, 220);
+ lv_arc_set_range(stepsArc, 0, 500);
+ lv_obj_align(stepsArc, nullptr, LV_ALIGN_CENTER, 0, 0);
+
+ stepsCount = motionController.NbSteps();
+
+ lv_arc_set_value(stepsArc, int16_t(500 * stepsCount / settingsController.GetStepsGoal()));
+
+ lSteps = lv_label_create(lv_scr_act(), nullptr);
+ lv_obj_set_style_local_text_color(lSteps, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x00FF00));
+ lv_obj_set_style_local_text_font(lSteps, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
+ lv_label_set_text_fmt(lSteps, "%li", stepsCount);
+ lv_obj_align(lSteps, nullptr, LV_ALIGN_CENTER, 0, -20);
+
+ lv_obj_t * lstepsL = lv_label_create(lv_scr_act(), nullptr);
+ lv_obj_set_style_local_text_color(lstepsL, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111));
+ lv_label_set_text_static(lstepsL, "Steps");
+ lv_obj_align(lstepsL, lSteps, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
+
+ lv_obj_t * lstepsGoal = lv_label_create(lv_scr_act(), nullptr);
+ lv_obj_set_style_local_text_color(lstepsGoal, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_CYAN);
+ lv_label_set_text_fmt(lstepsGoal,"Goal\n%i", settingsController.GetStepsGoal());
+ lv_label_set_align(lstepsGoal, LV_LABEL_ALIGN_CENTER);
+ lv_obj_align(lstepsGoal, lSteps, LV_ALIGN_OUT_BOTTOM_MID, 0, 60);
+
+ lv_obj_t * backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
+ lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP);
+ lv_obj_set_size(backgroundLabel, 240, 240);
+ lv_obj_set_pos(backgroundLabel, 0, 0);
+ lv_label_set_text_static(backgroundLabel, "");
+
+}
+
+Steps::~Steps() {
+ lv_obj_clean(lv_scr_act());
+}
+
+bool Steps::Refresh() {
+
+ stepsCount = motionController.NbSteps();
+
+ lv_label_set_text_fmt(lSteps,"%li", stepsCount);
+ lv_obj_align(lSteps, nullptr, LV_ALIGN_CENTER, 0, -20);
+
+ lv_arc_set_value(stepsArc, int16_t(500 * stepsCount / settingsController.GetStepsGoal()));
+
+ return running;
+}
+
+
diff --git a/src/displayapp/screens/Steps.h b/src/displayapp/screens/Steps.h
new file mode 100644
index 00000000..9c135e26
--- /dev/null
+++ b/src/displayapp/screens/Steps.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include <cstdint>
+#include <lvgl/lvgl.h>
+#include "Screen.h"
+#include <components/motion/MotionController.h>
+
+namespace Pinetime {
+
+ namespace Controllers {
+ class Settings;
+ }
+
+ namespace Applications {
+ namespace Screens {
+
+ class Steps : public Screen {
+ public:
+ Steps(DisplayApp* app, Controllers::MotionController& motionController, Controllers::Settings &settingsController);
+ ~Steps() override;
+
+ bool Refresh() override;
+
+
+ private:
+
+ Controllers::MotionController& motionController;
+ Controllers::Settings& settingsController;
+
+ lv_obj_t * lSteps;
+ lv_obj_t * lStepsIcon;
+ lv_obj_t * stepsArc;
+
+ uint32_t stepsCount;
+
+ };
+ }
+ }
+}
diff --git a/src/displayapp/screens/settings/SettingSteps.cpp b/src/displayapp/screens/settings/SettingSteps.cpp
new file mode 100644
index 00000000..8bd94fc6
--- /dev/null
+++ b/src/displayapp/screens/settings/SettingSteps.cpp
@@ -0,0 +1,102 @@
+#include "SettingSteps.h"
+#include <lvgl/lvgl.h>
+#include "displayapp/DisplayApp.h"
+#include "displayapp/screens/Symbols.h"
+
+using namespace Pinetime::Applications::Screens;
+
+namespace {
+ static void event_handler(lv_obj_t * obj, lv_event_t event) {
+ SettingSteps* screen = static_cast<SettingSteps *>(obj->user_data);
+ screen->UpdateSelected(obj, event);
+ }
+}
+
+SettingSteps::SettingSteps(
+ Pinetime::Applications::DisplayApp *app, Pinetime::Controllers::Settings &settingsController) :
+ Screen(app),
+ settingsController{settingsController}
+{
+
+ lv_obj_t * container1 = lv_cont_create(lv_scr_act(), nullptr);
+
+ //lv_obj_set_style_local_bg_color(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111));
+ lv_obj_set_style_local_bg_opa(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP);
+ lv_obj_set_style_local_pad_all(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 10);
+ lv_obj_set_style_local_pad_inner(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 5);
+ lv_obj_set_style_local_border_width(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0);
+ lv_obj_set_pos(container1, 30, 60);
+ lv_obj_set_width(container1, LV_HOR_RES - 50);
+ lv_obj_set_height(container1, LV_VER_RES - 60);
+ //lv_obj_set_auto_realign(container1, true);
+ //lv_obj_align_origo(container1, NULL, LV_ALIGN_CENTER, 0, 0);
+ //lv_cont_set_fit(container1, LV_FIT_MAX);
+ lv_cont_set_layout(container1, LV_LAYOUT_COLUMN_LEFT);
+
+ lv_obj_t * title = lv_label_create(lv_scr_act(), NULL);
+ lv_label_set_text_static(title,"Daily steps goal");
+ lv_label_set_align(title, LV_LABEL_ALIGN_CENTER);
+ lv_obj_align(title, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 15, 15);
+
+ lv_obj_t * icon = lv_label_create(lv_scr_act(), NULL);
+ lv_obj_set_style_local_text_color(icon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
+
+ lv_label_set_text_static(icon, Symbols::shoe);
+ lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER);
+ lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
+
+
+ stepValue = lv_label_create(lv_scr_act(), NULL);
+ lv_obj_set_style_local_text_font(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
+ lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
+ lv_label_set_align(stepValue, LV_LABEL_ALIGN_CENTER);
+ lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, 0);
+
+ btnPlus = lv_btn_create(lv_scr_act(), NULL);
+ btnPlus->user_data = this;
+ lv_obj_set_size(btnPlus, 60, 40);
+ lv_obj_align(btnPlus, lv_scr_act(), LV_ALIGN_CENTER, 50, 80);
+ lv_obj_set_style_local_value_str(btnPlus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "+");
+ lv_obj_set_event_cb(btnPlus, event_handler);
+
+ btnMinus = lv_btn_create(lv_scr_act(), NULL);
+ btnMinus->user_data = this;
+ lv_obj_set_size(btnMinus, 60, 40);
+ lv_obj_set_event_cb(btnMinus, event_handler);
+ lv_obj_align(btnMinus, lv_scr_act(), LV_ALIGN_CENTER, -50, 80);
+ lv_obj_set_style_local_value_str(btnMinus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "-");
+
+
+}
+
+SettingSteps::~SettingSteps() {
+ lv_obj_clean(lv_scr_act());
+ settingsController.SaveSettings();
+}
+
+bool SettingSteps::Refresh() {
+ return running;
+}
+
+
+void SettingSteps::UpdateSelected(lv_obj_t *object, lv_event_t event) {
+ uint32_t value = settingsController.GetStepsGoal();
+ if(object == btnPlus && (event == LV_EVENT_PRESSED)) {
+ value += 1000;
+ if ( value <= 500000 ) {
+ settingsController.SetStepsGoal(value);
+ lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
+ lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, 0);
+ }
+ }
+
+ if(object == btnMinus && (event == LV_EVENT_PRESSED)) {
+ value -= 1000;
+ if ( value >= 1000 ) {
+ settingsController.SetStepsGoal(value);
+ lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
+ lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, 0);
+ }
+ }
+
+} \ No newline at end of file
diff --git a/src/displayapp/screens/settings/SettingSteps.h b/src/displayapp/screens/settings/SettingSteps.h
new file mode 100644
index 00000000..0a4c2056
--- /dev/null
+++ b/src/displayapp/screens/settings/SettingSteps.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <cstdint>
+#include <lvgl/lvgl.h>
+#include "components/settings/Settings.h"
+#include "displayapp/screens/Screen.h"
+
+namespace Pinetime {
+
+ namespace Applications {
+ namespace Screens {
+
+ class SettingSteps : public Screen{
+ public:
+ SettingSteps(DisplayApp* app, Pinetime::Controllers::Settings &settingsController);
+ ~SettingSteps() override;
+
+ bool Refresh() override;
+ void UpdateSelected(lv_obj_t *object, lv_event_t event);
+
+ private:
+
+ Controllers::Settings& settingsController;
+
+ lv_obj_t * stepValue;
+ lv_obj_t * btnPlus;
+ lv_obj_t * btnMinus;
+
+ };
+ }
+ }
+}
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp
index b2825915..06776525 100644
--- a/src/displayapp/screens/settings/Settings.cpp
+++ b/src/displayapp/screens/settings/Settings.cpp
@@ -57,10 +57,10 @@ std::unique_ptr<Screen> Settings::CreateScreen2() {
std::array<Screens::List::Applications, 4> applications {
{
+ {Symbols::shoe, "Steps", Apps::SettingSteps},
{Symbols::batteryHalf, "Battery", Apps::BatteryInfo},
{Symbols::check, "Firmware", Apps::FirmwareValidation},
{Symbols::list, "About", Apps::SysInfo},
- {"", "", Apps::None},
}
};
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 11:46:23 +0000