Skip to content

Updates for background hr (InfiniTimeOrg/InfiniTime#2322) #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NeroBurner merged 1 commit into from
Nov 5, 2025
Merged

Updates for background hr (InfiniTimeOrg/InfiniTime#2322) #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion InfiniTime
Open in desktop
Submodule InfiniTime updated 110 files
4 changes: 2 additions & 2 deletions main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,15 +779,15 @@ class Framework {
}
} else if (key == 'h') {
if (heartRateController.State() == Pinetime::Controllers::HeartRateController::States::Stopped) {
heartRateController.Start();
heartRateController.Enable();
} else if (heartRateController.State() == Pinetime::Controllers::HeartRateController::States::NotEnoughData) {
heartRateController.Update(Pinetime::Controllers::HeartRateController::States::Running, 10);
} else {
uint8_t heartrate = heartRateController.HeartRate();
heartRateController.Update(Pinetime::Controllers::HeartRateController::States::Running, heartrate + 10);
}
} else if (key == 'H') {
heartRateController.Stop();
heartRateController.Disable();
} else if (key == 'i') {
saveScreenshot();
} else if (key == 'I') {
Expand Down
8 changes: 4 additions & 4 deletions sim/components/heartrate/HeartRateController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ void HeartRateController::Update(HeartRateController::States newState, uint8_t h
}
}

void HeartRateController::Start() {
void HeartRateController::Enable() {
if (task != nullptr) {
state = States::NotEnoughData;
task->PushMessage(Pinetime::Applications::HeartRateTask::Messages::StartMeasurement);
task->PushMessage(Pinetime::Applications::HeartRateTask::Messages::Enable);
}
}

void HeartRateController::Stop() {
void HeartRateController::Disable() {
if (task != nullptr) {
state = States::Stopped;
task->PushMessage(Pinetime::Applications::HeartRateTask::Messages::StopMeasurement);
task->PushMessage(Pinetime::Applications::HeartRateTask::Messages::Disable);
}
}

Expand Down
6 changes: 3 additions & 3 deletions sim/components/heartrate/HeartRateController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ namespace Pinetime {
enum class States { Stopped, NotEnoughData, NoTouch, Running };

HeartRateController() = default;
void Start();
void Stop();
void Enable();
void Disable();
void Update(States newState, uint8_t heartRate);

void SetHeartRateTask(Applications::HeartRateTask* task);
Expand All @@ -37,4 +37,4 @@ namespace Pinetime {
//Pinetime::Controllers::HeartRateService* service = nullptr;
};
}
}
}
6 changes: 3 additions & 3 deletions sim/heartratetask/HeartRateTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ namespace Pinetime {
namespace Applications {
class HeartRateTask {
public:
enum class Messages : uint8_t { GoToSleep, WakeUp, StartMeasurement, StopMeasurement };
enum class States { Idle, Running };
enum class Messages : uint8_t { GoToSleep, WakeUp, Enable, Disable };

explicit HeartRateTask(Drivers::Hrs3300& heartRateSensor, Controllers::HeartRateController& controller);
void Start();
void Work();
void PushMessage(Messages msg);

private:
enum class States : uint8_t { Disabled, Waiting, BackgroundMeasuring, ForegroundMeasuring };
//static void Process(void* instance);
//void StartMeasurement();
//void StopMeasurement();

// TaskHandle_t taskHandle;
QueueHandle_t messageQueue;
States state = States::Running;
States state = States::Disabled;
Drivers::Hrs3300& heartRateSensor;
Controllers::HeartRateController& controller;
// Controllers::Ppg ppg;
Expand Down