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

Merge remote-tracking branch 'origin/develop' into mueller/yocto-rootfs

Browse Source
This commit is contained in:
Robin Müller 2022-04-21 13:45:13 +02:00
commit 20bb1d73f5
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mission/devices/PCDUHandler.cpp
View File

@ -81,12 +81,16 @@ ReturnValue_t PCDUHandler::initialize() {
void PCDUHandler::initializeSwitchStates() { void PCDUHandler::initializeSwitchStates() {
using namespace pcdu; using namespace pcdu;
for (uint8_t idx = 0; idx < NUMBER_OF_SWITCHES; idx++) { try {
if (idx < PDU::CHANNELS_LEN) { for (uint8_t idx = 0; idx < NUMBER_OF_SWITCHES; idx++) {
switchStates[idx] = INIT_SWITCHES_PDU1[idx]; if (idx < PDU::CHANNELS_LEN) {
} else { switchStates[idx] = INIT_SWITCHES_PDU1.at(idx);
switchStates[idx] = INIT_SWITCHES_PDU2[idx]; } else {
switchStates[idx] = INIT_SWITCHES_PDU2.at(idx - PDU::CHANNELS_LEN);
}
} }
} catch (const std::out_of_range& err) {
sif::error << "PCDUHandler::initializeSwitchStates: " << err.what() << std::endl;
} }
} }

2
scripts/q7s-cp.py
View File

@ -92,7 +92,7 @@ def build_cmd(args):
else: else:
target = args.target target = args.target
if args.invert: if args.invert:
cmd += f"{port_args} {address}:{args.source} {target}" cmd += f"{port_args} {address}:{source_files} {target}"
else: else:
cmd += f"{port_args} {source_files} {address}:{target}" cmd += f"{port_args} {source_files} {address}:{target}"
return cmd return cmd