Check for ERRInternal in command_base Step()
Reduces code size significantlypull/232/head
parent
ef4246dd9a
commit
394f290bfb
|
|
@ -136,7 +136,8 @@ bool CommandBase::WaitForModulesErrorRecovery() {
|
|||
}
|
||||
|
||||
bool CommandBase::Step() {
|
||||
if (WaitForModulesErrorRecovery()) {
|
||||
if (WaitForModulesErrorRecovery() || state == ProgressCode::ERRInternal) {
|
||||
// ERRInternal: firmware panic was triggered
|
||||
return true;
|
||||
}
|
||||
return StepInner();
|
||||
|
|
|
|||
|
|
@ -100,9 +100,6 @@ bool CutFilament::StepInner() {
|
|||
break;
|
||||
case ProgressCode::OK:
|
||||
return true;
|
||||
case ProgressCode::ERRInternal:
|
||||
// firmware panic triggered
|
||||
return true;
|
||||
default: // we got into an unhandled state, better report it
|
||||
state = ProgressCode::ERRInternal;
|
||||
error = ErrorCode::INTERNAL;
|
||||
|
|
|
|||
|
|
@ -75,9 +75,6 @@ bool EjectFilament::StepInner() {
|
|||
case ProgressCode::OK:
|
||||
dbg_logic_fP(PSTR("FilamentLoadState after Eject %d"), mg::globals.FilamentLoaded());
|
||||
return true;
|
||||
case ProgressCode::ERRInternal:
|
||||
// firmware panic triggered
|
||||
return true;
|
||||
default: // we got into an unhandled state, better report it
|
||||
state = ProgressCode::ERRInternal;
|
||||
error = ErrorCode::INTERNAL;
|
||||
|
|
|
|||
|
|
@ -28,9 +28,6 @@ bool Home::StepInner() {
|
|||
break;
|
||||
case ProgressCode::OK:
|
||||
return true;
|
||||
case ProgressCode::ERRInternal:
|
||||
// firmware panic triggered
|
||||
return true;
|
||||
default: // we got into an unhandled state, better report it
|
||||
state = ProgressCode::ERRInternal;
|
||||
error = ErrorCode::INTERNAL;
|
||||
|
|
|
|||
|
|
@ -168,9 +168,6 @@ bool HWSanity::StepInner() {
|
|||
}
|
||||
case ProgressCode::OK:
|
||||
return true;
|
||||
case ProgressCode::ERRInternal:
|
||||
// firmware panic triggered
|
||||
return true;
|
||||
default: // we got into an unhandled state, better report it
|
||||
state = ProgressCode::ERRInternal;
|
||||
error = ErrorCode::INTERNAL;
|
||||
|
|
|
|||
|
|
@ -162,9 +162,6 @@ bool LoadFilament::StepInner() {
|
|||
GoToErrDisengagingIdler(ErrorCode::FINDA_DIDNT_SWITCH_ON);
|
||||
}
|
||||
return false;
|
||||
case ProgressCode::ERRInternal:
|
||||
// firmware panic triggered
|
||||
return true;
|
||||
default: // we got into an unhandled state, better report it
|
||||
state = ProgressCode::ERRInternal;
|
||||
error = ErrorCode::INTERNAL;
|
||||
|
|
|
|||
|
|
@ -31,9 +31,6 @@ bool MoveSelector::StepInner() {
|
|||
break;
|
||||
case ProgressCode::OK:
|
||||
return true;
|
||||
case ProgressCode::ERRInternal:
|
||||
// firmware panic triggered
|
||||
return true;
|
||||
default: // we got into an unhandled state, better report it
|
||||
state = ProgressCode::ERRInternal;
|
||||
error = ErrorCode::INTERNAL;
|
||||
|
|
|
|||
|
|
@ -179,9 +179,6 @@ bool ToolChange::StepInner() {
|
|||
GoToErrDisengagingIdler(ErrorCode::FSENSOR_DIDNT_SWITCH_ON);
|
||||
}
|
||||
return false;
|
||||
case ProgressCode::ERRInternal:
|
||||
// firmware panic triggered
|
||||
return true;
|
||||
default: // we got into an unhandled state, better report it
|
||||
state = ProgressCode::ERRInternal;
|
||||
error = ErrorCode::INTERNAL;
|
||||
|
|
|
|||
|
|
@ -159,9 +159,6 @@ bool UnloadFilament::StepInner() {
|
|||
break;
|
||||
case ProgressCode::OK:
|
||||
return true; // successfully finished
|
||||
case ProgressCode::ERRInternal:
|
||||
// firmware panic triggered
|
||||
return true;
|
||||
default: // we got into an unhandled state, better report it
|
||||
state = ProgressCode::ERRInternal;
|
||||
error = ErrorCode::INTERNAL;
|
||||
|
|
|
|||
Loading…
Reference in New Issue