mirror of
https://gitlab.com/lander-team/lander-cpp.git
synced 2025-06-16 15:17:23 +00:00
Merge branch '19-failed-velocity-requirement' of https://gitlab.com/lander-team/lander-cpp into 19-failed-velocity-requirement
This commit is contained in:
commit
90d385f0b3
2
.vscode/tasks.json
vendored
2
.vscode/tasks.json
vendored
@ -2,7 +2,7 @@
|
|||||||
"version": "2.0.0",
|
"version": "2.0.0",
|
||||||
"tasks": [
|
"tasks": [
|
||||||
{
|
{
|
||||||
"type": "cppbuild",
|
"type": "process",
|
||||||
"label": "buildSim",
|
"label": "buildSim",
|
||||||
"command": "g++",
|
"command": "g++",
|
||||||
"args": [
|
"args": [
|
||||||
|
@ -16,7 +16,6 @@ double limit(double value, double upr, double lwr);
|
|||||||
|
|
||||||
// Any parameters that are constants should be declared here instead of
|
// Any parameters that are constants should be declared here instead of
|
||||||
// buried in code
|
// buried in code
|
||||||
double const dt = 0.001;
|
|
||||||
double const g = -9.81;
|
double const g = -9.81;
|
||||||
|
|
||||||
bool sim(struct Vehicle &State, struct Vehicle &PrevState) {
|
bool sim(struct Vehicle &State, struct Vehicle &PrevState) {
|
||||||
@ -71,6 +70,7 @@ bool sim(struct Vehicle &State, struct Vehicle &PrevState) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void burnStartTimeCalc(Vehicle &State) {
|
void burnStartTimeCalc(Vehicle &State) {
|
||||||
|
double dt = State.stepSize/1000.0;
|
||||||
double velocity = State.vz;
|
double velocity = State.vz;
|
||||||
double h = 0;
|
double h = 0;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user