fix rebase mistakes
This commit is contained in:
parent
04ed068ff9
commit
520e50901a
|
@ -43,10 +43,6 @@ namespace Pinetime {
|
||||||
bool IsContinuosModeActivated();
|
bool IsContinuosModeActivated();
|
||||||
bool IsBackgroundMeasurementActivated();
|
bool IsBackgroundMeasurementActivated();
|
||||||
|
|
||||||
void HandleBackgroundWaiting();
|
|
||||||
void HandleSensorData(int* lastBpm);
|
|
||||||
int CurrentTaskDelay();
|
|
||||||
|
|
||||||
TaskHandle_t taskHandle;
|
TaskHandle_t taskHandle;
|
||||||
QueueHandle_t messageQueue;
|
QueueHandle_t messageQueue;
|
||||||
States state = States::Running;
|
States state = States::Running;
|
||||||
|
|
Loading…
Reference in a new issue