Anson/Lander-Embedded
1
0
Fork 0
mirror of https://gitlab.com/lander-team/lander-cpp.git synced 2025-06-16 23:26:43 +00:00
Code Releases Activity

forgot a merge issue

Browse Source
This commit is contained in:
Anson Biggs 2021-09-17 13:09:28 -07:00
parent 8702d9aa7f
commit 56cb20ca82
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/sim.h
View File

@ -18,14 +18,11 @@ double const g = -9.81;
bool sim(struct Vehicle &State, struct Vehicle &PrevState) { bool sim(struct Vehicle &State, struct Vehicle &PrevState) {
<<<<<<< HEAD
// defining a few random values here cause I'm lazy // defining a few random values here cause I'm lazy
State.burnElapsed = 2000; State.burnElapsed = 2000;
State.mass = State.massInitial; State.mass = State.massInitial;
PrevState.thrust = 0.0; PrevState.thrust = 0.0;
=======
outVector stateVector; outVector stateVector;
>>>>>>> 3-store-data-in-memory
// Determine when to burn // Determine when to burn
burnStartTimeCalc(State); burnStartTimeCalc(State);
@ -41,11 +38,7 @@ bool sim(struct Vehicle &State, struct Vehicle &PrevState) {
state2vec(State, stateVector, t); state2vec(State, stateVector, t);
t++; t++;
<<<<<<< HEAD
} while ((State.z > 0.0) || (State.thrust > 1.0)); } while ((State.z > 0.0) || (State.thrust > 1.0));
=======
} while ((State.z > 0) || (State.thrust > 1));
>>>>>>> 3-store-data-in-memory
write2CSV(stateVector); write2CSV(stateVector);