From 4f4f44651702758295edfda8b295beaccffd4dd3 Mon Sep 17 00:00:00 2001 From: minacode <minamoto9@web.de> Date: Wed, 7 Dec 2022 14:23:17 +0100 Subject: [PATCH] Support refactor watch face to enum Support for PR: https://github.com/InfiniTimeOrg/InfiniTime/pull/1339 --- InfiniTime | 2 +- littlefs-do-main.cpp | 12 ++++++------ main.cpp | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/InfiniTime b/InfiniTime index 40f7e1c..020a7fd 160000 --- a/InfiniTime +++ b/InfiniTime @@ -1 +1 @@ -Subproject commit 40f7e1c7be6882e01058b5ccf64d5005c6105346 +Subproject commit 020a7fd11d1b18fd7ac29ccc00b9c6f6e0cdb17b diff --git a/littlefs-do-main.cpp b/littlefs-do-main.cpp index 780e561..0a5dfbd 100644 --- a/littlefs-do-main.cpp +++ b/littlefs-do-main.cpp @@ -535,15 +535,15 @@ int command_settings(const std::string &program_name, const std::vector<std::str settingsController.Init(); using namespace Pinetime::Controllers; { - auto clockface = settingsController.GetClockFace(); + auto clockface = settingsController.GetWatchFace(); auto clockface_str = [](auto val) { - if (val == 0) return "Digital"; - if (val == 1) return "Analog"; - if (val == 2) return "PineTimeStyle"; - if (val == 3) return "Terminal"; + if (val == Pinetime::Applications::WatchFace::Digital) return "Digital"; + if (val == Pinetime::Applications::WatchFace::Analog) return "Analog"; + if (val == Pinetime::Applications::WatchFace::PineTimeStyle) return "PineTimeStyle"; + if (val == Pinetime::Applications::WatchFace::Terminal) return "Terminal"; return "unknown"; }(clockface); - std::cout << "ClockFace: " << static_cast<int>(clockface) << " " << clockface_str << std::endl; + std::cout << "ClockFace: " << static_cast<uint32_t>(clockface) << " " << clockface_str << std::endl; } { auto chimes = settingsController.GetChimeOption(); diff --git a/main.cpp b/main.cpp index b679d27..16cfc3f 100644 --- a/main.cpp +++ b/main.cpp @@ -755,15 +755,15 @@ public: void switch_to_screen(uint8_t screen_idx) { if (screen_idx == 1) { - settingsController.SetClockFace(0); + settingsController.SetWatchFace(Pinetime::Applications::WatchFace::Digital); displayApp.StartApp(Pinetime::Applications::Apps::Clock, Pinetime::Applications::DisplayApp::FullRefreshDirections::None); } else if (screen_idx == 2) { - settingsController.SetClockFace(1); + settingsController.SetWatchFace(Pinetime::Applications::WatchFace::Analog); displayApp.StartApp(Pinetime::Applications::Apps::Clock, Pinetime::Applications::DisplayApp::FullRefreshDirections::None); } else if (screen_idx == 3) { - settingsController.SetClockFace(2); + settingsController.SetWatchFace(Pinetime::Applications::WatchFace::PineTimeStyle); displayApp.StartApp(Pinetime::Applications::Apps::Clock, Pinetime::Applications::DisplayApp::FullRefreshDirections::None); } else if (screen_idx == 4) {