Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 677 → Rev 685

/C-OSD/trunk/main.c
40,6 → 40,7
#include "osd_ncmode_default.h"
#include "osd_ncmode_minimal.h"
#include "osd_fcmode_default.h"
#include "osd_fcmode_jopl.h"
 
#if WRITECHARS != -1
#include "characters.h"
68,6 → 69,7
// 16bit should be enough, normal LiPos don't last that long
volatile uint16_t uptime = 0;
volatile uint16_t timer = 0;
volatile uint16_t flytime_fc = 0;
 
// remember last time data was received
volatile uint8_t seconds_since_last_data = 0;
132,6 → 134,7
* ##########################################################################*/
const char str_1[] PROGMEM = "default";
const char str_2[] PROGMEM = "minimal";
const char str_3[] PROGMEM = " jopl";
 
const displaymode_t ncdisplaymodes[] PROGMEM = {
{ osd_ncmode_default, (char *)str_1 },
140,6 → 143,7
 
const displaymode_t fcdisplaymodes[] PROGMEM = {
{ osd_fcmode_default, (char *)str_1 },
{ osd_fcmode_jopl, (char *)str_3 }
};
 
int (*osd_ncmode)(void) = (int(*)(void)) &osd_ncmode_default;
171,6 → 175,13
ISR(TIMER0_COMP_vect) {
if (!timer--) {
uptime++;
 
#if FCONLY
if (debugData.Analog[12]>10) {
flytime_fc++;
}
#endif
 
timer = 999;
seconds_since_last_data++;
}
319,10 → 330,10
 
#if ALLCHARSDEBUG | (WRITECHARS != -1)
clear();
write_all_chars();
LED1_ON
LED2_ON
LED3_ON
write_all_chars();
LED1_ON
LED2_ON
LED3_ON
LED4_ON
#else