Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 1755 → Rev 1756

/branches/MartinW_Jeti+/fc.c
53,6 → 53,14
// + POSSIBILITY OF SUCH DAMAGE.
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
//Interessanten Maximumwerte
//Capacity.ActualCurrent/10, Capacity.ActualCurrent%10
//GPSInfo.Speed,GPSInfo.NumOfSats
//VarioMeter
//HoverGas/4
 
 
 
#include "main.h"
#include "mymath.h"
#include "isqrt.h"
62,12 → 70,16
 
 
#endif
unsigned char loop1, loop2, loop3, loop4;
unsigned char loop1, loop2, loop3;
unsigned char settingdest = 5;
int keynumber=-7;
 
unsigned short CurrentOffset = 0;///
 
unsigned char pos1, pos2, pos3, pos4=0;
unsigned char Motors0,Motors1,Motors2,Motors3,Motors4,Motors5,Motors6,Motors7;
unsigned char Motors0max,Motors1max,Motors2max,Motors3max,Motors4max,Motors5max,Motors6max,Motors7max;
unsigned short MotorsTmax;
unsigned char updatemotors=5;
unsigned char h,m,s;
unsigned int BaroExpandActive = 0;
1311,8 → 1323,10
int CosAttitude; // for projection of hoover gas
 
// get the current hooverpoint
DebugOut.Analog[21] = HoverGas;
 
if((FCFlags & FCFLAG_FLY)) ///
{
DebugOut.Analog[21] = HoverGas;
}
// Expand the measurement
// measurement of air pressure close to upper limit and no overflow in correction of the new OCR0A value occurs
if(!BaroExpandActive)
1600,11 → 1614,15
HoverGasFilter += 4L * tmp_long2;
}
else //later
if(abs(VarioMeter) < 100) // only on small vertical speed
{
HoverGasFilter -= HoverGasFilter/HOVER_GAS_AVERAGE;
HoverGasFilter += tmp_long2;
}
HoverGas = (int16_t)(HoverGasFilter/HOVER_GAS_AVERAGE);
if(EE_Parameter.Hoehe_HoverBand)
{