Merge branch 'develop' of JF/PineTime into master

JF002 · Gitea · commit 09bd6fdbc72c · 2021-02-04T17:57:12.000+01:00
diff --git a/src/FreeRTOSConfig.h b/src/FreeRTOSConfig.h
@@ -63,7 +63,7 @@
 #define configTICK_RATE_HZ                                                        1024
 #define configMAX_PRIORITIES                                                      ( 3 )
 #define configMINIMAL_STACK_SIZE                                                  ( 120 )
-#define configTOTAL_HEAP_SIZE                                                     ( 1024*14 )
+#define configTOTAL_HEAP_SIZE                                                     ( 1024*15 )
 #define configMAX_TASK_NAME_LEN                                                   ( 4 )
 #define configUSE_16_BIT_TICKS                                                    0
 #define configIDLE_SHOULD_YIELD                                                   1
diff --git a/src/heartratetask/HeartRateTask.cpp b/src/heartratetask/HeartRateTask.cpp
@@ -14,8 +14,8 @@ HeartRateTask::HeartRateTask(Drivers::Hrs3300 &heartRateSensor, Controllers::Hea
 }
 
 void HeartRateTask::Start() {
-  //if (pdPASS != xTaskCreate(HeartRateTask::Process, "Heartrate", 500, this, 0, &taskHandle))
-  //  APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
+  if (pdPASS != xTaskCreate(HeartRateTask::Process, "Heartrate", 500, this, 0, &taskHandle))
+    APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
 }
 
 void HeartRateTask::Process(void *instance) {

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ HeartRateTask::HeartRateTask(Drivers::Hrs3300 &heartRateSensor, Controllers::Hea`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`void HeartRateTask::Start() {`
`17`		`- //if (pdPASS != xTaskCreate(HeartRateTask::Process, "Heartrate", 500, this, 0, &taskHandle))`
`18`		`- // APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);`
	`17`	`+ if (pdPASS != xTaskCreate(HeartRateTask::Process, "Heartrate", 500, this, 0, &taskHandle))`
	`18`	`+ APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`void HeartRateTask::Process(void *instance) {`