Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2679 → Rev 2680

/trunk/fc.c
1493,7 → 1493,6
Looping_Roll = 0;
Looping_Nick = 0;
}
 
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// Integrale auf ACC-Signal abgleichen
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1740,6 → 1739,7
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// send SPI pending bytes
if(BytegapSPI == 0) SPI_TransmitByte();
 
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// Höhenregelung
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1985,7 → 1985,7
}
HeightTrimming = 0;
LIMIT_MIN_MAX(HoehenWertF, (HoehenWert-1024), (HoehenWert+1024)); // max. 10m Unterschied
LIMIT_MIN_MAX(SollHoehe, (HoehenWertF-1024), (HoehenWertF+1500)); // max. 15m Unterschied
LIMIT_MIN_MAX(SollHoehe, (HoehenWertF-1500), (HoehenWertF+1500)); // max. 15m Unterschied
if(Parameter_ExtraConfig & CFG2_VARIO_BEEP) beeptime = 100;
//update hoover gas stick value when setpoint is shifted
if(FromNC_AltitudeSpeed == 0) CalcStickGasHover();
2239,9 → 2239,11
BeepMuster = 0x0E00;
}
// limit gas to parameter setting
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
if(TouchDownTimer > 9) GasMischanteil = 1; // gas runter
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
LIMIT_MIN(GasMischanteil, (MIN_GAS + 10) * STICK_GAIN);
if(GasMischanteil > (MAX_GAS - 20) * STICK_GAIN) GasMischanteil = (MAX_GAS - 20) * STICK_GAIN;
 
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// all BL-Ctrl connected?
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
/trunk/fc.h
41,11 → 41,12
#define FC_STATUS3_MOTORS_STOPPED_BY_RC 0x20
 
//NC_To_FC_Flags
#define NC_TO_FC_FLYING_RANGE 0x01
#define NC_TO_FC_EMERGENCY_LANDING 0x02 // Forces a landing
#define NC_TO_FC_AUTOSTART 0x04
#define NC_TO_FC_FAILSAFE_LANDING 0x08 // moves Servos into FS-Position
#define NC_TO_FC_SIMULATION_ACTIVE 0x10 // don't start motors
#define NC_TO_FC_FLYING_RANGE 0x01
#define NC_TO_FC_EMERGENCY_LANDING 0x02 // Forces a landing
#define NC_TO_FC_AUTOSTART 0x04
#define NC_TO_FC_FAILSAFE_LANDING 0x08 // moves Servos into FS-Position
#define NC_TO_FC_SIMULATION_ACTIVE 0x10 // don't start motors
#define NC_TO_FC_SWITCHOFF_IF_LANDED 0x20 // switch off if MK is on the ground and doesn't further sink
 
extern volatile unsigned char FC_StatusFlags, FC_StatusFlags2;
extern unsigned char FC_StatusFlags3;
174,6 → 175,5
extern unsigned char Parameter_Autoland_Switch;
extern signed char BaroExpandCnt;
 
 
#endif //_FC_H
 
/trunk/libfc1284.a
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/version.txt
884,6 → 884,13
2.15i (28.09.2016)
- Baro temperature compensation implemented for FC3.0
 
2.15k (18.10.2016)
- Autoswitch-Off if landed: (only FC2.2 and newer)
-> RC failsafe
-> Auto Landing switch
-> undervoltage
-> NC landing Waypoints
 
toDo:
- CalAthmospheare nachführen