CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add start of settings app for senstivity.

Browse Source 
really just debugging. I want to make it more configurable then high med low.
Position of setting needs a new location...dynamicly adding it currently at the end. Which honestly im fine with.
This commit is contained in:
Tim Keller
2021-09-27 02:52:02 +00:00
parent ad42cdf120
commit 3ebf002f9d
10 changed files with 145 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/motion/MotionController.cpp
View File

@@ -45,12 +45,12 @@ bool MotionController::Should_RaiseWake(bool isSleeping) {
return false;
}
bool MotionController::Should_ShakeWake() {
bool MotionController::Should_ShakeWake(uint16_t thresh) {
bool wake = false;
auto diff = xTaskGetTickCount() - lastShakeTime;
lastShakeTime = xTaskGetTickCount();
int32_t speed = std::abs(y + z - lastYForShake - lastZForShake) / diff * 10;
if (speed > 150) { // TODO move threshold to a setting
if (speed > thresh) {
wake = true;
}
lastXForShake = x;

3
src/components/motion/MotionController.h
View File

@@ -35,7 +35,8 @@ namespace Pinetime {
uint32_t GetTripSteps() const {
return currentTripSteps;
}
bool Should_ShakeWake();
bool Should_ShakeWake(uint16_t thresh);
bool Should_RaiseWake(bool isSleeping);
void IsSensorOk(bool isOk);

13
src/components/settings/Settings.h
View File

@@ -109,10 +109,19 @@ namespace Pinetime {
}
settings.screenTimeOut = timeout;
};
uint32_t GetScreenTimeOut() const {
return settings.screenTimeOut;
};
void SetShakeThreshold(uint16_t thresh){
settings.shakeWakeThreshold = thresh;
}
int16_t GetShakeThreshold() const{
return settings.shakeWakeThreshold;
}
void setWakeUpMode(WakeUpMode wakeUp, bool enabled) {
if (enabled != isWakeUpModeOn(wakeUp)) {
settingsChanged = true;
@@ -164,7 +173,7 @@ namespace Pinetime {
private:
Pinetime::Controllers::FS& fs;
static constexpr uint32_t settingsVersion = 0x0003;
static constexpr uint32_t settingsVersion = 0x0004;
struct SettingsData {
uint32_t version = settingsVersion;
uint32_t stepsGoal = 10000;
@@ -178,7 +187,7 @@ namespace Pinetime {
PineTimeStyle PTS;
std::bitset<4> wakeUpMode {0};
uint16_t shakeWakeThreshold = 300;
Controllers::BrightnessController::Levels brightLevel = Controllers::BrightnessController::Levels::Medium;
};