From e3ab9da8e931fca07e71fd81ed2153f945248ef2 Mon Sep 17 00:00:00 2001 From: bpmcgeeney Date: Tue, 30 Nov 2021 11:23:42 -0700 Subject: [PATCH 1/3] thrustInfo() instead of TVC() --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index a11dbac..e47b56d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -66,7 +66,7 @@ void loop() { vehicleDynamics(State, PrevState); thrustInfo(State); pidController(State, PrevState); - TVC(State, PrevState); + thrustInfo(State, PrevState); processTVC(State, yaw, pitch); write2CSV(State); From 2249417045de1d223f0bd53ff3b5cc38790bff50 Mon Sep 17 00:00:00 2001 From: Anson Biggs Date: Tue, 30 Nov 2021 11:47:51 -0700 Subject: [PATCH 2/3] wait for ignition before simulation --- include/teensy.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/teensy.h b/include/teensy.h index 94d76e0..f7154d5 100644 --- a/include/teensy.h +++ b/include/teensy.h @@ -230,7 +230,21 @@ void thrustInfo(Vehicle &State) { State.burnStart = State.time; State.burnElapsed = 0.0; + // Save load cell values before ignition + double lc_val = State.lc0_processed + State.lc1_processed + + State.lc2_processed + State.lc3_processed; + + // CONTACT + Serial.println("CONTACT"); digitalWrite(pin_igniter, HIGH); + + // Wait for motor to start burning + Serial.println("waiting for motor to start."); + while (lc_val * 1.5 < State.lc0_processed + State.lc1_processed + + State.lc2_processed + State.lc3_processed) { + ; + } + State.thrustFiring = 1; } else if (State.thrustFiring == 1) { From 71a128b0863fd996e56a62c73ad3916e7bb12a4d Mon Sep 17 00:00:00 2001 From: Anson Biggs Date: Tue, 30 Nov 2021 11:49:39 -0700 Subject: [PATCH 3/3] make code compile --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index e47b56d..268e056 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -66,7 +66,7 @@ void loop() { vehicleDynamics(State, PrevState); thrustInfo(State); pidController(State, PrevState); - thrustInfo(State, PrevState); + thrustInfo(State); processTVC(State, yaw, pitch); write2CSV(State);