Skip to content

Commit 62d7d4a

Browse files
mikellermikeller
authored
Merge pull request #204 from klutvott123/filter-update
Update filter pages
2 parents 37a4ed4 + f5c576a commit 62d7d4a

File tree

6 files changed

+258
-108
lines changed

6 files changed

+258
-108
lines changed

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

Lines changed: 78 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,95 @@
1-
21
return {
32
read = 92, -- MSP_FILTER_CONFIG
43
write = 93, -- MSP_SET_FILTER_CONFIG
54
eepromWrite = true,
65
reboot = false,
76
title = "Filters",
8-
minBytes = 18,
9-
outputBytes = 18,
7+
minBytes = 37,
8+
outputBytes = 37,
9+
yMinLimit = 35,
10+
yMaxLimit = 215,
1011
text= {
11-
-- Column headers
12-
{ t = "Gy LP", x = 60, y = 68, to = SMLSIZE },
13-
{ t = "Gy NF1", x = 125, y = 68, to = SMLSIZE },
14-
{ t = "Gy NF2", x = 190, y = 68, to = SMLSIZE },
15-
{ t = "DT LP", x = 255, y = 68, to = SMLSIZE },
16-
{ t = "DT NF", x = 315, y = 68, to = SMLSIZE },
17-
{ t = "Yaw LP", x = 385, y = 68, to = SMLSIZE },
18-
19-
-- Line titles
20-
{ t = "Hz", x = 48, y = 110, to = SMLSIZE + RIGHT },
21-
{ t = "COff", x = 48, y = 155, to = SMLSIZE + RIGHT },
22-
23-
{ t = "DTerm LP Type", x = 60, y = 208 },
12+
{ t = "Gyro Lowpass 1 Dynamic", x = 5, y = 35 },
13+
{ t = "Min Cutoff", x = 35, y = 55, to = SMLSIZE },
14+
{ t = "Max Cutoff", x = 35, y = 75, to = SMLSIZE },
15+
{ t = "Filter Type", x = 35, y = 95, to = SMLSIZE },
16+
17+
{ t = "Gyro Lowpass 1", x = 5, y = 115 },
18+
{ t = "Cutoff", x = 35, y = 135, to = SMLSIZE },
19+
{ t = "Filter Type", x = 35, y = 155, to = SMLSIZE },
20+
21+
{ t = "Gyro Lowpass 2", x = 5, y = 175 },
22+
{ t = "Cutoff", x = 35, y = 195, to = SMLSIZE },
23+
{ t = "Filter Type", x = 35, y = 215, to = SMLSIZE },
24+
25+
{ t = "Gyro Notch 1", x = 5, y = 235 },
26+
{ t = "Center", x = 35, y = 255, to = SMLSIZE },
27+
{ t = "Cutoff", x = 35, y = 275, to = SMLSIZE },
28+
29+
{ t = "Gyro Notch 2", x = 5, y = 295 },
30+
{ t = "Center", x = 35, y = 315, to = SMLSIZE },
31+
{ t = "Cutoff", x = 35, y = 335, to = SMLSIZE },
32+
33+
{ t = "D Term Lowpass 1 Dynamic", x = 5, y = 355 },
34+
{ t = "Min Cutoff", x = 35, y = 375, to = SMLSIZE },
35+
{ t = "Max Cutoff", x = 35, y = 395, to = SMLSIZE },
36+
{ t = "Filter Type", x = 35, y = 415, to = SMLSIZE },
37+
38+
{ t = "D Term Lowpass 1", x = 5, y = 435 },
39+
{ t = "Cutoff", x = 35, y = 455, to = SMLSIZE },
40+
{ t = "Filter Type", x = 35, y = 475, to = SMLSIZE },
41+
42+
{ t = "D Term Lowpass 2", x = 5, y = 495 },
43+
{ t = "Cutoff", x = 35, y = 515, to = SMLSIZE },
44+
{ t = "Filter Type", x = 35, y = 535, to = SMLSIZE },
45+
46+
{ t = "D Term Notch", x = 5, y = 555 },
47+
{ t = "Center", x = 35, y = 575, to = SMLSIZE },
48+
{ t = "Cutoff", x = 35, y = 595, to = SMLSIZE },
49+
50+
{ t = "Yaw Lowpass", x = 5, y = 615 },
51+
{ t = "Cutoff", x = 35, y = 635, to = SMLSIZE },
2452
},
2553
fields = {
26-
{ x = 60, y = 110, min = 0, max = 255, vals = { 1 }, to = MIDSIZE },
54+
-- Gyro Lowpass 1 Dynamic
55+
{ x = 200, y = 55, min = 0, max = 1000, vals = { 30, 31 } },
56+
{ x = 200, y = 75, min = 0, max = 1000, vals = { 32, 33 } },
57+
{ x = 200, y = 95, min = 0, max = 1, vals = { 25 }, table = { [0] = "PT1", [1] = "BIQUAD" } },
58+
59+
-- Gyro Lowpass 1
60+
{ x = 200, y = 135, min = 0, max = 16000, vals = { 21, 22 } },
61+
{ x = 200, y = 155, min = 0, max = 1, vals = { 25 }, table = { [0] = "PT1", [1] = "BIQUAD" } },
62+
63+
-- Gyro Lowpass 2
64+
{ x = 200, y = 195, min = 0, max = 16000, vals = { 23, 24 } },
65+
{ x = 200, y = 215, min = 0, max = 1, vals = { 26 }, table = { [0] = "PT1", [1] = "BIQUAD" } },
66+
67+
-- Gyro Notch 1
68+
{ x = 200, y = 255, min = 0, max = 16000, vals = { 6, 7 } },
69+
{ x = 200, y = 275, min = 0, max = 16000, vals = { 8, 9 } },
2770

28-
{ x = 125, y = 110, min = 0, max = 16000, vals = { 6, 7 }, to = MIDSIZE },
29-
{ x = 125, y = 155, min = 0, max = 16000, vals = { 8, 9 }, to = MIDSIZE },
71+
-- Gyro Notch 2
72+
{ x = 200, y = 315, min = 0, max = 16000, vals = { 14, 15 } },
73+
{ x = 200, y = 335, min = 0, max = 16000, vals = { 16, 17 } },
3074

31-
{ x = 190, y = 110, min = 0, max = 16000, vals = { 14, 15 }, to = MIDSIZE },
32-
{ x = 190, y = 155, min = 0, max = 16000, vals = { 16, 17 }, to = MIDSIZE },
75+
-- D Term Lowpass 1 Dynamic
76+
{ x = 200, y = 375, min = 0, max = 1000, vals = { 34, 35 } },
77+
{ x = 200, y = 395, min = 0, max = 1000, vals = { 36, 37 } },
78+
{ x = 200, y = 415, min = 0, max = 1, vals = { 18 }, table = { [0] = "PT1", [1] = "BIQUAD" } },
3379

34-
{ x = 255, y = 110, min = 0, max = 16000, vals = { 2, 3 }, to = MIDSIZE },
80+
-- D Term Lowpass 1
81+
{ x = 200, y = 455, min = 0, max = 16000, vals = { 2, 3 } },
82+
{ x = 200, y = 475, min = 0, max = 1, vals = { 18 }, table = { [0] = "PT1", [1] = "BIQUAD" } },
3583

36-
{ x = 315, y = 110, min = 0, max = 16000, vals = { 10, 11 }, to = MIDSIZE },
37-
{ x = 315, y = 155, min = 0, max = 16000, vals = { 12, 13 }, to = MIDSIZE },
84+
-- D Term Lowpass 2
85+
{ x = 200, y = 515, min = 0, max = 16000, vals = { 27, 28 } },
86+
{ x = 200, y = 535, min = 0, max = 1, vals = { 29 }, table = { [0] = "PT1", [1] = "BIQUAD" } },
3887

39-
{ x = 391, y = 110, min = 0, max = 500, vals = { 4, 5 }, to = MIDSIZE },
88+
-- D Term Notch
89+
{ x = 200, y = 575, min = 0, max = 16000, vals = { 10, 11 } },
90+
{ x = 200, y = 595, min = 0, max = 16000, vals = { 12, 13 } },
4091

41-
{ x = 208, y = 208, min = 0, max = 2, vals = { 18 }, to = MIDSIZE,
42-
table = { [0] = "PT1", [1] = "BIQUAD", [2] = "FIR" }
43-
},
92+
-- Yaw Lowpass
93+
{ x = 200, y = 635, min = 0, max = 500, vals = { 4, 5 } },
4494
}
4595
}

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

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
return {
2+
read = 92, -- MSP_FILTER_CONFIG
3+
write = 93, -- MSP_SET_FILTER_CONFIG
4+
eepromWrite = true,
5+
reboot = false,
6+
title = "Filters",
7+
minBytes = 37,
8+
outputBytes = 37,
9+
yMinLimit = 12,
10+
yMaxLimit = 52,
11+
text= {
12+
{ t = "Gyro Lowpass 1 Dynamic", x = 2, y = 12, to = SMLSIZE },
13+
{ t = "Min Cutoff", x = 12, y = 20, to = SMLSIZE },
14+
{ t = "Max Cutoff", x = 12, y = 28, to = SMLSIZE },
15+
{ t = "Filter Type", x = 12, y = 36, to = SMLSIZE },
16+
17+
{ t = "Gyro Lowpass 1", x = 2, y = 44, to = SMLSIZE },
18+
{ t = "Cutoff", x = 12, y = 52, to = SMLSIZE },
19+
{ t = "Filter Type", x = 12, y = 60, to = SMLSIZE },
20+
21+
{ t = "Gyro Lowpass 2", x = 2, y = 68, to = SMLSIZE },
22+
{ t = "Cutoff", x = 12, y = 76, to = SMLSIZE },
23+
{ t = "Filter Type", x = 12, y = 84, to = SMLSIZE },
24+
25+
{ t = "Gyro Notch 1", x = 2, y = 92, to = SMLSIZE },
26+
{ t = "Center", x = 12, y = 100, to = SMLSIZE },
27+
{ t = "Cutoff", x = 12, y = 108, to = SMLSIZE },
28+
29+
{ t = "Gyro Notch 2", x = 2, y = 116, to = SMLSIZE },
30+
{ t = "Center", x = 12, y = 124, to = SMLSIZE },
31+
{ t = "Cutoff", x = 12, y = 132, to = SMLSIZE },
32+
33+
{ t = "D Term Lowpass 1 Dynamic", x = 2, y = 140, to = SMLSIZE },
34+
{ t = "Min Cutoff", x = 12, y = 148, to = SMLSIZE },
35+
{ t = "Max Cutoff", x = 12, y = 156, to = SMLSIZE },
36+
{ t = "Filter Type", x = 12, y = 164, to = SMLSIZE },
37+
38+
{ t = "D Term Lowpass 1", x = 2, y = 172, to = SMLSIZE },
39+
{ t = "Cutoff", x = 12, y = 180, to = SMLSIZE },
40+
{ t = "Filter Type", x = 12, y = 188, to = SMLSIZE },
41+
42+
{ t = "D Term Lowpass 2", x = 2, y = 196, to = SMLSIZE },
43+
{ t = "Cutoff", x = 12, y = 204, to = SMLSIZE },
44+
{ t = "Filter Type", x = 12, y = 212, to = SMLSIZE },
45+
46+
{ t = "D Term Notch", x = 2, y = 220, to = SMLSIZE },
47+
{ t = "Center", x = 12, y = 228, to = SMLSIZE },
48+
{ t = "Cutoff", x = 12, y = 236, to = SMLSIZE },
49+
50+
{ t = "Yaw Lowpass", x = 2, y = 244, to = SMLSIZE },
51+
{ t = "Cutoff", x = 12, y = 252, to = SMLSIZE },
52+
},
53+
fields = {
54+
-- Gyro Lowpass 1 Dynamic
55+
{ x = 87, y = 20, min = 0, max = 1000, to = SMLSIZE, vals = { 30, 31 } },
56+
{ x = 87, y = 28, min = 0, max = 1000, to = SMLSIZE, vals = { 32, 33 } },
57+
{ x = 87, y = 36, min = 0, max = 1, to = SMLSIZE, vals = { 25 }, table = { [0] = "PT1", [1] = "BIQUAD" } },
58+
59+
-- Gyro Lowpass 1
60+
{ x = 87, y = 52, min = 0, max = 16000, to = SMLSIZE, vals = { 21, 22 } },
61+
{ x = 87, y = 60, min = 0, max = 1, to = SMLSIZE, vals = { 25 }, table = { [0] = "PT1", [1] = "BIQUAD" } },
62+
63+
-- Gyro Lowpass 2
64+
{ x = 87, y = 76, min = 0, max = 16000, to = SMLSIZE, vals = { 23, 24 } },
65+
{ x = 87, y = 84, min = 0, max = 1, to = SMLSIZE, vals = { 26 }, table = { [0] = "PT1", [1] = "BIQUAD" } },
66+
67+
-- Gyro Notch 1
68+
{ x = 87, y = 100, min = 0, max = 16000, to = SMLSIZE, vals = { 6, 7 } },
69+
{ x = 87, y = 108, min = 0, max = 16000, to = SMLSIZE, vals = { 8, 9 } },
70+
71+
-- Gyro Notch 2
72+
{ x = 87, y = 124, min = 0, max = 16000, to = SMLSIZE, vals = { 14, 15 } },
73+
{ x = 87, y = 132, min = 0, max = 16000, to = SMLSIZE, vals = { 16, 17 } },
74+
75+
-- D Term Lowpass 1 Dynamic
76+
{ x = 87, y = 148, min = 0, max = 1000, to = SMLSIZE, vals = { 34, 35 } },
77+
{ x = 87, y = 156, min = 0, max = 1000, to = SMLSIZE, vals = { 36, 37 } },
78+
{ x = 87, y = 164, min = 0, max = 1, to = SMLSIZE, vals = { 18 }, table = { [0] = "PT1", [1] = "BIQUAD" } },
79+
80+
-- D Term Lowpass 1
81+
{ x = 87, y = 180, min = 0, max = 16000, to = SMLSIZE, vals = { 2, 3 } },
82+
{ x = 87, y = 188, min = 0, max = 1, to = SMLSIZE, vals = { 18 }, table = { [0] = "PT1", [1] = "BIQUAD" } },
83+
84+
-- D Term Lowpass 2
85+
{ x = 87, y = 204, min = 0, max = 16000, to = SMLSIZE, vals = { 27, 28 } },
86+
{ x = 87, y = 212, min = 0, max = 1, to = SMLSIZE, vals = { 29 }, table = { [0] = "PT1", [1] = "BIQUAD" } },
87+
88+
-- D Term Notch
89+
{ x = 87, y = 228, min = 0, max = 16000, to = SMLSIZE, vals = { 10, 11 } },
90+
{ x = 87, y = 236, min = 0, max = 16000, to = SMLSIZE, vals = { 12, 13 } },
91+
92+
-- Yaw Lowpass
93+
{ x = 87, y = 252, min = 0, max = 500, to = SMLSIZE, vals = { 4, 5 } },
94+
}
95+
}

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

Lines changed: 0 additions & 26 deletions
This file was deleted.

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

Lines changed: 0 additions & 25 deletions
This file was deleted.

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ PageFiles =
55
"rates1.lua",
66
"rates2.lua",
77
"pid_advanced.lua",
8-
"filters1.lua",
9-
"filters2.lua",
8+
"filters.lua",
109
"pwm.lua",
1110
"vtx.lua",
1211
"rescue.lua",

0 commit comments

Comments
 (0)