Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 205 → Rev 341

/branches/v0.60_MicroMag3_Nick666/main.c
51,7 → 51,8
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
#include "main.h"
 
unsigned char EEPromArray[E2END+1] EEMEM;
// unsigned char EEPromArray[E2END+1] EEMEM;
unsigned char EEPromArray[501] EEMEM;
 
// -- Parametersatz aus EEPROM lesen ---
// number [0..5]
101,7 → 102,7
WDTCSR |= (1<<WDCE)|(1<<WDE);
WDTCSR = 0;
 
beeptime = 2000;
beeptime = 1000;
 
StickGier = 0; PPM_in[K_GAS] = 0;StickRoll = 0; StickNick = 0;
 
113,7 → 114,7
ADC_Init();
i2c_init();
init_spi();
init_MM3();
sei();
 
140,7 → 141,17
ReadParameterSet(GetActiveParamSetNumber(), (unsigned char *) &EE_Parameter.Kanalbelegung[0], STRUCT_PARAM_LAENGE);
printf("\n\rBenutze Parametersatz %d", GetActiveParamSetNumber());
 
//kurze Wartezeit (sonst reagiert die "Kompass kalibrieren?"-Abfrage nicht
timer = SetDelay(500);
while(!CheckDelay(timer));
//Kompass kalibrieren?
if(PPM_in[EE_Parameter.Kanalbelegung[K_GAS]] > 100 && PPM_in[EE_Parameter.Kanalbelegung[K_GIER]] > 100)
{
printf("\n\rKalibriere Kompass");
if(EE_Parameter.GlobalConfig & CFG_KOMPASS_AKTIV) MM3_calib();
}
if(EE_Parameter.GlobalConfig & CFG_HOEHENREGELUNG)
{