• 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

  → / @ 805

  → / @ 806

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 805 → Rev 806

/trunk/main.c
122,6 → 122,7
u8 ErrorOutSideOperationArea = 0; // I am outside the operation polygon area
u32 ShowNoFlyzoneErrorMessage = 0;
u8 ShowCalibrationErrorMessage = 0;
u8 TryAgain_UBX_Setup = 0;
//----------------------------------------------------------------------------------------------------
void SCU_Config(void)
{
652,6 → 653,8
else
if(FC_Temperatur < FC_Temperatur_raw/10) FC_Temperatur++;
}
if(TryAgain_UBX_Setup) { if(--TryAgain_UBX_Setup == 0) UBX_Setup();}
}
// ++++++++++++++++++++++++++++++++++++++++++++++++
// ---------------- Error Check Timing ----------------------------
791,7 → 794,14
LED_RED_ON;
}
#endif
if(UBX_Setup() == 0) UBX_Setup(); // inits the GPS-Module via ubx -> try twice // Achtung: muss nach FC-Versions check
if(UBX_Setup() == 0) // Achtung: muss nach FC-Versions check
{
if(UBX_Setup() == 0) // inits the GPS-Module via ubx -> try twice
{
if(IamMaster == SLAVE) TryAgain_UBX_Setup = 2;
else TryAgain_UBX_Setup = 4;
}
}
// +++++++++++++++++++++++++++++++++++++++
// ++ check CamCtrl version (if connected)
if(Compass_I2CPort == NCMAG_PORT_INTERN)

/trunk/main.h
14,7 → 14,7
#define VERSION_MAJOR 2
#define VERSION_MINOR 17
#define VERSION_PATCH 1
#define VERSION_PATCH 3
// 0 = A
// 1 = B
// 2 = C
373,6 → 373,7
extern u8 ShowCalibrationErrorMessage;
#define OEM_NAME_LENGHT 16
extern u8 OEM_String[OEM_NAME_LENGHT+1];
extern u8 TryAgain_UBX_Setup;
#define CHECK_ONLY 0
#define GET_LICENSE 1

/trunk/ubx.c
276,8 → 276,7
UbxVelNed.Status = INVALID;
UbxMsg.Status = INVALID;
GPSData.Status = INVALID;
UBX_Timeout = SetDelay(2 * UBX_Timeout);
UBX_Timeout = SetDelay(5000);
}
/********************************************************/