Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 941 → Rev 942

/C-OSD/trunk/CHANGE.LOG
18,6 → 18,9
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
****************************************************************************/
 
20110331-1805
+added possibility to blank the display with SJ1 (SJ1 closed = no HUD)
 
20110331-1200
*small adaption to NC 0.24b and FC 0.84a
*added CF-indicator icon
/C-OSD/trunk/default/dist.bat
19,7 → 19,7
:: * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
:: ****************************************************************************/
 
set DATE=20110331-1200
set DATE=20110331-1805
 
:: date /T
 
/C-OSD/trunk/main.c
252,9 → 252,10
LED3_OFF
LED4_OFF
 
DDRC &= ~((1 << PC4) | (1 << PC5)); // PC4 input(MODE) | PC5 input(SET)
PORTC |= ((1 << PC4) | (1 << PC5)); // pullup
DDRC &= ~((1 << PC4) | (1 << PC5) | (1 << PC6) | (1 << PC7)); // PC4 input(MODE) | PC5 input(SET) | PC6 input SJ1 | PC7 input SJ2
PORTC |= ((1 << PC4) | (1 << PC5) | (1 << PC6) | (1 << PC7)); // pullup
 
 
// reset the MAX7456 to be sure any undefined states do no harm
MAX_RESET_LOW
MAX_RESET_HIGH
485,6 → 486,22
_delay_ms(300);
}
}
 
 
if (SJ1_CLOSED && !(COSD_FLAGS_RUNTIME & COSD_BLANKBYSJ)) { // we do not want the HUD anymore
if (COSD_FLAGS_MODES & COSD_FLAG_HUD) {
clear();
}
COSD_FLAGS_MODES &= ~COSD_FLAG_HUD;
COSD_FLAGS_RUNTIME |= COSD_BLANKBYSJ;
} else if (!SJ1_CLOSED && (COSD_FLAGS_RUNTIME & COSD_BLANKBYSJ)) { // we want the HUD back again
if (!(COSD_FLAGS_MODES & COSD_FLAG_HUD)) {
COSD_FLAGS_RUNTIME &= ~COSD_ICONS_WRITTEN;
}
COSD_FLAGS_MODES |= COSD_FLAG_HUD;
COSD_FLAGS_RUNTIME &= ~(COSD_BLANKBYSJ);
}
 
}
 
#else // character flashing...
/C-OSD/trunk/main.h
110,6 → 110,7
#define COSD_ICONS_WRITTEN 2
#define COSD_WASFLYING 4
#define COSD_DATARECEIVED 8
#define COSD_BLANKBYSJ 16
 
/* ##########################################################################
* LED controll
129,7 → 130,14
#define S1_PRESSED !(PINC & (1<<PC5))
#define S2_PRESSED !(PINC & (1<<PC4))
 
/* ##########################################################################
* solder jumpers
* ##########################################################################*/
 
#define SJ1_CLOSED !(PINC & (1<<PC6))
#define SJ2_CLOSED !(PINC & (1<<PC7))
 
 
/* ##########################################################################
* extern spi controlled vars
* ##########################################################################*/