From 7df7ced43e16f501cbd9087e64b299fbabc2708b Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 21 Dec 2022 13:40:31 +0100 Subject: [PATCH 1/2] added 5v stack command --- mission/devices/PCDUHandler.cpp | 5 +++++ mission/devices/devicedefinitions/GomspaceDefinitions.h | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/mission/devices/PCDUHandler.cpp b/mission/devices/PCDUHandler.cpp index 91881db5..71b4734e 100644 --- a/mission/devices/PCDUHandler.cpp +++ b/mission/devices/PCDUHandler.cpp @@ -321,6 +321,11 @@ ReturnValue_t PCDUHandler::sendSwitchCommand(uint8_t switchNr, ReturnValue_t onO pdu = ObjectManager::instance()->get(objects::PDU2_HANDLER); break; } + case pcdu::P60_DOCK_5V_STACK: { + memoryAddress = P60Dock::CONFIG_ADDRESS_OUT_EN_5V_STACK; + pdu = ObjectManager::instance()->get(objects::P60DOCK_HANDLER); + break; + } default: { sif::error << "PCDUHandler::sendSwitchCommand: Invalid switch number " << std::endl; diff --git a/mission/devices/devicedefinitions/GomspaceDefinitions.h b/mission/devices/devicedefinitions/GomspaceDefinitions.h index d2ffdc25..ca92f5e4 100644 --- a/mission/devices/devicedefinitions/GomspaceDefinitions.h +++ b/mission/devices/devicedefinitions/GomspaceDefinitions.h @@ -108,6 +108,8 @@ enum class SetIds : uint32_t { CORE = 1, AUX = 2, CONFIG = 3 }; namespace P60Dock { +static const uint16_t CONFIG_ADDRESS_OUT_EN_5V_STACK = 0x72; + namespace pool { enum Ids : lp_id_t { @@ -733,7 +735,9 @@ enum Switches : power::Switch_t { PDU2_CH5_DEPLOYMENT_MECHANISM_8V, PDU2_CH6_PL_PCDU_BATT_1_14V8, PDU2_CH7_ACS_BOARD_SIDE_B_3V3, - PDU2_CH8_PAYLOAD_CAMERA + PDU2_CH8_PAYLOAD_CAMERA, + + P60_DOCK_5V_STACK }; static constexpr uint8_t NUMBER_OF_SWITCHES = 18; -- 2.34.1 From 9024460da34f7e1eb162467eaf5bcb10a7c1fc5b Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 21 Dec 2022 13:44:48 +0100 Subject: [PATCH 2/2] changelog update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf627b3a..b7f27fc7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ list yields a list of all related PRs for each release. - First version of ACS controller PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/329 +- Allow commanding the 5V stack internally in software + PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/334 # [v1.18.0] 01.12.2022 -- 2.34.1