• 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

  → / @ 319

  → / @ 318

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 319 → Rev 318

/trunk/main.h
35,7 → 35,7
#define VERSION_SERIAL_MINOR 0
#ifndef FOLLOW_ME
#define FC_SPI_COMPATIBLE 20
#define FC_SPI_COMPATIBLE 19
#else
#define FC_SPI_COMPATIBLE 0xFF
#endif

/trunk/spi_slave.c
106,7 → 106,6
u32 ToFC_AltitudeRate = 0;
s32 ToFC_AltitudeSetpoint = 0;
u8 FromFC_VarioCharacter = ' ';
u8 DisableFC_Sticks = 0;
SPI_Version_t FC_Version;
293,7 → 292,7
ToFlightCtrl.Command = SPI_CommandSequence[SPI_CommandCounter++];
// restart command cycle at the end
if (SPI_CommandCounter >= sizeof(SPI_CommandSequence)) SPI_CommandCounter = 0;
#define FLAG_GPS_AID 0x01
switch (ToFlightCtrl.Command)
{
case SPI_NCCMD_KALMAN:
305,7 → 304,7
ToFlightCtrl.Param.sByte[4] = (s8) ToFcGpsZ;
ToFlightCtrl.Param.Byte[5] = (s8) ToFC_Rotate_C;
ToFlightCtrl.Param.Byte[6] = (s8) ToFC_Rotate_S;
if(DisableFC_Sticks) ToFlightCtrl.Param.Byte[7] = FLAG_GPS_AID; else ToFlightCtrl.Param.Byte[7] = 0x00;
//ToFlightCtrl.Param.Byte[7] =
if(CAM_Orientation.UpdateMask & CAM_UPDATE_AZIMUTH)
{
ToFlightCtrl.Param.sInt[4] = CAM_Orientation.Azimuth;

/trunk/spi_slave.h
94,7 → 94,6
extern ToFlightCtrl_t ToFlightCtrl;
extern volatile u32 SPI0_Timeout;
extern SPI_Version_t FC_Version;
extern u8 DisableFC_Sticks;
void SPI0_Init(void);
void SPI0_GetFlightCtrlVersion(void);