rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

OP-336 CPU usage calculation incorrect when armed - no measure the time between calculations

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2987 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
FredericG 2011-03-06 11:50:54 +00:00 committed by FredericG
parent 5554973cea
commit baf0850690
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
flight/Modules/System/systemmod.c
View File

@ -255,6 +255,7 @@ static void updateWDGstats()
*/ */
static void updateStats() static void updateStats()
{ {
static portTickType lastTickCount = 0;
SystemStatsData stats; SystemStatsData stats;
// Get stats and update // Get stats and update
@ -271,8 +272,14 @@ static void updateStats()
if (idleCounterClear) { if (idleCounterClear) {
idleCounter = 0; idleCounter = 0;
} }
stats.CPULoad =
100 - (uint8_t) round(100.0 * ((float)idleCounter / (float)(SYSTEM_UPDATE_PERIOD_MS / 1000)) / (float)IDLE_COUNTS_PER_SEC_AT_NO_LOAD); portTickType now = xTaskGetTickCount();
if (now > lastTickCount) {
uint32_t dT = (xTaskGetTickCount() - lastTickCount) * portTICK_RATE_MS; // in ms
stats.CPULoad =
100 - (uint8_t) round(100.0 * ((float)idleCounter / ((float)dT / 1000.0)) / (float)IDLE_COUNTS_PER_SEC_AT_NO_LOAD);
} //else: TickCount has wrapped, do not calc now
lastTickCount = now;
idleCounterClear = 1; idleCounterClear = 1;
#if defined(PIOS_INCLUDE_ADC) && defined(PIOS_ADC_USE_TEMP_SENSOR) #if defined(PIOS_INCLUDE_ADC) && defined(PIOS_ADC_USE_TEMP_SENSOR)