Skip to content

Commit 2102034

Browse files
mikellermikeller
authored
Merge pull request #394 from klutvott123/rc-update
2 parents 2d8f33c + 025686d commit 2102034

File tree

2 files changed

+34
-30
lines changed

2 files changed

+34
-30
lines changed

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,13 @@ if apiVersion >= 1.040 then
4848
end
4949

5050
if apiVersion >= 1.040 then
51-
labels[#labels + 1] = { t = "Feedforward", x = x, y = inc.y(lineSpacing) }
52-
fields[#fields + 1] = { t = "Transition", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 100, vals = { 9 }, scale = 100 }
53-
end
54-
55-
if apiVersion >= 1.044 then
56-
labels[#labels + 1] = { t = "FF Interpolate", x = x, y = inc.y(lineSpacing) }
57-
fields[#fields + 1] = { t = "Mode", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 4, vals = { 51 }, table = { [0] = "OFF", "ON", "AVG_2", "AVG_3", "AVG_4" } }
58-
fields[#fields + 1] = { t = "Smoothness", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 75, vals = { 52 } }
59-
fields[#fields + 1] = { t = "Boost", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 50, vals = { 53 } }
51+
labels[#labels + 1] = { t = "Feedforward", x = x, y = inc.y(lineSpacing) }
52+
fields[#fields + 1] = { t = "Transition", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 100, vals = { 9 }, scale = 100 }
53+
if apiVersion >= 1.044 then
54+
fields[#fields + 1] = { t = "Averaging", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 3, vals = { 51 }, table = { [0] = "OFF", "2_POINT", "3_POINT", "4_POINT" } }
55+
fields[#fields + 1] = { t = "Smoothness", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 75, vals = { 52 } }
56+
fields[#fields + 1] = { t = "Boost", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 50, vals = { 53 } }
57+
end
6058
end
6159

6260
if apiVersion >= 1.041 then

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

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,29 +23,35 @@ if apiVersion >= 1.016 then
2323
fields[#fields + 1] = { t = "High", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 1000, max = 2000, vals = { 2, 3 } }
2424
end
2525

26-
if apiVersion >= 1.040 then
27-
labels[#labels + 1] = { t = "RC Smoothing", x = x, y = inc.y(lineSpacing) }
28-
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" } }
29-
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" } }
30-
end
31-
32-
if apiVersion >= 1.020 then
33-
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"} }
34-
fields[#fields + 1] = { t = "Interval", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 1, max = 50, vals = { 14 } }
35-
36-
end
26+
if apiVersion >= 1.044 then
27+
labels[#labels + 1] = { t = "RC Smoothing", x = x, y = inc.y(lineSpacing) }
28+
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" } }
29+
labels[#labels + 1] = { t = "Cutoffs", x = x + indent, y = inc.y(lineSpacing) }
30+
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" } }
31+
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" } }
32+
labels[#labels + 1] = { t = "Auto Smoothness", x = x + indent, y = inc.y(lineSpacing) }
33+
fields[#fields + 1] = { t = "Setpoint", x = x + indent*2, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 250, vals = { 31 } }
34+
else
35+
if apiVersion >= 1.040 then
36+
labels[#labels + 1] = { t = "RC Smoothing", x = x, y = inc.y(lineSpacing) }
37+
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" } }
38+
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" } }
39+
labels[#labels + 1] = { t = "Input Filter", x = x, y = inc.y(lineSpacing) }
40+
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 255, vals = { 26 }, table = { [0] = "Auto" } }
41+
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"} }
42+
labels[#labels + 1] = { t = "Derivative Filter", x = x, y = inc.y(lineSpacing) }
43+
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 255, vals = { 27 }, table = { [0] = "Auto" } }
44+
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"} }
45+
end
3746

38-
if apiVersion >= 1.040 then
39-
labels[#labels + 1] = { t = "Input Filter", x = x, y = inc.y(lineSpacing) }
40-
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 255, vals = { 26 }, table = { [0] = "Auto" } }
41-
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"} }
42-
labels[#labels + 1] = { t = "Derivative Filter", x = x, y = inc.y(lineSpacing) }
43-
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 255, vals = { 27 }, table = { [0] = "Auto" } }
44-
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"} }
45-
end
47+
if apiVersion >= 1.020 then
48+
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"} }
49+
fields[#fields + 1] = { t = "Interval", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 1, max = 50, vals = { 14 } }
50+
end
4651

47-
if apiVersion >= 1.042 then
48-
fields[#fields + 1] = { t = "Auto Smoothness", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 50, vals = { 31 } }
52+
if apiVersion >= 1.042 then
53+
fields[#fields + 1] = { t = "Auto Smoothness", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 50, vals = { 31 } }
54+
end
4955
end
5056

5157
if apiVersion >= 1.031 then

0 commit comments

Comments
 (0)