Merge branch 'update-nimble-1_3-master' into develop
This commit is contained in:
commit
ee430fe5a9
|
@ -63,7 +63,7 @@
|
||||||
#define configTICK_RATE_HZ 1024
|
#define configTICK_RATE_HZ 1024
|
||||||
#define configMAX_PRIORITIES ( 3 )
|
#define configMAX_PRIORITIES ( 3 )
|
||||||
#define configMINIMAL_STACK_SIZE ( 120 )
|
#define configMINIMAL_STACK_SIZE ( 120 )
|
||||||
#define configTOTAL_HEAP_SIZE ( 1024*14 )
|
#define configTOTAL_HEAP_SIZE ( 1024*15 )
|
||||||
#define configMAX_TASK_NAME_LEN ( 4 )
|
#define configMAX_TASK_NAME_LEN ( 4 )
|
||||||
#define configUSE_16_BIT_TICKS 0
|
#define configUSE_16_BIT_TICKS 0
|
||||||
#define configIDLE_SHOULD_YIELD 1
|
#define configIDLE_SHOULD_YIELD 1
|
||||||
|
|
|
@ -14,8 +14,8 @@ HeartRateTask::HeartRateTask(Drivers::Hrs3300 &heartRateSensor, Controllers::Hea
|
||||||
}
|
}
|
||||||
|
|
||||||
void HeartRateTask::Start() {
|
void HeartRateTask::Start() {
|
||||||
//if (pdPASS != xTaskCreate(HeartRateTask::Process, "Heartrate", 500, this, 0, &taskHandle))
|
if (pdPASS != xTaskCreate(HeartRateTask::Process, "Heartrate", 500, this, 0, &taskHandle))
|
||||||
// APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
|
APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
|
||||||
}
|
}
|
||||||
|
|
||||||
void HeartRateTask::Process(void *instance) {
|
void HeartRateTask::Process(void *instance) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user