Merge branch piggz/nav into develop:

- fix conflict - add a icon for the navigation app.
2021-01-20 21:34:09 +01:00
parent a0f2fa8469
commit 522a1eb0be
280 changed files with 10934 additions and 384 deletions
--- a/src/displayapp/screens/ApplicationList.cpp
+++ b/src/displayapp/screens/ApplicationList.cpp
@@ -56,7 +56,7 @@ std::unique_ptr<Screen> ApplicationList::CreateScreen1() {

 std::unique_ptr<Screen> ApplicationList::CreateScreen2() {
  std::array<Screens::Tile::Applications, 6> applications {
-          {{Symbols::tachometer, Apps::Gauge},
+          {{Symbols::map, Apps::Navigation},
           {Symbols::asterisk, Apps::Meter},
           {Symbols::paintbrush, Apps::Paint},
                  {Symbols::info, Apps::Notifications},