Check for ERRInternal in command_base Step()

Reduces code size significantly
pull/232/head
Guðni Már Gilbert 2022-10-27 15:40:15 +00:00
parent ef4246dd9a
commit 394f290bfb
9 changed files with 2 additions and 25 deletions

View File

@ -136,7 +136,8 @@ bool CommandBase::WaitForModulesErrorRecovery() {
} }
bool CommandBase::Step() { bool CommandBase::Step() {
if (WaitForModulesErrorRecovery()) { if (WaitForModulesErrorRecovery() || state == ProgressCode::ERRInternal) {
// ERRInternal: firmware panic was triggered
return true; return true;
} }
return StepInner(); return StepInner();

View File

@ -100,9 +100,6 @@ bool CutFilament::StepInner() {
break; break;
case ProgressCode::OK: case ProgressCode::OK:
return true; return true;
case ProgressCode::ERRInternal:
// firmware panic triggered
return true;
default: // we got into an unhandled state, better report it default: // we got into an unhandled state, better report it
state = ProgressCode::ERRInternal; state = ProgressCode::ERRInternal;
error = ErrorCode::INTERNAL; error = ErrorCode::INTERNAL;

View File

@ -75,9 +75,6 @@ bool EjectFilament::StepInner() {
case ProgressCode::OK: case ProgressCode::OK:
dbg_logic_fP(PSTR("FilamentLoadState after Eject %d"), mg::globals.FilamentLoaded()); dbg_logic_fP(PSTR("FilamentLoadState after Eject %d"), mg::globals.FilamentLoaded());
return true; return true;
case ProgressCode::ERRInternal:
// firmware panic triggered
return true;
default: // we got into an unhandled state, better report it default: // we got into an unhandled state, better report it
state = ProgressCode::ERRInternal; state = ProgressCode::ERRInternal;
error = ErrorCode::INTERNAL; error = ErrorCode::INTERNAL;

View File

@ -28,9 +28,6 @@ bool Home::StepInner() {
break; break;
case ProgressCode::OK: case ProgressCode::OK:
return true; return true;
case ProgressCode::ERRInternal:
// firmware panic triggered
return true;
default: // we got into an unhandled state, better report it default: // we got into an unhandled state, better report it
state = ProgressCode::ERRInternal; state = ProgressCode::ERRInternal;
error = ErrorCode::INTERNAL; error = ErrorCode::INTERNAL;

View File

@ -168,9 +168,6 @@ bool HWSanity::StepInner() {
} }
case ProgressCode::OK: case ProgressCode::OK:
return true; return true;
case ProgressCode::ERRInternal:
// firmware panic triggered
return true;
default: // we got into an unhandled state, better report it default: // we got into an unhandled state, better report it
state = ProgressCode::ERRInternal; state = ProgressCode::ERRInternal;
error = ErrorCode::INTERNAL; error = ErrorCode::INTERNAL;

View File

@ -162,9 +162,6 @@ bool LoadFilament::StepInner() {
GoToErrDisengagingIdler(ErrorCode::FINDA_DIDNT_SWITCH_ON); GoToErrDisengagingIdler(ErrorCode::FINDA_DIDNT_SWITCH_ON);
} }
return false; return false;
case ProgressCode::ERRInternal:
// firmware panic triggered
return true;
default: // we got into an unhandled state, better report it default: // we got into an unhandled state, better report it
state = ProgressCode::ERRInternal; state = ProgressCode::ERRInternal;
error = ErrorCode::INTERNAL; error = ErrorCode::INTERNAL;

View File

@ -31,9 +31,6 @@ bool MoveSelector::StepInner() {
break; break;
case ProgressCode::OK: case ProgressCode::OK:
return true; return true;
case ProgressCode::ERRInternal:
// firmware panic triggered
return true;
default: // we got into an unhandled state, better report it default: // we got into an unhandled state, better report it
state = ProgressCode::ERRInternal; state = ProgressCode::ERRInternal;
error = ErrorCode::INTERNAL; error = ErrorCode::INTERNAL;

View File

@ -179,9 +179,6 @@ bool ToolChange::StepInner() {
GoToErrDisengagingIdler(ErrorCode::FSENSOR_DIDNT_SWITCH_ON); GoToErrDisengagingIdler(ErrorCode::FSENSOR_DIDNT_SWITCH_ON);
} }
return false; return false;
case ProgressCode::ERRInternal:
// firmware panic triggered
return true;
default: // we got into an unhandled state, better report it default: // we got into an unhandled state, better report it
state = ProgressCode::ERRInternal; state = ProgressCode::ERRInternal;
error = ErrorCode::INTERNAL; error = ErrorCode::INTERNAL;

View File

@ -159,9 +159,6 @@ bool UnloadFilament::StepInner() {
break; break;
case ProgressCode::OK: case ProgressCode::OK:
return true; // successfully finished return true; // successfully finished
case ProgressCode::ERRInternal:
// firmware panic triggered
return true;
default: // we got into an unhandled state, better report it default: // we got into an unhandled state, better report it
state = ProgressCode::ERRInternal; state = ProgressCode::ERRInternal;
error = ErrorCode::INTERNAL; error = ErrorCode::INTERNAL;