Commit 70f5e47

authored

Merge pull request #480 from atomgomba/hide-vtx-menu

Hide VTX menu when feature is unavailable

2 parents b5a9948 + 47f9efb commit 70f5e47Copy full SHA for 70f5e47

File tree

+36

-5

lines changed

+36

-5

lines changed

Lines changed: 5 additions & 0 deletions

Lines changed: 19 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,24 @@ local function confirm(page)`
`82`	`82`	`collectgarbage()`
`83`	`83`	`end`
`84`	`84`
	`85`	`+local function filterAvailablePages(pageFiles)`
	`86`	`+ local newPageFiles = pageFiles`
	`87`	`+`
	`88`	`+ local function skipPage(script)`
	`89`	`+ local currentPageFiles = {}`
	`90`	`+ for i = 1, #newPageFiles do`
	`91`	`+ if newPageFiles[i].script ~= script then`
	`92`	`+ currentPageFiles[#currentPageFiles + 1] = newPageFiles[i]`
	`93`	`+ end`
	`94`	`+ end`
	`95`	`+ newPageFiles = currentPageFiles`
	`96`	`+ end`
	`97`	`+`
	`98`	`+ if not features.vtx then skipPage("vtx.lua") end`
	`99`	`+`
	`100`	`+ return newPageFiles`
	`101`	`+end`
	`102`	`+`
`85`	`103`	`local function createPopupMenu()`
`86`	`104`	`popupMenuActive = 1`
`87`	`105`	`popupMenu = {}`
`@@ -296,7 +314,7 @@ local function run_ui(event)`
`296`	`314`	`return 0`
`297`	`315`	`end`
`298`	`316`	`init = nil`
`299`		`- PageFiles = assert(loadScript("pages.lua"))()`
	`317`	`+ PageFiles = filterAvailablePages(assert(loadScript("pages.lua"))())`
`300`	`318`	`invalidatePages()`
`301`	`319`	`uiState = prevUiState or uiStatus.mainMenu`
`302`	`320`	`prevUiState = nil`

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,15 @@ local function init()`
`22`	`22`	`mcuIdReceived = getMCUId.f()`
`23`	`23`	`if mcuIdReceived then`
`24`	`24`	`getMCUId = nil`
`25`		`- local f = loadScript("VTX_TABLES/"..mcuId..".lua")`
`26`		`- if f and f() then`
`27`		`- vtxTablesReceived = true`
`28`		`- f = nil`
	`25`	`+ local f = loadScript("VTX_TABLES/" .. mcuId .. ".lua")`
	`26`	`+ if f then`
	`27`	`+ local table = f()`
	`28`	`+ if table then`
	`29`	`+ vtxTablesReceived = true`
	`30`	`+ features.vtx = 0 < table.frequenciesPerBand`
	`31`	`+ f = nil`
	`32`	`+ table = nil`
	`33`	`+ end`
`29`	`34`	`end`
`30`	`35`	`collectgarbage()`
`31`	`36`	`f = loadScript("BOARD_INFO/"..mcuId..".lua")`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,12 @@ local function processMspReply(cmd, payload, err)`
`29`	`29`	`vtxTableAvailable = true`
`30`	`30`	`vtxFrequencyTableReceived = true`
`31`	`31`	`vtxPowerTableReceived = true`
	`32`	`+ features.vtx = false`
`32`	`33`	`return`
`33`	`34`	`end`
`34`	`35`	`vtxConfigReceived = true`
`35`	`36`	`vtxTableAvailable = payload[12] ~= 0`
	`37`	`+ features.vtx = vtxTableAvailable`
`36`	`38`	`vtxTableConfig.bands = payload[13]`
`37`	`39`	`vtxTableConfig.channels = payload[14]`
`38`	`40`	`vtxTableConfig.powerLevels = payload[15]`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ if scriptsCompiled then`
`12`	`12`	`radio = assert(loadScript("radios.lua"))().msp`
`13`	`13`	`assert(loadScript(protocol.mspTransport))()`
`14`	`14`	`assert(loadScript("MSP/common.lua"))()`
	`15`	`+ features = assert(loadScript("features.lua"))()`
`15`	`16`	`run = assert(loadScript("ui.lua"))()`
`16`	`17`	`else`
`17`	`18`	`run = assert(loadScript("COMPILE/compile.lua"))()`

Comments

(0)