Skip to content

Commit bece6f8

Browse files
committed
Update parameters
1 parent 1eec05b commit bece6f8

1 file changed

Lines changed: 21 additions & 21 deletions

File tree

drone_controllers/mellinger/params.toml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
[cf2x_L250.core]
33
mass = 0.033
44
mass_thrust = 132000
5-
thrust_min = 0.02
6-
thrust_max = 0.1125
7-
pwm_min = 20000.0
8-
pwm_max = 65535.0
5+
pwm_min = 7000
6+
pwm_max = 65535
7+
thrust_min = 0.012817578393224994 # in N per motor
8+
thrust_max = 0.12 # in N per motor
99
torque_pwm_max = [32000.0, 32000.0, 32000.0]
1010
L = 0.03253
11-
rpm2thrust = [0.0, 0.0, 3.16e-10] # TODO
12-
rpm2torque = [0.0, 0.0, 7.94e-12] # TODO
13-
thrust2torque = 0.002513 # TODO
11+
rpm2thrust = [0.0, -5.382196214637237e-7, 2.4582929831265485e-10]
12+
rpm2torque = [0.0, 1.410454111996297e-9, 1.4592584373980652e-12]
13+
thrust2torque = 0.007350862856566459
1414
mixing_matrix = [
1515
[-1.0, -1.0, 1.0, 1.0],
1616
[-1.0, 1.0, 1.0, -1.0],
@@ -35,15 +35,15 @@ int_err_max = [1.0, 1.0, 1500.0]
3535
[cf2x_P250.core]
3636
mass = 0.033
3737
mass_thrust = 132000
38-
thrust_min = 0.02
39-
thrust_max = 0.1125
40-
pwm_min = 20000.0
41-
pwm_max = 65535.0
38+
pwm_min = 7000
39+
pwm_max = 65535
40+
thrust_min = 0.012817578393224994 # in N per motor
41+
thrust_max = 0.12 # in N per motor
4242
torque_pwm_max = [32000.0, 32000.0, 32000.0]
4343
L = 0.03253
44-
rpm2thrust = [0.0, 0.0, 5.792654323957372e-10] # TODO
45-
rpm2torque = [0.0, 0.0, 7.94e-12] # TODO
46-
thrust2torque = 0.001371 # TODO
44+
rpm2thrust = [0.0, -3.6200226530383495e-7, 1.6060924304100328e-10] # Index is order
45+
rpm2torque = [0.0, -2.2665265829562245e-9, 1.1149485566919186e-12] # Index is order
46+
thrust2torque = 0.0069928948992470565
4747
mixing_matrix = [
4848
[-1.0, -1.0, 1.0, 1.0],
4949
[-1.0, 1.0, 1.0, -1.0],
@@ -68,15 +68,15 @@ int_err_max = [1.0, 1.0, 1500.0]
6868
[cf2x_T350.core]
6969
mass = 0.03454 # TODO
7070
mass_thrust = 132000
71-
thrust_min = 0.03
72-
thrust_max = 0.1625
73-
pwm_min = 20000.0
74-
pwm_max = 65535.0
71+
pwm_min = 7000
72+
pwm_max = 65535
73+
thrust_min = 0.01922636758983749 # in N per motor
74+
thrust_max = 0.18 # in N per motor
7575
torque_pwm_max = [32000.0, 32000.0, 32000.0]
7676
L = 0.03253
77-
rpm2thrust = [0.0, 0.0, 5.792654323957372e-10] # TODO
78-
rpm2torque = [0.0, 0.0, 7.94e-12] # TODO
79-
thrust2torque = 0.001371 # TODO
77+
rpm2thrust = [0.0, -7.167227176573658e-7, 2.9401303690194613e-10] # Index is order
78+
rpm2torque = [0.0, 5.815894847811497e-10, 1.331813874166509e-12] # Index is order
79+
thrust2torque = 0.005355990836477486
8080
mixing_matrix = [
8181
[-1.0, -1.0, 1.0, 1.0],
8282
[-1.0, 1.0, 1.0, -1.0],

0 commit comments

Comments
 (0)