From 3008cde75ecf955925f3a3a015771f12e5052b94 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Fri, 22 Jul 2022 15:51:09 +0200 Subject: [PATCH] Bump MMU FW version to 2.0.19 to match/enforce the necessary compatibility level --- Firmware/mmu2_protocol_logic.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Firmware/mmu2_protocol_logic.cpp b/Firmware/mmu2_protocol_logic.cpp index 1ae935483b..535702a75c 100644 --- a/Firmware/mmu2_protocol_logic.cpp +++ b/Firmware/mmu2_protocol_logic.cpp @@ -6,6 +6,10 @@ namespace MMU2 { +static constexpr uint8_t supportedMmuFWVersionMajor = 2; +static constexpr uint8_t supportedMmuFWVersionMinor = 0; +static constexpr uint8_t supportedMmuFWVersionBuild = 19; + StepStatus ProtocolLogicPartBase::ProcessFINDAReqSent(StepStatus finishedRV, State nextState){ if (auto expmsg = logic->ExpectingMessage(linkLayerTimeout); expmsg != MessageReady) return expmsg; @@ -140,7 +144,7 @@ StepStatus StartSeq::Step() { SendVersion(0); } else { logic->mmuFwVersionMajor = logic->rsp.paramValue; - if (logic->mmuFwVersionMajor != 2) { + if (logic->mmuFwVersionMajor != supportedMmuFWVersionMajor) { return VersionMismatch; } logic->dataTO.Reset(); // got meaningful response from the MMU, stop data layer timeout tracking @@ -153,7 +157,7 @@ StepStatus StartSeq::Step() { SendVersion(1); } else { logic->mmuFwVersionMinor = logic->rsp.paramValue; - if (logic->mmuFwVersionMinor != 0) { + if (logic->mmuFwVersionMinor != supportedMmuFWVersionMinor) { return VersionMismatch; } SendVersion(2); @@ -165,7 +169,7 @@ StepStatus StartSeq::Step() { SendVersion(2); } else { logic->mmuFwVersionBuild = logic->rsp.paramValue; - if (logic->mmuFwVersionBuild < 18) { + if (logic->mmuFwVersionBuild < supportedMmuFWVersionBuild) { return VersionMismatch; } // Start General Interrogation after line up.