diff options
| author | Michele Bini <michele.bini@gmail.com> | 2022-04-12 03:11:16 (GMT) |
|---|---|---|
| committer | Michele Bini <michele.bini@gmail.com> | 2022-04-12 03:11:16 (GMT) |
| commit | 502dfad3d3dd062b37722ea65ec42908139b2e17 (patch) | |
| tree | 334dbd66e0e074a5d8f47423702d3e0cd2fa1731 /src/components/settings | |
| parent | adc82f138237b17797f695aa6e272188ccb3fb15 (diff) | |
Fixed screen brightness, no sleep or wake up
Diffstat (limited to 'src/components/settings')
| -rw-r--r-- | src/components/settings/Settings.h | 48 |
1 files changed, 1 insertions, 47 deletions
diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h index 5201b77..7842664 100644 --- a/src/components/settings/Settings.h +++ b/src/components/settings/Settings.h @@ -1,7 +1,6 @@ #pragma once #include <cstdint> #include <bitset> -#include "components/brightness/BrightnessController.h" namespace Pinetime { namespace Controllers { @@ -9,11 +8,6 @@ namespace Pinetime { public: enum class ClockType : uint8_t { H24, H12 }; enum class Notification : uint8_t { ON, OFF }; - enum class WakeUpMode : uint8_t { - SingleTap = 0, - DoubleTap = 1, - RaiseWrist = 2, - }; enum class Colors : uint8_t { White, Silver, @@ -95,47 +89,8 @@ namespace Pinetime { return settings.screenTimeOut; }; - void setWakeUpMode(WakeUpMode wakeUp, bool enabled) { - if (enabled != isWakeUpModeOn(wakeUp)) { - settingsChanged = true; - } - settings.wakeUpMode.set(static_cast<size_t>(wakeUp), enabled); - // Handle special behavior - if (enabled) { - switch (wakeUp) { - case WakeUpMode::SingleTap: - settings.wakeUpMode.set(static_cast<size_t>(WakeUpMode::DoubleTap), false); - break; - case WakeUpMode::DoubleTap: - settings.wakeUpMode.set(static_cast<size_t>(WakeUpMode::SingleTap), false); - break; - default: - break; - } - } - }; - - std::bitset<4> getWakeUpModes() const { - return settings.wakeUpMode; - } - - bool isWakeUpModeOn(const WakeUpMode mode) const { - return getWakeUpModes()[static_cast<size_t>(mode)]; - } - - void SetBrightness(Controllers::BrightnessController::Levels level) { - if (level != settings.brightLevel) { - settingsChanged = true; - } - settings.brightLevel = level; - }; - - Controllers::BrightnessController::Levels GetBrightness() const { - return settings.brightLevel; - }; - private: - static constexpr uint32_t settingsVersion = 0x4021; // infinitime redux settings + static constexpr uint32_t settingsVersion = 0x4121; // infinitime redux settings struct SettingsData { uint32_t version = settingsVersion; uint32_t screenTimeOut = 15000; @@ -146,7 +101,6 @@ namespace Pinetime { uint8_t clockFace = 0; std::bitset<4> wakeUpMode {0}; - Controllers::BrightnessController::Levels brightLevel = Controllers::BrightnessController::Levels::Medium; }; SettingsData settings; |
