Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2446 → Rev 2447

/trunk/eeprom.c
235,7 → 235,8
EE_Parameter.NaviStickThreshold = 8;
EE_Parameter.NaviWindCorrection = 50;
EE_Parameter.NaviAccCompensation = 42;
EE_Parameter.NaviOperatingRadius = 245;
EE_Parameter.NaviMaxFlyingRange = 0;
EE_Parameter.NaviDescendRange = 0;
EE_Parameter.NaviAngleLimitation = 140;
EE_Parameter.NaviPH_LoginTime = 2;
EE_Parameter.OrientationAngle = 0;
/trunk/eeprom.h
4,7 → 4,7
#include <inttypes.h>
#include "twimaster.h"
 
#define EEPARAM_REVISION 101 // is count up, if paramater stucture has changed (compatibility)
#define EEPARAM_REVISION 102 // is count up, if paramater stucture has changed (compatibility)
#define EEMIXER_REVISION 1 // is count up, if mixer stucture has changed (compatibility)
 
#define EEPROM_ADR_PARAM_BEGIN 0
46,7 → 46,7
 
//GlobalConfig3
#define CFG3_NO_SDCARD_NO_START 0x01
#define CFG3_DPH_MAX_RADIUS 0x02
//#define CFG3_DPH_MAX_RADIUS 0x02
#define CFG3_VARIO_FAILSAFE 0x04
#define CFG3_MOTOR_SWITCH_MODE 0x08
#define CFG3_NO_GPSFIX_NO_START 0x10
228,9 → 228,10
unsigned char NaviStickThreshold;
unsigned char NaviWindCorrection;
unsigned char NaviAccCompensation; // New since 0.86 -> was: SpeedCompensation
unsigned char NaviOperatingRadius;
unsigned char NaviMaxFlyingRange; // in 10m
unsigned char NaviAngleLimitation;
unsigned char NaviPH_LoginTime;
unsigned char NaviDescendRange;
//---Ext.Ctrl---------------------------------------------
unsigned char ExternalControl; // for serial Control
//---CareFree---------------------------------------------
/trunk/fc.c
159,7 → 159,7
unsigned char Parameter_NaviGpsI;
unsigned char Parameter_NaviGpsD;
unsigned char Parameter_NaviGpsA;
unsigned char Parameter_NaviOperatingRadius;
//unsigned char Parameter_NaviOperatingRadius;
unsigned char Parameter_NaviWindCorrection;
unsigned char Parameter_NaviSpeedCompensation;
unsigned char Parameter_ExternalControl;
709,7 → 709,7
CHK_POTI(Parameter_AchsKopplung2,EE_Parameter.AchsKopplung2);
CHK_POTI(Parameter_CouplingYawCorrection,EE_Parameter.CouplingYawCorrection);
CHK_POTI(Parameter_MaximumAltitude,EE_Parameter.MaxAltitude);
if((NC_To_FC_MaxAltitude && NC_To_FC_MaxAltitude < Parameter_MaximumAltitude) || Parameter_MaximumAltitude == 0) Parameter_MaximumAltitude = NC_To_FC_MaxAltitude;
// if((NC_To_FC_MaxAltitude && NC_To_FC_MaxAltitude < Parameter_MaximumAltitude) || Parameter_MaximumAltitude == 0) Parameter_MaximumAltitude = NC_To_FC_MaxAltitude;
Parameter_GlobalConfig = EE_Parameter.GlobalConfig;
Parameter_ExtraConfig = EE_Parameter.ExtraConfig;
// CHK_POTI(Parameter_AchsGegenKopplung1,EE_Parameter.AchsGegenKopplung1,0,255);
/trunk/fc.h
149,6 → 149,6
extern const signed char sintab[31];
extern unsigned char LowVoltageLandingActive;
extern unsigned char LowVoltageHomeActive;
 
extern unsigned char Parameter_MaximumAltitude;
#endif //_FC_H
 
/trunk/libfc1284.a
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/libfc644.a
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/main.c
200,7 → 200,7
if(PlatinenVersion < 20)
{
wdt_enable(WDTO_250MS); // Reset-Commando
while(1) printf("\n\rFlightControl not supported!");
while(1) printf("\n\rOld FC Hardware not supported by this Frimware!");
}
#ifndef REDUNDANT_FC_SLAVE
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
/trunk/makefile
6,10 → 6,10
#-------------------------------------------------------------------
VERSION_MAJOR = 2
VERSION_MINOR = 05
VERSION_PATCH = 5
VERSION_PATCH = 6
VERSION_SERIAL_MAJOR = 11 # Serial Protocol to KopterTool -> do not change!
VERSION_SERIAL_MINOR = 0 # Serial Protocol
NC_SPI_COMPATIBLE = 66 # Navi-Kompatibilität
NC_SPI_COMPATIBLE = 67 # Navi-Kompatibilität
LIB_FC_COMPATIBLE = 6 # Library
#-------------------------------------------------------------------
# ATMEGA644: 63487 is maximum
/trunk/spi.c
31,7 → 31,7
unsigned char EarthMagneticField = 0;
unsigned char EarthMagneticInclination = 0, EarthMagneticInclinationTheoretic = 0;
unsigned char NC_To_FC_Flags = 0;
unsigned char NC_To_FC_MaxAltitude = 0; // this is a Parameter on the SD-card
//unsigned char NC_To_FC_MaxAltitude = 0; // this is a Parameter on the SD-card
signed int POI_KameraNick = 0; // in 0,1°
vector16_t MagVec = {0,0,0};
 
202,7 → 202,7
ToNaviCtrl.Param.Byte[5] = EE_Parameter.NaviGpsA;
ToNaviCtrl.Param.Byte[6] = EE_Parameter.NaviGpsMinSat;
ToNaviCtrl.Param.Byte[7] = EE_Parameter.NaviStickThreshold;
ToNaviCtrl.Param.Byte[8] = EE_Parameter.NaviOperatingRadius;
ToNaviCtrl.Param.Byte[8] = EE_Parameter.NaviMaxFlyingRange;
ToNaviCtrl.Param.Byte[9] = EE_Parameter.NaviWindCorrection;
ToNaviCtrl.Param.Byte[10] = EE_Parameter.NaviAccCompensation;
ToNaviCtrl.Param.Byte[11] = EE_Parameter.NaviAngleLimitation;
292,11 → 292,10
ToNaviCtrl.Param.Byte[3] = Parameter_ServoRollControl;
ToNaviCtrl.Param.Byte[4] = DebugOut.Analog[28]; // I2C-Error counter
ToNaviCtrl.Param.Byte[5] = RedundanceBlOperation;
ToNaviCtrl.Param.Byte[6] = EE_Parameter.NaviDescendRange; // in 10m
ToNaviCtrl.Param.Byte[7] = Parameter_MaximumAltitude;
ToNaviCtrl.Param.Int[4] = FlugMinutenGesamt; // 8 & 9
/*
ToNaviCtrl.Param.Byte[6] = 0;
ToNaviCtrl.Param.Byte[7] = 0;
ToNaviCtrl.Param.Byte[8] = 0;
ToNaviCtrl.Param.Byte[9] = 0;
ToNaviCtrl.Param.Byte[10] = 0;
ToNaviCtrl.Param.Byte[11] = 0;
*/
357,7 → 356,7
NC_GPS_ModeCharacter = FromNaviCtrl.Param.Byte[8];
FromNaviCtrl_Value.SerialDataOkay = FromNaviCtrl.Param.Byte[9];
NC_To_FC_Flags = FromNaviCtrl.Param.Byte[10];
NC_To_FC_MaxAltitude = FromNaviCtrl.Param.Byte[11];
//NC_To_FC_MaxAltitude = FromNaviCtrl.Param.Byte[11];
break;
case SPI_NCCMD_GPSINFO:
GPSInfo.Flags = FromNaviCtrl.Param.Byte[0];
/trunk/version.txt
691,27 → 691,26
- Jeti: Indicator "R" for redundancy
2.04c
- S.Bus auf 16 Kanäle erweitert
- S.Bus extended to 16 Channels
 
2.05c
2.05f
- Load/Store Single Point
 
2.05d
- Photo-Releases on Altitudes
 
2.05e
- Voltage warning set to 3,2V, because the Voltage measurement was lower than before
- new Parameter: SinglePoint Speed
 
2.05f
- Counter for Motor-Restarts for each single motor
- Servo-Signals can be configured if mapped to output
- Speak "Error_Motor" as soon as one Motor reports a restart
 
2.05g
- EE_Parameter.NaviDescendRange now as Parameter in EEPROM
- EE_Parameter.NaviMaxFlyingRange now as Parameter in EEPROM
- Maximum Altitude is also used in the NC instead of "ABSOLUTE_FLYING_ALTITUDE" from SD-Card
(08.04.2013 after public beta 2.05)