Add start of settings app for senstivity.
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:
parent
ad42cdf120
commit
3ebf002f9d
|
@ -447,6 +447,7 @@ list(APPEND SOURCE_FILES
|
||||||
displayapp/screens/settings/SettingSteps.cpp
|
displayapp/screens/settings/SettingSteps.cpp
|
||||||
displayapp/screens/settings/SettingSetDate.cpp
|
displayapp/screens/settings/SettingSetDate.cpp
|
||||||
displayapp/screens/settings/SettingSetTime.cpp
|
displayapp/screens/settings/SettingSetTime.cpp
|
||||||
|
displayapp/screens/settings/SettingShakeThreshold.cpp
|
||||||
|
|
||||||
## Watch faces
|
## Watch faces
|
||||||
displayapp/icons/bg_clock.c
|
displayapp/icons/bg_clock.c
|
||||||
|
|
|
@ -45,12 +45,12 @@ bool MotionController::Should_RaiseWake(bool isSleeping) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool MotionController::Should_ShakeWake() {
|
bool MotionController::Should_ShakeWake(uint16_t thresh) {
|
||||||
bool wake = false;
|
bool wake = false;
|
||||||
auto diff = xTaskGetTickCount() - lastShakeTime;
|
auto diff = xTaskGetTickCount() - lastShakeTime;
|
||||||
lastShakeTime = xTaskGetTickCount();
|
lastShakeTime = xTaskGetTickCount();
|
||||||
int32_t speed = std::abs(y + z - lastYForShake - lastZForShake) / diff * 10;
|
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;
|
wake = true;
|
||||||
}
|
}
|
||||||
lastXForShake = x;
|
lastXForShake = x;
|
||||||
|
|
|
@ -35,7 +35,8 @@ namespace Pinetime {
|
||||||
uint32_t GetTripSteps() const {
|
uint32_t GetTripSteps() const {
|
||||||
return currentTripSteps;
|
return currentTripSteps;
|
||||||
}
|
}
|
||||||
bool Should_ShakeWake();
|
|
||||||
|
bool Should_ShakeWake(uint16_t thresh);
|
||||||
bool Should_RaiseWake(bool isSleeping);
|
bool Should_RaiseWake(bool isSleeping);
|
||||||
|
|
||||||
void IsSensorOk(bool isOk);
|
void IsSensorOk(bool isOk);
|
||||||
|
|
|
@ -109,10 +109,19 @@ namespace Pinetime {
|
||||||
}
|
}
|
||||||
settings.screenTimeOut = timeout;
|
settings.screenTimeOut = timeout;
|
||||||
};
|
};
|
||||||
|
|
||||||
uint32_t GetScreenTimeOut() const {
|
uint32_t GetScreenTimeOut() const {
|
||||||
return settings.screenTimeOut;
|
return settings.screenTimeOut;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
void SetShakeThreshold(uint16_t thresh){
|
||||||
|
settings.shakeWakeThreshold = thresh;
|
||||||
|
}
|
||||||
|
|
||||||
|
int16_t GetShakeThreshold() const{
|
||||||
|
return settings.shakeWakeThreshold;
|
||||||
|
}
|
||||||
|
|
||||||
void setWakeUpMode(WakeUpMode wakeUp, bool enabled) {
|
void setWakeUpMode(WakeUpMode wakeUp, bool enabled) {
|
||||||
if (enabled != isWakeUpModeOn(wakeUp)) {
|
if (enabled != isWakeUpModeOn(wakeUp)) {
|
||||||
settingsChanged = true;
|
settingsChanged = true;
|
||||||
|
@ -164,7 +173,7 @@ namespace Pinetime {
|
||||||
private:
|
private:
|
||||||
Pinetime::Controllers::FS& fs;
|
Pinetime::Controllers::FS& fs;
|
||||||
|
|
||||||
static constexpr uint32_t settingsVersion = 0x0003;
|
static constexpr uint32_t settingsVersion = 0x0004;
|
||||||
struct SettingsData {
|
struct SettingsData {
|
||||||
uint32_t version = settingsVersion;
|
uint32_t version = settingsVersion;
|
||||||
uint32_t stepsGoal = 10000;
|
uint32_t stepsGoal = 10000;
|
||||||
|
@ -178,7 +187,7 @@ namespace Pinetime {
|
||||||
PineTimeStyle PTS;
|
PineTimeStyle PTS;
|
||||||
|
|
||||||
std::bitset<4> wakeUpMode {0};
|
std::bitset<4> wakeUpMode {0};
|
||||||
|
uint16_t shakeWakeThreshold = 300;
|
||||||
Controllers::BrightnessController::Levels brightLevel = Controllers::BrightnessController::Levels::Medium;
|
Controllers::BrightnessController::Levels brightLevel = Controllers::BrightnessController::Levels::Medium;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,9 @@ namespace Pinetime {
|
||||||
SettingSteps,
|
SettingSteps,
|
||||||
SettingSetDate,
|
SettingSetDate,
|
||||||
SettingSetTime,
|
SettingSetTime,
|
||||||
Error,
|
SettingShakeThreshold,
|
||||||
|
Error
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,6 +47,7 @@
|
||||||
#include "displayapp/screens/settings/SettingSteps.h"
|
#include "displayapp/screens/settings/SettingSteps.h"
|
||||||
#include "displayapp/screens/settings/SettingSetDate.h"
|
#include "displayapp/screens/settings/SettingSetDate.h"
|
||||||
#include "displayapp/screens/settings/SettingSetTime.h"
|
#include "displayapp/screens/settings/SettingSetTime.h"
|
||||||
|
#include "displayapp/screens/settings/SettingShakeThreshold.h"
|
||||||
|
|
||||||
#include "libs/lv_conf.h"
|
#include "libs/lv_conf.h"
|
||||||
|
|
||||||
|
@ -415,6 +416,10 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
|
||||||
currentScreen = std::make_unique<Screens::SettingSetTime>(this, dateTimeController);
|
currentScreen = std::make_unique<Screens::SettingSetTime>(this, dateTimeController);
|
||||||
ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
|
ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
|
||||||
break;
|
break;
|
||||||
|
case Apps::SettingShakeThreshold:
|
||||||
|
currentScreen = std::make_unique<Screens::SettingShakeThreshold>(this, settingsController);
|
||||||
|
ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
|
||||||
|
break;
|
||||||
case Apps::BatteryInfo:
|
case Apps::BatteryInfo:
|
||||||
currentScreen = std::make_unique<Screens::BatteryInfo>(this, batteryController);
|
currentScreen = std::make_unique<Screens::BatteryInfo>(this, batteryController);
|
||||||
ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
|
ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
|
||||||
|
|
89
src/displayapp/screens/settings/SettingShakeThreshold.cpp
Normal file
89
src/displayapp/screens/settings/SettingShakeThreshold.cpp
Normal file
|
@ -0,0 +1,89 @@
|
||||||
|
#include "SettingShakeThreshold.h"
|
||||||
|
#include <lvgl/lvgl.h>
|
||||||
|
#include "displayapp/DisplayApp.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) {
|
||||||
|
SettingShakeThreshold* screen = static_cast<SettingShakeThreshold*>(obj->user_data);
|
||||||
|
screen->UpdateSelected(obj, event);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
SettingShakeThreshold::SettingShakeThreshold(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_color(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111));
|
||||||
|
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, "Shake Threshold");
|
||||||
|
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::home);
|
||||||
|
lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER);
|
||||||
|
lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
|
||||||
|
|
||||||
|
optionsTotal = 0;
|
||||||
|
cbOption[optionsTotal] = lv_checkbox_create(container1, nullptr);
|
||||||
|
lv_checkbox_set_text_static(cbOption[optionsTotal], " High");
|
||||||
|
cbOption[optionsTotal]->user_data = this;
|
||||||
|
lv_obj_set_event_cb(cbOption[optionsTotal], event_handler);
|
||||||
|
if (settingsController.GetShakeThreshold() == 150) {
|
||||||
|
lv_checkbox_set_checked(cbOption[optionsTotal], true);
|
||||||
|
}
|
||||||
|
|
||||||
|
optionsTotal++;
|
||||||
|
cbOption[optionsTotal] = lv_checkbox_create(container1, nullptr);
|
||||||
|
lv_checkbox_set_text_static(cbOption[optionsTotal], " Medium");
|
||||||
|
cbOption[optionsTotal]->user_data = this;
|
||||||
|
lv_obj_set_event_cb(cbOption[optionsTotal], event_handler);
|
||||||
|
if (settingsController.GetShakeThreshold() == 300) {
|
||||||
|
lv_checkbox_set_checked(cbOption[optionsTotal], true);
|
||||||
|
}
|
||||||
|
|
||||||
|
optionsTotal++;
|
||||||
|
cbOption[optionsTotal] = lv_checkbox_create(container1, nullptr);
|
||||||
|
lv_checkbox_set_text_static(cbOption[optionsTotal], " Low");
|
||||||
|
cbOption[optionsTotal]->user_data = this;
|
||||||
|
lv_obj_set_event_cb(cbOption[optionsTotal], event_handler);
|
||||||
|
if (settingsController.GetShakeThreshold() == 450) {
|
||||||
|
lv_checkbox_set_checked(cbOption[optionsTotal], true);
|
||||||
|
}
|
||||||
|
|
||||||
|
optionsTotal++;
|
||||||
|
}
|
||||||
|
|
||||||
|
SettingShakeThreshold::~SettingShakeThreshold() {
|
||||||
|
lv_obj_clean(lv_scr_act());
|
||||||
|
settingsController.SaveSettings();
|
||||||
|
}
|
||||||
|
|
||||||
|
void SettingShakeThreshold::UpdateSelected(lv_obj_t* object, lv_event_t event) {
|
||||||
|
if (event == LV_EVENT_VALUE_CHANGED) {
|
||||||
|
for (uint8_t i = 0; i < optionsTotal; i++) {
|
||||||
|
if (object == cbOption[i]) {
|
||||||
|
lv_checkbox_set_checked(cbOption[i], true);
|
||||||
|
settingsController.SetShakeThreshold((i+1)*150);
|
||||||
|
} else {
|
||||||
|
lv_checkbox_set_checked(cbOption[i], false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
27
src/displayapp/screens/settings/SettingShakeThreshold.h
Normal file
27
src/displayapp/screens/settings/SettingShakeThreshold.h
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
|
#include <lvgl/lvgl.h>
|
||||||
|
#include "components/settings/Settings.h"
|
||||||
|
#include "displayapp/screens/Screen.h"
|
||||||
|
|
||||||
|
namespace Pinetime {
|
||||||
|
|
||||||
|
namespace Applications {
|
||||||
|
namespace Screens {
|
||||||
|
|
||||||
|
class SettingShakeThreshold : public Screen {
|
||||||
|
public:
|
||||||
|
SettingShakeThreshold(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
|
||||||
|
~SettingShakeThreshold() override;
|
||||||
|
|
||||||
|
void UpdateSelected(lv_obj_t* object, lv_event_t event);
|
||||||
|
|
||||||
|
private:
|
||||||
|
Controllers::Settings& settingsController;
|
||||||
|
uint8_t optionsTotal;
|
||||||
|
lv_obj_t* cbOption[2];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -65,6 +65,8 @@ std::unique_ptr<Screen> Settings::CreateScreen3() {
|
||||||
{Symbols::none, "None", Apps::None},
|
{Symbols::none, "None", Apps::None},
|
||||||
{Symbols::none, "None", Apps::None}
|
{Symbols::none, "None", Apps::None}
|
||||||
}};
|
}};
|
||||||
|
if (settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::Shake)) {
|
||||||
|
applications[1] = {Symbols::list, "Shake Threshold", Apps::SettingShakeThreshold};
|
||||||
|
}
|
||||||
return std::make_unique<Screens::List>(2, 3, app, settingsController, applications);
|
return std::make_unique<Screens::List>(2, 3, app, settingsController, applications);
|
||||||
}
|
}
|
|
@ -475,7 +475,8 @@ void SystemTask::UpdateMotion() {
|
||||||
motionController.Should_RaiseWake(isSleeping)) {
|
motionController.Should_RaiseWake(isSleeping)) {
|
||||||
GoToRunning();
|
GoToRunning();
|
||||||
}
|
}
|
||||||
if (settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::Shake) && motionController.Should_ShakeWake()) {
|
if (settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::Shake) &&
|
||||||
|
motionController.Should_ShakeWake(settingsController.GetShakeThreshold())) {
|
||||||
GoToRunning();
|
GoToRunning();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user