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

Add missing CheckUserInput calls, fix bad array entry for FW_update

This commit is contained in:
VintagePC 2022-06-12 14:05:47 -04:00 committed by D.R.racer
parent e8088b0161
commit f155c7664d
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/mmu2.cpp
View File

@ -555,6 +555,7 @@ void MMU2::manage_response(const bool move_axes, const bool turn_off_nozzle) {
st_synchronize(); st_synchronize();
return; return;
case VersionMismatch: // this basically means the MMU will be disabled until reconnected case VersionMismatch: // this basically means the MMU will be disabled until reconnected
CheckUserInput();
return; return;
case CommunicationTimeout: case CommunicationTimeout:
case CommandError: case CommandError:
@ -597,6 +598,7 @@ StepStatus MMU2::LogicStep() {
case VersionMismatch: case VersionMismatch:
StopKeepPowered(); StopKeepPowered();
ReportError(ErrorCode::VERSION_MISMATCH); ReportError(ErrorCode::VERSION_MISMATCH);
CheckUserInput();
break; break;
default: default:
break; break;

2
Firmware/mmu2/errors_list.h
View File

@ -110,7 +110,7 @@ static const constexpr uint16_t errorCodes[] PROGMEM = {
ERR_SYSTEM_INVALID_TOOL, ERR_SYSTEM_INVALID_TOOL,
ERR_SYSTEM_QUEUE_FULL, ERR_SYSTEM_QUEUE_FULL,
ERR_SYSTEM_FW_UPDATE_NEEDED, ERR_SYSTEM_FW_UPDATE_NEEDED,
ERR_SYSTEM_FW_UPDATE_NEEDED, ERR_SYSTEM_FW_RUNTIME_ERROR,
ERR_SYSTEM_UNLOAD_MANUALLY ERR_SYSTEM_UNLOAD_MANUALLY
}; };

2
Firmware/mmu2_error_converter.cpp
View File

@ -249,7 +249,7 @@ Buttons ButtonPressed(uint16_t ec) {
break; break;
case ERR_SYSTEM_FW_UPDATE_NEEDED: case ERR_SYSTEM_FW_UPDATE_NEEDED:
switch (buttonSelectedOperation) { switch (buttonSelectedOperation) {
case ButtonOperations::DisableMMU: // "Restart MMU" case ButtonOperations::DisableMMU: // "Disable"
return DisableMMU; return DisableMMU;
default: default:
break; break;