Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-24 00:35:18 +03:00
Code Issues Wiki Activity

Merge remote-tracking branch 'origin/next' into

Browse source 
bsongis/Issue554_trims_relative_default

Conflicts:
	radio/src/gui/menu_model.cpp
This commit is contained in:
Bertrand Songis 2014-02-01 19:56:31 +01:00
commit 53c670deee
203 changed files with 10687 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/lcd.cpp
View file

@ -1155,7 +1155,7 @@ void putsTmrMode(xcoord_t x, uint8_t y, int8_t mode, LcdFlags att)
return;
}
if (mode >= TMR_VAROFS+MAX_PSWITCH+NUM_CSW) {
if (mode >= TMR_VAROFS+NUM_PSWITCH+NUM_CSW) {
mode++;
}