josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump MMU FW version to 2.0.19 to match/enforce the necessary compatibility level

This commit is contained in:
D.R.racer 2022-07-22 15:51:09 +02:00
parent fa176c69db
commit 1d2acb5bd6
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Firmware/mmu2_protocol_logic.cpp
View File

@ -6,6 +6,10 @@
namespace MMU2 { 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){ StepStatus ProtocolLogicPartBase::ProcessFINDAReqSent(StepStatus finishedRV, State nextState){
if (auto expmsg = logic->ExpectingMessage(linkLayerTimeout); expmsg != MessageReady) if (auto expmsg = logic->ExpectingMessage(linkLayerTimeout); expmsg != MessageReady)
return expmsg; return expmsg;
@ -140,7 +144,7 @@ StepStatus StartSeq::Step() {
SendVersion(0); SendVersion(0);
} else { } else {
logic->mmuFwVersionMajor = logic->rsp.paramValue; logic->mmuFwVersionMajor = logic->rsp.paramValue;
if (logic->mmuFwVersionMajor != 2) { if (logic->mmuFwVersionMajor != supportedMmuFWVersionMajor) {
return VersionMismatch; return VersionMismatch;
} }
logic->dataTO.Reset(); // got meaningful response from the MMU, stop data layer timeout tracking logic->dataTO.Reset(); // got meaningful response from the MMU, stop data layer timeout tracking
@ -153,7 +157,7 @@ StepStatus StartSeq::Step() {
SendVersion(1); SendVersion(1);
} else { } else {
logic->mmuFwVersionMinor = logic->rsp.paramValue; logic->mmuFwVersionMinor = logic->rsp.paramValue;
if (logic->mmuFwVersionMinor != 0) { if (logic->mmuFwVersionMinor != supportedMmuFWVersionMinor) {
return VersionMismatch; return VersionMismatch;
} }
SendVersion(2); SendVersion(2);
@ -165,7 +169,7 @@ StepStatus StartSeq::Step() {
SendVersion(2); SendVersion(2);
} else { } else {
logic->mmuFwVersionBuild = logic->rsp.paramValue; logic->mmuFwVersionBuild = logic->rsp.paramValue;
if (logic->mmuFwVersionBuild < 18) { if (logic->mmuFwVersionBuild < supportedMmuFWVersionBuild) {
return VersionMismatch; return VersionMismatch;
} }
// Start General Interrogation after line up. // Start General Interrogation after line up.