Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 08:15:30 +03:00
Code Issues Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Marcin Baliniak 2016-09-25 11:57:43 +02:00
commit 419547a2bf
5 changed files with 41 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/io/osd.c
View file

@ -1369,11 +1369,11 @@ void osdExitMenu(void *ptr)
#ifdef VTX
masterConfig.vtxBand = vtxBand;
masterConfig.vtxChannel = vtxChannel - 1;
masterConfig.vtx_channel = vtxChannel - 1;
#endif // VTX
#ifdef USE_RTC6705
masterConfig.vtxChannel = vtxBand * 8 + vtxChannel - 1;
masterConfig.vtx_channel = vtxBand * 8 + vtxChannel - 1;
#endif // USE_RTC6705
saveConfigAndNotify();
@ -1400,12 +1400,12 @@ void osdOpenMenu(void)
#ifdef VTX
vtxBand = masterConfig.vtxBand;
vtxChannel = masterConfig.vtxChannel + 1;
vtxChannel = masterConfig.vtx_channel + 1;
#endif // VTX
#ifdef USE_RTC6705
vtxBand = masterConfig.vtxChannel / 8;
vtxChannel = masterConfig.vtxChannel % 8 + 1;
vtxBand = masterConfig.vtx_channel / 8;
vtxChannel = masterConfig.vtx_channel % 8 + 1;
#endif // USE_RTC6705
osdRows = max7456GetRowsCount();