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

added 5v stack command #334

Merged
muellerr merged 3 commits from mueller_pcdu_handler_stack_command into develop 2022-12-22 16:06:18 +01:00
Conversation 0 Commits 3 Files Changed 3 +12 -1
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -14,6 +14,8 @@ list yields a list of all related PRs for each release.
- First version of ACS controller - First version of ACS controller
PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/329 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 # [v1.18.0] 01.12.2022

5
mission/devices/PCDUHandler.cpp
View File

@ -321,6 +321,11 @@ ReturnValue_t PCDUHandler::sendSwitchCommand(uint8_t switchNr, ReturnValue_t onO
pdu = ObjectManager::instance()->get<GomspaceDeviceHandler>(objects::PDU2_HANDLER); pdu = ObjectManager::instance()->get<GomspaceDeviceHandler>(objects::PDU2_HANDLER);
break; break;
} }
case pcdu::P60_DOCK_5V_STACK: {
memoryAddress = P60Dock::CONFIG_ADDRESS_OUT_EN_5V_STACK;
pdu = ObjectManager::instance()->get<GomspaceDeviceHandler>(objects::P60DOCK_HANDLER);
break;
}
default: { default: {
sif::error << "PCDUHandler::sendSwitchCommand: Invalid switch number " << std::endl; sif::error << "PCDUHandler::sendSwitchCommand: Invalid switch number " << std::endl;

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

@ -108,6 +108,8 @@ enum class SetIds : uint32_t { CORE = 1, AUX = 2, CONFIG = 3 };
namespace P60Dock { namespace P60Dock {
static const uint16_t CONFIG_ADDRESS_OUT_EN_5V_STACK = 0x72;
namespace pool { namespace pool {
enum Ids : lp_id_t { enum Ids : lp_id_t {
@ -733,7 +735,9 @@ enum Switches : power::Switch_t {
PDU2_CH5_DEPLOYMENT_MECHANISM_8V, PDU2_CH5_DEPLOYMENT_MECHANISM_8V,
PDU2_CH6_PL_PCDU_BATT_1_14V8, PDU2_CH6_PL_PCDU_BATT_1_14V8,
PDU2_CH7_ACS_BOARD_SIDE_B_3V3, 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; static constexpr uint8_t NUMBER_OF_SWITCHES = 18;