• 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

  → / @ 849

  → / @ 850

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 849 → Rev 850

/trunk/main.c
612,13 → 612,23
if(HugeBlockFromFC.WhoAmI == 1) // contains eeprom-Data
{
u8 crc1, crc2;
// static u8 first_time = 1;
crc1 = HugeBlockFromFC.Data[sizeof(EE_Parameter)-1]; // contains the EE_Parameter.crc
crc2 = RAM_Checksum((u8 *)(&HugeBlockFromFC.Data), sizeof(EE_Parameter)-1); // calculates the current crc
if(crc1 == crc2)
{
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// + get EE_Parameters from FC
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
memcpy(&EE_Parameter, (u8 *) HugeBlockFromFC.Data, sizeof(EE_Parameter));
RequestConfigFromFC = 0;
if(UART_VersionInfo.HWMajor >= 30) SendOemName = 1;
// if(first_time)
{
WP_MissionParameter.ComingHomeAltitude = EE_Parameter.ComingHomeAltitude;
WP_MissionParameter.FailsafeAltitude = EE_Parameter.FailSafeAltitude;
WP_MissionParameter.TriggerMask = EE_Parameter.J16Bitmask;
}
}
HugeBlockFromFC.WhoAmI = 0;
}

/trunk/main.h
14,7 → 14,7
#define VERSION_MAJOR 2
#define VERSION_MINOR 19
#define VERSION_PATCH 5
#define VERSION_PATCH 7
// 0 = A
// 1 = B
// 2 = C
37,7 → 37,7
#define CAN_SLAVE_COMPATIBLE 2
#ifndef FOLLOW_ME
#define FC_SPI_COMPATIBLE 89 // <------------------
#define FC_SPI_COMPATIBLE 90 // <------------------
#else
#define FC_SPI_COMPATIBLE 0xFF
#endif
352,6 → 352,7
s16 GyroCompassCorrected;
} __attribute__((packed)) Partner_t; // from FC
extern Partner_t Partner;
extern Param_t Parameter;
extern volatile FC_t FC;