From 68bdaee1cc301a2aca1849f38d2596debe7d67d1 Mon Sep 17 00:00:00 2001 From: Jean-François Milants Date: Wed, 31 Mar 2021 19:47:27 +0200 Subject: First integration of the motion sensor (bma 421) : step counting + wake on wrist rotation + app to see the value of the 3 axis in "real time". --- src/components/motion/MotionController.cpp | 33 ++++++++++++++++++++++++++++++ src/components/motion/MotionController.h | 26 +++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 src/components/motion/MotionController.cpp create mode 100644 src/components/motion/MotionController.h (limited to 'src/components') diff --git a/src/components/motion/MotionController.cpp b/src/components/motion/MotionController.cpp new file mode 100644 index 00000000..bad9d45f --- /dev/null +++ b/src/components/motion/MotionController.cpp @@ -0,0 +1,33 @@ +#include "MotionController.h" + +using namespace Pinetime::Controllers; + +void MotionController::Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps) { + this->x = x; + this->y = y; + this->z = z; + this->nbSteps = nbSteps; +} + +bool MotionController::ShouldWakeUp(bool isSleeping) { + if ((x + 335) <= 670 && z < 0) { + if (not isSleeping) { + if (y <= 0) { + return false; + } else { + lastYForWakeUp = 0; + return false; + } + } + + if (y >= 0) { + lastYForWakeUp = 0; + return false; + } + if (y + 230 < lastYForWakeUp) { + lastYForWakeUp = y; + return true; + } + } + return false; +} diff --git a/src/components/motion/MotionController.h b/src/components/motion/MotionController.h new file mode 100644 index 00000000..dbbbf910 --- /dev/null +++ b/src/components/motion/MotionController.h @@ -0,0 +1,26 @@ +#pragma once + +#include + +namespace Pinetime { + namespace Controllers { + class MotionController { + public: + void Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps); + + uint16_t X() const { return x; } + uint16_t Y() const { return y; } + uint16_t Z() const { return z; } + uint32_t NbSteps() const { return nbSteps; } + bool ShouldWakeUp(bool isSleeping); + + private: + uint32_t nbSteps; + int16_t x; + int16_t y; + int16_t z; + int16_t lastYForWakeUp = 0; + + }; + } +} \ No newline at end of file -- cgit v1.2.3 From 52a90288fd2b744b68d584db316fcf3fede84262 Mon Sep 17 00:00:00 2001 From: Jean-François Milants Date: Fri, 2 Apr 2021 16:56:14 +0200 Subject: Handle return code from BMA driver, and set a flag is the initialization fails. This allows to boot InfiniTime even if the device cannot initialize. --- src/components/motion/MotionController.cpp | 3 +++ src/components/motion/MotionController.h | 7 +++++-- src/displayapp/screens/WatchFaceDigital.cpp | 8 ++++++-- src/displayapp/screens/WatchFaceDigital.h | 1 + src/drivers/Bma421.cpp | 23 ++++++++++++++--------- src/drivers/Bma421.h | 5 +++-- src/systemtask/SystemTask.cpp | 1 + 7 files changed, 33 insertions(+), 15 deletions(-) (limited to 'src/components') diff --git a/src/components/motion/MotionController.cpp b/src/components/motion/MotionController.cpp index bad9d45f..e9ee314b 100644 --- a/src/components/motion/MotionController.cpp +++ b/src/components/motion/MotionController.cpp @@ -31,3 +31,6 @@ bool MotionController::ShouldWakeUp(bool isSleeping) { } return false; } +void MotionController::IsSensorOk(bool isOk) { + isSensorOk = isOk; +} diff --git a/src/components/motion/MotionController.h b/src/components/motion/MotionController.h index dbbbf910..5881997f 100644 --- a/src/components/motion/MotionController.h +++ b/src/components/motion/MotionController.h @@ -14,13 +14,16 @@ namespace Pinetime { uint32_t NbSteps() const { return nbSteps; } bool ShouldWakeUp(bool isSleeping); - private: + void IsSensorOk(bool isOk); + bool IsSensorOk() const { return isSensorOk; } + + private: uint32_t nbSteps; int16_t x; int16_t y; int16_t z; int16_t lastYForWakeUp = 0; - + bool isSensorOk = false; }; } } \ No newline at end of file diff --git a/src/displayapp/screens/WatchFaceDigital.cpp b/src/displayapp/screens/WatchFaceDigital.cpp index 2204e177..2dd89bb4 100644 --- a/src/displayapp/screens/WatchFaceDigital.cpp +++ b/src/displayapp/screens/WatchFaceDigital.cpp @@ -240,9 +240,13 @@ bool WatchFaceDigital::Refresh() { } stepCount = motionController.NbSteps(); - if(stepCount.IsUpdated()) { + motionSensorOk = motionController.IsSensorOk(); + if(stepCount.IsUpdated() || motionSensorOk.IsUpdated()) { char stepBuffer[5]; - sprintf(stepBuffer, "%lu", stepCount.Get()); + if(motionSensorOk.Get()) + sprintf(stepBuffer, "%lu", stepCount.Get()); + else + sprintf(stepBuffer, "---", stepCount.Get()); lv_label_set_text(stepValue, stepBuffer); lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_IN_BOTTOM_RIGHT, -5, -2); lv_obj_align(stepIcon, stepValue, LV_ALIGN_OUT_LEFT_MID, -5, 0); diff --git a/src/displayapp/screens/WatchFaceDigital.h b/src/displayapp/screens/WatchFaceDigital.h index e6514f1e..0f6a2f0c 100644 --- a/src/displayapp/screens/WatchFaceDigital.h +++ b/src/displayapp/screens/WatchFaceDigital.h @@ -50,6 +50,7 @@ namespace Pinetime { DirtyValue batteryPercentRemaining {}; DirtyValue bleState {}; DirtyValue> currentDateTime{}; + DirtyValue motionSensorOk {}; DirtyValue stepCount {}; DirtyValue heartbeat {}; DirtyValue heartbeatRunning {}; diff --git a/src/drivers/Bma421.cpp b/src/drivers/Bma421.cpp index 9e98f1ca..4e33ef8b 100644 --- a/src/drivers/Bma421.cpp +++ b/src/drivers/Bma421.cpp @@ -36,27 +36,27 @@ Bma421::Bma421(TwiMaster& twiMaster, uint8_t twiAddress) : twiMaster{twiMaster}, void Bma421::Init() { auto ret = bma4_soft_reset(&bma); - ASSERT(ret == BMA4_OK); + if(ret != BMA4_OK) return; nrf_delay_ms(1); ret = bma423_init(&bma); - ASSERT(ret == BMA4_OK); + if(ret != BMA4_OK) return; ret = bma423_write_config_file(&bma); - ASSERT(ret == BMA4_OK); + if(ret != BMA4_OK) return; ret = bma4_set_interrupt_mode(BMA4_LATCH_MODE, &bma); - ASSERT(ret == BMA4_OK); + if(ret != BMA4_OK) return; ret = bma423_feature_enable(BMA423_STEP_CNTR, 1, &bma); - ASSERT(ret == BMA4_OK); + if(ret != BMA4_OK) return; ret = bma423_step_detector_enable(0, &bma); - ASSERT(ret == BMA4_OK); + if(ret != BMA4_OK) return; ret = bma4_set_accel_enable(1, &bma); - ASSERT(ret == BMA4_OK); + if(ret != BMA4_OK) return; struct bma4_accel_config accel_conf; accel_conf.odr = BMA4_OUTPUT_DATA_RATE_100HZ; @@ -64,7 +64,9 @@ void Bma421::Init() { accel_conf.bandwidth = BMA4_ACCEL_NORMAL_AVG4; accel_conf.perf_mode = BMA4_CIC_AVG_MODE; ret = bma4_set_accel_config(&accel_conf, &bma); - ASSERT(ret == BMA4_OK); + if(ret != BMA4_OK) return; + + isOk = true; } void Bma421::Reset() { @@ -81,6 +83,7 @@ void Bma421::Write(uint8_t registerAddress, const uint8_t *data, size_t size) { } Bma421::Values Bma421::Process() { + if(not isOk) return {}; struct bma4_accel data; bma4_read_accel_xyz(&data, &bma); @@ -99,4 +102,6 @@ Bma421::Values Bma421::Process() { // X and Y axis are swapped because of the way the sensor is mounted in the PineTime return {steps, data.y, data.x, data.z}; } - +bool Bma421::IsOk() const { + return isOk; +} diff --git a/src/drivers/Bma421.h b/src/drivers/Bma421.h index fbb190ae..e2e24f0d 100644 --- a/src/drivers/Bma421.h +++ b/src/drivers/Bma421.h @@ -25,12 +25,13 @@ namespace Pinetime { void Read(uint8_t registerAddress, uint8_t *buffer, size_t size); void Write(uint8_t registerAddress, const uint8_t *data, size_t size); + bool IsOk() const; + private: TwiMaster& twiMaster; uint8_t deviceAddress = 0x18; - - struct bma4_dev bma; + bool isOk = false; }; } } \ No newline at end of file diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp index 74c2c46e..d2f38adb 100644 --- a/src/systemtask/SystemTask.cpp +++ b/src/systemtask/SystemTask.cpp @@ -243,6 +243,7 @@ void SystemTask::UpdateMotion() { if(isSleeping) twiMaster.Sleep(); + motionController.IsSensorOk(motionSensor.IsOk()); motionController.Update(motionValues.x, motionValues.y, motionValues.z, -- cgit v1.2.3 From 1d7576de64a33837434e6f414a74ae7dbe929196 Mon Sep 17 00:00:00 2001 From: Jean-François Milants Date: Fri, 2 Apr 2021 17:33:49 +0200 Subject: Reset the step count every day at midnight. --- src/components/datetime/DateTimeController.cpp | 13 +++++++++++++ src/components/datetime/DateTimeController.h | 8 ++++++++ src/drivers/Bma421.cpp | 4 ++++ src/drivers/Bma421.h | 4 +++- src/main.cpp | 3 +-- src/systemtask/SystemTask.cpp | 14 ++++++++++++-- src/systemtask/SystemTask.h | 7 ++++--- 7 files changed, 45 insertions(+), 8 deletions(-) (limited to 'src/components') diff --git a/src/components/datetime/DateTimeController.cpp b/src/components/datetime/DateTimeController.cpp index 59982477..9c1f2684 100644 --- a/src/components/datetime/DateTimeController.cpp +++ b/src/components/datetime/DateTimeController.cpp @@ -1,9 +1,14 @@ #include "DateTimeController.h" #include #include +#include using namespace Pinetime::Controllers; +DateTime::DateTime(System::SystemTask& systemTask) : systemTask{systemTask} { + +} + void DateTime::SetTime(uint16_t year, uint8_t month, uint8_t day, uint8_t dayOfWeek, uint8_t hour, uint8_t minute, uint8_t second, uint32_t systickCounter) { @@ -62,6 +67,14 @@ void DateTime::UpdateTime(uint32_t systickCounter) { hour = time.hours().count(); minute = time.minutes().count(); second = time.seconds().count(); + + // Notify new day to SystemTask + if(hour == 0 and not isMidnightAlreadyNotified) { + isMidnightAlreadyNotified = true; + systemTask.PushMessage(System::SystemTask::Messages::OnNewDay); + } else if (hour != 0) { + isMidnightAlreadyNotified = false; + } } const char *DateTime::MonthShortToString() { diff --git a/src/components/datetime/DateTimeController.h b/src/components/datetime/DateTimeController.h index 16bb59c9..fb0969d1 100644 --- a/src/components/datetime/DateTimeController.h +++ b/src/components/datetime/DateTimeController.h @@ -4,12 +4,17 @@ #include namespace Pinetime { + namespace System { + class SystemTask; + } namespace Controllers { class DateTime { public: enum class Days : uint8_t {Unknown, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday}; enum class Months : uint8_t {Unknown, January, February, March, April, May, June, July, August, September, October, November, December}; + DateTime(System::SystemTask& systemTask); + void SetTime(uint16_t year, uint8_t month, uint8_t day, uint8_t dayOfWeek, uint8_t hour, uint8_t minute, uint8_t second, uint32_t systickCounter); void UpdateTime(uint32_t systickCounter); uint16_t Year() const { return year; } @@ -31,6 +36,7 @@ namespace Pinetime { std::chrono::time_point CurrentDateTime() const { return currentDateTime; } std::chrono::seconds Uptime() const { return uptime; } private: + System::SystemTask& systemTask; uint16_t year = 0; Months month = Months::Unknown; uint8_t day = 0; @@ -43,6 +49,8 @@ namespace Pinetime { std::chrono::time_point currentDateTime; std::chrono::seconds uptime {0}; + bool isMidnightAlreadyNotified = false; + static char const *DaysString[]; static char const *DaysStringShort[]; static char const *DaysStringLow[]; diff --git a/src/drivers/Bma421.cpp b/src/drivers/Bma421.cpp index 4e33ef8b..10d3e5e8 100644 --- a/src/drivers/Bma421.cpp +++ b/src/drivers/Bma421.cpp @@ -105,3 +105,7 @@ Bma421::Values Bma421::Process() { bool Bma421::IsOk() const { return isOk; } + +void Bma421::ResetStepCounter() { + bma423_reset_step_counter(&bma); +} diff --git a/src/drivers/Bma421.h b/src/drivers/Bma421.h index e2e24f0d..d36d1db5 100644 --- a/src/drivers/Bma421.h +++ b/src/drivers/Bma421.h @@ -19,8 +19,8 @@ namespace Pinetime { Bma421& operator=(Bma421&&) = delete; void Init(); - void Reset(); Values Process(); + void ResetStepCounter(); void Read(uint8_t registerAddress, uint8_t *buffer, size_t size); void Write(uint8_t registerAddress, const uint8_t *data, size_t size); @@ -28,6 +28,8 @@ namespace Pinetime { bool IsOk() const; private: + void Reset(); + TwiMaster& twiMaster; uint8_t deviceAddress = 0x18; struct bma4_dev bma; diff --git a/src/main.cpp b/src/main.cpp index f1d1bcf7..6cca9c8b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -107,7 +107,6 @@ Pinetime::Drivers::Hrs3300 heartRateSensor {twiMaster, heartRateSensorTwiAddress TimerHandle_t debounceTimer; Pinetime::Controllers::Battery batteryController; Pinetime::Controllers::Ble bleController; -Pinetime::Controllers::DateTime dateTimeController; void ble_manager_set_ble_connection_callback(void (*connection)()); void ble_manager_set_ble_disconnection_callback(void (*disconnection)()); static constexpr uint8_t pinTouchIrq = 28; @@ -259,7 +258,7 @@ int main(void) { debounceTimer = xTimerCreate ("debounceTimer", 200, pdFALSE, (void *) 0, DebounceTimerCallback); systemTask = std::make_unique(spi, lcd, spiNorFlash, twiMaster, touchPanel, lvgl, batteryController, bleController, - dateTimeController, motorController, heartRateSensor, motionSensor, settingsController); + motorController, heartRateSensor, motionSensor, settingsController); systemTask->Start(); nimble_port_init(); diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp index d2f38adb..4605ba95 100644 --- a/src/systemtask/SystemTask.cpp +++ b/src/systemtask/SystemTask.cpp @@ -40,7 +40,6 @@ SystemTask::SystemTask(Drivers::SpiMaster &spi, Drivers::St7789 &lcd, Drivers::TwiMaster& twiMaster, Drivers::Cst816S &touchPanel, Components::LittleVgl &lvgl, Controllers::Battery &batteryController, Controllers::Ble &bleController, - Controllers::DateTime &dateTimeController, Pinetime::Controllers::MotorController& motorController, Pinetime::Drivers::Hrs3300& heartRateSensor, Pinetime::Drivers::Bma421& motionSensor, @@ -48,7 +47,7 @@ SystemTask::SystemTask(Drivers::SpiMaster &spi, Drivers::St7789 &lcd, spi{spi}, lcd{lcd}, spiNorFlash{spiNorFlash}, twiMaster{twiMaster}, touchPanel{touchPanel}, lvgl{lvgl}, batteryController{batteryController}, heartRateController{*this}, - bleController{bleController}, dateTimeController{dateTimeController}, + bleController{bleController}, dateTimeController{*this}, watchdog{}, watchdogView{watchdog}, motorController{motorController}, heartRateSensor{heartRateSensor}, motionSensor{motionSensor}, settingsController{settingsController}, @@ -210,6 +209,11 @@ void SystemTask::Work() { isSleeping = true; isGoingToSleep = false; break; + case Messages::OnNewDay: + // We might be sleeping (with TWI device disabled. + // Remember we'll have to reset the counter next time we're awake + stepCounterMustBeReset = true; + break; default: break; } } @@ -239,6 +243,12 @@ void SystemTask::UpdateMotion() { if(isSleeping) twiMaster.Wakeup(); + + if(stepCounterMustBeReset) { + motionSensor.ResetStepCounter(); + stepCounterMustBeReset = false; + } + auto motionValues = motionSensor.Process(); if(isSleeping) twiMaster.Sleep(); diff --git a/src/systemtask/SystemTask.h b/src/systemtask/SystemTask.h index 2b70d19a..bb2a2868 100644 --- a/src/systemtask/SystemTask.h +++ b/src/systemtask/SystemTask.h @@ -40,7 +40,8 @@ namespace Pinetime { class SystemTask { public: enum class Messages {GoToSleep, GoToRunning, OnNewTime, OnNewNotification, OnNewCall, BleConnected, - BleFirmwareUpdateStarted, BleFirmwareUpdateFinished, OnTouchEvent, OnButtonEvent, OnDisplayTaskSleeping + BleFirmwareUpdateStarted, BleFirmwareUpdateFinished, OnTouchEvent, OnButtonEvent, OnDisplayTaskSleeping, + OnNewDay }; SystemTask(Drivers::SpiMaster &spi, Drivers::St7789 &lcd, @@ -48,7 +49,6 @@ namespace Pinetime { Drivers::TwiMaster& twiMaster, Drivers::Cst816S &touchPanel, Components::LittleVgl &lvgl, Controllers::Battery &batteryController, Controllers::Ble &bleController, - Controllers::DateTime &dateTimeController, Pinetime::Controllers::MotorController& motorController, Pinetime::Drivers::Hrs3300& heartRateSensor, Pinetime::Drivers::Bma421& motionSensor, @@ -80,7 +80,7 @@ namespace Pinetime { std::unique_ptr heartRateApp; Pinetime::Controllers::Ble& bleController; - Pinetime::Controllers::DateTime& dateTimeController; + Pinetime::Controllers::DateTime dateTimeController; QueueHandle_t systemTasksMsgQueue; std::atomic isSleeping{false}; std::atomic isGoingToSleep{false}; @@ -115,6 +115,7 @@ namespace Pinetime { void GoToRunning(); void UpdateMotion(); + bool stepCounterMustBeReset = false; #if configUSE_TRACE_FACILITY == 1 SystemMonitor monitor; -- cgit v1.2.3