Skip to content

Commit b796693

Browse files
klutvott123klutvott123
committed
Add yaw D
Adds D Term for yaw axis for use with Integrated Yaw. Also some coding style fixes.
1 parent 37a4ed4 commit b796693

File tree

3 files changed

+86
-84
lines changed

3 files changed

+86
-84
lines changed

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

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
11

22
return {
3-
read = 112, -- MSP_PID
4-
write = 202, -- MSP_SET_PID
5-
title = "PIDs (1/2)",
6-
reboot = false,
7-
eepromWrite = true,
8-
minBytes = 8,
9-
text = {
10-
{ t = "P", x = 142, y = 48, to = MIDSIZE },
11-
{ t = "I", x = 244, y = 48, to = MIDSIZE },
12-
{ t = "D", x = 342, y = 48, to = MIDSIZE },
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-
-- P
19-
{ x = 140, y = 100, min = 0, max = 200, vals = { 1 }, to = MIDSIZE },
20-
{ x = 140, y = 150, min = 0, max = 200, vals = { 4 }, to = MIDSIZE },
21-
{ x = 140, y = 200, min = 0, max = 200, vals = { 7 }, to = MIDSIZE },
22-
-- I
23-
{ x = 240, y = 100, min = 0, max = 200, vals = { 2 }, to = MIDSIZE },
24-
{ x = 240, y = 150, min = 0, max = 200, vals = { 5 }, to = MIDSIZE },
25-
{ x = 240, y = 200, min = 0, max = 200, vals = { 8 }, to = MIDSIZE },
26-
-- D
27-
{ x = 340, y = 100, min = 0, max = 200, vals = { 3 }, to = MIDSIZE },
28-
{ x = 340, y = 150, min = 0, max = 200, vals = { 6 }, to = MIDSIZE },
29-
},
30-
}
3+
read = 112, -- MSP_PID
4+
write = 202, -- MSP_SET_PID
5+
title = "PIDs (1/2)",
6+
reboot = false,
7+
eepromWrite = true,
8+
minBytes = 9,
9+
text = {
10+
{ t = "P", x = 142, y = 48, to = MIDSIZE },
11+
{ t = "I", x = 244, y = 48, to = MIDSIZE },
12+
{ t = "D", x = 342, y = 48, to = MIDSIZE },
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+
-- P
19+
{ x = 140, y = 100, min = 0, max = 200, vals = { 1 }, to = MIDSIZE },
20+
{ x = 140, y = 150, min = 0, max = 200, vals = { 4 }, to = MIDSIZE },
21+
{ x = 140, y = 200, min = 0, max = 200, vals = { 7 }, to = MIDSIZE },
22+
-- I
23+
{ x = 240, y = 100, min = 0, max = 200, vals = { 2 }, to = MIDSIZE },
24+
{ x = 240, y = 150, min = 0, max = 200, vals = { 5 }, to = MIDSIZE },
25+
{ x = 240, y = 200, min = 0, max = 200, vals = { 8 }, to = MIDSIZE },
26+
-- D
27+
{ x = 340, y = 100, min = 0, max = 200, vals = { 3 }, to = MIDSIZE },
28+
{ x = 340, y = 150, min = 0, max = 200, vals = { 6 }, to = MIDSIZE },
29+
{ x = 340, y = 200, min = 0, max = 200, vals = { 9 }, to = MIDSIZE },
30+
},
31+
}

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

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
11

22
return {
3-
read = 112, -- MSP_PID
4-
write = 202, -- MSP_SET_PID
5-
title = "PIDs (1/2)",
6-
reboot = false,
7-
eepromWrite = true,
8-
minBytes = 8,
9-
text = {
10-
{ t = "P", x = 45, y = 14, to=SMLSIZE },
11-
{ t = "I", x = 73, y = 14, to=SMLSIZE },
12-
{ t = "D", x = 101, y = 14, 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-
-- P
19-
{ x = 41, y = 26, min = 0, max = 200, vals = { 1 }, to=SMLSIZE },
20-
{ x = 41, y = 36, min = 0, max = 200, vals = { 4 }, to=SMLSIZE },
21-
{ x = 41, y = 46, min = 0, max = 200, vals = { 7 }, to=SMLSIZE },
22-
-- I
23-
{ x = 69, y = 26, min = 0, max = 200, vals = { 2 }, to=SMLSIZE },
24-
{ x = 69, y = 36, min = 0, max = 200, vals = { 5 }, to=SMLSIZE },
25-
{ x = 69, y = 46, min = 0, max = 200, vals = { 8 }, to=SMLSIZE },
26-
-- D
27-
{ x = 97, y = 26, min = 0, max = 200, vals = { 3 }, to=SMLSIZE },
28-
{ x = 97, y = 36, min = 0, max = 200, vals = { 6 }, to=SMLSIZE },
29-
},
30-
}
3+
read = 112, -- MSP_PID
4+
write = 202, -- MSP_SET_PID
5+
title = "PIDs (1/2)",
6+
reboot = false,
7+
eepromWrite = true,
8+
minBytes = 9,
9+
text = {
10+
{ t = "P", x = 45, y = 14, to = SMLSIZE },
11+
{ t = "I", x = 73, y = 14, to = SMLSIZE },
12+
{ t = "D", x = 101, y = 14, 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+
-- P
19+
{ x = 41, y = 26, min = 0, max = 200, vals = { 1 }, to = SMLSIZE },
20+
{ x = 41, y = 36, min = 0, max = 200, vals = { 4 }, to = SMLSIZE },
21+
{ x = 41, y = 46, min = 0, max = 200, vals = { 7 }, to = SMLSIZE },
22+
-- I
23+
{ x = 69, y = 26, min = 0, max = 200, vals = { 2 }, to = SMLSIZE },
24+
{ x = 69, y = 36, min = 0, max = 200, vals = { 5 }, to = SMLSIZE },
25+
{ x = 69, y = 46, min = 0, max = 200, vals = { 8 }, to = SMLSIZE },
26+
-- D
27+
{ x = 97, y = 26, min = 0, max = 200, vals = { 3 }, to = SMLSIZE },
28+
{ x = 97, y = 36, min = 0, max = 200, vals = { 6 }, to = SMLSIZE },
29+
{ x = 97, y = 46, min = 0, max = 200, vals = { 9 }, to = SMLSIZE },
30+
},
31+
}

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

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11

22
return {
3-
read = 112, -- MSP_PID
4-
write = 202, -- MSP_SET_PID
5-
title = "PIDs (1/2)",
6-
reboot = false,
7-
eepromWrite = true,
8-
minBytes = 8,
9-
text = {
10-
{ t = "P", x = 70, y = 14, to = SMLSIZE },
11-
{ t = "I", x = 98, y = 14, to = SMLSIZE },
12-
{ t = "D", x = 126, y = 14, 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-
-- P
19-
{ x = 66, y = 26, min = 0, max = 200, vals = { 1 }, to = SMLSIZE },
20-
{ x = 66, y = 36, min = 0, max = 200, vals = { 4 }, to = SMLSIZE },
21-
{ x = 66, y = 46, min = 0, max = 200, vals = { 7 }, to = SMLSIZE },
22-
-- I
23-
{ x = 94, y = 26, min = 0, max = 200, vals = { 2 }, to = SMLSIZE },
24-
{ x = 94, y = 36, min = 0, max = 200, vals = { 5 }, to = SMLSIZE },
25-
{ x = 94, y = 46, min = 0, max = 200, vals = { 8 }, to = SMLSIZE },
26-
-- D
27-
{ x = 122, y = 26, min = 0, max = 200, vals = { 3 }, to = SMLSIZE },
28-
{ x = 122, y = 36, min = 0, max = 200, vals = { 6 }, to = SMLSIZE },
29-
--{ x = 122, y = 46, i = 9 },
30-
},
3+
read = 112, -- MSP_PID
4+
write = 202, -- MSP_SET_PID
5+
title = "PIDs (1/2)",
6+
reboot = false,
7+
eepromWrite = true,
8+
minBytes = 9,
9+
text = {
10+
{ t = "P", x = 70, y = 14, to = SMLSIZE },
11+
{ t = "I", x = 98, y = 14, to = SMLSIZE },
12+
{ t = "D", x = 126, y = 14, 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+
-- P
19+
{ x = 66, y = 26, min = 0, max = 200, vals = { 1 }, to = SMLSIZE },
20+
{ x = 66, y = 36, min = 0, max = 200, vals = { 4 }, to = SMLSIZE },
21+
{ x = 66, y = 46, min = 0, max = 200, vals = { 7 }, to = SMLSIZE },
22+
-- I
23+
{ x = 94, y = 26, min = 0, max = 200, vals = { 2 }, to = SMLSIZE },
24+
{ x = 94, y = 36, min = 0, max = 200, vals = { 5 }, to = SMLSIZE },
25+
{ x = 94, y = 46, min = 0, max = 200, vals = { 8 }, to = SMLSIZE },
26+
-- D
27+
{ x = 122, y = 26, min = 0, max = 200, vals = { 3 }, to = SMLSIZE },
28+
{ x = 122, y = 36, min = 0, max = 200, vals = { 6 }, to = SMLSIZE },
29+
{ x = 122, y = 46, min = 0, max = 200, vals = { 9 }, to = SMLSIZE },
30+
},
3131
}

0 commit comments

Comments
 (0)