Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2332 → Rev 2333

/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
59,6 → 59,7
pVoidFnct_pVoidFnctChar_const_fmt _printf_P;
unsigned char FoundMotors = 0;
unsigned char JetiBeep = 0; // to allow any Morse-Beeping of the Jeti-Box
unsigned char ActiveParamSet = 3;
 
void PrintLine(void)
{
277,10 → 278,10
DebugOut.Status[0] = 0x01 | 0x02;
JetiBeep = 0;
if(EE_Parameter.ExtraConfig & CFG_NO_RCOFF_BEEPING) DisableRcOffBeeping = 1;
EEAR = EE_DUMMY; // Set the EEPROM Address pointer to an unused space
while(1)
{
if(ReceiverUpdateModeActive) while (1) PORTC &= ~(1<<7); // Beeper off
EEAR = EE_DUMMY; // Set the EEPROM Address pointer to an unused space
//GRN_ON;
if(UpdateMotor && AdReady) // ReglerIntervall
{
412,6 → 413,7
 
SPI_StartTransmitPacket();
SendSPI = 4;
EEAR = EE_DUMMY; // Set the EEPROM Address pointer to an unused space
// +++++++++++++++++++++++++++++++++
// Sekundentakt
if(++second == 49)
/trunk/main.h
35,6 → 35,7
void LipoDetection(unsigned char print);
extern unsigned int FlugMinuten,FlugMinutenGesamt,FlugSekunden;
extern void PrintLine(void); // "================================="
extern unsigned char ActiveParamSet;
 
#include <avr/pgmspace.h>
 
/trunk/menu.c
92,7 → 92,7
case 0:
LCD_printfxy(0,0,"+ MikroKopter +");
LCD_printfxy(0,1,"HW:V%d.%d SW:%d.%d%c V4",PlatinenVersion/10,PlatinenVersion%10, VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH +'a');
LCD_printfxy(0,2,"Setting:%d %s", GetActiveParamSet(),Mixer.Name);
LCD_printfxy(0,2,"Setting:%d %s", ActiveParamSet,Mixer.Name);
 
if(VersionInfo.HardwareError[1] & FC_ERROR1_MIXER) LCD_printfxy(0,3,"Mixer Error!")
else
/trunk/spi.c
192,7 → 192,7
ToNaviCtrl.Param.Byte[8] = FC_StatusFlags;
//if(FC_StatusFlags2 & FC_STATUS2_WAIT_FOR_TAKEOFF) ToNaviCtrl.Param.Byte[8] &= ~FC_STATUS_FLY;
FC_StatusFlags &= ~(FC_STATUS_CALIBRATE | FC_STATUS_START);
ToNaviCtrl.Param.Byte[9] = GetActiveParamSet();
ToNaviCtrl.Param.Byte[9] = ActiveParamSet;
ToNaviCtrl.Param.Byte[10] = EE_Parameter.ComingHomeAltitude;
ToNaviCtrl.Param.Byte[11] = FC_StatusFlags2;
break;
/trunk/version.txt
585,4 → 585,5
0.90j (23.05.2013)
- Changes for better EEPROM-Safety
- variable ActiveParamSet instead of the EEPROM-Reading