Merge pull request #1547 from blckmn/aff4_fix

AlienFlightF4 build fix.
This commit is contained in:
J Blackman 2016-11-13 22:07:30 +11:00 committed by GitHub
commit 901d7ef90f
1 changed files with 1 additions and 3 deletions

View File

@ -47,8 +47,6 @@
#include "hardware_revision.h" #include "hardware_revision.h"
void intFeatureSet(uint32_t mask, master_t *config);
// alternative defaults settings for AlienFlight targets // alternative defaults settings for AlienFlight targets
void targetConfiguration(master_t *config) void targetConfiguration(master_t *config)
{ {
@ -62,7 +60,7 @@ void targetConfiguration(master_t *config)
config->rxConfig.sbus_inversion = 0; config->rxConfig.sbus_inversion = 0;
config->serialConfig.portConfigs[SERIAL_PORT_USART2].functionMask = FUNCTION_TELEMETRY_FRSKY; config->serialConfig.portConfigs[SERIAL_PORT_USART2].functionMask = FUNCTION_TELEMETRY_FRSKY;
config->telemetryConfig.telemetry_inversion = 0; config->telemetryConfig.telemetry_inversion = 0;
intFeatureSet(FEATURE_CURRENT_METER | FEATURE_VBAT, config); intFeatureSet(FEATURE_CURRENT_METER | FEATURE_VBAT, &config->enabledFeatures);
config->batteryConfig.currentMeterOffset = 2500; config->batteryConfig.currentMeterOffset = 2500;
config->batteryConfig.currentMeterScale = -667; config->batteryConfig.currentMeterScale = -667;
} }