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

Fix issues intriduced in #1218

Browse source
This commit is contained in:
Dan Nixon 2016-09-24 23:19:10 +01:00
parent 9998284160
commit aa15dec809
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -36,7 +36,7 @@ env:
# - TARGET=REVO_OPBL # - TARGET=REVO_OPBL
# - TARGET=RMDO # - TARGET=RMDO
# - TARGET=SINGULARITY # - TARGET=SINGULARITY
# - TARGET=SIRINFPV - TARGET=SIRINFPV
- TARGET=SPARKY - TARGET=SPARKY
# - TARGET=SPARKY2 # - TARGET=SPARKY2
# - TARGET=SPARKY_OPBL # - TARGET=SPARKY_OPBL
@ -48,7 +48,7 @@ env:
# - TARGET=X_RACERSPI # - TARGET=X_RACERSPI
# - TARGET=ZCOREF3 # - TARGET=ZCOREF3
# - TARGET=RCEXPLORERF3 # - TARGET=RCEXPLORERF3
# use new docker environment # use new docker environment
sudo: false sudo: false

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

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