diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/displayapp/DisplayApp.cpp | 6 | ||||
| -rw-r--r-- | src/displayapp/fonts/fonts.json | 2 | ||||
| -rw-r--r-- | src/displayapp/screens/ApplicationList.h | 4 | ||||
| -rw-r--r-- | src/displayapp/screens/Symbols.h | 1 |
4 files changed, 7 insertions, 6 deletions
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index 6698ea28..1648a090 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -363,6 +363,9 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio currentScreen = std::make_unique<Screens::ApplicationList>(this, settingsController, batteryController, bleController, dateTimeController); break; + case Apps::Motion: + // currentScreen = std::make_unique<Screens::Motion>(motionController); + // break; case Apps::None: case Apps::Clock: currentScreen = std::make_unique<Screens::Clock>(dateTimeController, @@ -493,9 +496,6 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio case Apps::Metronome: currentScreen = std::make_unique<Screens::Metronome>(motorController, *systemTask); break; - case Apps::Motion: - currentScreen = std::make_unique<Screens::Motion>(motionController); - break; case Apps::Steps: currentScreen = std::make_unique<Screens::Steps>(motionController, settingsController); break; diff --git a/src/displayapp/fonts/fonts.json b/src/displayapp/fonts/fonts.json index e8e20b9b..914ba163 100644 --- a/src/displayapp/fonts/fonts.json +++ b/src/displayapp/fonts/fonts.json @@ -7,7 +7,7 @@ }, { "file": "FontAwesome5-Solid+Brands+Regular.woff", - "range": "0xf294, 0xf242, 0xf54b, 0xf21e, 0xf1e6, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf201, 0xf06e, 0xf015, 0xf00c" + "range": "0xf294, 0xf242, 0xf54b, 0xf21e, 0xf1e6, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf06e, 0xf015, 0xf00c" } ], "bpp": 1, diff --git a/src/displayapp/screens/ApplicationList.h b/src/displayapp/screens/ApplicationList.h index 4a9b347f..7bdd1154 100644 --- a/src/displayapp/screens/ApplicationList.h +++ b/src/displayapp/screens/ApplicationList.h @@ -50,9 +50,11 @@ namespace Pinetime { {Symbols::paintbrush, Apps::Paint}, {Symbols::paddle, Apps::Paddle}, {"2", Apps::Twos}, - {Symbols::chartLine, Apps::Motion}, {Symbols::drum, Apps::Metronome}, {Symbols::map, Apps::Navigation}, + {Symbols::none, Apps::None}, + + // {"M", Apps::Motion}, }}; ScreenList<nScreens> screens; }; diff --git a/src/displayapp/screens/Symbols.h b/src/displayapp/screens/Symbols.h index 47177942..934cdc3f 100644 --- a/src/displayapp/screens/Symbols.h +++ b/src/displayapp/screens/Symbols.h @@ -34,7 +34,6 @@ namespace Pinetime { static constexpr const char* hourGlass = "\xEF\x89\x92"; static constexpr const char* lapsFlag = "\xEF\x80\xA4"; static constexpr const char* drum = "\xEF\x95\xA9"; - static constexpr const char* chartLine = "\xEF\x88\x81"; static constexpr const char* eye = "\xEF\x81\xAE"; static constexpr const char* home = "\xEF\x80\x95"; static constexpr const char* sleep = "\xEE\xBD\x84"; |