Merge pull request #901 from MJ666/AlienWii_failsafe

Remove obsolate failsafe setting for the ALIENWII32 targets
This commit is contained in:
Dominic Clifton 2015-05-17 21:26:56 +01:00
commit 3dc675f24d
2 changed files with 1 additions and 3 deletions

View File

@ -528,14 +528,12 @@ static void resetConf(void)
#ifdef ALIENWII32 #ifdef ALIENWII32
featureSet(FEATURE_RX_SERIAL); featureSet(FEATURE_RX_SERIAL);
featureSet(FEATURE_MOTOR_STOP); featureSet(FEATURE_MOTOR_STOP);
featureSet(FEATURE_FAILSAFE);
#ifdef ALIENWIIF3 #ifdef ALIENWIIF3
masterConfig.serialConfig.portConfigs[2].functionMask = FUNCTION_RX_SERIAL; masterConfig.serialConfig.portConfigs[2].functionMask = FUNCTION_RX_SERIAL;
masterConfig.batteryConfig.vbatscale = 20; masterConfig.batteryConfig.vbatscale = 20;
#else #else
masterConfig.serialConfig.portConfigs[1].functionMask = FUNCTION_RX_SERIAL; masterConfig.serialConfig.portConfigs[1].functionMask = FUNCTION_RX_SERIAL;
#endif #endif
masterConfig.rxConfig.serialrx_provider = 1;
masterConfig.rxConfig.spektrum_sat_bind = 5; masterConfig.rxConfig.spektrum_sat_bind = 5;
masterConfig.escAndServoConfig.minthrottle = 1000; masterConfig.escAndServoConfig.minthrottle = 1000;
masterConfig.escAndServoConfig.maxthrottle = 2000; masterConfig.escAndServoConfig.maxthrottle = 2000;

View File

@ -104,7 +104,7 @@
#define ADC_DMA_CHANNEL DMA2_Channel1 #define ADC_DMA_CHANNEL DMA2_Channel1
#define ADC_AHB_PERIPHERAL RCC_AHBPeriph_DMA2 #define ADC_AHB_PERIPHERAL RCC_AHBPeriph_DMA2
#define BOARD_HAS_VOLTAGE_DIVIDER //#define BOARD_HAS_VOLTAGE_DIVIDER
#define VBAT_ADC_GPIO GPIOA #define VBAT_ADC_GPIO GPIOA
#define VBAT_ADC_GPIO_PIN GPIO_Pin_4 #define VBAT_ADC_GPIO_PIN GPIO_Pin_4