Skip to content

Commit eea97b7

Browse files
mikellermikeller
authored
Allow text for fields (#291)
Allow text for fields
2 parents a4963f9 + 5fff82b commit eea97b7

File tree

10 files changed

+90
-169
lines changed

10 files changed

+90
-169
lines changed

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

Lines changed: 23 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -18,96 +18,73 @@ local fields = {}
1818

1919
if apiVersion >= 1.041 then
2020
labels[#labels + 1] = { t = "Gyro Lowpass 1 Dynamic", x = x, y = inc.y(lineSpacing) }
21-
labels[#labels + 1] = { t = "Min Cutoff", x = x + indent, y = inc.y(lineSpacing) }
22-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1000, vals = { 30, 31 } }
23-
labels[#labels + 1] = { t = "Max Cutoff", x = x + indent, y = inc.y(lineSpacing) }
24-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1000, vals = { 32, 33 } }
25-
labels[#labels + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing) }
26-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1, vals = { 25 }, table = { [0] = "PT1", [1] = "BIQUAD" } }
21+
fields[#fields + 1] = { t = "Min Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1000, vals = { 30, 31 } }
22+
fields[#fields + 1] = { t = "Max Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1000, vals = { 32, 33 } }
23+
fields[#fields + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 25 }, table = { [0] = "PT1", [1] = "BIQUAD" } }
2724
end
2825

2926
if apiVersion >= 1.016 then
3027
labels[#labels + 1] = { t = "Gyro Lowpass 1", x = x, y = inc.y(lineSpacing) }
3128
if apiVersion >= 1.039 then
32-
labels[#labels + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing) }
33-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 16000, vals = { 21, 22 } }
34-
labels[#labels + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing) }
35-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1, vals = { 25 }, table = { [0] = "PT1", [1] = "BIQUAD" } }
29+
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 21, 22 } }
30+
fields[#fields + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 25 }, table = { [0] = "PT1", [1] = "BIQUAD" } }
3631
else
37-
labels[#labels + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing) }
38-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 255, vals = { 1 } }
32+
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 255, vals = { 1 } }
3933
end
4034
end
4135

4236
if apiVersion >= 1.039 then
4337
labels[#labels + 1] = { t = "Gyro Lowpass 2", x = x, y = inc.y(lineSpacing) }
44-
labels[#labels + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing) }
45-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 16000, vals = { 23, 24 } }
46-
labels[#labels + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing) }
47-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1, vals = { 26 }, table = { [0] = "PT1", [1] = "BIQUAD" } }
38+
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 23, 24 } }
39+
fields[#fields + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 26 }, table = { [0] = "PT1", [1] = "BIQUAD" } }
4840
end
4941

5042
if apiVersion >= 1.020 then
5143
labels[#labels + 1] = { t = "Gyro Notch 1", x = x, y = inc.y(lineSpacing) }
52-
labels[#labels + 1] = { t = "Center", x = x + indent, y = inc.y(lineSpacing) }
53-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 16000, vals = { 6, 7 } }
54-
labels[#labels + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing) }
55-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 16000, vals = { 8, 9 } }
44+
fields[#fields + 1] = { t = "Center", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 6, 7 } }
45+
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 8, 9 } }
5646
end
5747

5848
if apiVersion >= 1.021 then
5949
labels[#labels + 1] = { t = "Gyro Notch 2", x = x, y = inc.y(lineSpacing) }
60-
labels[#labels + 1] = { t = "Center", x = x + indent, y = inc.y(lineSpacing) }
61-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 16000, vals = { 14, 15 } }
62-
labels[#labels + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing) }
63-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 16000, vals = { 16, 17 } }
50+
fields[#fields + 1] = { t = "Center", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 14, 15 } }
51+
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 16, 17 } }
6452
end
6553

6654
if apiVersion >= 1.041 then
6755
labels[#labels + 1] = { t = "D Term Lowpass 1 Dynamic", x = x, y = inc.y(lineSpacing) }
68-
labels[#labels + 1] = { t = "Min Cutoff", x = x + indent, y = inc.y(lineSpacing) }
69-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1000, vals = { 34, 35 } }
70-
labels[#labels + 1] = { t = "Max Cutoff", x = x + indent, y = inc.y(lineSpacing) }
71-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1000, vals = { 36, 37 } }
72-
labels[#labels + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing) }
73-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1, vals = { 18 }, table = { [0] = "PT1", [1] = "BIQUAD" } }
56+
fields[#fields + 1] = { t = "Min Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1000, vals = { 34, 35 } }
57+
fields[#fields + 1] = { t = "Max Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1000, vals = { 36, 37 } }
58+
fields[#fields + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 18 }, table = { [0] = "PT1", [1] = "BIQUAD" } }
7459
end
7560

7661
if apiVersion >= 1.016 then
7762
labels[#labels + 1] = { t = "D Term Lowpass 1", x = x, y = inc.y(lineSpacing) }
78-
labels[#labels + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing) }
79-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 16000, vals = { 2, 3 } }
63+
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 2, 3 } }
8064
if apiVersion >= 1.036 and apiVersion <= 1.038 then
81-
labels[#labels + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing) }
82-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 2, vals = { 18 }, table = { [0] = "PT1", [1] = "BIQUAD", [2] = "FIR" } }
65+
fields[#fields + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 2, vals = { 18 }, table = { [0] = "PT1", [1] = "BIQUAD", [2] = "FIR" } }
8366
elseif apiVersion >= 1.039 then
84-
labels[#labels + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing) }
85-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1, vals = { 18 }, table = { [0] = "PT1", [1] = "BIQUAD" } }
67+
fields[#fields + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 18 }, table = { [0] = "PT1", [1] = "BIQUAD" } }
8668
end
8769
end
8870

8971
if apiVersion >= 1.039 then
9072
labels[#labels + 1] = { t = "D Term Lowpass 2", x = x, y = inc.y(lineSpacing) }
91-
labels[#labels + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing) }
92-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 16000, vals = { 27, 28 } }
73+
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 27, 28 } }
9374
if apiVersion >= 1.041 then
94-
labels[#labels + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing) }
95-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1, vals = { 29 }, table = { [0] = "PT1", [1] = "BIQUAD" } }
75+
fields[#fields + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 29 }, table = { [0] = "PT1", [1] = "BIQUAD" } }
9676
end
9777
end
9878

9979
if apiVersion >= 1.020 then
10080
labels[#labels + 1] = { t = "D Term Notch", x = x, y = inc.y(lineSpacing) }
101-
labels[#labels + 1] = { t = "Center", x = x + indent, y = inc.y(lineSpacing) }
102-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 16000, vals = { 10, 11 } }
103-
labels[#labels + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing) }
104-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 16000, vals = { 12, 13 } }
81+
fields[#fields + 1] = { t = "Center", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 10, 11 } }
82+
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 12, 13 } }
10583
end
10684

10785
if apiVersion >= 1.016 then
10886
labels[#labels + 1] = { t = "Yaw Lowpass", x = x, y = inc.y(lineSpacing) }
109-
labels[#labels + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing) }
110-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 500, vals = { 4, 5 } }
87+
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 500, vals = { 4, 5 } }
11188
end
11289

11390
return {

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

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,13 @@ local fields = {}
1818

1919
if apiVersion >= 1.042 then
2020
labels[#labels + 1] = { t = "Gyro RPM Filter", x = x, y = inc.y(lineSpacing) }
21-
labels[#labels + 1] = { t = "Harmonics", x = x + indent, y = inc.y(lineSpacing) }
22-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 3, vals = { 44 } }
23-
labels[#labels + 1] = { t = "Min Frequency", x = x + indent, y = inc.y(lineSpacing) }
24-
fields[#fields + 1] = { x = x + sp, y = y, min = 50, max = 200, vals = { 45 } }
21+
fields[#fields + 1] = { t = "Harmonics", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 3, vals = { 44 } }
22+
fields[#fields + 1] = { t = "Min Frequency", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 50, max = 200, vals = { 45 } }
2523
labels[#labels + 1] = { t = "Dynamic Notch Filter", x = x, y = inc.y(lineSpacing) }
26-
labels[#labels + 1] = { t = "Range", x = x + indent, y = inc.y(lineSpacing) }
27-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 3, vals = { 38 }, table = { [0]="HIGH", "MEDIUM", "LOW", "AUTO" } }
28-
labels[#labels + 1] = { t = "Width %", x = x + indent, y = inc.y(lineSpacing) }
29-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 20, vals = { 39 } }
30-
labels[#labels + 1] = { t = "Q", x = x + indent, y = inc.y(lineSpacing) }
31-
fields[#fields + 1] = { x = x + sp, y = y, min = 1, max = 1000, vals = { 40, 41 } }
32-
labels[#labels + 1] = { t = "Min Frequency", x = x + indent, y = inc.y(lineSpacing) }
33-
fields[#fields + 1] = { x = x + sp, y = y, min = 60, max = 1000, vals = { 42, 43 } }
24+
fields[#fields + 1] = { t = "Range", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 3, vals = { 38 }, table = { [0]="HIGH", "MEDIUM", "LOW", "AUTO" } }
25+
fields[#fields + 1] = { t = "Width %", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 20, vals = { 39 } }
26+
fields[#fields + 1] = { t = "Q", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 1, max = 1000, vals = { 40, 41 } }
27+
fields[#fields + 1] = { t = "Min Frequency", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 60, max = 1000, vals = { 42, 43 } }
3428
end
3529

3630
return {

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

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,53 +18,40 @@ local fields = {}
1818

1919
if apiVersion >= 1.040 then
2020
labels[#labels + 1] = { t = "Acro Trainer", x = x, y = inc.y(lineSpacing) }
21-
labels[#labels + 1] = { t = "Angle Limit", x = x + indent, y = inc.y(lineSpacing) }
22-
fields[#fields + 1] = { x = x + sp, y = y, min = 20, max = 80, vals = { 32 } }
23-
labels[#labels + 1] = { t = "Throttle Boost", x = x, y = inc.y(lineSpacing) }
24-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 100, vals = { 31 } }
25-
labels[#labels + 1] = { t = "Absolute Control", x = x, y = inc.y(lineSpacing) }
26-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 20, vals = { 30 } }
27-
labels[#labels + 1] = { t = "I Term Rotation", x = x, y = inc.y(lineSpacing) }
28-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1, vals = { 26 }, table = { [0]="OFF", "ON" } }
21+
fields[#fields + 1] = { t = "Angle Limit", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 20, max = 80, vals = { 32 } }
22+
fields[#fields + 1] = { t = "Throttle Boost", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 100, vals = { 31 } }
23+
fields[#fields + 1] = { t = "Absolute Control", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 20, vals = { 30 } }
24+
fields[#fields + 1] = { t = "I Term Rotation", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 26 }, table = { [0]="OFF", "ON" } }
2925
end
3026

3127
if apiVersion >= 1.016 then
32-
labels[#labels + 1] = { t = "VBAT Compensation", x = x, y = inc.y(lineSpacing) }
33-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1, vals = { 8 }, table = { [0]="OFF", "ON" } }
28+
fields[#fields + 1] = { t = "VBAT Compensation", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 8 }, table = { [0]="OFF", "ON" } }
3429
end
3530

3631
if apiVersion >= 1.040 and apiVersion <= 1.041 then
37-
labels[#labels + 1] = { t = "Smart Feedforward", x = x, y = inc.y(lineSpacing) }
38-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1, vals = { 27 }, table = { [0] = "OFF", "ON" } }
32+
fields[#fields + 1] = { t = "Smart Feedforward", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 27 }, table = { [0] = "OFF", "ON" } }
3933
end
4034

4135
if apiVersion >= 1.040 then
4236
labels[#labels + 1] = { t = "I Term Relax", x = x, y = inc.y(lineSpacing) }
43-
labels[#labels + 1] = { t = "Axes", x = x + indent, y = inc.y(lineSpacing) }
44-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 4, vals = { 28 }, table = { [0]="NONE", "RP", "RPY", "RP (inc)", "RPY (inc)" } }
45-
labels[#labels + 1] = { t = "Type", x = x + indent, y = inc.y(lineSpacing) }
46-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1, vals = { 29 }, table = { [0]="Gyro", "Setpoint" } }
37+
fields[#fields + 1] = { t = "Axes", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 4, vals = { 28 }, table = { [0]="NONE", "RP", "RPY", "RP (inc)", "RPY (inc)" } }
38+
fields[#fields + 1] = { t = "Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 29 }, table = { [0]="Gyro", "Setpoint" } }
4739
if apiVersion >= 1.042 then
48-
labels[#labels + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing) }
49-
fields[#fields + 1] = { x = x + sp, y = y, min = 1, max = 100, vals = { 47 } }
40+
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 1, max = 100, vals = { 47 } }
5041
end
5142
end
5243

5344
if apiVersion >= 1.041 then
54-
labels[#labels + 1] = { t = "Integrated Yaw", x = x, y = inc.y(lineSpacing) }
55-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1, vals = { 45 }, table = { [0]="OFF", "ON" } }
45+
fields[#fields + 1] = { t = "Integrated Yaw", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 45 }, table = { [0]="OFF", "ON" } }
5646
end
5747

5848
if apiVersion >= 1.036 then
5949
labels[#labels + 1] = { t = "Anti Gravity", x = x, y = inc.y(lineSpacing) }
6050
if apiVersion >= 1.040 then
61-
labels[#labels + 1] = { t = "Mode", x = x + indent, y = inc.y(lineSpacing) }
62-
fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1, vals = { 39 }, table = { [0]="Smooth", "Step" } }
51+
fields[#fields + 1] = { t = "Mode", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 39 }, table = { [0]="Smooth", "Step" } }
6352
end
64-
labels[#labels + 1] = { t = "Gain", x = x + indent, y = inc.y(lineSpacing) }
65-
fields[#fields + 1] = { x = x + sp, y = y, min = 1000, max = 30000, vals = { 22, 23 }, scale = 1000, mult = 100 }
66-
labels[#labels + 1] = { t = "Threshold", x = x + indent, y = inc.y(lineSpacing) }
67-
fields[#fields + 1] = { x = x + sp, y = y, min = 20,max = 1000, vals = { 20, 21 } }
53+
fields[#fields + 1] = { t = "Gain", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 1000, max = 30000, vals = { 22, 23 }, scale = 1000, mult = 100 }
54+
fields[#fields + 1] = { t = "Threshold", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 20,max = 1000, vals = { 20, 21 } }
6855
end
6956

7057
return {

0 commit comments

Comments
 (0)