Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 527 → Rev 528

/C-OSD/trunk/CHANGE.LOG
18,6 → 18,9
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
****************************************************************************/
 
20090714-2100
*fixed the flags (hopefully) for C-Strom and stuff
 
20090706-2000
*hopefully fixed the new 10th number showing functions
+support for GPS height instead of Baro
/C-OSD/trunk/main.c
81,7 → 81,7
uint8_t max_voltage = 0;
 
// Flags
uint8_t COSD_FLAGS = 0, COSD_FLAGS2 = 0;
uint8_t COSD_FLAGS_MODES = 0, COSD_FLAGS_CONFIG = 0, COSD_FLAGS_RUNTIME = 0, COSD_DISPLAYMODE = 0;
 
#if !(ALLCHARSDEBUG|(WRITECHARS != -1))
 
259,7 → 259,7
#endif
 
// Setup Video Mode
if (COSD_FLAGS & COSD_FLAG_NTSC) {
if (COSD_FLAGS_CONFIG & COSD_FLAG_NTSC) {
// NTSC + enable display immediately (VM0)
spi_send_byte(0x00, 0b00001000);
 
351,15 → 351,15
s_volt = SPI_buffer.data.volt;
 
// if this is the first receival we should print the small A
if (!(COSD_FLAGS2 & COSD_FLAG_STROMREC)) {
if (!(COSD_FLAGS_RUNTIME & COSD_FLAG_STROMREC)) {
clear();
COSD_FLAGS2 &= ~COSD_ICONS_WRITTEN;
COSD_FLAGS_RUNTIME &= ~COSD_ICONS_WRITTEN;
// update this flag
COSD_FLAGS2 |= COSD_FLAG_STROMREC;
COSD_FLAGS_RUNTIME |= COSD_FLAG_STROMREC;
}
} else {
// update flags
COSD_FLAGS2 &= ~COSD_FLAG_STROMREC;
COSD_FLAGS_RUNTIME &= ~COSD_FLAG_STROMREC;
}
StartTransfer(9);
}
/C-OSD/trunk/ppm.c
54,12 → 54,12
ppm = TCNT1 - old_timer1;
ppm -= 256;
if (ppm < 128) { // we want HUD
COSD_FLAGS |= COSD_FLAG_HUD;
COSD_FLAGS_CONFIG |= COSD_FLAG_HUD;
} else { // we do not want hud
if (COSD_FLAGS & COSD_FLAG_HUD) {
if (COSD_FLAGS_CONFIG & COSD_FLAG_HUD) {
clear();
}
COSD_FLAGS &= ~COSD_FLAG_HUD;
COSD_FLAGS_CONFIG &= ~COSD_FLAG_HUD;
}
}
EMCUCR |= (1<<ISC2); // next one is rising