From 951114b729e1aa57a1c5ff0219a7a65709ec92ef Mon Sep 17 00:00:00 2001 From: Ludovic LANGE Date: Sat, 18 Feb 2023 00:36:57 +0100 Subject: [PATCH] ESP-IDF v4+: we do not have uxMutexesHeld any more --- vehicle/OVMS.V3/main/ovms_module.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/vehicle/OVMS.V3/main/ovms_module.cpp b/vehicle/OVMS.V3/main/ovms_module.cpp index 6d70650f3..9794fd13e 100644 --- a/vehicle/OVMS.V3/main/ovms_module.cpp +++ b/vehicle/OVMS.V3/main/ovms_module.cpp @@ -784,6 +784,15 @@ static void module_tasks(int verbosity, OvmsWriter* writer, OvmsCommand* cmd, in uint32_t used = total - ((uint32_t)taskstatus[i].pxStackBase & 0xFFFF); int core = xTaskGetAffinity(taskstatus[i].xHandle); uint32_t runtime = taskstatus[i].ulRunTimeCounter - last_runtime[taskstatus[i].xTaskNumber]; +#if ESP_IDF_VERSION_MAJOR >= 4 + writer->printf("%08" PRIX32 " %4u %s %-15s %5" PRIu32 " %5" PRIu32 " %5" PRIu32 " %7u%7u%7u %c %3d %3.0f%% %3d\n", + (uint32_t)taskstatus[i].xHandle, + taskstatus[i].xTaskNumber, states[taskstatus[i].eCurrentState], taskstatus[i].pcTaskName, + used, total - taskstatus[i].usStackHighWaterMark, total, heaptotal, heap32bit, heapspi, + (core == tskNO_AFFINITY) ? '*' : '0'+core, taskstatus[i].uxCurrentPriority, + diff_totalruntime ? ((float) runtime / diff_totalruntime * 100) : 0.0f, + taskstatus[i].uxBasePriority); +#else writer->printf("%08" PRIX32 " %4u %s %-15s %5" PRIu32 " %5" PRIu32 " %5" PRIu32 " %7u%7u%7u %c %3d %3.0f%% %3d/%2d\n", (uint32_t)taskstatus[i].xHandle, taskstatus[i].xTaskNumber, states[taskstatus[i].eCurrentState], taskstatus[i].pcTaskName, @@ -791,6 +800,7 @@ static void module_tasks(int verbosity, OvmsWriter* writer, OvmsCommand* cmd, in (core == tskNO_AFFINITY) ? '*' : '0'+core, taskstatus[i].uxCurrentPriority, diff_totalruntime ? ((float) runtime / diff_totalruntime * 100) : 0.0f, taskstatus[i].uxBasePriority, taskstatus[i].uxMutexesHeld); +#endif if (showStack) { uint32_t* stack = (uint32_t*)(pxTaskGetStackStart(taskstatus[i].xHandle) + total);