From e7c0066d5d43e7f2aeaf9822a97ecad7e62f0c9f Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 4 Mar 2022 15:28:47 +0100 Subject: [PATCH] added last small fixes for successfull compilation --- bsp_q7s/core/ObjectFactory.cpp | 6 +++--- mission/devices/PayloadPcduHandler.cpp | 2 +- mission/devices/devicedefinitions/payloadPcduDefinitions.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp index be6d1b11..519dec8f 100644 --- a/bsp_q7s/core/ObjectFactory.cpp +++ b/bsp_q7s/core/ObjectFactory.cpp @@ -736,7 +736,7 @@ void ObjectFactory::createHeaterComponents() { heaterGpiosCookie->addGpio(gpioIds::HEATER_7, gpio); new HeaterHandler(objects::HEATER_HANDLER, objects::GPIO_IF, heaterGpiosCookie, - objects::PCDU_HANDLER, pcduSwitches::Switches::PDU2_CH3_TCS_BOARD_HEATER_IN_8V); + objects::PCDU_HANDLER, pcduSwitches::TCS_BOARD_8V_HEATER_IN); } void ObjectFactory::createSolarArrayDeploymentComponents() { @@ -756,8 +756,8 @@ void ObjectFactory::createSolarArrayDeploymentComponents() { // TODO: Find out burn time. For now set to 1000 ms. new SolarArrayDeploymentHandler(objects::SOLAR_ARRAY_DEPL_HANDLER, objects::GPIO_IF, solarArrayDeplCookie, objects::PCDU_HANDLER, - pcduSwitches::Switches::PDU2_CH5_DEPLOYMENT_MECHANISM_8V, - gpioIds::DEPLSA1, gpioIds::DEPLSA2, 1000); + pcduSwitches::DEPLOYMENT_MECHANISM, gpioIds::DEPLSA1, + gpioIds::DEPLSA2, 1000); } void ObjectFactory::createSyrlinksComponents() { diff --git a/mission/devices/PayloadPcduHandler.cpp b/mission/devices/PayloadPcduHandler.cpp index d22e70ec..1d5f4b89 100644 --- a/mission/devices/PayloadPcduHandler.cpp +++ b/mission/devices/PayloadPcduHandler.cpp @@ -656,7 +656,7 @@ void PayloadPcduHandler::handleFailureInjection(std::string output, Event event) << std::endl; triggerEvent(event, 0, 0); transitionOk = false; - transitionBackToOff(); + transitionBackToOff(true); droToX8InjectionRequested = false; } diff --git a/mission/devices/devicedefinitions/payloadPcduDefinitions.h b/mission/devices/devicedefinitions/payloadPcduDefinitions.h index 69cb71f0..b6ce949e 100644 --- a/mission/devices/devicedefinitions/payloadPcduDefinitions.h +++ b/mission/devices/devicedefinitions/payloadPcduDefinitions.h @@ -133,10 +133,10 @@ static constexpr float SCALE_CURRENT_DRO = MAX122X_SCALE / (GAIN_INA169 * R_SHUN static constexpr double DFT_NEG_V_LOWER_BOUND = -6.5; static constexpr double DFT_NEG_V_UPPER_BOUND = -2.7; -static constexpr double DRO_U_LOWER_BOUND = 5.0; -static constexpr double DRO_U_UPPER_BOUND = 7.0; +static constexpr double DFT_DRO_U_LOWER_BOUND = 5.0; +static constexpr double DFT_DRO_U_UPPER_BOUND = 7.0; // Max Current DRO + Max Current Neg V | 40 + 15 -static constexpr double DRO_I_UPPER_BOUND = 55.0; +static constexpr double DFT_DRO_I_UPPER_BOUND = 55.0; static constexpr double DFT_X8_U_LOWER_BOUND = 2.6; static constexpr double DFT_X8_U_UPPER_BOUND = 4.0;