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

meier/startracker #118

Merged
muellerr merged 43 commits from meier/startracker into develop 2021-12-22 15:22:58 +01:00
Conversation 1 Commits 43 Files Changed 49 +5636 -1014
75 changed files with 5636 additions and 1014 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2dd8fb4f45 - Show all commits

37
mission/devices/ACUHandler.cpp
View File

@ -16,6 +16,11 @@ ReturnValue_t ACUHandler::buildNormalDeviceCommand(
return buildCommandFromCommand(*id, NULL, 0);
}
void ACUHandler::fillCommandAndReplyMap() {
GomspaceDeviceHandler::fillCommandAndReplyMap();
this->insertInCommandMap(PRINT_CHANNEL_STATS);
}
void ACUHandler::letChildHandleHkReply(DeviceCommandId_t id, const uint8_t *packet) {
parseHkTableReply(packet);
@ -281,29 +286,23 @@ ReturnValue_t ACUHandler::deviceSpecificCommand(DeviceCommandId_t cmd) {
void ACUHandler::printChannelStats() {
PoolReadGuard pg(&acuHkTableDataset);
sif::info << "ACU Info: Stats, Current [mA], Voltage [mV]" << std::endl;
sif::info << std::setw(30) << std::left << "Ch0" << std::dec << "| " <<
sif::info << "ACU Info: Current [mA], Voltage [mV]" << std::endl;
sif::info << std::setw(8) << std::left << "Ch0" << std::dec << "| " <<
static_cast<unsigned int>(acuHkTableDataset.currentInChannel0.value) << ", " <<
std::setw(4) << std::right << acuHkTableDataset.voltageInChannel0.value << ", "
<< std::setw(4) << std::endl;
sif::info << std::setw(30) << std::left << "Ch1" << std::dec << "| " <<
std::setw(13) << std::right << acuHkTableDataset.voltageInChannel0.value << std::endl;
sif::info << std::setw(8) << std::left << "Ch1" << std::dec << "| " <<
static_cast<unsigned int>(acuHkTableDataset.currentInChannel1.value) << ", " <<
std::setw(4) << std::right << acuHkTableDataset.voltageInChannel1.value << ", "
<< std::setw(4) << std::endl;
sif::info << std::setw(30) << std::left << "Ch2" << std::dec << "| " <<
std::setw(13) << std::right << acuHkTableDataset.voltageInChannel1.value << std::endl;
sif::info << std::setw(8) << std::left << "Ch2" << std::dec << "| " <<
static_cast<unsigned int>(acuHkTableDataset.currentInChannel2.value) << ", " <<
std::setw(4) << std::right << acuHkTableDataset.voltageInChannel2.value << ", "
<< std::setw(4) << std::endl;
sif::info << std::setw(30) << std::left << "Ch3" << std::dec << "| " <<
std::setw(13) << std::right << acuHkTableDataset.voltageInChannel2.value << std::endl;
sif::info << std::setw(8) << std::left << "Ch3" << std::dec << "| " <<
static_cast<unsigned int>(acuHkTableDataset.currentInChannel3.value) << ", " <<
std::setw(4) << std::right << acuHkTableDataset.voltageInChannel3.value << ", "
<< std::setw(4) << std::endl;
sif::info << std::setw(30) << std::left << "Ch4" << std::dec << "| " <<
std::setw(13) << std::right << acuHkTableDataset.voltageInChannel3.value << std::endl;
sif::info << std::setw(8) << std::left << "Ch4" << std::dec << "| " <<
static_cast<unsigned int>(acuHkTableDataset.currentInChannel4.value) << ", " <<
std::setw(4) << std::right << acuHkTableDataset.voltageInChannel4.value << ", "
<< std::setw(4) << std::endl;
sif::info << std::setw(30) << std::left << "Ch5" << std::dec << "| " <<
std::setw(13) << std::right << acuHkTableDataset.voltageInChannel4.value << std::endl;
sif::info << std::setw(8) << std::left << "Ch5" << std::dec << "| " <<
static_cast<unsigned int>(acuHkTableDataset.currentInChannel5.value) << ", " <<
std::setw(4) << std::right << acuHkTableDataset.voltageInChannel5.value << ", "
<< std::setw(4) << std::endl;
std::setw(13) << std::right << acuHkTableDataset.voltageInChannel5.value << std::endl;
}

2
mission/devices/ACUHandler.h
View File

@ -26,6 +26,8 @@ protected:
*/
virtual ReturnValue_t buildNormalDeviceCommand(DeviceCommandId_t * id) override;
virtual void fillCommandAndReplyMap() override;
virtual ReturnValue_t deviceSpecificCommand(DeviceCommandId_t cmd) override;
private:

2
mission/devices/GomspaceDeviceHandler.h
View File

@ -73,7 +73,7 @@ protected:
virtual ReturnValue_t buildNormalDeviceCommand(DeviceCommandId_t * id)
override;
ReturnValue_t buildTransitionDeviceCommand(DeviceCommandId_t * id) override;
void fillCommandAndReplyMap() override;
virtual void fillCommandAndReplyMap() override;
ReturnValue_t buildCommandFromCommand(DeviceCommandId_t deviceCommand,
const uint8_t * commandData,size_t commandDataLen) override;
ReturnValue_t scanForReply(const uint8_t *start, size_t remainingSize,