From 265944c507f01d386c10cbdd4c796f96d52a6cfb Mon Sep 17 00:00:00 2001
From: Andy Snawerdt <Andy Snawerdt>
Date: Sat, 4 Feb 2017 05:41:45 -0600
Subject: [PATCH] Updated thrust and drag constant scripts, data, and
 associated model parameters

---
 .../thrustAndDragConstant/calcDragConstant.m  |   1 +
 .../Thrust and Drag Constant Data v2.xlsx     | Bin 4897 -> 9776 bytes
 controls/model/modelParameters.m              |  18 ++++++++++++------
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/controls/MATLAB/thrustAndDragConstant/calcDragConstant.m b/controls/MATLAB/thrustAndDragConstant/calcDragConstant.m
index 5f46efe50..3ebd01357 100644
--- a/controls/MATLAB/thrustAndDragConstant/calcDragConstant.m
+++ b/controls/MATLAB/thrustAndDragConstant/calcDragConstant.m
@@ -36,6 +36,7 @@ rotor_speed_3 = data.(5) * (pi/30);
 % b: Defined in section 5.5.4.1
 % Kd_vector: Vector containing all experimental Kd values
 % Vb: Battery voltage
+
 u1 = ((data.(1)) - Pmin)/(Pmax - Pmin);
 u2 = ((data.(1)) - Pmin)/(Pmax - Pmin);
 u3 = ((data.(1)) - Pmin)/(Pmax - Pmin);
diff --git a/controls/dataCollection/Thrust and Drag Constant Data v2.xlsx b/controls/dataCollection/Thrust and Drag Constant Data v2.xlsx
index b187c4f2eb2211604727e86c58726f207be56ae4..5e843501691b72708b7b7b2f0c36d2e62330cdbb 100644
GIT binary patch
literal 9776
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
a|6T-@WMROw3jiR1p8)VenMVHGzyAktJ}}Dw

literal 4897
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

diff --git a/controls/model/modelParameters.m b/controls/model/modelParameters.m
index 4d04f5726..103e14e9b 100644
--- a/controls/model/modelParameters.m
+++ b/controls/model/modelParameters.m
@@ -5,9 +5,13 @@
     Jyy = 0.0277;                   % Quadrotor and battery motor of inertia around by (roll)
     Jzz = 0.0332;                   % Quadrotor and battery motor of inertia around bz (yaw)
     Jreq = 4.2012e-05;              % Rotor and motor moment of inertia around axis of rotation
-    Kt = 8.1558*10^-6;              % Rotor thrust constant
+    %Kt = 8.1558*10^-6;              % Rotor thrust constant
+    Kt = 8.6519e-6;
     Kh = 0;                         % Rotor in-plane drag constant
-    Kd = 1.8087e-07;                % Rotor drag constant
+    %Kd = 1.8087e-07;               % Rotor drag constant
+    %Kd = 1.7473e-07;
+    %Kd = 1.0327e-6;                 % Kd value without rotor 3
+    Kd = 1.0317e-6;
     rhx = 0.016;                    % X-axis distance from center of mass to a rotor hub
     rhy = 0.016;                    % Y-axis distance from center of mass to a rotor hub
     rhz = 0.003;                    % Z-axis distance from center of mass to a rotor hub
@@ -15,18 +19,20 @@
     Kq = 96.3422;                   % Motor torque constant
     Kv = 96.3422;                   % Motor back emf constant
     If = 0.511;                     % Motor internal friction current
-    Pmin = 0.40;                    % Minimum zybo output duty cycle command
-    Pmax = 0.80;                    % Maximum zybo output duty cycle command
+    %Pmin = 0.40;                   % Minimum zybo output duty cycle command
+    %Pmax = 0.80;                   % Maximum zybo output duty cycle command
+    Pmin = 1e5;                     % Minimum zybo output duty cycle command
+    Pmax = 2e5;                     % Maximum zybo output duty cycle command
     Tc = 0.01;                      % Camera system sampling period
     tau_c = 0;                      % Camera system total latency
     Vb = 11.1;                      % Nominal battery voltage (V)
-    omega_o = 598.088;              % Equilibrium Rotor Speed
     x_controlled_o = 0;             % Equilibrium lateral controller output
     y_controlled_o = 0;             % Equilibrium longitudinal controller output
     yaw_controlled_o = 0;           % Equilibrium yaw controller output
+    omega_o = sqrt((m*g)/(4*Kt));   % Equilibrium Rotor Speed
     
     % Equilibrium height controller output
     height_controlled_o = (((Rm*If + ...
     + (((omega_o * 2 * Rm * Kv * Kq  ...
     * Kd + 1)^2) - 1)/(4* Rm*Kv^2*Kq ...
-    *Kd))/Vb)*(Pmax- Pmin)+Pmin)*100;     
\ No newline at end of file
+    *Kd))/Vb)*(Pmax- Pmin)+Pmin);
-- 
GitLab