aboutsummaryrefslogtreecommitdiffstats
path: root/src/components
diff options
context:
space:
mode:
authorFintasticMan <finlay.neon.kid@gmail.com>2023-08-27 18:15:21 +0200
committerGitHub <noreply@github.com>2023-08-27 18:15:21 +0200
commit0f9f606b78ffbb93b1365156d8492bbf4ee4995d (patch)
tree263f41ae22015f70fcf93eaea1f2f4cfddff4e70 /src/components
parent2b1eae7f597ea6c210b4c15a73ab5ba116fc5d2a (diff)
lowersleep: Implement Lower to Sleep functionality (#827)
Diffstat (limited to 'src/components')
-rw-r--r--src/components/motion/MotionController.cpp14
-rw-r--r--src/components/motion/MotionController.h1
-rw-r--r--src/components/settings/Settings.h14
3 files changed, 20 insertions, 9 deletions
diff --git a/src/components/motion/MotionController.cpp b/src/components/motion/MotionController.cpp
index feb9ead0..d28378d5 100644
--- a/src/components/motion/MotionController.cpp
+++ b/src/components/motion/MotionController.cpp
@@ -115,6 +115,20 @@ bool MotionController::ShouldShakeWake(uint16_t thresh) {
return accumulatedSpeed > thresh;
}
+bool MotionController::ShouldLowerSleep() const {
+ if (stats.yMean < 724 || DegreesRolled(stats.yMean, stats.zMean, stats.prevYMean, stats.prevZMean) < 30) {
+ return false;
+ }
+
+ for (uint8_t i = AccelStats::numHistory + 1; i < yHistory.Size(); i++) {
+ if (yHistory[i] < 265) {
+ return false;
+ }
+ }
+
+ return true;
+}
+
void MotionController::Init(Pinetime::Drivers::Bma421::DeviceTypes types) {
switch (types) {
case Drivers::Bma421::DeviceTypes::BMA421:
diff --git a/src/components/motion/MotionController.h b/src/components/motion/MotionController.h
index 1ad032b8..0aa7823e 100644
--- a/src/components/motion/MotionController.h
+++ b/src/components/motion/MotionController.h
@@ -46,6 +46,7 @@ namespace Pinetime {
bool ShouldShakeWake(uint16_t thresh);
bool ShouldRaiseWake() const;
+ bool ShouldLowerSleep() const;
int32_t CurrentShakeSpeed() const {
return accumulatedSpeed;
diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
index efa44fde..81cf4923 100644
--- a/src/components/settings/Settings.h
+++ b/src/components/settings/Settings.h
@@ -12,12 +12,7 @@ namespace Pinetime {
enum class ClockType : uint8_t { H24, H12 };
enum class Notification : uint8_t { On, Off, Sleep };
enum class ChimesOption : uint8_t { None, Hours, HalfHours };
- enum class WakeUpMode : uint8_t {
- SingleTap = 0,
- DoubleTap = 1,
- RaiseWrist = 2,
- Shake = 3,
- };
+ enum class WakeUpMode : uint8_t { SingleTap = 0, DoubleTap = 1, RaiseWrist = 2, Shake = 3, LowerWrist = 4 };
enum class Colors : uint8_t {
White,
Silver,
@@ -238,7 +233,7 @@ namespace Pinetime {
}
};
- std::bitset<4> getWakeUpModes() const {
+ std::bitset<5> getWakeUpModes() const {
return settings.wakeUpMode;
}
@@ -279,7 +274,7 @@ namespace Pinetime {
private:
Pinetime::Controllers::FS& fs;
- static constexpr uint32_t settingsVersion = 0x0005;
+ static constexpr uint32_t settingsVersion = 0x0006;
struct SettingsData {
uint32_t version = settingsVersion;
@@ -296,8 +291,9 @@ namespace Pinetime {
WatchFaceInfineat watchFaceInfineat;
- std::bitset<4> wakeUpMode {0};
+ std::bitset<5> wakeUpMode {0};
uint16_t shakeWakeThreshold = 150;
+
Controllers::BrightnessController::Levels brightLevel = Controllers::BrightnessController::Levels::Medium;
};