Skip to content

Commit f1b8363

Browse files
mikellermikeller
authored
Merge pull request #188 from mikeller/add_api_version_detection
Added API version detection.
2 parents 75aa8af + 6a0d86d commit f1b8363

File tree

9 files changed

+81
-78
lines changed

9 files changed

+81
-78
lines changed

‎src/SCRIPTS/BF/HORUS/gpspids.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ return {
55
reboot = false,
66
eepromWrite = true,
77
minBytes = 14,
8+
requiredVersion = 1.041,
89
text = {
910
{ t = "P", x = 142, y = 48, to = MIDSIZE },
1011
{ t = "I", x = 244, y = 48, to = MIDSIZE },
@@ -25,4 +26,4 @@ return {
2526
{ x = 340, y = 100, min = 0, max = 200, vals = { 5, 6 }, to = MIDSIZE },
2627
{ x = 340, y = 150, min = 0, max = 200, vals = { 11,12 }, to = MIDSIZE },
2728
},
28-
}
29+
}

‎src/SCRIPTS/BF/HORUS/rescue.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ return {
55
reboot = false,
66
eepromWrite = true,
77
minBytes = 16,
8+
requiredVersion = 1.041,
89
text = {
910
{ t = "Min Sats.", x =130, y = 40, to = MIDSIZE },
1011
{ t = "Angle", x =150, y = 80, to = MIDSIZE },
@@ -32,4 +33,4 @@ return {
3233
{ x = 400, y = 200, min = 1000, max = 2000, vals = { 11,12 }, to = MIDSIZE },
3334

3435
},
35-
}
36+
}

‎src/SCRIPTS/BF/X7/gpspids.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ return {
66
reboot = false,
77
eepromWrite = true,
88
minBytes = 14,
9+
requiredVersion = 1.041,
910
text = {
1011
{ t = "P", x = 55, y = 14, to=SMLSIZE },
1112
{ t = "I", x = 83, y = 14, to=SMLSIZE },
@@ -26,4 +27,4 @@ return {
2627
{ x = 107, y = 26, min = 0, max = 200, vals = { 5,6 }, to=SMLSIZE },
2728
{ x = 107, y = 36, min = 0, max = 200, vals = { 11,12 }, to=SMLSIZE },
2829
},
29-
}
30+
}

‎src/SCRIPTS/BF/X7/rescue.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ return {
66
reboot = false,
77
eepromWrite = true,
88
minBytes = 16,
9+
requiredVersion = 1.041,
910
text = {
1011

1112
{ t = "Min Sats.", x = 3, y = 10, to=SMLSIZE },
@@ -32,4 +33,4 @@ return {
3233
{ x = 105, y = 40, min = 1000, max = 2000, vals = { 13,14 }, to = SMLSIZE },
3334
{ x = 105, y = 50, min = 1000, max = 2000, vals = { 11,12 }, to = SMLSIZE },
3435
},
35-
}
36+
}

‎src/SCRIPTS/BF/X9/gpspids.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ return {
55
reboot = false,
66
eepromWrite = true,
77
minBytes = 14,
8+
requiredVersion = 1.041,
89
text = {
910
{ t = "P", x = 70, y = 14, to = SMLSIZE },
1011
{ t = "I", x = 98, y = 14, to = SMLSIZE },
@@ -26,4 +27,4 @@ return {
2627
{ x = 122, y = 36, min = 0, max = 500, vals = { 11,12 }, to = SMLSIZE },
2728

2829
},
29-
}
30+
}

‎src/SCRIPTS/BF/X9/rescue.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ return {
55
reboot = false,
66
eepromWrite = true,
77
minBytes = 16,
8+
requiredVersion = 1.041,
89

910

1011
text = {
@@ -35,4 +36,4 @@ return {
3536
{ x = 150, y = 56, min = 1000, max = 2000, vals = { 11,12 }, to = SMLSIZE },
3637

3738
},
38-
}
39+
}

‎src/SCRIPTS/BF/background.lua‎

Lines changed: 64 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
local INTERVAL = 50 -- in 1/100th seconds
2-
local MSP_SET_RTC = 246
2+
local MSP_API_VERSION = 1
33
local MSP_TX_INFO = 186
4+
local MSP_SET_RTC = 246
45

56
local lastRunTS
67
local sensorId = -1
8+
local apiVersionReceived = false
79
local timeIsSet = false
8-
local mspMsgQueued = false
910

1011
local function getSensorValue()
1112
if sensorId == -1 then
@@ -25,87 +26,87 @@ local function init()
2526
lastRunTS = 0
2627
end
2728

29+
local function processMspReply(cmd,rx_buf)
30+
if cmd == nil or rx_buf == nil then
31+
return
32+
end
33+
if cmd == MSP_API_VERSION and #(rx_buf) >= 3 then
34+
apiVersion = rx_buf[2] + rx_buf[3] / 1000
35+
36+
apiVersionReceived = true
37+
end
38+
end
39+
2840
local function run_bg()
2941
-- run in intervals
30-
3142
if lastRunTS == 0 or lastRunTS + INTERVAL < getTime() then
32-
mspMsgQueued = false
33-
-- ------------------------------------
34-
-- SYNC DATE AND TIME
35-
-- ------------------------------------
3643
local sensorValue = getSensorValue()
37-
38-
if not timeIsSet and modelActive(sensorValue) then
39-
-- Send datetime when the telemetry connection is available
44+
if modelActive(sensorValue) then
45+
-- Send data when the telemetry connection is available
4046
-- assuming when sensor value higher than 0 there is an telemetry connection
41-
-- only send datetime one time after telemetry connection became available
42-
-- or when connection is restored after e.g. lipo refresh
47+
if not apiVersionReceived then
48+
protocol.mspRead(MSP_API_VERSION)
49+
50+
processMspReply(mspPollReply())
51+
elseif apiVersionReceived and not timeIsSet then
52+
-- only send datetime one time after telemetry connection became available
53+
-- or when connection is restored after e.g. lipo refresh
54+
55+
if apiVersion >= 1.041 then
56+
-- format: seconds after the epoch (32) / milliseconds (16)
57+
local now = getRtcTime()
58+
59+
values = {}
60+
61+
for i = 1, 4 do
62+
values[i] = bit32.band(now, 0xFF)
63+
now = bit32.rshift(now, 8)
64+
end
65+
66+
values[5] = 0 -- we don't have milliseconds
67+
values[6] = 0
68+
else
69+
-- format: year (16) / month (8) / day (8) / hour (8) / min (8) / sec (8)
70+
local now = getDateTime()
71+
local year = now.year;
72+
73+
values = {}
74+
values[1] = bit32.band(year, 0xFF)
75+
year = bit32.rshift(year, 8)
76+
values[2] = bit32.band(year, 0xFF)
77+
values[3] = now.mon
78+
values[4] = now.day
79+
values[5] = now.hour
80+
values[6] = now.min
81+
values[7] = now.sec
82+
end
4383

44-
if API_VERSION < 1.041 then
45-
-- format: year (16) / month (8) / day (8) / hour (8) / min (8) / sec (8)
46-
local now = getDateTime()
47-
local year = now.year;
84+
protocol.mspWrite(MSP_SET_RTC, values)
4885

49-
values = {}
50-
values[1] = bit32.band(year, 0xFF)
51-
year = bit32.rshift(year, 8)
52-
values[2] = bit32.band(year, 0xFF)
53-
values[3] = now.mon
54-
values[4] = now.day
55-
values[5] = now.hour
56-
values[6] = now.min
57-
values[7] = now.sec
86+
timeIsSet = true
5887
else
59-
-- format: seconds after the epoch (32) / milliseconds (16)
60-
local now = getRtcTime()
88+
local rssi, alarm_low, alarm_crit = getRSSI()
89+
-- Scale the [0, 85] (empirical) RSSI values to [0, 255]
90+
rssi = rssi * 3
91+
if rssi > 255 then
92+
rssi = 255
93+
end
6194

6295
values = {}
96+
values[1] = rssi
6397

64-
for i = 1, 4 do
65-
values[i] = bit32.band(now, 0xFF)
66-
now = bit32.rshift(now, 8)
67-
end
68-
69-
values[5] = 0 -- we don't have milliseconds
70-
values[6] = 0
98+
protocol.mspWrite(MSP_TX_INFO, values)
7199
end
72-
73-
-- send msp message
74-
protocol.mspWrite(MSP_SET_RTC, values)
75-
mspMsgQueued = true
76-
77-
timeIsSet = true
78-
elseif not modelActive(sensorValue) then
100+
else
101+
apiVersionReceived = false
79102
timeIsSet = false
80103
end
81104

82-
83-
-- ------------------------------------
84-
-- SEND RSSI VALUE
85-
-- ------------------------------------
86-
87-
if mspMsgQueued == false then
88-
local rssi, alarm_low, alarm_crit = getRSSI()
89-
-- Scale the [0, 85] (empirical) RSSI values to [0, 255]
90-
rssi = rssi * 3
91-
if rssi > 255 then
92-
rssi = 255
93-
end
94-
95-
values = {}
96-
values[1] = rssi
97-
98-
-- send msp message
99-
protocol.mspWrite(MSP_TX_INFO, values)
100-
mspMsgQueued = true
101-
end
102-
103105
lastRunTS = getTime()
104106
end
105107

106108
-- process queue
107109
mspProcessTxQ()
108-
109110
end
110111

111112
return { init=init, run_bg=run_bg }

‎src/SCRIPTS/BF/ui.lua‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,8 +336,11 @@ function run_ui(event)
336336
incValue(-1)
337337
end
338338
end
339-
if Page == nil then
339+
while Page == nil do
340340
Page = assert(loadScript(radio.templateHome .. PageFiles[currentPage]))()
341+
if Page.requiredVersion and Page.requiredVersion > apiVersion then
342+
incPage(1)
343+
end
341344
end
342345
if not Page.values and currentState == pageStatus.display then
343346
requestPage()

‎src/SCRIPTS/TELEMETRY/bf.lua‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
SCRIPT_HOME = "/SCRIPTS/BF"
22

3-
-- Change this to match the API version of the firmware you are using
4-
-- (you can have multiple copies of this script with different values
5-
-- for API_VERSION, and select different versions for different models
6-
-- on your TX)
7-
-- Version mapping:
8-
-- 1.041: Betaflight 4.0 and newer
9-
-- <1.041: Betaflight 3.5 and older
10-
API_VERSION = 1.040
3+
apiVersion = 0
114

125
protocol = assert(loadScript(SCRIPT_HOME.."/protocols.lua"))()
136
radio = assert(loadScript(SCRIPT_HOME.."/radios.lua"))()

0 commit comments

Comments
 (0)