Merge upstream changes from Marlin 2.1.1
This commit is contained in:
@@ -41,8 +41,8 @@ namespace ExtUI {
|
||||
|
||||
void onIdle() { Chiron.IdleLoop(); }
|
||||
|
||||
void onPrinterKilled(PGM_P const error, PGM_P const component) {
|
||||
Chiron.PrinterKilled(error,component);
|
||||
void onPrinterKilled(FSTR_P const error, FSTR_P const component) {
|
||||
Chiron.PrinterKilled(error, component);
|
||||
}
|
||||
|
||||
void onMediaInserted() { Chiron.MediaEvent(AC_media_inserted); }
|
||||
@@ -57,14 +57,16 @@ namespace ExtUI {
|
||||
|
||||
void onPrintTimerStarted() { Chiron.TimerEvent(AC_timer_started); }
|
||||
void onPrintTimerPaused() { Chiron.TimerEvent(AC_timer_paused); }
|
||||
void onPrintTimerStopped() { Chiron.TimerEvent(AC_timer_stopped); }
|
||||
void onPrintTimerStopped() { Chiron.TimerEvent(AC_timer_stopped); }
|
||||
void onPrintDone() {}
|
||||
|
||||
void onFilamentRunout(const extruder_t) { Chiron.FilamentRunout(); }
|
||||
|
||||
void onUserConfirmRequired(const char * const msg) { Chiron.ConfirmationRequest(msg); }
|
||||
void onStatusChanged(const char * const msg) { Chiron.StatusChange(msg); }
|
||||
|
||||
void onHomingStart() {}
|
||||
void onHomingComplete() {}
|
||||
void onPrintFinished() {}
|
||||
void onHomingDone() {}
|
||||
|
||||
void onFactoryReset() {}
|
||||
|
||||
@@ -92,18 +94,19 @@ namespace ExtUI {
|
||||
// Called after loading or resetting stored settings
|
||||
}
|
||||
|
||||
void onConfigurationStoreWritten(bool success) {
|
||||
void onSettingsStored(bool success) {
|
||||
// Called after the entire EEPROM has been written,
|
||||
// whether successful or not.
|
||||
}
|
||||
|
||||
void onConfigurationStoreRead(bool success) {
|
||||
void onSettingsLoaded(bool success) {
|
||||
// Called after the entire EEPROM has been read,
|
||||
// whether successful or not.
|
||||
}
|
||||
|
||||
#if HAS_MESH
|
||||
void onMeshLevelingStart() {}
|
||||
void onLevelingStart() {}
|
||||
void onLevelingDone() {}
|
||||
|
||||
void onMeshUpdate(const int8_t xpos, const int8_t ypos, const_float_t zval) {
|
||||
// Called when any mesh points are updated
|
||||
|
Reference in New Issue
Block a user