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

Update to v1.8.0 #100

Merged
muellerr merged 125 commits from develop into main 2021-09-24 10:17:43 +02:00
Conversation 0 Commits 125 Files Changed 67 +30 -22
3 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 536c0cb0fe - Show all commits

12
mission/devices/GomspaceDeviceHandler.cpp
View File

@ -7,11 +7,11 @@ GomspaceDeviceHandler::GomspaceDeviceHandler(object_id_t objectId, object_id_t c
DeviceHandlerBase(objectId, comIF, comCookie), maxConfigTableAddress(maxConfigTableAddress), DeviceHandlerBase(objectId, comIF, comCookie), maxConfigTableAddress(maxConfigTableAddress),
maxHkTableAddress(maxHkTableAddress), hkTableReplySize(hkTableReplySize), maxHkTableAddress(maxHkTableAddress), hkTableReplySize(hkTableReplySize),
hkTableDataset(hkTableDataset) { hkTableDataset(hkTableDataset) {
if (comCookie == NULL) { if (comCookie == nullptr) {
sif::error << "GomspaceDeviceHandler::GomspaceDeviceHandler: Invalid com cookie" sif::error << "GomspaceDeviceHandler::GomspaceDeviceHandler: Invalid com cookie"
<< std::endl; << std::endl;
} }
if (hkTableDataset == NULL) { if (hkTableDataset == nullptr) {
sif::error << "GomspaceDeviceHandler::GomspaceDeviceHandler: Invalid hk table data set" sif::error << "GomspaceDeviceHandler::GomspaceDeviceHandler: Invalid hk table data set"
<< std::endl; << std::endl;
} }
@ -75,7 +75,10 @@ ReturnValue_t GomspaceDeviceHandler::buildCommandFromCommand(
} }
break; break;
} }
case(GOMSPACE::PRINT_OUT_ENB_STATUS): { case(GOMSPACE::PRINT_OUT_ENB_STATUS):
case(GOMSPACE::PRINT_ALL):
case(GOMSPACE::PRINT_OUT_CURRENTS):
case(GOMSPACE::PRINT_OUT_VOLTAGES): {
result = printStatus(deviceCommand); result = printStatus(deviceCommand);
break; break;
} }
@ -99,7 +102,10 @@ void GomspaceDeviceHandler::fillCommandAndReplyMap(){
this->insertInCommandAndReplyMap(GOMSPACE::PARAM_GET, 3); this->insertInCommandAndReplyMap(GOMSPACE::PARAM_GET, 3);
this->insertInCommandAndReplyMap(GOMSPACE::REQUEST_HK_TABLE, 3); this->insertInCommandAndReplyMap(GOMSPACE::REQUEST_HK_TABLE, 3);
this->insertInCommandMap(GOMSPACE::GNDWDT_RESET); this->insertInCommandMap(GOMSPACE::GNDWDT_RESET);
this->insertInCommandMap(GOMSPACE::PRINT_ALL);
this->insertInCommandMap(GOMSPACE::PRINT_OUT_ENB_STATUS); this->insertInCommandMap(GOMSPACE::PRINT_OUT_ENB_STATUS);
this->insertInCommandMap(GOMSPACE::PRINT_OUT_VOLTAGES);
this->insertInCommandMap(GOMSPACE::PRINT_OUT_CURRENTS);
} }
ReturnValue_t GomspaceDeviceHandler::scanForReply(const uint8_t *start, ReturnValue_t GomspaceDeviceHandler::scanForReply(const uint8_t *start,

38
mission/devices/PDU2Handler.cpp
View File

@ -382,43 +382,45 @@ void PDU2Handler::printOutputSwitchStates() {
} }
void PDU2Handler::printOutputCurrents() { void PDU2Handler::printOutputCurrents() {
sif::info << "PDU2 Q7S current: " << sif::info << "Printing PDU2 currents [mA]: " << std::endl;
sif::info << "PDU2 Q7S:" <<
pdu2HkTableDataset.currentOutQ7S.value << std::endl; pdu2HkTableDataset.currentOutQ7S.value << std::endl;
sif::info << "PDU2 Payload PCDU current: " << sif::info << "PDU2 Payload PCDU:" <<
pdu2HkTableDataset.currentOutPayloadPCDUCh1.value << std::endl; pdu2HkTableDataset.currentOutPayloadPCDUCh1.value << std::endl;
sif::info << "PDU2 RW currents: " << sif::info << "PDU2 RW:" <<
pdu2HkTableDataset.currentOutReactionWheels.value << std::endl; pdu2HkTableDataset.currentOutReactionWheels.value << std::endl;
sif::info << "PDU2 TCS Board Heater In Current: " << sif::info << "PDU2 TCS Board Heater In:" <<
pdu2HkTableDataset.currentOutTCSBoardHeaterIn.value << std::endl; pdu2HkTableDataset.currentOutTCSBoardHeaterIn.value << std::endl;
sif::info << "PDU2 SuS Redundant current: " << sif::info << "PDU2 SuS Redundant:" <<
pdu2HkTableDataset.currentOutSUSRedundant.value << std::endl; pdu2HkTableDataset.currentOutSUSRedundant.value << std::endl;
sif::info << "PDU2 Depl-Mechanism current: " << sif::info << "PDU2 Depl-Mechanism:" <<
pdu2HkTableDataset.currentOutDeplMechanism.value << std::endl; pdu2HkTableDataset.currentOutDeplMechanism.value << std::endl;
sif::info << "PDU2 Payload PCDU current: " << sif::info << "PDU2 Payload PCDU:" <<
pdu2HkTableDataset.currentOutPayloadPCDUCh6.value << std::endl; pdu2HkTableDataset.currentOutPayloadPCDUCh6.value << std::endl;
sif::info << "PDU2 ACS Board current: " << sif::info << "PDU2 ACS Board:" <<
pdu2HkTableDataset.currentOutACSBoardSideB.value << std::endl; pdu2HkTableDataset.currentOutACSBoardSideB.value << std::endl;
sif::info << "PDU2 Payload Camera current: " << sif::info << "PDU2 Payload Camera:" <<
pdu2HkTableDataset.currentOutPayloadCamera.value << std::endl; pdu2HkTableDataset.currentOutPayloadCamera.value << std::endl;
} }
void PDU2Handler::printOutputVoltages() { void PDU2Handler::printOutputVoltages() {
sif::info << "PDU2 Q7S voltage: " << sif::info << "Printing PDU2 voltages [mV]: " << std::endl;
sif::info << "PDU2 Q7S:" <<
pdu2HkTableDataset.voltageOutQ7S.value << std::endl; pdu2HkTableDataset.voltageOutQ7S.value << std::endl;
sif::info << "PDU2 Payload PCDU voltage: " << sif::info << "PDU2 Payload PCDU:" <<
pdu2HkTableDataset.voltageOutPayloadPCDUCh1.value << std::endl; pdu2HkTableDataset.voltageOutPayloadPCDUCh1.value << std::endl;
sif::info << "PDU2 RW voltage: " << sif::info << "PDU2 RW:" <<
pdu2HkTableDataset.voltageOutReactionWheels.value << std::endl; pdu2HkTableDataset.voltageOutReactionWheels.value << std::endl;
sif::info << "PDU2 TCS Board Heater In voltage: " << sif::info << "PDU2 TCS Board Heater In:" <<
pdu2HkTableDataset.voltageOutTCSBoardHeaterIn.value << std::endl; pdu2HkTableDataset.voltageOutTCSBoardHeaterIn.value << std::endl;
sif::info << "PDU2 SuS Redundant voltage: " << sif::info << "PDU2 SuS Redundant:" <<
pdu2HkTableDataset.voltageOutSUSRedundant.value << std::endl; pdu2HkTableDataset.voltageOutSUSRedundant.value << std::endl;
sif::info << "PDU2 Depl-Mechanism voltage: " << sif::info << "PDU2 Depl-Mechanism:" <<
pdu2HkTableDataset.voltageOutDeplMechanism.value << std::endl; pdu2HkTableDataset.voltageOutDeplMechanism.value << std::endl;
sif::info << "PDU2 Payload PCDU voltage: " << sif::info << "PDU2 Payload PCDU:" <<
pdu2HkTableDataset.voltageOutPayloadPCDUCh6.value << std::endl; pdu2HkTableDataset.voltageOutPayloadPCDUCh6.value << std::endl;
sif::info << "PDU2 ACS Board voltage: " << sif::info << "PDU2 ACS Board voltage:" <<
pdu2HkTableDataset.voltageOutACSBoardSideB.value << std::endl; pdu2HkTableDataset.voltageOutACSBoardSideB.value << std::endl;
sif::info << "PDU2 Payload Camera voltage: " << sif::info << "PDU2 Payload Camera voltage:" <<
pdu2HkTableDataset.voltageOutPayloadCamera.value << std::endl; pdu2HkTableDataset.voltageOutPayloadCamera.value << std::endl;
} }

2
tmtc

@ -1 +1 @@
Subproject commit 6da94c73d0568c64e41d6c4b803539e09409c942 Subproject commit 5c65390a8b0344c41728d276729cae0a2cc1d9d1