eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

v1.10.0 #220

Merged
meierj merged 592 commits from develop into main 2022-04-22 07:42:20 +02:00
Conversation 0 Commits 592 Files Changed 218 +4 -4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ffe1fd9af4 - Show all commits

2
mission/devices/PayloadPcduHandler.cpp
View File

@ -656,7 +656,7 @@ void PayloadPcduHandler::handleFailureInjection(std::string output, Event event)
<< std::endl; << std::endl;
triggerEvent(event, 0, 0); triggerEvent(event, 0, 0);
transitionOk = false; transitionOk = false;
transitionBackToOff(); transitionBackToOff(true);
droToX8InjectionRequested = false; droToX8InjectionRequested = false;
} }

6
mission/devices/devicedefinitions/payloadPcduDefinitions.h
View File

@ -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_LOWER_BOUND = -6.5;
static constexpr double DFT_NEG_V_UPPER_BOUND = -2.7; static constexpr double DFT_NEG_V_UPPER_BOUND = -2.7;
static constexpr double DRO_U_LOWER_BOUND = 5.0; static constexpr double DFT_DRO_U_LOWER_BOUND = 5.0;
static constexpr double DRO_U_UPPER_BOUND = 7.0; static constexpr double DFT_DRO_U_UPPER_BOUND = 7.0;
// Max Current DRO + Max Current Neg V | 40 + 15 // 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_LOWER_BOUND = 2.6;
static constexpr double DFT_X8_U_UPPER_BOUND = 4.0; static constexpr double DFT_X8_U_UPPER_BOUND = 4.0;