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

acu command to print current and voltage of ACU channels
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Jakob Meier 2021-12-17 15:08:33 +01:00
parent 2ed0bdf132
commit 2dd8fb4f45
3 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
mission/devices/ACUHandler.cpp
View File

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

2
mission/devices/ACUHandler.h
View File

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

2
mission/devices/GomspaceDeviceHandler.h
View File

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