diff --git a/mission/com/SyrlinksHandler.cpp b/mission/com/SyrlinksHandler.cpp index 6fbc8dc2..c579ef9c 100644 --- a/mission/com/SyrlinksHandler.cpp +++ b/mission/com/SyrlinksHandler.cpp @@ -236,39 +236,39 @@ ReturnValue_t SyrlinksHandler::buildCommandFromCommand(DeviceCommandId_t deviceC void SyrlinksHandler::fillCommandAndReplyMap() { this->insertInCommandAndReplyMap(syrlinks::RESET_UNIT, 1, nullptr, syrlinks::ACK_SIZE, false, true, syrlinks::ACK_REPLY); - this->insertInCommandAndReplyMap(syrlinks::SET_TX_MODE_STANDBY, 1, nullptr, syrlinks::ACK_SIZE, + this->insertInCommandAndReplyMap(syrlinks::SET_TX_MODE_STANDBY, 2, nullptr, syrlinks::ACK_SIZE, false, true, syrlinks::ACK_REPLY); - this->insertInCommandAndReplyMap(syrlinks::SET_TX_MODE_MODULATION, 1, nullptr, syrlinks::ACK_SIZE, + this->insertInCommandAndReplyMap(syrlinks::SET_TX_MODE_MODULATION, 2, nullptr, syrlinks::ACK_SIZE, false, true, syrlinks::ACK_REPLY); - this->insertInCommandAndReplyMap(syrlinks::SET_TX_MODE_CW, 1, nullptr, syrlinks::ACK_SIZE, false, + this->insertInCommandAndReplyMap(syrlinks::SET_TX_MODE_CW, 2, nullptr, syrlinks::ACK_SIZE, false, true, syrlinks::ACK_REPLY); - this->insertInCommandAndReplyMap(syrlinks::WRITE_LCL_CONFIG, 1, nullptr, syrlinks::ACK_SIZE, + this->insertInCommandAndReplyMap(syrlinks::WRITE_LCL_CONFIG, 2, nullptr, syrlinks::ACK_SIZE, false, true, syrlinks::ACK_REPLY); - this->insertInCommandAndReplyMap(syrlinks::SET_WAVEFORM_BPSK, 1, nullptr, syrlinks::ACK_SIZE, + this->insertInCommandAndReplyMap(syrlinks::SET_WAVEFORM_BPSK, 2, nullptr, syrlinks::ACK_SIZE, false, true, syrlinks::ACK_REPLY); - this->insertInCommandAndReplyMap(syrlinks::SET_WAVEFORM_0QPSK, 1, nullptr, syrlinks::ACK_SIZE, + this->insertInCommandAndReplyMap(syrlinks::SET_WAVEFORM_0QPSK, 2, nullptr, syrlinks::ACK_SIZE, false, true, syrlinks::ACK_REPLY); this->insertInCommandMap(syrlinks::ENABLE_DEBUG); this->insertInCommandMap(syrlinks::DISABLE_DEBUG); - this->insertInCommandAndReplyMap(syrlinks::READ_LCL_CONFIG, 1, nullptr, + this->insertInCommandAndReplyMap(syrlinks::READ_LCL_CONFIG, 2, nullptr, syrlinks::READ_ONE_REGISTER_REPLY_SIE); - this->insertInCommandAndReplyMap(syrlinks::READ_TX_STATUS, 1, &txDataset, + this->insertInCommandAndReplyMap(syrlinks::READ_TX_STATUS, 2, &txDataset, syrlinks::READ_ONE_REGISTER_REPLY_SIE); - this->insertInCommandAndReplyMap(syrlinks::READ_TX_WAVEFORM, 1, &txDataset, + this->insertInCommandAndReplyMap(syrlinks::READ_TX_WAVEFORM, 2, &txDataset, syrlinks::READ_ONE_REGISTER_REPLY_SIE); - this->insertInCommandAndReplyMap(syrlinks::READ_TX_AGC_VALUE_HIGH_BYTE, 1, &txDataset, + this->insertInCommandAndReplyMap(syrlinks::READ_TX_AGC_VALUE_HIGH_BYTE, 2, &txDataset, syrlinks::READ_ONE_REGISTER_REPLY_SIE); - this->insertInCommandAndReplyMap(syrlinks::READ_TX_AGC_VALUE_LOW_BYTE, 1, &txDataset, + this->insertInCommandAndReplyMap(syrlinks::READ_TX_AGC_VALUE_LOW_BYTE, 2, &txDataset, syrlinks::READ_ONE_REGISTER_REPLY_SIE); - this->insertInCommandAndReplyMap(syrlinks::TEMP_POWER_AMPLIFIER_HIGH_BYTE, 1, nullptr, + this->insertInCommandAndReplyMap(syrlinks::TEMP_POWER_AMPLIFIER_HIGH_BYTE, 2, nullptr, syrlinks::READ_ONE_REGISTER_REPLY_SIE); - this->insertInCommandAndReplyMap(syrlinks::TEMP_POWER_AMPLIFIER_LOW_BYTE, 1, nullptr, + this->insertInCommandAndReplyMap(syrlinks::TEMP_POWER_AMPLIFIER_LOW_BYTE, 2, nullptr, syrlinks::READ_ONE_REGISTER_REPLY_SIE); - this->insertInCommandAndReplyMap(syrlinks::TEMP_BASEBAND_BOARD_HIGH_BYTE, 1, nullptr, + this->insertInCommandAndReplyMap(syrlinks::TEMP_BASEBAND_BOARD_HIGH_BYTE, 2, nullptr, syrlinks::READ_ONE_REGISTER_REPLY_SIE); - this->insertInCommandAndReplyMap(syrlinks::TEMP_BASEBAND_BOARD_LOW_BYTE, 1, nullptr, + this->insertInCommandAndReplyMap(syrlinks::TEMP_BASEBAND_BOARD_LOW_BYTE, 2, nullptr, syrlinks::READ_ONE_REGISTER_REPLY_SIE); - this->insertInCommandAndReplyMap(syrlinks::READ_RX_STATUS_REGISTERS, 1, &rxDataset, + this->insertInCommandAndReplyMap(syrlinks::READ_RX_STATUS_REGISTERS, 2, &rxDataset, syrlinks::RX_STATUS_REGISTERS_REPLY_SIZE); } diff --git a/mission/system/com/SyrlinksFdir.cpp b/mission/system/com/SyrlinksFdir.cpp index a8e25496..6cb5feea 100644 --- a/mission/system/com/SyrlinksFdir.cpp +++ b/mission/system/com/SyrlinksFdir.cpp @@ -10,7 +10,10 @@ #include "mission/com/syrlinksDefs.h" SyrlinksFdir::SyrlinksFdir(object_id_t syrlinksId) - : DeviceHandlerFailureIsolation(syrlinksId, objects::NO_OBJECT) {} + : DeviceHandlerFailureIsolation(syrlinksId, objects::NO_OBJECT) { + // Higher threshold. + missedReplyCount.setFailureThreshold(10); +} ReturnValue_t SyrlinksFdir::eventReceived(EventMessage* event) { if (isFdirInActionOrAreWeFaulty(event)) {