Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 61d3029

Browse files
Create empty vtx table if not available
1 parent 3ea553e commit 61d3029

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

‎src/SCRIPTS/BF/PAGES/vtx.lua

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ local labels = {}
1212
local fields = {}
1313

1414
local vtx_tables
15-
local f = loadScript("VTX_TABLES/"..mcuId..".lua")
16-
if apiVersion >= 1.42 and f then
17-
vtx_tables = f()
15+
if apiVersion >= 1.42 then
16+
vtx_tables = assert(loadScript("VTX_TABLES/"..mcuId..".lua"))()
1817
else
1918
vtx_tables = assert(loadScript("VTX_TABLES/vtx_defaults.lua"))()
2019
end

‎src/SCRIPTS/BF/vtx_tables.lua

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ local MSP_VTX_CONFIG = 88
22
local MSP_VTXTABLE_BAND = 137
33
local MSP_VTXTABLE_POWERLEVEL = 138
44

5-
local vtxAvailable = true
65
local vtxTableAvailable = false
76
local vtxConfigReceived = false
87
local vtxFrequencyTableReceived = false
@@ -12,7 +11,6 @@ local requestedBand = 1
1211
local requestedPowerLevel = 1
1312
local vtxTableConfig = {}
1413
local frequencyTable = {}
15-
local frequenciesPerBand = 0
1614
local bandTable = {}
1715
local powerTable = {}
1816

@@ -22,7 +20,15 @@ local INTERVAL = 100
2220
local function processMspReply(cmd, payload, err)
2321
if cmd == MSP_VTX_CONFIG then
2422
if err then
25-
vtxAvailable = false
23+
-- Vtx not available. Create empty vtx table to skip future download attempts
24+
frequencyTable[1] = {}
25+
vtxTableConfig.channels = 0
26+
bandTable = { [0] = "U", "1" }
27+
powerTable = { "LV0" }
28+
vtxConfigReceived = true
29+
vtxTableAvailable = true
30+
vtxFrequencyTableReceived = true
31+
vtxPowerTableReceived = true
2632
return
2733
end
2834
vtxConfigReceived = true
@@ -118,7 +124,7 @@ local function getVtxTables()
118124
end
119125
mspProcessTxQ()
120126
processMspReply(mspPollReply())
121-
return vtxTablesReceivedornotvtxAvailable
127+
return vtxTablesReceived
122128
end
123129

124130
return { f = getVtxTables, t = "Downloading VTX tables" }

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /