Skip to content

Commit 0841883

Browse files
committed
bench test fixs
1 parent bdf214d commit 0841883

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
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"}
1+
{"command_port": 6000, "retrieval_timeout": 60000, "pod_address": "127.0.0.1", "pod_driver": "Simulation", "controlLaptopIpAddr": "192.168.0.6", "telemetry_port": 7000, "heartbeat_timeout": 5000}

OnPod/FlightComputer/src/Communication/CanManager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ void processFrame(const struct can_frame &frame, TelemetryManager &pod) {
183183
auto cellId = extractCanValue<int32_t >(frame.data, indices, 1 );
184184

185185
if(cellId > 96){
186-
cellId-=11;
186+
cellId-=12;
187187
}
188188
indices = {1,2};
189189
auto voltage = extractCanValue<float>(frame.data, indices, 10000);

OnPod/FlightComputer/src/Constants/SensorConfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ namespace LV_LIMITS
8484
static int32_t PRESSURE_TEMP_MAX = 60; //C
8585

8686
static int32_t COOLING_TEMP_MIN = 10;
87-
static int32_t COOLING_TEMP_MAX = 30;
87+
static int32_t COOLING_TEMP_MAX = 40;
8888
};
8989

9090
#endif //FLIGHTCOMPUTER_SENSORCONFIG_H

OnPod/FlightComputer/src/States.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ bool PreFlight::testTransitions() {
386386
this->setupTransition(psBraking, "Emergency Stop. Pod --> Braking");
387387
return true;
388388
}
389-
if(this->timeInStateSeconds() < 2 ){ //Allow nodes
389+
if(this->timeInStateSeconds() < 3 ){ //Allow nodes
390390
return false;
391391
}
392392
try {
@@ -419,7 +419,7 @@ Acceleration::Acceleration(TelemetryManager * pod) : PodState(pod) {
419419
}
420420

421421
Acceleration::~Acceleration() {
422-
422+
this->pod->telemetry->motorTorque = 0;
423423
}
424424

425425
bool Acceleration::testTransitions() {

OnPod/FlightComputer/src/TelemetryManager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ void TelemetryManager::setHighPressure(float value){
267267

268268
if(currentState == psStandby){
269269
status = inRange<float>(value, GENERAL_CONSTANTS::VACUUM, PNEUMATICS_LIMITS::HIGHPRESSURE_ARMED_MAX);
270-
} else if(currentState == psArming || currentState == psArmed || currentState == psAcceleration || currentState == psCoasting){
270+
} else if(currentState == psArming || currentState == psArmed || currentState == psAcceleration || currentState == psCoasting || currentState == psPreFlight){
271271
status = inRange<float>(value, PNEUMATICS_LIMITS::HIGHPRESSURE_ARMED_MIN, PNEUMATICS_LIMITS::HIGHPRESSURE_ARMED_MAX);
272272
}else if( currentState == psBraking ){
273273
status = inRange<float>(value, GENERAL_CONSTANTS::VACUUM, PNEUMATICS_LIMITS::HIGHPRESSURE_ARMED_MAX); //TODO confirm this

OnPod/FlightComputer/src/Threads/NavigationThread.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ void readNavigationNode(int serialPort, TelemetryManager &pod){
9090
std::stringstream().swap(dataStream);
9191
if(stripCount == "aa"){ //strip count velocity pressure
9292
pod.countIrTape();
93-
LOG(INFO)<<"strip : "<< stripCount << " velocity : "<< velocity << " pressure : " << tubePressure;
93+
//LOG(INFO)<<"strip : "<< stripCount << " velocity : "<< velocity << " pressure : " << tubePressure;
9494
}
9595
pod.telemetry->tubePressure = tubePressure;
9696
pod.telemetry->stripVelocity = velocity;

0 commit comments

Comments
 (0)