Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2693 → Rev 2694

/trunk/eeprom.c
123,6 → 123,11
{
EE_Parameter.GlobalConfig3 |= CFG3_RISE_FIRST_WAYPOINT;
}
if(old_version <= 109)
{
EE_Parameter.ExtraConfig &= CFG_FLYZONE_REQUIRED;
}
 
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
}
 
153,7 → 158,7
*/
EE_Parameter.GyroAccAbgleich = 32; // 1/k
EE_Parameter.BitConfig = 0; // Looping usw.
EE_Parameter.GlobalConfig = CFG_ACHSENKOPPLUNG_AKTIV | CFG_KOMPASS_AKTIV | CFG_GPS_AKTIV | CFG_HOEHEN_SCHALTER;
EE_Parameter.GlobalConfig = CFG_LAND_OUTSIDE_FLYZONE | CFG_KOMPASS_AKTIV | CFG_GPS_AKTIV | CFG_HOEHEN_SCHALTER;
EE_Parameter.ExtraConfig = CFG_GPS_AID | CFG2_VARIO_BEEP | CFG_LEARNABLE_CAREFREE | CFG_NO_RCOFF_BEEPING;
EE_Parameter.GlobalConfig3 = CFG3_NO_SDCARD_NO_START | CFG3_SPEAK_ALL | CFG3_NO_GPSFIX_NO_START | CFG3_RISE_FIRST_WAYPOINT;//
#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__))
/trunk/eeprom.h
4,7 → 4,7
#include <inttypes.h>
#include "twimaster.h"
 
#define EEPARAM_REVISION 109 // !!!Update NC also!!! is count up, if paramater stucture has changed (compatibility)
#define EEPARAM_REVISION 110 // -> InsertDefaultParameters()
#define EEMIXER_REVISION 1 // is count up, if mixer stucture has changed (compatibility)
#define EE_BACKWARD_COMP 1 // change if the eepropm parameters are not backwards compatible
 
55,7 → 55,7
extern MixerTable_t Mixer;
extern uint8_t RequiredMotors;
 
//GlobalConfig3
// EE_Parameter.GlobalConfig3
#define CFG3_NO_SDCARD_NO_START 0x01
#define CFG3_RISE_FIRST_WAYPOINT 0x02
#define CFG3_VARIO_FAILSAFE 0x04
65,7 → 65,7
#define CFG3_SPEAK_ALL 0x40
#define CFG3_SERVO_NICK_COMP_OFF 0x80
 
//GlobalConfig
// EE_Parameter.GlobalConfig
#define CFG_HOEHENREGELUNG 0x01
#define CFG_HOEHEN_SCHALTER 0x02
#define CFG_HEADING_HOLD 0x04
72,10 → 72,10
#define CFG_KOMPASS_AKTIV 0x08
#define CFG_KOMPASS_FIX 0x10
#define CFG_GPS_AKTIV 0x20
#define CFG_ACHSENKOPPLUNG_AKTIV 0x40
#define CFG_LAND_OUTSIDE_FLYZONE 0x40
#define CFG_DREHRATEN_BEGRENZER 0x80
 
//BitConfig
// EE_Parameter.BitConfig
#define CFG_LOOP_OBEN 0x01
#define CFG_LOOP_UNTEN 0x02
#define CFG_LOOP_LINKS 0x04
85,10 → 85,10
#define CFG_MOTOR_OFF_LED2 0x40
#define CFG_MOTOR_BLINK2 0x80
 
// ExtraConfig
// EE_Parameter.ExtraConfig
#define CFG2_HEIGHT_LIMIT 0x01
#define CFG2_VARIO_BEEP 0x02
//#define CFG_SENSITIVE_RC 0x04
#define CFG_FLYZONE_REQUIRED 0x04
#define CFG_3_3V_REFERENCE 0x08
#define CFG_NO_RCOFF_BEEPING 0x10
#define CFG_GPS_AID 0x20