• 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

  → / @ 922

  → / @ 923

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 922 → Rev 923

/trunk/triggerlog.c
95,7 → 95,7
TrigLogging.Count++;
if(BlitzSchuhConnected) TrigLogging.CountExternal++;
else TrigLogging.CountExternal = 0;
TrigLogging.AltiBaro = NaviData.Altimeter_5cm * 5; // in cm
TrigLogging.AltiBaro = BaroAltimeter_dm * 10; // in cm
TrigLogging.ShutterCounter = NaviData_Volatile.ShutterCounter;
TrigLogging.AltiGPS = GPSData.Position.Altitude;

/trunk/uart1.c
966,7 → 966,7
i += sprintf(&array[i],"%d,",GPSData.NumOfSats);
i += sprintf(&array[i],"%d.%d,",(s16)(GPSData.Position_Accuracy/100),abs(GPSData.Position_Accuracy%100));
// i += sprintf(&array[i],"%d.%d,M,",GPSData.Position.Altitude/1000,abs(GPSData.Position.Altitude%1000)/100);
tmp1 = NaviData.Altimeter_5cm / 2; // in dm
tmp1 = BaroAltimeter_dm; // in dm
i += sprintf(&array[i],"%d.%d,M,",(s16)tmp1 / 10,abs((s16)tmp1 % 10));
i += sprintf(&array[i],",,,*");
}
1574,7 → 1574,7
Data3D.AngleNick = FromFlightCtrl.AngleNick; // in 0.1 deg
Data3D.AngleRoll = FromFlightCtrl.AngleRoll; // in 0.1 deg
Data3D.Heading = FromFlightCtrl.GyroHeading; // in 0.1 deg
Data3D.Altimeter_5cm = FC.Altimeter_5cm; // in 5cm -> 20 = 1m
Data3D.Altimeter_5cm = BaroAltimeter_dm * 2; // in 5cm -> 20 = 1m
MKProtocol_CreateSerialFrame(&UART1_tx_buffer, 'C', NC_ADDRESS, 1,(u8 *)&Data3D, sizeof(Data3D));
UART1_Data3D_Timer = SetDelay(UART1_Data3D_Interval);
UART1_Request_Data3D = FALSE;