Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 469 → Rev 470

/branches/v0.60_MicroMag3_Nick666/trunc/compass.h
5,9 → 5,9
uint8_t STATE;
unsigned int DRDY;
uint8_t AXIS;
signed int x_axis;
signed int y_axis;
signed int z_axis;
volatile signed int x_axis;
volatile signed int y_axis;
volatile signed int z_axis;
};
 
 
/branches/v0.60_MicroMag3_Nick666/trunc/fc.c
68,9 → 68,9
volatile long Mess_IntegralRoll = 0,Mess_IntegralRoll2 = 0;
volatile long Mess_Integral_Gier = 0,Mess_Integral_Gier2 = 0;
volatile long Mess_Integral_Hoch = 0;
volatile int KompassValue = 0;
volatile int KompassStartwert = 0;
volatile int KompassRichtung = 0;
int KompassValue = 0;
int KompassStartwert = 0;
int KompassRichtung = 0;
uint8_t updKompass = 0;
unsigned char MAX_GAS,MIN_GAS;
unsigned char Notlandung = 0;
/branches/v0.60_MicroMag3_Nick666/trunc/fc.h
13,9 → 13,9
extern volatile long Mess_IntegralRoll,Mess_IntegralRoll2;
extern volatile long Mess_Integral_Hoch;
extern volatile long Integral_Gier,Mess_Integral_Gier,Mess_Integral_Gier2;
extern volatile int KompassValue;
extern volatile int KompassStartwert;
extern volatile int KompassRichtung;
extern int KompassValue;
extern int KompassStartwert;
extern int KompassRichtung;
extern int HoehenWert;
extern int SollHoehe;
extern volatile int MesswertNick,MesswertRoll,MesswertGier;
34,7 → 34,7
void DefaultKonstanten2(void);
 
unsigned char h,m,s;
volatile unsigned char Timeout ;
volatile unsigned char Timeout;
unsigned char CosinusNickWinkel, CosinusRollWinkel;
volatile long IntegralNick,IntegralNick2;
volatile long IntegralRoll,IntegralRoll2;