diff options
| author | Mark Russell <mruss660@gmail.com> | 2021-09-16 16:20:39 -0400 |
|---|---|---|
| committer | Mark Russell <mruss660@gmail.com> | 2021-09-16 16:20:39 -0400 |
| commit | b9e56843a29672b2befa65bf036f6db21078291f (patch) | |
| tree | c2fa91e352127c09abd0f9b4959cd1f47d628ea8 /src/systemtask/SystemTask.h | |
| parent | cdf99b08f42c3826a8608d756bc7cda0a476ed98 (diff) | |
| parent | 3eb73774a39e255cd4b5de76441a59f1525a989c (diff) | |
resolve conflict in src/systemtask/Messages.h
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 cbd98d26..9e7e5e8c 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" @@ -123,15 +124,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(); @@ -139,13 +131,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; |