Skip to content

Commit 343635b

Browse files
mikellermikeller
authored
Merge pull request #206 from klutvott123/add-Dmin
Add D Min
2 parents 62d7d4a + 11b2519 commit 343635b

File tree

3 files changed

+126
-73
lines changed

3 files changed

+126
-73
lines changed

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

Lines changed: 42 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,44 @@
11

22
return {
3-
read = 94, -- MSP_PID_ADVANCED
4-
write = 95, -- MSP_SET_PID_ADVANCED
5-
title = "PIDs (2/2)",
6-
reboot = false,
7-
eepromWrite = true,
8-
minBytes = 38,
9-
text = {
10-
{ t = "Feed", x = 135, y = 52 },
11-
{ t = "forward", x = 120, y = 70 },
12-
{ t = "Transition", x = 250, y = 150 },
13-
{ t = "ROLL", x = 28, y = 100 },
14-
{ t = "PITCH", x = 28, y = 150 },
15-
{ t = "YAW", x = 28, y = 200 },
16-
},
17-
fields = {
18-
-- ROLL FF
19-
{ x = 140, y = 100, min = 0, max = 200, vals = { 33, 34 }, to = MIDSIZE },
20-
-- PITCH FF
21-
{ x = 140, y = 150, min = 0, max = 200, vals = { 35, 36 }, to = MIDSIZE },
22-
-- YAW FF
23-
{ x = 140, y = 200, min = 0, max = 200, vals = { 37, 38 }, to = MIDSIZE },
24-
-- TRANSITION
25-
{ x = 350, y = 150, min = 0, max = 100, vals = { 9 }, to = MIDSIZE, scale = 100 },
26-
},
27-
}
3+
read = 94, -- MSP_PID_ADVANCED
4+
write = 95, -- MSP_SET_PID_ADVANCED
5+
title = "PIDs (2/2)",
6+
reboot = false,
7+
eepromWrite = true,
8+
minBytes = 44,
9+
text = {
10+
{ t = "Feed", x = 97, y = 52 },
11+
{ t = "forward", x = 82, y = 70 },
12+
{ t = "D", x = 207, y = 52 },
13+
{ t = "Min", x = 202, y = 70 },
14+
{ t = "ROLL", x = 28, y = 100 },
15+
{ t = "PITCH", x = 28, y = 150 },
16+
{ t = "YAW", x = 28, y = 200 },
17+
18+
{ t = "Feedforward", x = 290, y = 100 },
19+
{ t = "Transition", x = 300, y = 120, to = SMLSIZE },
20+
{ t = "D Min", x = 290, y = 140 },
21+
{ t = "Gain", x = 300, y = 160, to = SMLSIZE },
22+
{ t = "Advance", x = 300, y = 180, to = SMLSIZE },
23+
},
24+
fields = {
25+
-- ROLL FF
26+
{ x = 102, y = 100, min = 0, max = 2000, vals = { 33, 34 }, to = MIDSIZE },
27+
-- PITCH FF
28+
{ x = 102, y = 150, min = 0, max = 2000, vals = { 35, 36 }, to = MIDSIZE },
29+
-- YAW FF
30+
{ x = 102, y = 200, min = 0, max = 2000, vals = { 37, 38 }, to = MIDSIZE },
31+
-- ROLL D MIN
32+
{ x = 202, y = 100, min = 0, max = 100, vals = { 40 }, to = MIDSIZE },
33+
-- PITCH D MIN
34+
{ x = 202, y = 150, min = 0, max = 100, vals = { 41 }, to = MIDSIZE },
35+
-- YAW D MIN
36+
{ x = 202, y = 200, min = 0, max = 100, vals = { 42 }, to = MIDSIZE },
37+
-- FF TRANSITION
38+
{ x = 390, y = 120, min = 0, max = 100, vals = { 9 }, scale = 100 },
39+
-- D MIN GAIN
40+
{ x = 390, y = 160, min = 0, max = 100, vals = { 43 } },
41+
-- D MIN ADVANCE
42+
{ x = 390, y = 180, min = 0, max = 200, vals = { 44 } },
43+
},
44+
}

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

Lines changed: 43 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,46 @@
11

22
return {
3-
read = 94, -- MSP_PID_ADVANCED
4-
write = 95, -- MSP_SET_PID_ADVANCED
5-
title = "PIDs (2/2)",
6-
reboot = false,
7-
eepromWrite = true,
8-
minBytes = 38,
9-
text = {
10-
{ t = "Feed", x = 45, y = 11, to=SMLSIZE },
11-
{ t = "forward", x = 37, y = 18, to=SMLSIZE },
12-
{ t = "Transn", x = 86, y = 31, to=SMLSIZE },
13-
{ t = "ROLL", x = 10, y = 26, to=SMLSIZE },
14-
{ t = "PITCH", x = 10, y = 36, to=SMLSIZE },
15-
{ t = "YAW", x = 10, y = 46, to=SMLSIZE },
16-
},
17-
fields = {
18-
-- ROLL FF
19-
{ x = 48, y = 26, min = 0, max = 200, vals = { 33, 34 }, to=SMLSIZE },
20-
-- PITCH FF
21-
{ x = 48, y = 36, min = 0, max = 200, vals = { 35, 36 }, to=SMLSIZE },
22-
-- YAW FF
23-
{ x = 48, y = 46, min = 0, max = 200, vals = { 37, 38 }, to=SMLSIZE },
24-
-- TRANSITION
25-
{ x = 94, y = 40, min = 0, max = 100, vals = { 9 }, to=SMLSIZE, scale = 100 },
26-
},
3+
read = 94, -- MSP_PID_ADVANCED
4+
write = 95, -- MSP_SET_PID_ADVANCED
5+
title = "PIDs (2/2)",
6+
reboot = false,
7+
eepromWrite = true,
8+
minBytes = 44,
9+
yMinLimit = 11,
10+
yMaxLimit = 52,
11+
text = {
12+
{ t = "Feed", x = 45, y = 11, to = SMLSIZE },
13+
{ t = "forward", x = 37, y = 18, to = SMLSIZE },
14+
{ t = "D", x = 85, y = 11, to = SMLSIZE },
15+
{ t = "Min", x = 80, y = 18, to = SMLSIZE },
16+
{ t = "ROLL", x = 10, y = 26, to = SMLSIZE },
17+
{ t = "PITCH", x = 10, y = 36, to = SMLSIZE },
18+
{ t = "YAW", x = 10, y = 46, to = SMLSIZE },
19+
20+
{ t = "Feedforward", x = 10, y = 60, to = SMLSIZE },
21+
{ t = "Transition", x = 20, y = 68, to = SMLSIZE },
22+
{ t = "D Min", x = 10, y = 76, to = SMLSIZE },
23+
{ t = "Gain", x = 20, y = 84, to = SMLSIZE },
24+
{ t = "Advance", x = 20, y = 92, to = SMLSIZE },
25+
},
26+
fields = {
27+
-- ROLL FF
28+
{ x = 48, y = 26, min = 0, max = 2000, vals = { 33, 34 }, to = SMLSIZE },
29+
-- PITCH FF
30+
{ x = 48, y = 36, min = 0, max = 2000, vals = { 35, 36 }, to = SMLSIZE },
31+
-- YAW FF
32+
{ x = 48, y = 46, min = 0, max = 2000, vals = { 37, 38 }, to = SMLSIZE },
33+
-- ROLL D MIN
34+
{ x = 80, y = 26, min = 0, max = 100, vals = { 40 }, to = SMLSIZE },
35+
-- PITCH D MIN
36+
{ x = 80, y = 36, min = 0, max = 100, vals = { 41 }, to = SMLSIZE },
37+
-- YAW D MIN
38+
{ x = 80, y = 46, min = 0, max = 100, vals = { 42 }, to = SMLSIZE },
39+
-- FF TRANSITION
40+
{ x = 80, y = 68, min = 0, max = 100, vals = { 9 }, to = SMLSIZE, scale = 100 },
41+
-- D MIN GAIN
42+
{ x = 80, y = 84, min = 0, max = 100, vals = { 43 }, to = SMLSIZE },
43+
-- D MIN ADVANCE
44+
{ x = 80, y = 92, min = 0, max = 200, vals = { 44 }, to = SMLSIZE },
45+
},
2746
}

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

Lines changed: 41 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,44 @@
11

22
return {
3-
read = 94, -- MSP_PID_ADVANCED
4-
write = 95, -- MSP_SET_PID_ADVANCED
5-
title = "PIDs (2/2)",
6-
reboot = false,
7-
eepromWrite = true,
8-
minBytes = 38,
9-
text = {
10-
{ t = "Feed", x = 63, y = 11, to=SMLSIZE },
11-
{ t = "forward", x = 55, y = 18, to=SMLSIZE },
12-
{ t = "Transition", x = 101, y = 35, to=SMLSIZE },
13-
{ t = "ROLL", x = 25, y = 26, to=SMLSIZE },
14-
{ t = "PITCH", x = 25, y = 36, to=SMLSIZE },
15-
{ t = "YAW", x = 25, y = 46, to=SMLSIZE },
16-
},
17-
fields = {
18-
-- ROLL FF
19-
{ x = 66, y = 26, min = 0, max = 200, vals = { 33, 34 }, to=SMLSIZE },
20-
-- PITCH FF
21-
{ x = 66, y = 36, min = 0, max = 200, vals = { 35, 36 }, to=SMLSIZE },
22-
-- YAW FF
23-
{ x = 66, y = 46, min = 0, max = 200, vals = { 37, 38 }, to=SMLSIZE },
24-
-- TRANSITION
25-
{ x = 160, y = 35, min = 0, max = 100, vals = { 9 }, to=SMLSIZE, scale = 100 },
26-
},
3+
read = 94, -- MSP_PID_ADVANCED
4+
write = 95, -- MSP_SET_PID_ADVANCED
5+
title = "PIDs (2/2)",
6+
reboot = false,
7+
eepromWrite = true,
8+
minBytes = 44,
9+
text = {
10+
{ t = "Feed", x = 46, y = 11, to = SMLSIZE },
11+
{ t = "forward", x = 38, y = 18, to = SMLSIZE },
12+
{ t = "D", x = 86, y = 11, to = SMLSIZE },
13+
{ t = "Min", x = 81, y = 18, to = SMLSIZE },
14+
{ t = "ROLL", x = 8, y = 26, to = SMLSIZE },
15+
{ t = "PITCH", x = 8, y = 36, to = SMLSIZE },
16+
{ t = "YAW", x = 8, y = 46, to = SMLSIZE },
17+
18+
{ t = "Feedforward", x = 110, y = 14, to = SMLSIZE },
19+
{ t = "Transition", x = 120, y = 22, to = SMLSIZE },
20+
{ t = "D Min", x = 110, y = 30, to = SMLSIZE },
21+
{ t = "Gain", x = 120, y = 38, to = SMLSIZE },
22+
{ t = "Advance", x = 120, y = 46, to = SMLSIZE },
23+
},
24+
fields = {
25+
-- ROLL FF
26+
{ x = 49, y = 26, min = 0, max = 2000, vals = { 33, 34 }, to = SMLSIZE },
27+
-- PITCH FF
28+
{ x = 49, y = 36, min = 0, max = 2000, vals = { 35, 36 }, to = SMLSIZE },
29+
-- YAW FF
30+
{ x = 49, y = 46, min = 0, max = 2000, vals = { 37, 38 }, to = SMLSIZE },
31+
-- ROLL D MIN
32+
{ x = 81, y = 26, min = 0, max = 100, vals = { 40 }, to = SMLSIZE },
33+
-- PITCH D MIN
34+
{ x = 81, y = 36, min = 0, max = 100, vals = { 41 }, to = SMLSIZE },
35+
-- YAW D MIN
36+
{ x = 81, y = 46, min = 0, max = 100, vals = { 42 }, to = SMLSIZE },
37+
-- FF TRANSITION
38+
{ x = 180, y = 22, min = 0, max = 100, vals = { 9 }, to = SMLSIZE, scale = 100 },
39+
-- D MIN GAIN
40+
{ x = 180, y = 38, min = 0, max = 100, vals = { 43 }, to = SMLSIZE },
41+
-- D MIN ADVANCE
42+
{ x = 180, y = 46, min = 0, max = 200, vals = { 44 }, to = SMLSIZE },
43+
},
2744
}

0 commit comments

Comments
 (0)