Commit bd1e7c4

committed

Hide OSD (SD) settings

1 parent 686a485 commit bd1e7c4Copy full SHA for bd1e7c4

File tree

+16

-10

lines changed

+16

-10

lines changed

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,7 @@`
`1`	`1`	`local template = assert(loadScript(radio.template))()`
`2`	`2`	`local margin = template.margin`
`3`		`-local indent = template.indent`
`4`	`3`	`local lineSpacing = template.lineSpacing`
`5`	`4`	`local tableSpacing = template.tableSpacing`
`6`		`-local sp = template.listSpacing.field`
`7`	`5`	`local yMinLim = radio.yMinLimit`
`8`	`6`	`local x = margin`
`9`	`7`	`local y = yMinLim - lineSpacing`
`@@ -133,12 +131,12 @@ return {`
`133`	`131`	`self.values[3] = bit32.rshift(combineValue, 8)`
`134`	`132`	`return self.values`
`135`	`133`	`end,`
`136`		`- checkProfile = function(self, value, profileFirst, profileSecond, profileThird)`
	`134`	`+ checkProfile = function(_, value, profileFirst, profileSecond, profileThird)`
`137`	`135`	`local profiles = profileFirst + bit32.lshift(profileSecond, 1) + bit32.lshift(profileThird, 2)`
`138`	`136`	`local output = bit32.replace(value, profiles, 11, 3)`
`139`	`137`	`return output`
`140`	`138`	`end,`
`141`		`- splitVal = function(self, inputFirstVal, inputSecondVal)`
	`139`	`+ splitVal = function(_, inputFirstVal, inputSecondVal)`
`142`	`140`	`local inputVal = inputFirstVal + bit32.lshift(inputSecondVal, 8)`
`143`	`141`	`local profiles = bit32.extract(inputVal, 11, 3)`
`144`	`142`	`local fieldPos = bit32.extract(inputVal, 0, 11)`

Lines changed: 3 additions & 2 deletions

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,10 @@`
`1`	`1`	`local MSP_GPS_CONFIG = 135`
`2`	`2`	`local MSP_VTX_CONFIG = 88`
	`3`	`+local MSP_OSD_CONFIG = 84`
`3`	`4`
`4`	`5`	`local isGpsRead = false`
`5`	`6`	`local isVtxRead = false`
	`7`	`+local isOsdSDRead = false`
`6`	`8`
`7`	`9`	`local lastRunTS = 0`
`8`	`10`	`local INTERVAL = 100`
`@@ -22,6 +24,10 @@ local function processMspReply(cmd, payload, err)`
`22`	`24`	`isVtxRead = true`
`23`	`25`	`local vtxTableAvailable = payload[12] ~= 0`
`24`	`26`	`features.vtx = isOkay and vtxTableAvailable`
	`27`	`+ elseif cmd == MSP_OSD_CONFIG then`
	`28`	`+ isOsdSDRead = true`
	`29`	`+ local osdSDAvailable = payload[1] ~= 0`
	`30`	`+ features.osdSD = isOkay and osdSDAvailable`
`25`	`31`	`end`
`26`	`32`	`end`
`27`	`33`
`@@ -35,16 +41,17 @@ local function updateFeatures()`
`35`	`41`	`elseif not isVtxRead then`
`36`	`42`	`cmd = MSP_VTX_CONFIG`
`37`	`43`	`returnTable.t = "Checking VTX..."`
	`44`	`+ elseif not isOsdSDRead then`
	`45`	`+ cmd = MSP_OSD_CONFIG`
	`46`	`+ returnTable.t = "Checking OSD (SD)..."`
`38`	`47`	`end`
`39`	`48`	`if cmd then`
`40`	`49`	`protocol.mspRead(cmd)`
`41`		`- else`
`42`		`- return true`
`43`	`50`	`end`
`44`	`51`	`end`
`45`	`52`	`mspProcessTxQ()`
`46`	`53`	`processMspReply(mspPollReply())`
`47`		`- return false`
	`54`	`+ return isGpsReadandisVtxReadandisOsdSDRead`
`48`	`55`	`end`
`49`	`56`
`50`	`57`	`returnTable.f = updateFeatures`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ if apiVersion >= 1.16 then`
`60`	`60`	`PageFiles[#PageFiles + 1] = { title = "Trim Accelerometer", script = "acc_trim.lua" }`
`61`	`61`	`end`
`62`	`62`
`63`		`-if apiVersion >= 1.45 then`
	`63`	`+if apiVersion >= 1.45 andfeatures.osdSDthen`
`64`	`64`	`PageFiles[#PageFiles + 1] = { title = "OSD Elements", script = "pos_osd.lua" }`
`65`	`65`	`end`
`66`	`66`

Comments

(0)