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

ProjectsBL-CtrlFlightCtrlMK3MagNaviCtrl

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

  → /C-OSD/trunk/main.c @ 825

  → /C-OSD/trunk/main.c @ 826

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 825 → Rev 826

/C-OSD/trunk/main.c
101,12 → 101,12
// store stats description in progmem to save space
const char stats_item_0[] PROGMEM = "max Altitude:";
const char stats_item_1[] PROGMEM = "max Speed :";
const char stats_item_1[] PROGMEM = "max Speed :";
const char stats_item_2[] PROGMEM = "max Distance:";
const char stats_item_3[] PROGMEM = "min Voltage :";
const char stats_item_4[] PROGMEM = "max Time :";
const char stats_item_5[] PROGMEM = "longitude :";
const char stats_item_6[] PROGMEM = "latitude :";
const char stats_item_4[] PROGMEM = "max Time:";
const char stats_item_5[] PROGMEM = "longitude :";
const char stats_item_6[] PROGMEM = "latitude:";
const char stats_item_7[] PROGMEM = "max current :";
const char *stats_item_pointers[8] PROGMEM = {stats_item_0, stats_item_1, stats_item_2,
stats_item_3, stats_item_4, stats_item_5, stats_item_6, stats_item_7};
137,7 → 137,7
* ##########################################################################*/
const char str_1[] PROGMEM = "default";
const char str_2[] PROGMEM = "minimal";
const char str_3[] PROGMEM = " jopl";
const char str_3[] PROGMEM = " jopl";
#if FCONLY
const displaymode_t fcdisplaymodes[] PROGMEM = {
233,7 → 233,7
// set up Atmega162 Ports
DDRA |= ((1 << PA1) | (1 << PA2) | (1 << PA3) | (1 << PA5)); // PA1 output (/CS) | PA2 output (SDIN) | PA3 output (SCLK) | PA5 output (RESET)
DDRA |= ((1 << PA1) | (1 << PA2) | (1 << PA3) | (1 << PA5)); // PA1 output (/CS) | PA2 output (SDIN) |PA3 output (SCLK) | PA5 output (RESET)
MAX_CS_HIGH
MAX_SDIN_LOW
MAX_SCLK_LOW
245,7 → 245,7
LED3_OFF
LED4_OFF
DDRC &= ~((1 << PC4) | (1 << PC5)); // PC4 input (MODE) | PC5 input (SET)
DDRC &= ~((1 << PC4) | (1 << PC5)); // PC4 input(MODE) | PC5 input(SET)
PORTC |= ((1 << PC4) | (1 << PC5)); // pullup
// reset the MAX7456 to be sure any undefined states do no harm
327,9 → 327,9
sei();
//write_ascii_string(2, 7, " CaScAdE ");
//write_ascii_string(2, 8, "is TESTING his open source");
//write_ascii_string(2, 9, " EPi OSD Firmware");
//write_ascii_string(2,7, " CaScAdE");
//write_ascii_string(2,8, "is TESTING his open source");
//write_ascii_string(2,9, "EPi OSD Firmware");
// we are ready
LED3_ON
338,8 → 338,9
// clear serial screen
//usart1_puts("\x1B[2J\x1B[H");
COSD_FLAGS_RUNTIME &= ~COSD_DATARECEIVED;
#if !FCONLY
usart1_request_nc_uart();
usart1_request_nc_uart();
#endif
while (1) {
405,7 → 406,7
// ONLY FOR TESTING
#ifdef ANTENNATRACKTEST
#include <stdlib.h>
#include <stdlib.h>
//#include <float.h>
//#include <math.h>
443,7 → 444,10
if (s1_pressed()) {
config_menu();
}
if (seconds_since_last_data > 0) {
// reqest data untill there has been some answer
if (!(COSD_FLAGS_RUNTIME & COSD_DATARECEIVED) ||
// or while not in passive mode
(seconds_since_last_data > 0 && !(COSD_FLAGS_CONFIG & COSD_FLAG_PASSIVE))) {
usart1_EnableTXD();
//usart1_puts_pgm(PSTR("zu alt\r\n"));
#if FCONLY