From 8a72362a67acfda38aa7dfdc67320043af095920 Mon Sep 17 00:00:00 2001 From: mikeller Date: Tue, 10 Jul 2018 17:37:51 +1200 Subject: [PATCH] Fixed tests. --- src/main/fc/config.c | 2 +- src/main/fc/fc_core.c | 2 +- src/main/fc/fc_tasks.c | 2 +- src/main/telemetry/smartport.c | 2 +- src/test/unit/cli_unittest.cc | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/fc/config.c b/src/main/fc/config.c index 28ffc61adc..cd6b6e3d10 100644 --- a/src/main/fc/config.c +++ b/src/main/fc/config.c @@ -415,7 +415,7 @@ void validateAndFixGyroConfig(void) #ifdef USE_GYRO_DATA_ANALYSE // Disable dynamic filter if gyro loop is less than 2KHz if (gyro.targetLooptime > DYNAMIC_FILTER_MAX_SUPPORTED_LOOP_TIME) { - featureClear(FEATURE_DYNAMIC_FILTER); + featureDisable(FEATURE_DYNAMIC_FILTER); } #endif diff --git a/src/main/fc/fc_core.c b/src/main/fc/fc_core.c index 046403705c..e3a653fb3c 100644 --- a/src/main/fc/fc_core.c +++ b/src/main/fc/fc_core.c @@ -849,7 +849,7 @@ bool processRx(timeUs_t currentTimeUs) } #endif - pidSetAntiGravityState(IS_RC_MODE_ACTIVE(BOXANTIGRAVITY) || feature(FEATURE_ANTI_GRAVITY)); + pidSetAntiGravityState(IS_RC_MODE_ACTIVE(BOXANTIGRAVITY) || featureIsEnabled(FEATURE_ANTI_GRAVITY)); return true; } diff --git a/src/main/fc/fc_tasks.c b/src/main/fc/fc_tasks.c index 5bfd941222..8427ab146c 100644 --- a/src/main/fc/fc_tasks.c +++ b/src/main/fc/fc_tasks.c @@ -318,7 +318,7 @@ void fcTasksInit(void) setTaskEnabled(TASK_TRANSPONDER, featureIsEnabled(FEATURE_TRANSPONDER)); #endif #ifdef USE_OSD - setTaskEnabled(TASK_OSD, featureIsEnabled(FEATURE_OSD) && osdInitialized())); + setTaskEnabled(TASK_OSD, featureIsEnabled(FEATURE_OSD) && osdInitialized()); #endif #ifdef USE_BST setTaskEnabled(TASK_BST_MASTER_PROCESS, true); diff --git a/src/main/telemetry/smartport.c b/src/main/telemetry/smartport.c index fb376dc5ea..cf5dc6da4c 100644 --- a/src/main/telemetry/smartport.c +++ b/src/main/telemetry/smartport.c @@ -332,7 +332,7 @@ static void initSmartPortSensors(void) if (isBatteryVoltageConfigured()) { #ifdef USE_ESC_SENSOR - if (!featureIsEnabled(FEATURE_ESC_SENSOR)) { + if (!reportExtendedEscSensors()) #endif { ADD_SENSOR(FSSP_DATAID_VFAS); diff --git a/src/test/unit/cli_unittest.cc b/src/test/unit/cli_unittest.cc index b0f1975dff..49b89b0764 100644 --- a/src/test/unit/cli_unittest.cc +++ b/src/test/unit/cli_unittest.cc @@ -210,6 +210,7 @@ uint8_t getCurrentControlRateProfileIndex(void){ return 1; } void changeControlRateProfile(uint8_t) {} void resetAllRxChannelRangeConfigurations(rxChannelRangeConfig_t *) {} void writeEEPROM() {} +void writeEEPROMWithFeatures(uint32_t) {} serialPortConfig_t *serialFindPortConfiguration(serialPortIdentifier_e) {return NULL; } baudRate_e lookupBaudRateIndex(uint32_t){return BAUD_9600; } serialPortUsage_t *findSerialPortUsageByIdentifier(serialPortIdentifier_e){ return NULL; }