diff options
| author | Riku Isokoski <riksu9000@gmail.com> | 2021-09-13 21:22:53 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-13 21:22:53 +0300 |
| commit | 40765f117347f4a4fc6cc4d2c4e46b1923a18fbb (patch) | |
| tree | f1eac679b683e04b80fdd245dd9d4c6949a174a5 /src/systemtask/SystemTask.h | |
| parent | 3ee4876214b70c107cabbb54f865e646e99f0d73 (diff) | |
| parent | b0bdd2be1c30d349a1efef96b93a5771f5edbd06 (diff) | |
Merge branch 'develop' into disable_notif_only
Diffstat (limited to 'src/systemtask/SystemTask.h')
| -rw-r--r-- | src/systemtask/SystemTask.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/systemtask/SystemTask.h b/src/systemtask/SystemTask.h index 0266ba8a..1f8be75f 100644 --- a/src/systemtask/SystemTask.h +++ b/src/systemtask/SystemTask.h @@ -8,6 +8,7 @@ #include <heartratetask/HeartRateTask.h> #include <components/settings/Settings.h> #include <drivers/Bma421.h> +#include <drivers/PinMap.h> #include <components/motion/MotionController.h> #include "SystemMonitor.h" @@ -120,15 +121,6 @@ namespace Pinetime { Pinetime::Controllers::TouchHandler& touchHandler; Pinetime::Controllers::NimbleController nimbleController; - static constexpr uint8_t pinSpiSck = 2; - static constexpr uint8_t pinSpiMosi = 3; - static constexpr uint8_t pinSpiMiso = 4; - static constexpr uint8_t pinSpiCsn = 25; - static constexpr uint8_t pinLcdDataCommand = 18; - static constexpr uint8_t pinButton = 13; - static constexpr uint8_t pinTouchIrq = 28; - static constexpr uint8_t pinPowerPresentIrq = 19; - static void Process(void* instance); void Work(); void ReloadIdleTimer(); @@ -136,13 +128,15 @@ namespace Pinetime { uint8_t bleDiscoveryTimer = 0; TimerHandle_t dimTimer; TimerHandle_t idleTimer; + TimerHandle_t measureBatteryTimer; + bool sendBatteryNotification = false; bool doNotGoToSleep = false; void GoToRunning(); void UpdateMotion(); bool stepCounterMustBeReset = false; - static constexpr TickType_t batteryNotificationPeriod = 1000 * 60 * 10; // 1 tick ~= 1ms. 1ms * 60 * 10 = 10 minutes - TickType_t batteryNotificationTick = 0; + static constexpr TickType_t batteryMeasurementPeriod = pdMS_TO_TICKS(10 * 60 * 1000); + TickType_t lastBatteryNotificationTime = 0; #if configUSE_TRACE_FACILITY == 1 SystemMonitor<FreeRtosMonitor> monitor; |