diff --git a/.travis.yml b/.travis.yml index 80b896b6a6..dfe63cb935 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ env: # - TARGET=REVO_OPBL # - TARGET=RMDO # - TARGET=SINGULARITY -# - TARGET=SIRINFPV + - TARGET=SIRINFPV - TARGET=SPARKY # - TARGET=SPARKY2 # - TARGET=SPARKY_OPBL @@ -48,7 +48,7 @@ env: # - TARGET=X_RACERSPI # - TARGET=ZCOREF3 # - TARGET=RCEXPLORERF3 - + # use new docker environment sudo: false diff --git a/src/main/io/osd.c b/src/main/io/osd.c index 547e399b43..a7065364cb 100755 --- a/src/main/io/osd.c +++ b/src/main/io/osd.c @@ -1363,11 +1363,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(); @@ -1394,12 +1394,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 = max7456_get_rows_count();