Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-16 04:45:17 +03:00
Code Issues Wiki Activity

Merge remote-tracking branch 'origin/next' into

Browse source 
bsongis/Taranis_6Positions_Pot

Conflicts:
	radio/src/myeeprom.h
This commit is contained in:
Bertrand Songis 2014-01-31 11:28:34 +01:00
commit 38145a02f4
1167 changed files with 24905 additions and 51441 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/gui/view_main.cpp
View file

@ -318,7 +318,7 @@ void displayTopBar()
/* RTC time */
struct gtm t;
gettime(&t);
lcd_putcAtt(BAR_TIME_X-1, BAR_Y+1, ':', BLINK);
lcd_putcAtt(BAR_TIME_X+1, BAR_Y+1, ':', BLINK);
lcd_outdezNAtt(BAR_TIME_X+1, BAR_Y+1, t.tm_hour, LEADING0, 2);
lcd_outdezNAtt(BAR_TIME_X+3*FWNUM-1, BAR_Y+1, t.tm_min, LEADING0, 2);