• MikroKopter.de
• Wiki
• SHOP
• Datenschutz
• Impressum

NaviCtrlBL-CtrlFlightCtrlMK3MagProjects

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → / @ 508

  → / @ 509

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 508 → Rev 509

/trunk/main.c
93,7 → 93,7
u8 NCFlags = 0;
s16 GeoMagDec = 0; // local magnetic declination in 0.1 deg
u8 ErrorGpsFixLost = 0;
u8 FromFC_LoadWP_List = 0;
u8 FromFC_LoadWP_List = 0, FromFC_Load_SingePoint = 0, FromFC_Store_SingePoint = 0;
u8 ToFC_MaxWpListIndex = 3;
u8 ClearFCStatusFlags = 0;
u8 StopNavigation = 0;
619,7 → 619,16
FromFC_LoadWP_List = 0;
}
// ++++++++++++++++++++++++++++++++++++++++++++++
if(FromFC_Store_SingePoint)
{
FromFC_Store_SingePoint = 0;
}
// ++++++++++++++++++++++++++++++++++++++++++++++
if(FromFC_Load_SingePoint)
{
FromFC_Load_SingePoint = 0;
}
// ++++++++++++++++++++++++++++++++++++++++++++++
// ---------------- Logging ---------------------------------------
if(SD_WatchDog)
{

/trunk/main.h
14,7 → 14,7
#define VERSION_MAJOR 2
#define VERSION_MINOR 4
#define VERSION_PATCH 1
#define VERSION_PATCH 2
// 0 = A
// 1 = B
// 2 = C
36,7 → 36,7
// 18 = S
#ifndef FOLLOW_ME
#define FC_SPI_COMPATIBLE 61 // <------------------
#define FC_SPI_COMPATIBLE 62 // <------------------
#else
#define FC_SPI_COMPATIBLE 0xFF
#endif
207,7 → 207,7
extern u8 ErrorCode;
extern u8 StopNavigation;
extern u8 ErrorGpsFixLost;
extern u8 FromFC_LoadWP_List, ToFC_MaxWpListIndex;
extern u8 FromFC_LoadWP_List, ToFC_MaxWpListIndex, FromFC_Load_SingePoint, FromFC_Store_SingePoint;
extern volatile u32 SPIWatchDog; // stop Navigation if this goes to zero
extern volatile u32 SD_WatchDog; // stop Logging if this goes to zero
extern volatile u32 PollingTimeout;

/trunk/spi_slave.c
691,6 → 691,8
Parameter.ComingHomeAltitude = FromFlightCtrl.Param.Byte[3];
Parameter.FromFC_LowVoltageHomeActive = FromFlightCtrl.Param.Byte[4];
if(FromFlightCtrl.Param.Byte[5]) FromFC_LoadWP_List = FromFlightCtrl.Param.Byte[5];
if(FromFlightCtrl.Param.Byte[6]) FromFC_Load_SingePoint = FromFlightCtrl.Param.Byte[6];
if(FromFlightCtrl.Param.Byte[7]) FromFC_Store_SingePoint = FromFlightCtrl.Param.Byte[7];
break;
case SPI_FCCMD_STICK:
FC.StickGas = FromFlightCtrl.Param.sByte[0];