Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2439 → Rev 2440

/trunk/eeprom.c
214,9 → 214,12
EE_Parameter.WARN_J17_Bitmask = 0xAA;
EE_Parameter.J16Timing = 40;
EE_Parameter.J17Timing = 40;
EE_Parameter.NaviOut1Parameter = 0; // Photo release in meter
EE_Parameter.AutoPhotoDistance = 0; // Photo release in meter
EE_Parameter.AutoPhotoAtitudes = 0; // Photo release in meter
EE_Parameter.SingleWpSpeed = 50; // Speed when flying the single points
 
EE_Parameter.LoopGasLimit = 50;
EE_Parameter.LoopThreshold = 90; // Wert: 0-247 Schwelle für Stickausschlag
EE_Parameter.LoopThreshold = 90; // Wert: 0-247 Schwelle für Stickausschlag
EE_Parameter.LoopHysterese = 50;
 
EE_Parameter.NaviGpsModeChannel = 6; // Kanal 6
249,9 → 252,9
EE_Parameter.ServoFilterRoll = 0;
EE_Parameter.CompassOffset = 0;
 
EE_Parameter.UnterspannungsWarnung = 33; // Wert : 0-247 ( Automatische Zellenerkennung bei < 50)
EE_Parameter.ComingHomeVoltage = 32;
EE_Parameter.AutoLandingVoltage = 31;
EE_Parameter.UnterspannungsWarnung = 32; // Wert : 0-247 ( Automatische Zellenerkennung bei < 50)
EE_Parameter.ComingHomeVoltage = 31;
EE_Parameter.AutoLandingVoltage = 30;
}
/*
void ParamSet_DefaultSet1(void) // sport
/trunk/eeprom.h
4,7 → 4,7
#include <inttypes.h>
#include "twimaster.h"
 
#define EEPARAM_REVISION 98 // is count up, if paramater stucture has changed (compatibility)
#define EEPARAM_REVISION 100 // 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
214,7 → 214,7
unsigned char WARN_J16_Bitmask; // for the J16 Output
unsigned char WARN_J17_Bitmask; // for the J17 Output
//---NaviCtrl---------------------------------------------
unsigned char NaviOut1Parameter; // for the J16 Output
unsigned char AutoPhotoDistance; // Auto Photo
unsigned char NaviGpsModeChannel; // Parameters for the Naviboard
unsigned char NaviGpsGain;
unsigned char NaviGpsP;
249,6 → 249,8
unsigned char CompassOffset;
unsigned char AutoLandingVoltage; // in 0,1V 0 -> disabled
unsigned char ComingHomeVoltage; // in 0,1V 0 -> disabled
unsigned char AutoPhotoAtitudes;
unsigned char SingleWpSpeed;
//------------------------------------------------
unsigned char BitConfig; // (war Loop-Cfg) Bitcodiert: 0x01=oben, 0x02=unten, 0x04=links, 0x08=rechts / wird getrennt behandelt
unsigned char ServoCompInvert; // // 0x01 = Nick, 0x02 = Roll, 0x04 = relative moving // WICHTIG!!! am Ende lassen
/trunk/hottmenu.c
618,6 → 618,8
case 14:
case 15:
case 16:
if(HottKeyboard == HOTT_KEY_DOWN) { LIBFC_HoTT_Clear(); page = 5; line = 0;}
else
if(HottKeyboard == HOTT_KEY_SET) { if(show_mag) show_mag = 0; else show_mag = 1;}
else
if(HottKeyboard == HOTT_KEY_LEFT) { LIBFC_HoTT_Clear(); page = 1; line = 0;};
1019,7 → 1021,7
break;
// HoTT_printfxy(11,7,"%s",WPL_Name)
case 3:
case 4:
case 4:
case 5:
if(HottKeyboard) DebugOut.Analog[17]++;
HoTT_printfxy(0,6,"load point:")
1030,7 → 1032,7
}
else
{
HoTT_printfxy(11,6," --")
HoTT_printfxy(11,6,"--")
}
if(NaviData_MaxWpListIndex == 0) HoTT_printfxy(0,7,"No SD-Card ")
/trunk/jetimenu.c
175,25 → 175,25
#endif
}
 
#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__))
void Menu_POINT_LD(uint8_t key)
{ //0123456789ABCDEF
#if !defined (RECEIVER_SPEKTRUM_DX7EXP) && !defined (RECEIVER_SPEKTRUM_DX8EXP)
JetiBox_printfxy(0,0,"Load singl.Point");
// JetiBox_printfxy(0,1,"(Fixed) ");
}
#endif
}
 
#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__))
void Menu_POINT_SV(uint8_t key)
{ //0123456789ABCDEF
#if !defined (RECEIVER_SPEKTRUM_DX7EXP) && !defined (RECEIVER_SPEKTRUM_DX8EXP)
JetiBox_printfxy(0,0,"Save singl.Point");
// JetiBox_printfxy(0,1,"(Relative) ");
}
#endif
}
 
#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__))
void Menu_POINT_SV2(uint8_t key)
{ //0123456789ABCDEF
#if !defined (RECEIVER_SPEKTRUM_DX7EXP) && !defined (RECEIVER_SPEKTRUM_DX8EXP)
static unsigned char load_waypoint_tmp = 1, changed;
 
// if(WPL_Name[0] == 0) JetiBox_printfxy(0,0,"Relative WPs ")
223,12 → 223,12
changed = 0;
}
}
}
#endif
}
 
#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__))
void Menu_POINT_LD2(uint8_t key)
{ //0123456789ABCDEF
#if !defined (RECEIVER_SPEKTRUM_DX7EXP) && !defined (RECEIVER_SPEKTRUM_DX8EXP)
static unsigned char load_waypoint_tmp = 1, changed;
// if(WPL_Name[0] == 0) JetiBox_printfxy(0,0,"FIX Waypoints")
255,8 → 255,8
changed = 0;
}
}
}
#endif
}
 
 
void Menu_WPL_A2(uint8_t key)
376,6 → 376,8
const MENU_ENTRY JetiBox_Menu[] PROGMEM=
{ // l r u d pHandler
#if !defined (RECEIVER_SPEKTRUM_DX7EXP) && !defined (RECEIVER_SPEKTRUM_DX8EXP)
 
#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__))
{8, 1, 0, 0, &Menu_Status }, // 0
{0, 2, 1, 1, &Menu_Temperature }, // 1
{1, 3, 2, 2, &Menu_Battery }, // 2
390,6 → 392,18
{5,10,10,10, &Menu_WPL_R2 }, // 10
{6,11,11,11, &Menu_POINT_LD2}, // 11
{7,12,12,12, &Menu_POINT_SV2}, // 12
#else
{6, 1, 0, 0, &Menu_Status }, // 0
{0, 2, 1, 1, &Menu_Temperature }, // 1
{1, 3, 2, 2, &Menu_Battery }, // 2
{2, 4, 3, 3, &Menu_PosInfo }, // 3
{3, 5, 7, 7, &Menu_WPL_A1 }, // 4
{4, 6, 8, 8, &Menu_WPL_R1 }, // 5
{5, 0, 6, 6, &Magnet_Values }, // 6
 
{4, 7, 7, 7, &Menu_WPL_A2 }, // 7
{5, 8, 8, 8, &Menu_WPL_R2 }, // 8
#endif
#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/makefile
5,11 → 5,11
F_CPU = 20000000
#-------------------------------------------------------------------
VERSION_MAJOR = 2
VERSION_MINOR = 04
VERSION_MINOR = 05
VERSION_PATCH = 4
VERSION_SERIAL_MAJOR = 11 # Serial Protocol to KopterTool -> do not change!
VERSION_SERIAL_MINOR = 0 # Serial Protocol
NC_SPI_COMPATIBLE = 62 # Navi-Kompatibilität
NC_SPI_COMPATIBLE = 65 # Navi-Kompatibilität
LIB_FC_COMPATIBLE = 6 # Library
#-------------------------------------------------------------------
# ATMEGA644: 63487 is maximum
/trunk/spi.c
206,7 → 206,7
ToNaviCtrl.Param.Byte[11] = EE_Parameter.NaviAngleLimitation;
break;
case SPI_FCCMD_PARAMETER2:
ToNaviCtrl.Param.Byte[0] = EE_Parameter.NaviOut1Parameter; // Distance between Photo releases
ToNaviCtrl.Param.Byte[0] = EE_Parameter.AutoPhotoDistance; // Distance between Photo releases
#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__))
// create the ToNC_SpeakHoTT
if(EE_Parameter.Receiver != RECEIVER_HOTT)
228,6 → 228,8
ToNC_Load_SingePoint = 0;
ToNC_Store_SingePoint = 0;
ToNaviCtrl.Param.sInt[4] = KompassSollWert; // Pos. 8 & 9
ToNaviCtrl.Param.Byte[10] = EE_Parameter.AutoPhotoAtitudes;
ToNaviCtrl.Param.Byte[11] = EE_Parameter.SingleWpSpeed;
break;
case SPI_FCCMD_STICK:
cli();
/trunk/version.txt
696,10 → 696,15
2.05c
- Load/Store Single Point
 
ToDo: Höhenauslösung
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