Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2481 → Rev 2482

/trunk/fc.h
31,13 → 31,19
#define FC_STATUS2_AUTO_STARTING 0x40
#define FC_STATUS2_AUTO_LANDING 0x80
 
// FC_StatusFlags3
#define FC_STATUS3_REDUNDANCE 0x01
#define FC_STATUS3_BOAT 0x02
 
//NC_To_FC_Flags
#define NC_TO_FC_FLYING_RANGE 0x01
#define NC_TO_FC_EMERGENCY_LANDING 0x02
#define NC_TO_FC_AUTOSTART 0x04
#define NC_TO_FC_AUTOLANDING 0x08 // not used
#define NC_TO_FC_SIMULATION_ACTIVE 0x10 // don't start motors
 
extern volatile unsigned char FC_StatusFlags, FC_StatusFlags2;
extern unsigned char FC_StatusFlags3;
extern void ParameterZuordnung(void);
extern unsigned char GetChannelValue(unsigned char ch); // gives the unsigned value of the channel
 
61,14 → 67,14
 
extern unsigned char Sekunde,Minute;
extern unsigned int BaroExpandActive;
extern long IntegralNick,IntegralNick2;
extern long IntegralRoll,IntegralRoll2;
extern long IntegralNick;//,IntegralNick2;
extern long IntegralRoll;//,IntegralRoll2;
//extern int IntegralNick,IntegralNick2;
//extern int IntegralRoll,IntegralRoll2;
extern unsigned char Poti[9];
 
extern long Mess_IntegralNick,Mess_IntegralNick2;
extern long Mess_IntegralRoll,Mess_IntegralRoll2;
extern long Mess_IntegralNick;//,Mess_IntegralNick2;
extern long Mess_IntegralRoll;//,Mess_IntegralRoll2;
extern long IntegralAccNick,IntegralAccRoll;
extern long SummeNick,SummeRoll;
extern volatile long Mess_Integral_Hoch;
/trunk/jetimenu.c
77,11 → 77,11
JetiBox_printfxy(0,0,"%2i.%1iV",UBat/10, UBat%10);
if(NaviDataOkay)
{
JetiBox_printfxy(6,0,"%3d%c %03dm%c",CompassCorrected, 0xDF, GPSInfo.HomeDistance/10,NC_GPS_ModeCharacter);
JetiBox_printfxy(6,0,"%3d%c %3dm%c",CompassCorrected, 0xDF, GPSInfo.HomeDistance/10,NC_GPS_ModeCharacter);
}
else
{
JetiBox_printfxy(6,0,"Status");
JetiBox_printfxy(6,0,"Status ");
}
 
#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__))
103,10 → 103,16
}
}
else
if(NC_To_FC_Flags & NC_TO_FC_SIMULATION_ACTIVE)
{
JetiBox_printfxy(6,0,"SIMULATION");
}
else
if(ShowSettingNameTime)
{
LIBFC_JetiBox_Clear();
JetiBox_printfxy(0,1,"Set%d:%s ",ActiveParamSet,EE_Parameter.Name);
JetiBox_printfxy(0,0,"Set%d:%s",ActiveParamSet,EE_Parameter.Name);
if(FC_StatusFlags3 & FC_STATUS3_BOAT) JetiBox_printfxy(0,1,"(Boat-Mode)");
return; // nichts weiter ausgeben
}
 
118,7 → 124,7
{
JetiBox_printfxy(10,1,"%4im%c", (int16_t)(HoehenWert/100),VarioCharacter);
}
if(RedundanceBlOperation) JetiBox_printfxy(10,1,"R");
if(FC_StatusFlags3 & FC_STATUS3_REDUNDANCE) JetiBox_printfxy(10,1,"R");
 
#endif
}
/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
324,7 → 324,6
while(!CheckDelay(timer));
printf("\n\rStart\n\r");
#endif
 
while(1)
{
EEAR = EE_DUMMY; // Set the EEPROM Address pointer to an unused space
520,5 → 519,5
else if(BytegapSPI == 0) SPI_TransmitByte();
}
}
//DebugOut.Analog[16]
//DebugOut.Analog[16]
 
/trunk/main.h
48,7 → 48,6
extern unsigned char ActiveParamSet;
extern unsigned int BL3_Current(unsigned char who); // in 0,1A
extern unsigned char LipoCells;
extern unsigned char RedundanceBlOperation;
 
#include <avr/pgmspace.h>
 
/trunk/makefile
5,11 → 5,11
F_CPU = 20000000
#-------------------------------------------------------------------
VERSION_MAJOR = 2
VERSION_MINOR = 06
VERSION_PATCH = 4
VERSION_MINOR = 07
VERSION_PATCH = 0
VERSION_SERIAL_MAJOR = 11 # Serial Protocol to KopterTool -> do not change!
VERSION_SERIAL_MINOR = 0 # Serial Protocol
NC_SPI_COMPATIBLE = 69 # Navi-Kompatibilität
NC_SPI_COMPATIBLE = 71 # Navi-Kompatibilität
LIB_FC_COMPATIBLE = 6 # Library
#-------------------------------------------------------------------
# ATMEGA644: 63487 is maximum
/trunk/menu.c
92,7 → 92,8
case 0:
LCD_printfxy(0,0,"+ MikroKopter +");
LCD_printfxy(0,1,"HW:V%d.%d SW:%d.%02d%c ",PlatinenVersion/10,PlatinenVersion%10, VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH +'a');
LCD_printfxy(0,2,"Setting:%d %s", ActiveParamSet,Mixer.Name);
LCD_printfxy(0,2,"Set:%d %s", ActiveParamSet,Mixer.Name);
if(FC_StatusFlags3 & FC_STATUS3_BOAT) LCD_printfxy(16,2,"BOAT");
 
if(VersionInfo.HardwareError[1] & FC_ERROR1_MIXER) LCD_printfxy(0,3,"Mixer Error!")
else
152,11 → 153,14
break;
case 5:
LCD_printfxy(0,0,"Gyro - Sensor");
LCD_printfxy(0,1,"Nick %4i (%3i.%x)",AdWertNick - AdNeutralNick/8, AdNeutralNick/16, (AdNeutralNick%16)/2);
LCD_printfxy(0,2,"Roll %4i (%3i.%x)",AdWertRoll - AdNeutralRoll/8, AdNeutralRoll/16, (AdNeutralRoll%16)/2);
LCD_printfxy(0,1,"Nick %4i (%4i)",AdWertNick - AdNeutralNick/8, AdNeutralNick);
LCD_printfxy(0,2,"Roll %4i (%4i)",AdWertRoll - AdNeutralRoll/8, AdNeutralRoll);
LCD_printfxy(0,3,"Yaw %4i (%4i)",AdNeutralGier - AdWertGier, AdNeutralGier);
// LCD_printfxy(0,1,"Nick %4i (%3i.%x)",AdWertNick - AdNeutralNick/8, AdNeutralNick/16, (AdNeutralNick%16)/2);
// LCD_printfxy(0,2,"Roll %4i (%3i.%x)",AdWertRoll - AdNeutralRoll/8, AdNeutralRoll/16, (AdNeutralRoll%16)/2);
// LCD_printfxy(0,1,"Nick %4i (%4i)",AdWertNickFilter, AdNeutralNick);
// LCD_printfxy(0,2,"Roll %4i (%4i)",AdWertRollFilter, AdNeutralRoll);
LCD_printfxy(0,3,"Yaw %4i (%3i)",AdNeutralGier - AdWertGier, AdNeutralGier/2);
// LCD_printfxy(0,3,"Yaw %4i (%3i)",AdNeutralGier - AdWertGier, AdNeutralGier/2);
 
/*
// entfernt aus Platzmangel
/trunk/version.txt
725,10 → 725,22
2.06f (21.7.2014)
- Secure function: Avoid that the Altitude setpoint can be much higher than the actual altitude
- Use MinGas setting before while "Waiting for takeoff" instead of "AltitudeMinGas".
 
2.06g
- don't start motors when NC is in simulation mode
- correct behaviour if CompassEffect is zero
2.07a (31.07.2014)
- Redundance now In Flag3
- Boat-Moade implemented
- New Gyro DriftCompensation implemented
- sending Offset values to NC for Logging
- Menu: Neutral Values of Gyro now in full resolution