Remove display timeout setting and code, logical fix for setting screensultraredux2-pwmbacklight

11 files changed, 3 insertions, 150 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 292e2c1..c47cda7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -404,7 +404,6 @@ list(APPEND SOURCE_FILES
         displayapp/screens/settings/QuickSettings.cpp
         displayapp/screens/settings/Settings.cpp
         displayapp/screens/settings/SettingTimeFormat.cpp
-        displayapp/screens/settings/SettingDisplay.cpp
 
         ## Watch faces
         displayapp/screens/WatchFaceDigital.cpp
diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
index 7842664..c7976a3 100644
--- a/src/components/settings/Settings.h
+++ b/src/components/settings/Settings.h
@@ -78,22 +78,10 @@ namespace Pinetime {
         return settings.notificationStatus;
       };
 
-      void SetScreenTimeOut(uint32_t timeout) {
-        if (timeout != settings.screenTimeOut) {
-          settingsChanged = true;
-        }
-        settings.screenTimeOut = timeout;
-      };
-
-      uint32_t GetScreenTimeOut() const {
-        return settings.screenTimeOut;
-      };
-
     private:
-      static constexpr uint32_t settingsVersion = 0x4121; // infinitime redux settings
+      static constexpr uint32_t settingsVersion = 0x4122; // infinitime redux settings
       struct SettingsData {
         uint32_t version = settingsVersion;
-        uint32_t screenTimeOut = 15000;
 
         ClockType clockType = ClockType::H24;
         Notification notificationStatus = Notification::ON;
diff --git a/src/displayapp/Apps.h b/src/displayapp/Apps.h
index 663d9f4..75a1e40 100644
--- a/src/displayapp/Apps.h
+++ b/src/displayapp/Apps.h
@@ -13,7 +13,6 @@ namespace Pinetime {
       QuickSettings,
       Settings,
       SettingTimeFormat,
-      SettingDisplay,
       Error
     };
   }
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index a03f4cf..e7b3416 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -23,7 +23,6 @@
 #include "displayapp/screens/settings/QuickSettings.h"
 #include "displayapp/screens/settings/Settings.h"
 #include "displayapp/screens/settings/SettingTimeFormat.h"
-#include "displayapp/screens/settings/SettingDisplay.h"
 
 #include "libs/lv_conf.h"
 
@@ -139,9 +138,6 @@ void DisplayApp::Refresh() {
   Messages msg;
   if (xQueueReceive(msgQueue, &msg, queueTimeout)) {
     switch (msg) {
-      case Messages::UpdateTimeOut:
-        PushMessageToSystemTask(System::Messages::UpdateTimeOut);
-        break;
       case Messages::UpdateBleConnection:
         //        clockScreen.SetBleConnectionState(bleController.IsConnected() ? Screens::Clock::BleConnectionStates::Connected :
         //        Screens::Clock::BleConnectionStates::NotConnected);
@@ -302,10 +298,6 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
       currentScreen = std::make_unique<Screens::SettingTimeFormat>(this, settingsController);
       ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
-    case Apps::SettingDisplay:
-      currentScreen = std::make_unique<Screens::SettingDisplay>(this, settingsController);
-      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
-      break;
   }
   currentApp = app;
 }
diff --git a/src/displayapp/Messages.h b/src/displayapp/Messages.h
index c6d9dd6..4904513 100644
--- a/src/displayapp/Messages.h
+++ b/src/displayapp/Messages.h
@@ -13,7 +13,6 @@ namespace Pinetime {
         ButtonDoubleClicked,
         NewNotification,
         BleFirmwareUpdateStarted,
-        UpdateTimeOut,
         Clock,
       };
     }
diff --git a/src/displayapp/screens/settings/SettingDisplay.cpp b/src/displayapp/screens/settings/SettingDisplay.cpp
deleted file mode 100644
index 9e972af..0000000
--- a/src/displayapp/screens/settings/SettingDisplay.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-#include "displayapp/screens/settings/SettingDisplay.h"
-#include <lvgl/lvgl.h>
-#include "displayapp/DisplayApp.h"
-#include "displayapp/Messages.h"
-#include "displayapp/screens/Styles.h"
-#include "displayapp/screens/Screen.h"
-#include "displayapp/screens/Symbols.h"
-
-using namespace Pinetime::Applications::Screens;
-
-namespace {
-  static void event_handler(lv_obj_t* obj, lv_event_t event) {
-    SettingDisplay* screen = static_cast<SettingDisplay*>(obj->user_data);
-    screen->UpdateSelected(obj, event);
-  }
-}
-
-constexpr std::array<uint16_t, 4> SettingDisplay::options;
-
-SettingDisplay::SettingDisplay(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController)
-  : Screen(app), settingsController {settingsController} {
-
-  lv_obj_t* container1 = lv_cont_create(lv_scr_act(), nullptr);
-
-  lv_obj_set_style_local_bg_opa(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP);
-  lv_obj_set_style_local_pad_all(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 10);
-  lv_obj_set_style_local_pad_inner(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 5);
-  lv_obj_set_style_local_border_width(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0);
-
-  lv_obj_set_pos(container1, 10, 60);
-  lv_obj_set_width(container1, LV_HOR_RES - 20);
-  lv_obj_set_height(container1, LV_VER_RES - 50);
-  lv_cont_set_layout(container1, LV_LAYOUT_COLUMN_LEFT);
-
-  lv_obj_t* title = lv_label_create(lv_scr_act(), nullptr);
-  lv_label_set_text_static(title, "Display timeout");
-  lv_label_set_align(title, LV_LABEL_ALIGN_CENTER);
-  lv_obj_align(title, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 10, 15);
-
-  lv_obj_t* icon = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(icon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
-  lv_label_set_text_static(icon, Symbols::sun);
-  lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER);
-  lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
-
-  char buffer[12];
-  for (unsigned int i = 0; i < options.size(); i++) {
-    cbOption[i] = lv_checkbox_create(container1, nullptr);
-    sprintf(buffer, "%3d seconds",  options[i] / 1000);
-    lv_checkbox_set_text(cbOption[i], buffer);
-    cbOption[i]->user_data = this;
-    lv_obj_set_event_cb(cbOption[i], event_handler);
-    SetRadioButtonStyle(cbOption[i]);
-
-    if (settingsController.GetScreenTimeOut() == options[i]) {
-      lv_checkbox_set_checked(cbOption[i], true);
-    }
-  }
-}
-
-SettingDisplay::~SettingDisplay() {
-  lv_obj_clean(lv_scr_act());
-  settingsController.SaveSettings();
-}
-
-void SettingDisplay::UpdateSelected(lv_obj_t* object, lv_event_t event) {
-  if (event == LV_EVENT_CLICKED) {
-    for (unsigned int i = 0; i < options.size(); i++) {
-      if (object == cbOption[i]) {
-        lv_checkbox_set_checked(cbOption[i], true);
-        settingsController.SetScreenTimeOut(options[i]);
-        app->PushMessage(Applications::Display::Messages::UpdateTimeOut);
-      } else {
-        lv_checkbox_set_checked(cbOption[i], false);
-      }
-    }
-  }
-}
diff --git a/src/displayapp/screens/settings/SettingDisplay.h b/src/displayapp/screens/settings/SettingDisplay.h
deleted file mode 100644
index dc56419..0000000
--- a/src/displayapp/screens/settings/SettingDisplay.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include <array>
-#include <cstdint>
-#include <lvgl/lvgl.h>
-
-#include "components/settings/Settings.h"
-#include "displayapp/screens/Screen.h"
-
-namespace Pinetime {
-
-  namespace Applications {
-    namespace Screens {
-
-      class SettingDisplay : public Screen {
-      public:
-        SettingDisplay(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
-        ~SettingDisplay() override;
-
-        void UpdateSelected(lv_obj_t* object, lv_event_t event);
-
-      private:
-        static constexpr std::array<uint16_t, 4> options = {5000, 15000, 20000, 30000};
-
-        Controllers::Settings& settingsController;
-        lv_obj_t* cbOption[options.size()];
-      };
-    }
-  }
-}
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp
index 22666a8..d2a5a63 100644
--- a/src/displayapp/screens/settings/Settings.cpp
+++ b/src/displayapp/screens/settings/Settings.cpp
@@ -17,9 +17,6 @@ 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,8 +31,8 @@ bool Settings::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
 
 std::unique_ptr<Screen> Settings::CreateScreen1() {
   std::array<Screens::List::Applications, 4> applications {{
-    {Symbols::sun, "Display", Apps::SettingDisplay},
     {Symbols::clock, "Time format", Apps::SettingTimeFormat},
+    {Symbols::check, "Firmware", Apps::FirmwareValidation},
     {Symbols::none, "None", Apps::None},
     {Symbols::none, "None", Apps::None}
   }};
@@ -43,14 +40,4 @@ std::unique_ptr<Screen> Settings::CreateScreen1() {
   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::check, "Firmware", Apps::FirmwareValidation},
-    {Symbols::none, "None", Apps::None},
-    {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/displayapp/screens/settings/Settings.h b/src/displayapp/screens/settings/Settings.h
index 02ccff6..ee032f2 100644
--- a/src/displayapp/screens/settings/Settings.h
+++ b/src/displayapp/screens/settings/Settings.h
@@ -19,7 +19,7 @@ namespace Pinetime {
       private:
         Controllers::Settings& settingsController;
 
-        ScreenList<2> screens;
+        ScreenList<1> screens;
 
         std::unique_ptr<Screen> CreateScreen1();
         std::unique_ptr<Screen> CreateScreen2();
diff --git a/src/systemtask/Messages.h b/src/systemtask/Messages.h
index 38a9c8e..3c99a89 100644
--- a/src/systemtask/Messages.h
+++ b/src/systemtask/Messages.h
@@ -7,7 +7,6 @@ namespace Pinetime {
         OnNewNotification,
         OnNewCall,
         BleConnected,
-        UpdateTimeOut,
         BleFirmwareUpdateStarted,
         BleFirmwareUpdateFinished,
         OnTouchEvent,
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index c333aad..60b4cc9 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -183,8 +183,6 @@ void SystemTask::Work() {
     if (xQueueReceive(systemTasksMsgQueue, &msg, 100)) {
       Messages message = static_cast<Messages>(msg);
       switch (message) {
-        case Messages::UpdateTimeOut:
-          break;
         case Messages::OnNewTime:
           displayApp.PushMessage(Pinetime::Applications::Display::Messages::UpdateDateTime);
           break;