From d90ef1224853fa919f926c9983c29c3edb3eb365 Mon Sep 17 00:00:00 2001 From: Thorsten Laux Date: Sat, 12 Jan 2019 12:45:36 +0100 Subject: [PATCH] address review feedback --- src/main/interface/settings.c | 8 +------- src/main/interface/settings.h | 1 - src/main/scheduler/scheduler.c | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/main/interface/settings.c b/src/main/interface/settings.c index 230773d2c..8ae45d919 100644 --- a/src/main/interface/settings.c +++ b/src/main/interface/settings.c @@ -423,11 +423,6 @@ static const char * const lookupTableTpaMode[] = { }; #endif -static const char* const lookupTableSchedulerPolicy[] = { - "PERIOD", "RATE" -}; - - #define LOOKUP_TABLE_ENTRY(name) { name, ARRAYLEN(name) } const lookupTableEntry_t lookupTables[] = { @@ -536,7 +531,6 @@ const lookupTableEntry_t lookupTables[] = { #ifdef USE_TPA_MODE LOOKUP_TABLE_ENTRY(lookupTableTpaMode), #endif - LOOKUP_TABLE_ENTRY(lookupTableSchedulerPolicy) }; #undef LOOKUP_TABLE_ENTRY @@ -1181,7 +1175,7 @@ const clivalue_t valueTable[] = { { "cpu_overclock", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OVERCLOCK }, PG_SYSTEM_CONFIG, offsetof(systemConfig_t, cpu_overclock) }, #endif { "pwr_on_arm_grace", VAR_UINT8 | MASTER_VALUE, .config.minmax = { 0, 30 }, PG_SYSTEM_CONFIG, offsetof(systemConfig_t, powerOnArmingGraceTime) }, - { "scheduler_policy", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_SCHEDULER_POLICY }, PG_SYSTEM_CONFIG, offsetof(systemConfig_t, schedulerPolicy) }, + { "scheduler_optimize_rate", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_SYSTEM_CONFIG, offsetof(systemConfig_t, schedulerPolicy) }, // PG_VTX_CONFIG #ifdef USE_VTX_COMMON diff --git a/src/main/interface/settings.h b/src/main/interface/settings.h index 75645c9b1..801a90a93 100644 --- a/src/main/interface/settings.h +++ b/src/main/interface/settings.h @@ -131,7 +131,6 @@ typedef enum { #ifdef USE_TPA_MODE TABLE_TPA_MODE, #endif - TABLE_SCHEDULER_POLICY, LOOKUP_TABLE_COUNT } lookupTableIndex_e; diff --git a/src/main/scheduler/scheduler.c b/src/main/scheduler/scheduler.c index 4167da54e..971e42f9c 100644 --- a/src/main/scheduler/scheduler.c +++ b/src/main/scheduler/scheduler.c @@ -347,7 +347,7 @@ FAST_CODE void scheduler(void) selectedTask->taskLatestDeltaTime = currentTimeUs - selectedTask->lastExecutedAt; float period = currentTimeUs - selectedTask->lastExecutedAt; selectedTask->lastExecutedAt = currentTimeUs; - selectedTask->lastDesiredAt += (cmpTimeUs(currentTimeUs,selectedTask->lastDesiredAt) / selectedTask->desiredPeriod) * selectedTask->desiredPeriod; + selectedTask->lastDesiredAt += (cmpTimeUs(currentTimeUs, selectedTask->lastDesiredAt) / selectedTask->desiredPeriod) * selectedTask->desiredPeriod; selectedTask->dynamicPriority = 0; // Execute task