diff --git a/include/outVector.h b/include/outVector.h index a0d6247..1e08f4b 100644 --- a/include/outVector.h +++ b/include/outVector.h @@ -33,9 +33,6 @@ struct outVector { std::vector LQRx = std::vector(length, 0.0); std::vector LQRy = std::vector(length, 0.0); - - std::vector thrust = std::vector(length, 0.0); - std::vector d_yError = std::vector(length, 0.0); }; #endif \ No newline at end of file diff --git a/include/sim.h b/include/sim.h index ab883df..0f10021 100644 --- a/include/sim.h +++ b/include/sim.h @@ -376,8 +376,6 @@ void state2vec(Vehicle &State, Vehicle &PrevState, outVector &stateVector, stateVector.LQRx[t] = State.LQRx; stateVector.LQRy[t] = State.LQRy; - stateVector.thrust[t] = State.thrust; - stateVector.d_yError[t] = State.d_yError; // Set "prev" values for next timestep PrevState = State; @@ -434,9 +432,7 @@ void write2CSV(outVector &stateVector, Vehicle &State) { outfile << stateVector.thrustFiring[t] << ", "; outfile << stateVector.LQRx[t] << ", "; - outfile << stateVector.LQRy[t] << ", "; - outfile << stateVector.thrust[t] << ", "; - outfile << stateVector.d_yError[t] << std::endl; + outfile << stateVector.LQRy[t] << std::endl; } outfile.close(); diff --git a/matlabHelpers/Untitled.asv b/matlabHelpers/Untitled.asv deleted file mode 100644 index 268daf9..0000000 --- a/matlabHelpers/Untitled.asv +++ /dev/null @@ -1,13 +0,0 @@ -clear all; close all; clc; - -syms I11 I22 I33 I11dot I22dot I33dot - -I = [I11 0 0; 0 I22 0; 0 0 I33]; -Idot = [I11dot 0 0; 0 I22dot 0; 0 0 I33dot]; - -syms yaw pitch roll yawdot pitchdot rolldot yawddot pitchddot rollddot - -w = - -I * - diff --git a/matlabHelpers/Untitled.m b/matlabHelpers/Untitled.m deleted file mode 100644 index 8842322..0000000 --- a/matlabHelpers/Untitled.m +++ /dev/null @@ -1,24 +0,0 @@ -clear all; close all; clc; - -syms I11 I22 I33 I11dot I22dot I33dot - -I = [I11 0 0; 0 I22 0; 0 0 I33]; -Idot = [I11dot 0 0; 0 I22dot 0; 0 0 I33dot]; - -syms yaw pitch roll yawdot pitchdot rolldot yawddot pitchddot rollddot - -w = [yawdot; pitchdot; rolldot]; - -Iw = I * w; -Idw = Idot * w; - -C = cross(w, Iw); - -syms momentX momentY momentZ - -M = [momentX; momentY; momentZ]; -A = M - Idw - C; -B = [A(1) A(2) A(3)]; - -X = B*inv(I); -E = [X(1); X(2); X(3)] \ No newline at end of file