Merge ../InfiniSim/InfiniTime into ultraredux

4 files changed, 19 insertions, 5 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);
+}
 
diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h
index c1af42d..73b2d50 100644
--- a/src/libs/lv_conf.h
+++ b/src/libs/lv_conf.h
@@ -413,7 +413,8 @@ typedef void* lv_indev_drv_user_data_t;            /*Type of user data in the in
  *                                LV_FONT_DECLARE(my_font_2)
  */
 
-#define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(neofont2) \
+#define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(neofont1) \
+                               LV_FONT_DECLARE(neofont2) \
                                LV_FONT_DECLARE(lv_font_sys_48)
 
 /* Enable it if you have fonts with a lot of characters.
@@ -474,7 +475,7 @@ typedef void* lv_font_user_data_t;
 #define LV_THEME_DEFAULT_COLOR_PRIMARY      lv_color_hex(0xffffff)
 #define LV_THEME_DEFAULT_COLOR_SECONDARY    lv_color_hex(0xaaaaaa)
 #define LV_THEME_DEFAULT_FLAG               0//LV_THEME_MATERIAL_FLAG_DARK
-#define LV_THEME_DEFAULT_FONT_SMALL         &neofont2
+#define LV_THEME_DEFAULT_FONT_SMALL         &neofont1
 #define LV_THEME_DEFAULT_FONT_NORMAL        &neofont2
 #define LV_THEME_DEFAULT_FONT_SUBTITLE      &neofont2
 #define LV_THEME_DEFAULT_FONT_TITLE         &neofont2