summaryrefslogtreecommitdiff
path: root/src/displayapp
diff options
context:
space:
mode:
Diffstat (limited to 'src/displayapp')
-rw-r--r--src/displayapp/fonts/neofont.c2
-rw-r--r--src/displayapp/fonts/neofont.h2
-rw-r--r--src/displayapp/screens/settings/Settings.cpp15
3 files changed, 16 insertions, 3 deletions
diff --git a/src/displayapp/fonts/neofont.c b/src/displayapp/fonts/neofont.c
index e2e67e7..538b16b 100644
--- a/src/displayapp/fonts/neofont.c
+++ b/src/displayapp/fonts/neofont.c
@@ -532,7 +532,7 @@ static const uint8_t * neofont1_glyph_bitmap_cb(const lv_font_t * font, uint32_t
}
/*Describe the properties of a font*/
-const lv_font_t neofont1 = {
+lv_font_t neofont1 = {
.get_glyph_dsc = neofont1_glyph_dsc_cb, /*Set a callback to get info about gylphs*/
.get_glyph_bitmap = neofont1_glyph_bitmap_cb, /*Set a callback to get bitmap of a glyp*/
.line_height = 12, /*The real line height where any text fits*/
diff --git a/src/displayapp/fonts/neofont.h b/src/displayapp/fonts/neofont.h
index 94d9e59..b6064b5 100644
--- a/src/displayapp/fonts/neofont.h
+++ b/src/displayapp/fonts/neofont.h
@@ -9,7 +9,7 @@ extern "C" {
#endif
extern const lv_font_t neofont0;
-extern const lv_font_t neofont1;
+// extern const lv_font_t neofont1;
// extern const lv_font_t neofont2;
extern const lv_font_t neofont3;
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp
index b71e333..01dd534 100644
--- a/src/displayapp/screens/settings/Settings.cpp
+++ b/src/displayapp/screens/settings/Settings.cpp
@@ -17,6 +17,9 @@ Settings::Settings(Pinetime::Applications::DisplayApp* app, Pinetime::Controller
[this]() -> std::unique_ptr<Screen> {
return CreateScreen1();
},
+ [this]() -> std::unique_ptr<Screen> {
+ return CreateScreen2();
+ },
},
Screens::ScreenListModes::UpDown} {
}
@@ -34,10 +37,20 @@ std::unique_ptr<Screen> Settings::CreateScreen1() {
{Symbols::sun, "Display", Apps::SettingDisplay},
{Symbols::eye, "Wake Up", Apps::SettingWakeUp},
{Symbols::clock, "Time format", Apps::SettingTimeFormat},
- {Symbols::check, "Firmware", Apps::FirmwareValidation},
+ {Symbols::none, "None", Apps::None}
}};
return std::make_unique<Screens::List>(0, 1, app, settingsController, applications);
}
+std::unique_ptr<Screen> Settings::CreateScreen2() {
+ std::array<Screens::List::Applications, 4> applications {{
+ {Symbols::tachometer, "Shake Calib.", Apps::SettingShakeThreshold},
+ {Symbols::check, "Firmware", Apps::FirmwareValidation},
+ {Symbols::none, "None", Apps::None},
+ {Symbols::none, "None", Apps::None}
+}};
+
+ return std::make_unique<Screens::List>(1, 2, app, settingsController, applications);
+}