Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-15 20:35:33 +03:00
Code Issues Wiki Activity

Improved formatting of cli tasks

Browse source
This commit is contained in:
Martin Budden 2016-07-28 09:11:03 +01:00
parent edb35a024c
commit 0cc07e75fe
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/main/io/serial_cli.c
View file

@ -3024,16 +3024,15 @@ static void cliTasks(char *cmdline)
int maxLoadSum = 0; int maxLoadSum = 0;
int averageLoadSum = 0; int averageLoadSum = 0;
cliPrintf("Task list max/us avg/us rate/hz maxload avgload total/ms\r\n"); cliPrintf("Task list rate/hz max/us avg/us maxload avgload total/ms\r\n");
for (cfTaskId_e taskId = 0; taskId < TASK_COUNT; taskId++) { for (cfTaskId_e taskId = 0; taskId < TASK_COUNT; taskId++) {
cfTaskInfo_t taskInfo; cfTaskInfo_t taskInfo;
getTaskInfo(taskId, &taskInfo); getTaskInfo(taskId, &taskInfo);
if (taskInfo.isEnabled) { if (taskInfo.isEnabled) {
int taskFrequency; int taskFrequency;
int subTaskFrequency; int subTaskFrequency;
if (taskId == TASK_GYROPID) { if (taskId == TASK_GYROPID) {
subTaskFrequency = (uint16_t)(1.0f / ((float)cycleTime * 0.000001f)); subTaskFrequency = (int)(1000000.0f / ((float)cycleTime));
taskFrequency = subTaskFrequency / masterConfig.pid_process_denom; taskFrequency = subTaskFrequency / masterConfig.pid_process_denom;
if (masterConfig.pid_process_denom > 1) { if (masterConfig.pid_process_denom > 1) {
cliPrintf("%02d - (%12s) ", taskId, taskInfo.taskName); cliPrintf("%02d - (%12s) ", taskId, taskInfo.taskName);
@ -3042,7 +3041,7 @@ static void cliTasks(char *cmdline)
cliPrintf("%02d - (%8s/%3s) ", taskId, taskInfo.subTaskName, taskInfo.taskName); cliPrintf("%02d - (%8s/%3s) ", taskId, taskInfo.subTaskName, taskInfo.taskName);
} }
} else { } else {
taskFrequency = (uint16_t)(1.0f / ((float)taskInfo.latestDeltaTime * 0.000001f)); taskFrequency = (int)(1000000.0f / ((float)taskInfo.latestDeltaTime));
cliPrintf("%02d - (%12s) ", taskId, taskInfo.taskName); cliPrintf("%02d - (%12s) ", taskId, taskInfo.taskName);
} }
const int maxLoad = (taskInfo.maxExecutionTime * taskFrequency + 5000) / 1000; const int maxLoad = (taskInfo.maxExecutionTime * taskFrequency + 5000) / 1000;
@ -3051,11 +3050,11 @@ static void cliTasks(char *cmdline)
maxLoadSum += maxLoad; maxLoadSum += maxLoad;
averageLoadSum += averageLoad; averageLoadSum += averageLoad;
} }
cliPrintf("%6d %5d %5d %4d.%1d%% %4d.%1d%% %8d\r\n", cliPrintf("%6d %7d %7d %4d.%1d%% %4d.%1d%% %9d\r\n",
taskInfo.maxExecutionTime, taskInfo.averageExecutionTime, taskFrequency, taskFrequency, taskInfo.maxExecutionTime, taskInfo.averageExecutionTime,
maxLoad/10, maxLoad%10, averageLoad/10, averageLoad%10, taskInfo.totalExecutionTime / 1000); maxLoad/10, maxLoad%10, averageLoad/10, averageLoad%10, taskInfo.totalExecutionTime / 1000);
if (taskId == TASK_GYROPID && masterConfig.pid_process_denom > 1) { if (taskId == TASK_GYROPID && masterConfig.pid_process_denom > 1) {
cliPrintf(" - (%12s) rate: %d\r\n", taskInfo.subTaskName, subTaskFrequency); cliPrintf(" - (%12s) %6d\r\n", taskInfo.subTaskName, subTaskFrequency);
} }
} }
} }