Skip to content

Commit 44936c8

Browse files
klutvott123klutvott123
authored
Merge pull request #527 from haslinghuis/filter-update
Update RX lua
2 parents c0eb63a + 261ce0a commit 44936c8

File tree

1 file changed

+28
-23
lines changed

1 file changed

+28
-23
lines changed

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

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,41 +18,46 @@ if apiVersion >= 1.16 then
1818
fields[#fields + 1] = { t = "High", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 1000, max = 2000, vals = { 2, 3 } }
1919
end
2020

21-
if apiVersion >= 1.44 then
21+
if apiVersion >= 1.20 and apiVersion <= 1.42 then
22+
fields[#fields + 1] = { t = "Interpolation", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 3, vals = { 13 }, table={ [0]="Off", "Preset", "Auto", "Manual"} }
23+
fields[#fields + 1] = { t = "Interval", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 1, max = 50, vals = { 14 } }
24+
end
25+
26+
if apiVersion >= 1.31 then
27+
fields[#fields + 1] = { t = "Cam Angle", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 90, vals = { 23 } }
28+
end
29+
30+
if apiVersion >= 1.47 then
31+
labels[#labels + 1] = { t = "RC Smoothing", x = x, y = inc.y(lineSpacing) }
32+
fields[#fields + 1] = { t = "Mode", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 25 }, table = { [0] = "ON", "OFF" } }
33+
labels[#labels + 1] = { t = "Cutoffs", x = x + indent, y = inc.y(lineSpacing) }
34+
fields[#fields + 1] = { t = "Setpoint", x = x + indent*2, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 255, vals = { 26 }, table = { [0] = "Auto" } }
35+
labels[#labels + 1] = { t = "Auto Smoothness", x = x + indent, y = inc.y(lineSpacing) }
36+
fields[#fields + 1] = { t = "Setpoint AF", x = x + indent*2, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 250, vals = { 31 } }
37+
elseif apiVersion >= 1.44 then
2238
labels[#labels + 1] = { t = "RC Smoothing", x = x, y = inc.y(lineSpacing) }
2339
fields[#fields + 1] = { t = "Mode", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 25 }, table = { [0] = "ON", "OFF" } }
2440
labels[#labels + 1] = { t = "Cutoffs", x = x + indent, y = inc.y(lineSpacing) }
2541
fields[#fields + 1] = { t = "Setpoint", x = x + indent*2, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 255, vals = { 26 }, table = { [0] = "Auto" } }
2642
fields[#fields + 1] = { t = "Feedforward", x = x + indent*2, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 255, vals = { 27 }, table = { [0] = "Auto" } }
2743
labels[#labels + 1] = { t = "Auto Smoothness", x = x + indent, y = inc.y(lineSpacing) }
28-
fields[#fields + 1] = { t = "Setpoint", x = x + indent*2, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 250, vals = { 31 } }
29-
else
30-
if apiVersion >= 1.40 then
31-
labels[#labels + 1] = { t = "RC Smoothing", x = x, y = inc.y(lineSpacing) }
32-
fields[#fields + 1] = { t = "Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 25 }, table = { [0] = "Interpolation", "Filter" } }
33-
fields[#fields + 1] = { t = "Channels", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 4, vals = { 24 }, table = { [0] = "RP", "RPY", "RPYT", "T", "RT" } }
34-
labels[#labels + 1] = { t = "Input Filter", x = x, y = inc.y(lineSpacing) }
35-
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 255, vals = { 26 }, table = { [0] = "Auto" } }
36-
fields[#fields + 1] = { t = "Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 28 }, table = { [0] = "PT1", "BIQUAD"} }
37-
labels[#labels + 1] = { t = "Derivative Filter", x = x, y = inc.y(lineSpacing) }
38-
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 255, vals = { 27 }, table = { [0] = "Auto" } }
39-
fields[#fields + 1] = { t = "Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 3, vals = { 29 }, table = { [0] = "Off", "PT1", "BIQUAD", "Auto"} }
40-
end
41-
42-
if apiVersion >= 1.20 then
43-
fields[#fields + 1] = { t = "Interpolation", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 3, vals = { 13 }, table={ [0]="Off", "Preset", "Auto", "Manual"} }
44-
fields[#fields + 1] = { t = "Interval", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 1, max = 50, vals = { 14 } }
45-
end
44+
fields[#fields + 1] = { t = "Setpoint AF", x = x + indent*2, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 250, vals = { 31 } }
45+
elseif apiVersion >= 1.40 then
46+
labels[#labels + 1] = { t = "RC Smoothing", x = x, y = inc.y(lineSpacing) }
47+
fields[#fields + 1] = { t = "Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 25 }, table = { [0] = "Interpolation", "Filter" } }
48+
fields[#fields + 1] = { t = "Channels", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 4, vals = { 24 }, table = { [0] = "RP", "RPY", "RPYT", "T", "RT" } }
49+
labels[#labels + 1] = { t = "Input Filter", x = x, y = inc.y(lineSpacing) }
50+
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 255, vals = { 26 }, table = { [0] = "Auto" } }
51+
fields[#fields + 1] = { t = "Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 28 }, table = { [0] = "PT1", "BIQUAD"} }
52+
labels[#labels + 1] = { t = "Derivative Filter", x = x, y = inc.y(lineSpacing) }
53+
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 255, vals = { 27 }, table = { [0] = "Auto" } }
54+
fields[#fields + 1] = { t = "Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 3, vals = { 29 }, table = { [0] = "Off", "PT1", "BIQUAD", "Auto"} }
4655

4756
if apiVersion >= 1.42 then
4857
fields[#fields + 1] = { t = "Auto Smoothness", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 50, vals = { 31 } }
4958
end
5059
end
5160

52-
if apiVersion >= 1.31 then
53-
fields[#fields + 1] = { t = "Cam Angle", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 90, vals = { 23 } }
54-
end
55-
5661
return {
5762
read = 44, -- MSP_RX_CONFIG
5863
write = 45, -- MSP_SET_RX_CONFIG

0 commit comments

Comments
 (0)