Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 1959 → Rev 1960

/branches/dongfang_FC_rewrite/main.c
85,7 → 85,7
 
// analyze hardware environment
CPUType = getCPUType();
BoardRelease = getBoardRelease();
boardRelease = getBoardRelease();
 
// disable watchdog
MCUSR &= ~(1 << WDRF);
128,7 → 128,8
printf("\n\r===================================");
 
// Parameter Set handling
ParamSet_Init();
channelMap_readOrDefault();
paramSet_readOrDefault();
 
// Wait for a short time (otherwise the RC channel check won't work below)
// timer = SetDelay(500);
160,17 → 161,6
 
printf("\n\r===================================");
 
/*
if(staticParams.GlobalConfig & CFG_HEIGHT_CONTROL)
{
printf("\n\rCalibrating air pressure sensor..");
timer = SetDelay(1000);
SearchAirPressureOffset();
while (!CheckDelay(timer));
printf("OK\n\r");
}
*/
 
#ifdef USE_NAVICTRL
printf("\n\rSupport for NaviCtrl");
#ifdef USE_RC_DSL
205,7 → 195,7
beep(2000);
 
printf("\n\rControl: ");
if (staticParams.GlobalConfig & CFG_HEADING_HOLD)
if (staticParams.bitConfig & CFG_HEADING_HOLD)
printf("HeadingHold");
else printf("Neutral (ACC-Mode)");
 
248,7 → 238,7
if (UBat <= UBAT_AT_5V) {
// Do nothing. The voltage on the input side of the regulator is <5V;
// we must be running off USB power. Keep it quiet.
} else if (UBat < staticParams.LowVoltageWarning) {
} else if (UBat < staticParams.batteryVoltageWarning) {
beepBatteryAlarm();
}