diff options
| author | JF <jf@codingfield.com> | 2020-10-27 21:55:18 +0100 |
|---|---|---|
| committer | JF <jf@codingfield.com> | 2020-10-27 21:55:18 +0100 |
| commit | 7de43a16608e599369867cb3cfa7d5776a5b6380 (patch) | |
| tree | 1750edfed02f547102e468eca485caab3b08e98d /src/systemtask/SystemMonitor.h | |
| parent | 5983e33b8d7702800dc91a3229b9a7cee75eb006 (diff) | |
| parent | c5bf09d21b2ed8e2435ec625e351594f58713924 (diff) | |
Fix conflicts
Diffstat (limited to 'src/systemtask/SystemMonitor.h')
| -rw-r--r-- | src/systemtask/SystemMonitor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/systemtask/SystemMonitor.h b/src/systemtask/SystemMonitor.h index ec1fd817..029a1364 100644 --- a/src/systemtask/SystemMonitor.h +++ b/src/systemtask/SystemMonitor.h @@ -27,7 +27,7 @@ namespace Pinetime { void Process() const { if(xTaskGetTickCount() - lastTick > 10000) { NRF_LOG_INFO("---------------------------------------\nFree heap : %d", xPortGetFreeHeapSize()); - auto nb = uxTaskGetSystemState(tasksStatus, 10, NULL); + auto nb = uxTaskGetSystemState(tasksStatus, 10, nullptr); for (uint32_t i = 0; i < nb; i++) { NRF_LOG_INFO("Task [%s] - %d", tasksStatus[i].pcTaskName, tasksStatus[i].usStackHighWaterMark); if (tasksStatus[i].usStackHighWaterMark < 20) |