diff options
author | Jean-François Milants <jf@codingfield.com> | 2022-01-04 21:48:20 +0100 |
---|---|---|
committer | Jean-François Milants <jf@codingfield.com> | 2022-01-04 21:48:20 +0100 |
commit | dc8be2244ceb46fb58d2706935dc05b2d0ecdf8c (patch) | |
tree | 8e955bb1b6c11c65afcc30eb39174ab20bfa0437 /src/components/settings/Settings.h | |
parent | b8b54f47a2a09e32186bf7d8dddc658fae2c6e5f (diff) | |
parent | bef3e708f6b5a6f71797f72aab89d09520813046 (diff) |
Merge branch 'geekbozu-ShakeWake' into develop
Diffstat (limited to 'src/components/settings/Settings.h')
-rw-r--r-- | src/components/settings/Settings.h | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h index 006b8c74..6de44aac 100644 --- a/src/components/settings/Settings.h +++ b/src/components/settings/Settings.h @@ -16,6 +16,7 @@ namespace Pinetime { SingleTap = 0, DoubleTap = 1, RaiseWrist = 2, + Shake = 3, }; enum class Colors : uint8_t { White, Silver, Gray, Black, Red, Maroon, Yellow, Olive, Lime, Green, Cyan, Teal, Blue, Navy, Magenta, Purple, Orange @@ -119,10 +120,23 @@ namespace Pinetime { } settings.screenTimeOut = timeout; }; + uint32_t GetScreenTimeOut() const { return settings.screenTimeOut; }; + void SetShakeThreshold(uint16_t thresh){ + if(settings.shakeWakeThreshold != thresh){ + settings.shakeWakeThreshold = thresh; + settingsChanged = true; + } + + } + + int16_t GetShakeThreshold() const{ + return settings.shakeWakeThreshold; + } + void setWakeUpMode(WakeUpMode wakeUp, bool enabled) { if (enabled != isWakeUpModeOn(wakeUp)) { settingsChanged = true; @@ -137,13 +151,13 @@ namespace Pinetime { case WakeUpMode::DoubleTap: settings.wakeUpMode.set(static_cast<size_t>(WakeUpMode::SingleTap), false); break; - case WakeUpMode::RaiseWrist: + default: break; } } }; - std::bitset<3> getWakeUpModes() const { + std::bitset<4> getWakeUpModes() const { return settings.wakeUpMode; } @@ -187,8 +201,8 @@ namespace Pinetime { PineTimeStyle PTS; - std::bitset<3> wakeUpMode {0}; - + std::bitset<4> wakeUpMode {0}; + uint16_t shakeWakeThreshold = 150; Controllers::BrightnessController::Levels brightLevel = Controllers::BrightnessController::Levels::Medium; }; |