KSat/fsfw
19
6
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases Wiki Activity

lots of breaking some patching back together

Browse Source
This commit is contained in:
Ulrich Mohr
2023-06-20 15:14:15 +02:00
parent e831ba11d2
commit 1fc50a1562
13 changed files with 202 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
src/fsfw_hal/devicehandlers/MgmRM3100Handler.cpp
View File

@ -96,62 +96,62 @@ ReturnValue_t MgmRM3100Handler::buildTransitionDeviceCommand(DeviceCommandId_t *
return returnvalue::OK;
}
return buildCommandFromCommand(*id, commandBuffer, commandLen);
return 0;//buildCommandFromCommand(*id, commandBuffer, commandLen);
}
ReturnValue_t MgmRM3100Handler::buildCommandFromCommand(DeviceCommandId_t deviceCommand,
const uint8_t *commandData,
size_t commandDataLen) {
switch (deviceCommand) {
case (RM3100::CONFIGURE_CMM): {
commandBuffer[0] = RM3100::CMM_REGISTER;
commandBuffer[1] = RM3100::CMM_VALUE;
rawPacket = commandBuffer;
rawPacketLen = 2;
break;
}
case (RM3100::READ_CMM): {
commandBuffer[0] = RM3100::CMM_REGISTER | RM3100::READ_MASK;
commandBuffer[1] = 0;
rawPacket = commandBuffer;
rawPacketLen = 2;
break;
}
case (RM3100::CONFIGURE_TMRC): {
return handleTmrcConfigCommand(deviceCommand, commandData, commandDataLen);
}
case (RM3100::READ_TMRC): {
commandBuffer[0] = RM3100::TMRC_REGISTER | RM3100::READ_MASK;
commandBuffer[1] = 0;
rawPacket = commandBuffer;
rawPacketLen = 2;
break;
}
case (RM3100::CONFIGURE_CYCLE_COUNT): {
return handleCycleCountConfigCommand(deviceCommand, commandData, commandDataLen);
}
case (RM3100::READ_CYCLE_COUNT): {
commandBuffer[0] = RM3100::CYCLE_COUNT_START_REGISTER | RM3100::READ_MASK;
std::memset(commandBuffer + 1, 0, 6);
rawPacket = commandBuffer;
rawPacketLen = 7;
break;
}
case (RM3100::READ_DATA): {
commandBuffer[0] = RM3100::MEASUREMENT_REG_START | RM3100::READ_MASK;
std::memset(commandBuffer + 1, 0, 9);
rawPacketLen = 10;
break;
}
default:
return DeviceHandlerIF::COMMAND_NOT_IMPLEMENTED;
}
return returnvalue::OK;
}
// ReturnValue_t MgmRM3100Handler::buildCommandFromCommand(DeviceCommandId_t deviceCommand,
// const uint8_t *commandData,
// size_t commandDataLen) {
// switch (deviceCommand) {
// case (RM3100::CONFIGURE_CMM): {
// commandBuffer[0] = RM3100::CMM_REGISTER;
// commandBuffer[1] = RM3100::CMM_VALUE;
// rawPacket = commandBuffer;
// rawPacketLen = 2;
// break;
// }
// case (RM3100::READ_CMM): {
// commandBuffer[0] = RM3100::CMM_REGISTER | RM3100::READ_MASK;
// commandBuffer[1] = 0;
// rawPacket = commandBuffer;
// rawPacketLen = 2;
// break;
// }
// case (RM3100::CONFIGURE_TMRC): {
// return handleTmrcConfigCommand(deviceCommand, commandData, commandDataLen);
// }
// case (RM3100::READ_TMRC): {
// commandBuffer[0] = RM3100::TMRC_REGISTER | RM3100::READ_MASK;
// commandBuffer[1] = 0;
// rawPacket = commandBuffer;
// rawPacketLen = 2;
// break;
// }
// case (RM3100::CONFIGURE_CYCLE_COUNT): {
// return handleCycleCountConfigCommand(deviceCommand, commandData, commandDataLen);
// }
// case (RM3100::READ_CYCLE_COUNT): {
// commandBuffer[0] = RM3100::CYCLE_COUNT_START_REGISTER | RM3100::READ_MASK;
// std::memset(commandBuffer + 1, 0, 6);
// rawPacket = commandBuffer;
// rawPacketLen = 7;
// break;
// }
// case (RM3100::READ_DATA): {
// commandBuffer[0] = RM3100::MEASUREMENT_REG_START | RM3100::READ_MASK;
// std::memset(commandBuffer + 1, 0, 9);
// rawPacketLen = 10;
// break;
// }
// default:
// return DeviceHandlerIF::COMMAND_NOT_IMPLEMENTED;
// }
// return returnvalue::OK;
// }
ReturnValue_t MgmRM3100Handler::buildNormalDeviceCommand(DeviceCommandId_t *id) {
*id = RM3100::READ_DATA;
return buildCommandFromCommand(*id, nullptr, 0);
return 0;//buildCommandFromCommand(*id, nullptr, 0);
}
ReturnValue_t MgmRM3100Handler::scanForReply(const uint8_t *start, size_t len,