Skip to content

Commit bdf214d

Browse files
committed
resolver fix
1 parent e803254 commit bdf214d

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"pod_driver": "Simulation", "pod_address": "127.0.0.1", "command_port": 6000, "retrieval_timeout": 60000, "telemetry_port": 7000, "controlLaptopIpAddr": "192.168.0.6", "heartbeat_timeout": 5000}
1+
{"retrieval_timeout": 60000, "pod_address": "127.0.0.1", "telemetry_port": 7000, "controlLaptopIpAddr": "192.168.0.6", "command_port": 6000, "heartbeat_timeout": 5000, "pod_driver": "Simulation"}

OnPod/FlightComputer/src/States.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,8 +428,8 @@ bool Acceleration::testTransitions() {
428428
return true;
429429
}
430430
try {
431-
this->commonChecks();
432431
this->armedChecks();
432+
this->commonChecks();
433433
}
434434
catch (CriticalErrorException &error){
435435
std::string reason = " Critical Pod --> Braking ";

OnPod/FlightComputer/src/Threads/NavigationThread.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ void readNavigationNode(int serialPort, TelemetryManager &pod){
8888
}
8989
dataStream >> tubePressure;
9090
std::stringstream().swap(dataStream);
91-
LOG(INFO)<<stripCount;
9291
if(stripCount == "aa"){ //strip count velocity pressure
9392
pod.countIrTape();
9493
LOG(INFO)<<"strip : "<< stripCount << " velocity : "<< velocity << " pressure : " << tubePressure;

0 commit comments

Comments
 (0)