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

Remove Done button on FINDA-related MMU error screens 

Follows the requirements from Prusa-Error-Codes yaml definition.
Saves a fwe bytes as well as the button switch() statement got simplified.

PFW-1494
This commit is contained in:
D.R.racer 2023-02-10 09:22:47 +01:00 committed by DRracer
parent 8b1b632164
commit c826ae989f
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/mmu2/errors_list.h
View File

@ -345,8 +345,8 @@ uint8_t constexpr Btns(ButtonOperations bMiddle, ButtonOperations bRight){
} }
static const uint8_t errorButtons[] PROGMEM = { static const uint8_t errorButtons[] PROGMEM = {
Btns(ButtonOperations::Retry, ButtonOperations::Continue),//FINDA_DIDNT_TRIGGER Btns(ButtonOperations::Retry, ButtonOperations::NoOperation),//FINDA_DIDNT_TRIGGER
Btns(ButtonOperations::Retry, ButtonOperations::Continue),//FINDA_DIDNT_GO_OFF Btns(ButtonOperations::Retry, ButtonOperations::NoOperation),//FINDA_DIDNT_GO_OFF
Btns(ButtonOperations::Retry, ButtonOperations::NoOperation),//FSENSOR_DIDNT_TRIGGER Btns(ButtonOperations::Retry, ButtonOperations::NoOperation),//FSENSOR_DIDNT_TRIGGER
Btns(ButtonOperations::Retry, ButtonOperations::NoOperation),//FSENSOR_DIDNT_GO_OFF Btns(ButtonOperations::Retry, ButtonOperations::NoOperation),//FSENSOR_DIDNT_GO_OFF

18
Firmware/mmu2_error_converter.cpp
View File

@ -199,15 +199,6 @@ Buttons ButtonAvailable(uint16_t ec) {
switch ( PrusaErrorCode(ei) ) { switch ( PrusaErrorCode(ei) ) {
case ERR_MECHANICAL_FINDA_DIDNT_TRIGGER: case ERR_MECHANICAL_FINDA_DIDNT_TRIGGER:
case ERR_MECHANICAL_FINDA_DIDNT_GO_OFF: case ERR_MECHANICAL_FINDA_DIDNT_GO_OFF:
switch (buttonSelectedOperation) {
case ButtonOperations::Retry: // "Repeat action"
return Middle;
case ButtonOperations::Continue: // "Continue"
return Right;
default:
break;
}
break;
case ERR_MECHANICAL_FSENSOR_DIDNT_TRIGGER: case ERR_MECHANICAL_FSENSOR_DIDNT_TRIGGER:
case ERR_MECHANICAL_FSENSOR_DIDNT_GO_OFF: case ERR_MECHANICAL_FSENSOR_DIDNT_GO_OFF:
case ERR_MECHANICAL_FSENSOR_TOO_EARLY: case ERR_MECHANICAL_FSENSOR_TOO_EARLY:
@ -227,6 +218,7 @@ Buttons ButtonAvailable(uint16_t ec) {
} }
break; break;
case ERR_MECHANICAL_LOAD_TO_EXTRUDER_FAILED: case ERR_MECHANICAL_LOAD_TO_EXTRUDER_FAILED:
case ERR_SYSTEM_FILAMENT_EJECTED:
switch (buttonSelectedOperation) { switch (buttonSelectedOperation) {
case ButtonOperations::Continue: // User solved the serious mechanical problem by hand - there is no other way around case ButtonOperations::Continue: // User solved the serious mechanical problem by hand - there is no other way around
return Middle; return Middle;
@ -313,14 +305,6 @@ Buttons ButtonAvailable(uint16_t ec) {
break; break;
} }
break; break;
case ERR_SYSTEM_FILAMENT_EJECTED:
switch (buttonSelectedOperation) {
case ButtonOperations::Continue: // "Continue" - eject filament completed
return Middle;
default:
break;
}
break;
default: default:
break; break;