Skip to content

Commit b0ac79c

Browse files
committed
Update so model params
1 parent cce86cf commit b0ac79c

3 files changed

Lines changed: 60 additions & 61 deletions

File tree

drone_models/so_rpy/params.toml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
1-
# TODO: Double-check yaw parameters. Currently induces weird behavior in sim
21
[cf2x_L250]
32
acc_coef = 0.0
4-
cmd_f_coef = 1.0633
5-
rpy_coef = [-286.2, -286.2, -192.9]
6-
rpy_rates_coef = [-23.03, -23.03, -22.22]
7-
cmd_rpy_coef = [225.6, 225.6, 323.5]
3+
cmd_f_coef = 0.97605781
4+
rpy_coef = [-245.67, -245.67, -227.78]
5+
rpy_rates_coef = [-17.32, -17.32, -25.63]
6+
cmd_rpy_coef = [196.18, 196.18, 390.27]
7+
88

9-
# TODO: Check if parameters are correct
109
[cf2x_P250]
1110
acc_coef = 0.0
12-
cmd_f_coef = 1.0633
13-
rpy_coef = [-99.94, -130.3, 0.0]
14-
rpy_rates_coef = [-13.3, -16.33, 0.0]
15-
cmd_rpy_coef = [84.73, 119.3, 0.0]
11+
cmd_f_coef = 0.98275823
12+
rpy_coef = [-319.14, -319.14, -284.28]
13+
rpy_rates_coef = [-20.85, -20.85, -38.43]
14+
cmd_rpy_coef = [263.30, 263.30, 502.58]
15+
1616

17-
# TODO: Check if parameters are correct
1817
[cf2x_T350]
1918
acc_coef = 0.0
20-
cmd_f_coef = 1.0633
21-
rpy_coef = [-99.94, -130.3, 0.0]
22-
rpy_rates_coef = [-13.3, -16.33, 0.0]
23-
cmd_rpy_coef = [84.73, 119.3, 0.0]
19+
cmd_f_coef = 0.86214912
20+
rpy_coef = [-267.14, -267.14, -126.49]
21+
rpy_rates_coef = [-19.48, -19.48, -14.41]
22+
cmd_rpy_coef = [200.90, 200.90, 193.11]
23+
2424

25-
# TODO: Check if parameters are correct
2625
[cf21B_500]
2726
acc_coef = 0.0
2827
cmd_f_coef = 0.96836458

drone_models/so_rpy_rotor/params.toml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
[cf2x_L250]
22
acc_coef = 0.0
3-
cmd_f_coef = 1.0591
4-
thrust_time_coef = 0.1108
5-
rpy_coef = [-257.2, -257.2, -225.3]
6-
rpy_rates_coef = [-20.2, -20.2, -28.61]
7-
cmd_rpy_coef = [207.1, 207.1, 392.7]
3+
cmd_f_coef = 0.97732585
4+
thrust_time_coef = 0.0858607
5+
rpy_coef = [-245.67, -245.67, -227.78]
6+
rpy_rates_coef = [-17.32, -17.32, -25.63]
7+
cmd_rpy_coef = [196.18, 196.18, 390.27]
8+
89

9-
# TODO: Check if parameters are correct
1010
[cf2x_P250]
11-
acc_coef = 0.1670
12-
cmd_f_coef = 0.5615
13-
thrust_time_coef = 0.0654
14-
rpy_coef = [-286.2, -286.2, -192.9]
15-
rpy_rates_coef = [-23.03, -23.03, -22.22]
16-
cmd_rpy_coef = [225.6, 225.6, 323.5]
11+
acc_coef = 0.0
12+
cmd_f_coef = 0.98323006
13+
thrust_time_coef = 0.0578952
14+
rpy_coef = [-319.14, -319.14, -284.28]
15+
rpy_rates_coef = [-20.85, -20.85, -38.43]
16+
cmd_rpy_coef = [263.30, 263.30, 502.58]
17+
1718

18-
# TODO: Check if parameters are correct
1919
[cf2x_T350]
20-
acc_coef = 0.1670
21-
cmd_f_coef = 0.5615
22-
thrust_time_coef = 0.0654
23-
rpy_coef = [-286.2, -286.2, -192.9]
24-
rpy_rates_coef = [-23.03, -23.03, -22.22]
25-
cmd_rpy_coef = [225.6, 225.6, 323.5]
20+
acc_coef = 0.0
21+
cmd_f_coef = 0.86259295
22+
thrust_time_coef = 0.05062676
23+
rpy_coef = [-267.14, -267.14, -126.49]
24+
rpy_rates_coef = [-19.48, -19.48, -14.41]
25+
cmd_rpy_coef = [200.90, 200.90, 193.11]
2626

2727

2828
[cf21B_500]

drone_models/so_rpy_rotor_drag/params.toml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
[cf2x_L250]
22
acc_coef = 0.0
3-
cmd_f_coef = 1.0627
4-
thrust_time_coef = 0.1891
3+
cmd_f_coef = 0.98325003
4+
thrust_time_coef = 0.12116392
55
drag_matrix = [
6-
[-0.0177, 0.0, 0.0 ],
7-
[0.0, -0.0177, 0.0 ],
8-
[0.0, 0.0, -0.0177 ]
6+
[-0.01471782, 0.0, 0.0 ],
7+
[0.0, -0.01471782, 0.0 ],
8+
[0.0, 0.0, -0.01277641 ]
99
]
10-
rpy_coef = [-257.2, -257.2, 225.3]
11-
rpy_rates_coef = [-20.2, -20.2, -28.61]
12-
cmd_rpy_coef = [207.1, 207.1, 392.7]
10+
rpy_coef = [-245.67, -245.67, -227.78]
11+
rpy_rates_coef = [-17.32, -17.32, -25.63]
12+
cmd_rpy_coef = [196.18, 196.18, 390.27]
13+
1314

14-
# TODO: Check if parameters are correct
1515
[cf2x_P250]
1616
acc_coef = 0.0
17-
cmd_f_coef = 1.0627
18-
thrust_time_coef = 0.1891
17+
cmd_f_coef = 0.99085062
18+
thrust_time_coef = 0.11554009
1919
drag_matrix = [
20-
[-0.0177, 0.0, 0.0 ],
21-
[0.0, -0.0177, 0.0 ],
22-
[0.0, 0.0, -0.0177 ]
20+
[-0.01351483, 0.0, 0.0 ],
21+
[0.0, -0.01351483, 0.0 ],
22+
[0.0, 0.0, -0.01677452 ]
2323
]
24-
rpy_coef = [-257.2, -257.2, -225.3]
25-
rpy_rates_coef = [-20.2, -20.2, -28.61]
26-
cmd_rpy_coef = [207.1, 207.1, 392.7]
24+
rpy_coef = [-319.14, -319.14, -284.28]
25+
rpy_rates_coef = [-20.85, -20.85, -38.43]
26+
cmd_rpy_coef = [263.30, 263.30, 502.58]
27+
2728

28-
# TODO: Check if parameters are correct
2929
[cf2x_T350]
3030
acc_coef = 0.0
31-
cmd_f_coef = 1.0627
32-
thrust_time_coef = 0.1891
31+
cmd_f_coef = 0.87242516
32+
thrust_time_coef = 0.13701907
3333
drag_matrix = [
34-
[-0.0177, 0.0, 0.0 ],
35-
[0.0, -0.0177, 0.0 ],
36-
[0.0, 0.0, -0.0177 ]
34+
[-0.01556697, 0.0, 0.0 ],
35+
[0.0, -0.01556697, 0.0 ],
36+
[0.0, 0.0, -0.02191672 ]
3737
]
38-
rpy_coef = [-257.2, -257.2, -225.3]
39-
rpy_rates_coef = [-20.2, -20.2, -28.61]
40-
cmd_rpy_coef = [207.1, 207.1, 392.7]
38+
rpy_coef = [-267.14, -267.14, -126.49]
39+
rpy_rates_coef = [-19.48, -19.48, -14.41]
40+
cmd_rpy_coef = [200.90, 200.90, 193.11]
4141

4242

4343
[cf21B_500]

0 commit comments

Comments
 (0)