Merge remote-tracking branch 'upstream/develop' into develop

.gitignore

@@ -52,3 +52,7 @@ Matlab_Toolbox/*.slxc
 
 # Exclude testing results
 ROSCO_testing/results/
+
+# Simulink/Matlab temp files
+*.slxc
+*.autosave

Matlab_Toolbox/README.md

@@ -13,5 +13,5 @@ The modules not currently implemented include:
   - Shutdown control
   - Flap control
 
-`runFAST.m` can be used to load the ROSCO parameters from a .IN file, using `load_ROSCO_params.m` and a more detailed version can be found in the `matlab-toolbox` [repository](https://github.com/dzalkind/matlab-toolbox/tree/master/Simulations).
+`runFAST.m` can be used to load the ROSCO parameters from a .IN file, using `load_ROSCO_params.m`.  Add the `matlab-toolbox` [repository](https://github.com/OpenFAST/matlab-toolbox) to your matlab path.
 

Matlab_Toolbox/Utilities/Af_HPF.m

@@ -0,0 +1,29 @@
+function [dHPF,HPF] = Af_HPF(omega,zeta,DT,varargin)
+%% Example Code
+% omega = 2*pi*6;  %rad/s
+% HPF = tf(om^2,[1,2*zeta*omega,omega^2]);
+% dHFP = c2d(LPF,DT);
+%
+% varargin to specify order
+
+if isempty(varargin)
+    order = 2;
+else
+    order = varargin{1};
+end
+
+if order == 2
+    HPF = tf([1,0,0],[1,2*zeta*omega,omega^2]);
+elseif order > 2
+    [b,a] = butter(order,omega,'high','s');
+    HPF = tf(b,a);
+else
+    HPF = tf([1,0],[1,omega]);
+end
+
+dHPF = c2d(HPF,DT,'tustin');
+
+if 0
+    figure(881);
+    bode(HPF);
+end

Matlab_Toolbox/Utilities/Af_LPF.m

@@ -0,0 +1,29 @@
+function [dLPF,LPF] = Af_LPF(omega,zeta,DT,varargin)
+%% Example Code
+% omega = 2*pi*6;  %rad/s
+% LPF = tf(om^2,[1,2*zeta*omega,omega^2]);
+% dLFP = c2d(LPF,DT);
+%
+% varargin to specify order
+
+if isempty(varargin)
+    order = 2;
+else
+    order = varargin{1};
+end
+
+if order == 2
+    LPF = tf(omega^2,[1,2*zeta*omega,omega^2]);
+elseif order > 2
+    [b,a] = butter(order,omega,'s');
+    LPF = tf(b,a);
+else
+    LPF = tf(omega,[1,omega]);
+end
+
+dLPF = c2d(LPF,DT,'tustin');
+
+if 0
+    figure(881);
+    bode(LPF);
+end