Commit 686a485

authored

Merge pull request #500 from atomgomba/skip-board-info-if-possible

Download board info only if necessary

2 parents c3c095f + 1c0f49d commit 686a485Copy full SHA for 686a485

File tree

+42

-12

lines changed

+42

-12

lines changed

Lines changed: 21 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,21 @@`
	`1`	`+local template = assert(loadScript(radio.template))()`
	`2`	`+local margin = template.margin`
	`3`	`+local lineSpacing = template.lineSpacing`
	`4`	`+local yMinLim = radio.yMinLimit`
	`5`	`+local x = margin`
	`6`	`+local y = yMinLim - lineSpacing`
	`7`	`+local inc = { x = function(val) x = x + val return x end, y = function(val) y = y + val return y end }`
	`8`	`+local labels = {}`
	`9`	`+local fields = {}`
	`10`	`+`
	`11`	`+labels[#labels + 1] = { t = "Download Board Info? Press", x = x, y = inc.y(lineSpacing) }`
	`12`	`+labels[#labels + 1] = { t = "[ENTER] to download, or", x = x, y = inc.y(lineSpacing) }`
	`13`	`+labels[#labels + 1] = { t = "[EXIT] to cancel.", x = x, y = inc.y(lineSpacing) }`
	`14`	`+fields[#fields + 1] = { x = x, y = inc.y(lineSpacing), value = "", ro = true }`
	`15`	`+`
	`16`	`+return {`
	`17`	`+ title = "Board Info",`
	`18`	`+ labels = labels,`
	`19`	`+ fields = fields,`
	`20`	`+ init = assert(loadScript("board_info.lua"))(),`
	`21`	`+}`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,15 @@`
	`1`	`+local function precondition()`
	`2`	`+ if apiVersion < 1.44 then`
	`3`	`+ -- BOARD_INFO is unavailable below 1.44`
	`4`	`+ return nil`
	`5`	`+ end`
	`6`	`+ local hasBoardInfo = loadScript("BOARD_INFO/"..mcuId..".lua")`
	`7`	`+ collectgarbage()`
	`8`	`+ if hasBoardInfo then`
	`9`	`+ return nil`
	`10`	`+ else`
	`11`	`+ return "CONFIRM/pwm.lua"`
	`12`	`+ end`
	`13`	`+end`
	`14`	`+`
	`15`	`+return precondition()`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ if apiVersion >= 1.42 then`
`37`	`37`	`end`
`38`	`38`
`39`	`39`	`if apiVersion >= 1.16 then`
`40`		`- PageFiles[#PageFiles + 1] = { title = "System / Motor", script = "pwm.lua" }`
	`40`	`+ PageFiles[#PageFiles + 1] = { title = "System / Motor", script = "pwm.lua", init="PAGES/INIT/pwm.lua" }`
`41`	`41`	`end`
`42`	`42`
`43`	`43`	`if apiVersion >= 1.16 then`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,9 @@ local function createPopupMenu()`
`94`	`94`	`if apiVersion >= 1.42 then`
`95`	`95`	`popupMenu[#popupMenu + 1] = { t = "vtx tables", f = function() confirm("CONFIRM/vtx_tables.lua") end }`
`96`	`96`	`end`
	`97`	`+ if apiVersion >= 1.44 then`
	`98`	`+ popupMenu[#popupMenu + 1] = { t = "board info", f = function() confirm("CONFIRM/pwm.lua") end }`
	`99`	`+ end`
`97`	`100`	`end`
`98`	`101`
`99`	`102`	`local function processMspReply(cmd,rx_buf,err)`

Lines changed: 2 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`local apiVersionReceived = false`
`2`	`2`	`local mcuIdReceived = false`
`3`		`-local boardInfoReceived = false`
`4`	`3`	`local featuresReceived = false`
`5`		`-local getApiVersion, getMCUId, getBoardInfo, getFeaturesInfo`
	`4`	`+local getApiVersion, getMCUId, getFeaturesInfo`
`6`	`5`	`local returnTable = { f = nil, t = "" }`
`7`	`6`
`8`	`7`	`local function init()`
`@@ -24,14 +23,6 @@ local function init()`
`24`	`23`	`getMCUId = nil`
`25`	`24`	`collectgarbage()`
`26`	`25`	`end`
`27`		`- elseif not boardInfoReceived and apiVersion >= 1.44 then`
`28`		`- getBoardInfo = getBoardInfo or assert(loadScript("board_info.lua"))()`
`29`		`- returnTable.t = getBoardInfo.t`
`30`		`- boardInfoReceived = getBoardInfo.f()`
`31`		`- if boardInfoReceived then`
`32`		`- getBoardInfo = nil`
`33`		`- collectgarbage()`
`34`		`- end`
`35`	`26`	`elseif not featuresReceived and apiVersion >= 1.41 then`
`36`	`27`	`getFeaturesInfo = getFeaturesInfo or assert(loadScript("features_info.lua"))()`
`37`	`28`	`returnTable.t = getFeaturesInfo.t`
`@@ -43,7 +34,7 @@ local function init()`
`43`	`34`	`else`
`44`	`35`	`return true`
`45`	`36`	`end`
`46`		`- return apiVersionReceived and vtxTablesReceivedandmcuIdandboardInfoReceived and featuresReceived`
	`37`	`+ return apiVersionReceived and mcuId and featuresReceived`
`47`	`38`	`end`
`48`	`39`
`49`	`40`	`returnTable.f = init`

Comments

(0)