Skip to content

Commit 6bd0fc0

Browse files
klutvott123klutvott123
committed
Add throttle limit
Adds throttle limit type and % for all radios. Combines rates1.lua and rates2.lua into one scrollable page for X7. Moved roll RCrate/expo fields to the correct position for HORUS.
1 parent f022976 commit 6bd0fc0

File tree

6 files changed

+151
-143
lines changed

6 files changed

+151
-143
lines changed

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

+48-43
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,50 @@
11
return {
2-
read = 111, -- MSP_RC_TUNING
3-
write = 204, -- MSP_SET_RC_TUNING
4-
title = "Rates",
5-
reboot = false,
6-
eepromWrite = true,
7-
minBytes = 12,
8-
text = {
9-
{ t = "RC", x = 100, y = 52 },
10-
{ t = "Rate", x = 94, y = 70 },
11-
{ t = "Super", x = 148, y = 52 },
12-
{ t = "Rate", x = 152, y = 70 },
13-
{ t = "RC", x = 214, y = 52 },
14-
{ t = "Expo", x = 207, y = 70 },
15-
{ t = "Throttle", x = 288, y = 68 },
16-
{ t = "Mid", x = 288, y = 100 },
17-
{ t = "Exp", x = 288, y = 150 },
18-
{ t = "TPA", x = 374, y = 68 },
19-
{ t = "Thr", x = 374, y = 100 },
20-
{ t = "Brk", x = 374, y = 150 },
21-
{ t = "ROLL", x = 28, y = 100 },
22-
{ t = "PITCH", x = 28, y = 150 },
23-
{ t = "YAW", x = 28, y = 200 },
24-
},
25-
fields = {
26-
-- RC Rates
27-
{ x = 102, y = 125, vals = { 1 }, min = 0, max = 255, scale = 100, to=MIDSIZE },
28-
{ x = 102, y = 150, vals = { 13 }, min = 0, max = 255, scale = 100, to=MIDSIZE },
29-
{ x = 102, y = 200, vals = { 12 }, min = 0, max = 255, scale = 100, to=MIDSIZE },
30-
-- Super Rates
31-
{ x = 158, y = 100, vals = { 3 }, min = 0, max = 100, scale = 100, to=MIDSIZE },
32-
{ x = 158, y = 150, vals = { 4 }, min = 0, max = 100, scale = 100, to=MIDSIZE },
33-
{ x = 158, y = 200, vals = { 5 }, min = 0, max = 255, scale = 100, to=MIDSIZE },
34-
-- RC Expo
35-
{ x = 216, y = 125, vals = { 2 }, min = 0, max = 100, scale = 100, to=MIDSIZE },
36-
{ x = 216, y = 150, vals = { 14 }, min = 0, max = 100, scale = 100, to=MIDSIZE },
37-
{ x = 216, y = 200, vals = { 11 }, min = 0, max = 100, scale = 100, to=MIDSIZE },
38-
-- Throttle
39-
{ x = 330, y = 100, vals = { 7 }, min = 0, max = 100, scale = 100, to=MIDSIZE },
40-
{ x = 330, y = 150, vals = { 8 }, min = 0, max = 100, scale = 100, to=MIDSIZE },
41-
-- TPA
42-
{ x = 416, y = 100, vals = { 6 } , min = 0, max = 100, scale = 100, to=MIDSIZE },
43-
{ x = 416, y = 150, vals = { 9, 10 }, min = 1000, max = 2000, to=MIDSIZE }
44-
},
2+
read = 111, -- MSP_RC_TUNING
3+
write = 204, -- MSP_SET_RC_TUNING
4+
title = "Rates",
5+
reboot = false,
6+
eepromWrite = true,
7+
minBytes = 16,
8+
text = {
9+
{ t = "RC", x = 100, y = 52 },
10+
{ t = "Rate", x = 94, y = 70 },
11+
{ t = "Super", x = 148, y = 52 },
12+
{ t = "Rate", x = 152, y = 70 },
13+
{ t = "RC", x = 214, y = 52 },
14+
{ t = "Expo", x = 207, y = 70 },
15+
{ t = "ROLL", x = 28, y = 100 },
16+
{ t = "PITCH", x = 28, y = 150 },
17+
{ t = "YAW", x = 28, y = 200 },
18+
19+
{ t = "Throttle", x = 290, y = 60 },
20+
{ t = "Mid", x = 300, y = 80, to = SMLSIZE },
21+
{ t = "Expo", x = 300, y = 100, to = SMLSIZE },
22+
{ t = "Limit Type", x = 300, y = 120, to = SMLSIZE },
23+
{ t = "Limit %", x = 300, y = 140, to = SMLSIZE },
24+
{ t = "TPA", x = 290, y = 160 },
25+
{ t = "Rate", x = 300, y = 180, to = SMLSIZE },
26+
{ t = "Breakpoint", x = 300, y = 200, to = SMLSIZE },
27+
},
28+
fields = {
29+
-- RC Rates
30+
{ x = 102, y = 100, vals = { 1 }, min = 0, max = 255, scale = 100, to = MIDSIZE },
31+
{ x = 102, y = 150, vals = { 13 }, min = 0, max = 255, scale = 100, to = MIDSIZE },
32+
{ x = 102, y = 200, vals = { 12 }, min = 0, max = 255, scale = 100, to = MIDSIZE },
33+
-- Super Rates
34+
{ x = 158, y = 100, vals = { 3 }, min = 0, max = 100, scale = 100, to = MIDSIZE },
35+
{ x = 158, y = 150, vals = { 4 }, min = 0, max = 100, scale = 100, to = MIDSIZE },
36+
{ x = 158, y = 200, vals = { 5 }, min = 0, max = 255, scale = 100, to = MIDSIZE },
37+
-- RC Expo
38+
{ x = 216, y = 100, vals = { 2 }, min = 0, max = 100, scale = 100, to = MIDSIZE },
39+
{ x = 216, y = 150, vals = { 14 }, min = 0, max = 100, scale = 100, to = MIDSIZE },
40+
{ x = 216, y = 200, vals = { 11 }, min = 0, max = 100, scale = 100, to = MIDSIZE },
41+
-- Throttle
42+
{ x = 390, y = 80, vals = { 7 }, min = 0, max = 100, scale = 100 },
43+
{ x = 390, y = 100, vals = { 8 }, min = 0, max = 100, scale = 100 },
44+
{ x = 390, y = 120, vals = { 15 }, min = 0, max = 2, table = { [0] = "OFF", "SCALE", "CLIP" } },
45+
{ x = 390, y = 140, vals = { 16 }, min = 25, max = 100 },
46+
-- TPA
47+
{ x = 390, y = 180, vals = { 6 }, min = 0, max = 100, scale = 100 },
48+
{ x = 390, y = 200, vals = { 9, 10 }, min = 1000, max = 2000 },
49+
},
4550
}

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

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
return {
2+
read = 111, -- MSP_RC_TUNING
3+
write = 204, -- MSP_SET_RC_TUNING
4+
title = "Rates",
5+
reboot = false,
6+
eepromWrite = true,
7+
minBytes = 16,
8+
yMinLimit = 11,
9+
yMaxLimit = 52,
10+
text = {
11+
{ t = "RC", x = 43, y = 11, to = SMLSIZE },
12+
{ t = "Rate", x = 38, y = 18, to = SMLSIZE },
13+
{ t = "Super", x = 63, y = 11, to = SMLSIZE },
14+
{ t = "Rate", x = 66, y = 18, to = SMLSIZE },
15+
{ t = "RC", x = 99, y = 11, to = SMLSIZE },
16+
{ t = "Expo", x = 94, y = 18, to = SMLSIZE },
17+
{ t = "ROLL", x = 10, y = 26, to = SMLSIZE },
18+
{ t = "PITCH", x = 10, y = 36, to = SMLSIZE },
19+
{ t = "YAW", x = 10, y = 46, to = SMLSIZE },
20+
21+
{ t = "Throttle", x = 10, y = 60, to = SMLSIZE },
22+
{ t = "Mid", x = 20, y = 68, to = SMLSIZE },
23+
{ t = "Expo", x = 20, y = 76, to = SMLSIZE },
24+
{ t = "Limit Type", x = 20, y = 84, to = SMLSIZE },
25+
{ t = "Limit %", x = 20, y = 92, to = SMLSIZE },
26+
{ t = "TPA", x = 10, y = 100, to = SMLSIZE },
27+
{ t = "Rate", x = 20, y = 108, to = SMLSIZE },
28+
{ t = "Breakpoint", x = 20, y = 116, to = SMLSIZE },
29+
},
30+
fields = {
31+
-- RC Rates
32+
{ x = 39, y = 26, vals = { 1 }, min = 0, max = 255, scale = 100, to = SMLSIZE },
33+
{ x = 39, y = 36, vals = { 13 }, min = 0, max = 255, scale = 100, to = SMLSIZE },
34+
{ x = 39, y = 46, vals = { 12 }, min = 0, max = 255, scale = 100, to = SMLSIZE },
35+
-- Super Rates
36+
{ x = 66, y = 26, vals = { 3 }, min = 0, max = 100, scale = 100, to = SMLSIZE },
37+
{ x = 66, y = 36, vals = { 4 }, min = 0, max = 100, scale = 100, to = SMLSIZE },
38+
{ x = 66, y = 46, vals = { 5 }, min = 0, max = 255, scale = 100, to = SMLSIZE },
39+
-- RC Expo
40+
{ x = 94, y = 26, vals = { 2 }, min = 0, max = 100, scale = 100, to = SMLSIZE },
41+
{ x = 94, y = 36, vals = { 14 }, min = 0, max = 100, scale = 100, to = SMLSIZE },
42+
{ x = 94, y = 46, vals = { 11 }, min = 0, max = 100, scale = 100, to = SMLSIZE },
43+
-- Throttle
44+
{ x = 70, y = 68, vals = { 7 }, min = 0, max = 100, scale = 100, to = SMLSIZE },
45+
{ x = 70, y = 76, vals = { 8 }, min = 0, max = 100, scale = 100, to = SMLSIZE },
46+
{ x = 70, y = 84, vals = { 15 }, min = 0, max = 2, to = SMLSIZE, table = { [0] = "OFF", "SCALE", "CLIP" } },
47+
{ x = 70, y = 92, vals = { 16 }, min = 25, max = 100, to = SMLSIZE },
48+
-- TPA
49+
{ x = 70, y = 108, vals = { 6 } , min = 0, max = 100, scale = 100, to = SMLSIZE },
50+
{ x = 70, y = 116, vals = { 9, 10 }, min = 1000, max = 2000, to = SMLSIZE },
51+
},
52+
}

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

-33
This file was deleted.

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

-22
This file was deleted.

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ PageFiles =
22
{
33
"pids1.lua",
44
"pids2.lua",
5-
"rates1.lua",
6-
"rates2.lua",
5+
"rates.lua",
76
"pid_advanced.lua",
87
"filters.lua",
98
"pwm.lua",

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

+50-43
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,52 @@
11
return {
2-
read = 111, -- MSP_RC_TUNING
3-
write = 204, -- MSP_SET_RC_TUNING
4-
title = "Rates",
5-
reboot = false,
6-
eepromWrite = true,
7-
minBytes = 12,
8-
text = {
9-
{ t = "RC", x = 43, y = 11, to = SMLSIZE },
10-
{ t = "Rate", x = 38, y = 18, to = SMLSIZE },
11-
{ t = "Super", x = 63, y = 11, to = SMLSIZE },
12-
{ t = "Rate", x = 66, y = 18, to = SMLSIZE },
13-
{ t = "RC", x = 99, y = 11, to = SMLSIZE },
14-
{ t = "Expo", x = 94, y = 18, to = SMLSIZE },
15-
{ t = "Throttle", x = 126, y = 18, to = SMLSIZE },
16-
{ t = "Mid", x = 126, y = 31, to = SMLSIZE },
17-
{ t = "Exp", x = 126, y = 46, to = SMLSIZE },
18-
{ t = "TPA", x = 186, y = 18, to = SMLSIZE },
19-
{ t = "Thr", x = 168, y = 31, to = SMLSIZE },
20-
{ t = "Brk", x = 168, y = 46, to = SMLSIZE },
21-
{ t = "ROLL", x = 8, y = 26, to = SMLSIZE },
22-
{ t = "PITCH", x = 8, y = 36, to = SMLSIZE },
23-
{ t = "YAW", x = 8, y = 46, to = SMLSIZE },
24-
},
25-
fields = {
26-
-- RC Rates
27-
{ x = 39, y = 26, vals = { 1 }, min = 0, max = 255, scale = 100, to = SMLSIZE },
28-
{ x = 39, y = 36, vals = { 13 }, min = 0, max = 255, scale = 100, to = SMLSIZE },
29-
{ x = 39, y = 46, vals = { 12 }, min = 0, max = 255, scale = 100, to = SMLSIZE },
30-
-- Super Rates
31-
{ x = 66, y = 26, vals = { 3 }, min = 0, max = 100, scale = 100, to = SMLSIZE },
32-
{ x = 66, y = 36, vals = { 4 }, min = 0, max = 100, scale = 100, to = SMLSIZE },
33-
{ x = 66, y = 46, vals = { 5 }, min = 0, max = 255, scale = 100, to = SMLSIZE },
34-
-- RC Expo
35-
{ x = 94, y = 26, vals = { 2 }, min = 0, max = 100, scale = 100, to = SMLSIZE },
36-
{ x = 94, y = 36, vals = { 14 }, min = 0, max = 100, scale = 100, to = SMLSIZE },
37-
{ x = 94, y = 46, vals = { 11 }, min = 0, max = 100, scale = 100, to = SMLSIZE },
38-
-- Throttle
39-
{ x = 144, y = 31, vals = { 7 }, min = 0, max = 100, scale = 100, to = SMLSIZE },
40-
{ x = 144, y = 46, vals = { 8 }, min = 0, max = 100, scale = 100, to = SMLSIZE },
41-
-- TPA
42-
{ x = 186, y = 31, vals = { 6 } , min = 0, max = 100, scale = 100, to = SMLSIZE },
43-
{ x = 186, y = 46, vals = { 9, 10 }, min = 1000, max = 2000, to = SMLSIZE },
44-
},
2+
read = 111, -- MSP_RC_TUNING
3+
write = 204, -- MSP_SET_RC_TUNING
4+
title = "Rates",
5+
reboot = false,
6+
eepromWrite = true,
7+
minBytes = 16,
8+
yMinLimit = 11,
9+
yMaxLimit = 52,
10+
text = {
11+
{ t = "RC", x = 43, y = 11, to = SMLSIZE },
12+
{ t = "Rate", x = 38, y = 18, to = SMLSIZE },
13+
{ t = "Super", x = 63, y = 11, to = SMLSIZE },
14+
{ t = "Rate", x = 66, y = 18, to = SMLSIZE },
15+
{ t = "RC", x = 99, y = 11, to = SMLSIZE },
16+
{ t = "Expo", x = 94, y = 18, to = SMLSIZE },
17+
{ t = "ROLL", x = 8, y = 26, to = SMLSIZE },
18+
{ t = "PITCH", x = 8, y = 36, to = SMLSIZE },
19+
{ t = "YAW", x = 8, y = 46, to = SMLSIZE },
20+
21+
{ t = "Throttle", x = 120, y = 12, to = SMLSIZE },
22+
{ t = "Mid", x = 130, y = 20, to = SMLSIZE },
23+
{ t = "Expo", x = 130, y = 28, to = SMLSIZE },
24+
{ t = "Limit Type", x = 130, y = 36, to = SMLSIZE },
25+
{ t = "Limit %", x = 130, y = 44, to = SMLSIZE },
26+
{ t = "TPA", x = 120, y = 52, to = SMLSIZE },
27+
{ t = "Rate", x = 130, y = 60, to = SMLSIZE },
28+
{ t = "Breakpoint", x = 130, y = 68, to = SMLSIZE },
29+
},
30+
fields = {
31+
-- RC Rates
32+
{ x = 39, y = 26, vals = { 1 }, min = 0, max = 255, scale = 100, to = SMLSIZE },
33+
{ x = 39, y = 36, vals = { 13 }, min = 0, max = 255, scale = 100, to = SMLSIZE },
34+
{ x = 39, y = 46, vals = { 12 }, min = 0, max = 255, scale = 100, to = SMLSIZE },
35+
-- Super Rates
36+
{ x = 66, y = 26, vals = { 3 }, min = 0, max = 100, scale = 100, to = SMLSIZE },
37+
{ x = 66, y = 36, vals = { 4 }, min = 0, max = 100, scale = 100, to = SMLSIZE },
38+
{ x = 66, y = 46, vals = { 5 }, min = 0, max = 255, scale = 100, to = SMLSIZE },
39+
-- RC Expo
40+
{ x = 94, y = 26, vals = { 2 }, min = 0, max = 100, scale = 100, to = SMLSIZE },
41+
{ x = 94, y = 36, vals = { 14 }, min = 0, max = 100, scale = 100, to = SMLSIZE },
42+
{ x = 94, y = 46, vals = { 11 }, min = 0, max = 100, scale = 100, to = SMLSIZE },
43+
-- Throttle
44+
{ x = 180, y = 20, vals = { 7 }, min = 0, max = 100, scale = 100, to = SMLSIZE },
45+
{ x = 180, y = 28, vals = { 8 }, min = 0, max = 100, scale = 100, to = SMLSIZE },
46+
{ x = 180, y = 36, vals = { 15 }, min = 0, max = 2, to = SMLSIZE, table = { [0] = "OFF", "SCALE", "CLIP" } },
47+
{ x = 180, y = 44, vals = { 16 }, min = 25, max = 100, to = SMLSIZE },
48+
-- TPA
49+
{ x = 180, y = 60, vals = { 6 } , min = 0, max = 100, scale = 100, to = SMLSIZE },
50+
{ x = 180, y = 68, vals = { 9, 10 }, min = 1000, max = 2000, to = SMLSIZE },
51+
},
4552
}

0 commit comments

Comments
 (0)