Browse Source

💥 Rename ExtUI settings methods

FB4S_WIFI
Scott Lahteine 3 years ago
committed by Scott Lahteine
parent
commit
4ec9af42b8
  1. 4
      Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp
  2. 4
      Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp
  3. 4
      Marlin/src/lcd/extui/dgus/dgus_extui.cpp
  4. 4
      Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp
  5. 4
      Marlin/src/lcd/extui/example/example.cpp
  6. 4
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
  7. 4
      Marlin/src/lcd/extui/malyan/malyan_extui.cpp
  8. 5
      Marlin/src/lcd/extui/nextion/nextion_extui.cpp
  9. 4
      Marlin/src/lcd/extui/ui_api.h
  10. 2
      Marlin/src/module/printcounter.cpp
  11. 4
      Marlin/src/module/settings.cpp

4
Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp

@ -94,12 +94,12 @@ namespace ExtUI {
// Called after loading or resetting stored settings // Called after loading or resetting stored settings
} }
void onConfigurationStoreWritten(bool success) { void onSettingsStored(bool success) {
// Called after the entire EEPROM has been written, // Called after the entire EEPROM has been written,
// whether successful or not. // whether successful or not.
} }
void onConfigurationStoreRead(bool success) { void onSettingsLoaded(bool success) {
// Called after the entire EEPROM has been read, // Called after the entire EEPROM has been read,
// whether successful or not. // whether successful or not.
} }

4
Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp

@ -83,12 +83,12 @@ namespace ExtUI {
// Called after loading or resetting stored settings // Called after loading or resetting stored settings
} }
void onConfigurationStoreWritten(bool success) { void onSettingsStored(bool success) {
// Called after the entire EEPROM has been written, // Called after the entire EEPROM has been written,
// whether successful or not. // whether successful or not.
} }
void onConfigurationStoreRead(bool success) { void onSettingsLoaded(bool success) {
// Called after the entire EEPROM has been read, // Called after the entire EEPROM has been read,
// whether successful or not. // whether successful or not.
} }

4
Marlin/src/lcd/extui/dgus/dgus_extui.cpp

@ -102,12 +102,12 @@ namespace ExtUI {
// Called after loading or resetting stored settings // Called after loading or resetting stored settings
} }
void onConfigurationStoreWritten(bool success) { void onSettingsStored(bool success) {
// Called after the entire EEPROM has been written, // Called after the entire EEPROM has been written,
// whether successful or not. // whether successful or not.
} }
void onConfigurationStoreRead(bool success) { void onSettingsLoaded(bool success) {
// Called after the entire EEPROM has been read, // Called after the entire EEPROM has been read,
// whether successful or not. // whether successful or not.
} }

4
Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp

@ -100,11 +100,11 @@ namespace ExtUI {
void onPostprocessSettings() {} void onPostprocessSettings() {}
void onConfigurationStoreWritten(bool success) { void onSettingsStored(bool success) {
dgus_screen_handler.ConfigurationStoreWritten(success); dgus_screen_handler.ConfigurationStoreWritten(success);
} }
void onConfigurationStoreRead(bool success) { void onSettingsLoaded(bool success) {
dgus_screen_handler.ConfigurationStoreRead(success); dgus_screen_handler.ConfigurationStoreRead(success);
} }

4
Marlin/src/lcd/extui/example/example.cpp

@ -88,12 +88,12 @@ namespace ExtUI {
// Called after loading or resetting stored settings // Called after loading or resetting stored settings
} }
void onConfigurationStoreWritten(bool success) { void onSettingsStored(bool success) {
// Called after the entire EEPROM has been written, // Called after the entire EEPROM has been written,
// whether successful or not. // whether successful or not.
} }
void onConfigurationStoreRead(bool success) { void onSettingsLoaded(bool success) {
// Called after the entire EEPROM has been read, // Called after the entire EEPROM has been read,
// whether successful or not. // whether successful or not.
} }

4
Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp

@ -97,7 +97,7 @@ namespace ExtUI {
void onLoadSettings(const char *buff) { InterfaceSettingsScreen::loadSettings(buff); } void onLoadSettings(const char *buff) { InterfaceSettingsScreen::loadSettings(buff); }
void onPostprocessSettings() {} // Called after loading or resetting stored settings void onPostprocessSettings() {} // Called after loading or resetting stored settings
void onConfigurationStoreWritten(bool success) { void onSettingsStored(bool success) {
#ifdef ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE #ifdef ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE
if (success && InterfaceSettingsScreen::backupEEPROM()) { if (success && InterfaceSettingsScreen::backupEEPROM()) {
SERIAL_ECHOLNPGM("EEPROM backed up to SPI Flash"); SERIAL_ECHOLNPGM("EEPROM backed up to SPI Flash");
@ -106,7 +106,7 @@ namespace ExtUI {
UNUSED(success); UNUSED(success);
#endif #endif
} }
void onConfigurationStoreRead(bool) {} void onSettingsLoaded(bool) {}
void onPlayTone(const uint16_t frequency, const uint16_t duration) { sound.play_tone(frequency, duration); } void onPlayTone(const uint16_t frequency, const uint16_t duration) { sound.play_tone(frequency, duration); }

4
Marlin/src/lcd/extui/malyan/malyan_extui.cpp

@ -147,8 +147,8 @@ namespace ExtUI {
void onStoreSettings(char*) {} void onStoreSettings(char*) {}
void onLoadSettings(const char*) {} void onLoadSettings(const char*) {}
void onPostprocessSettings() {} void onPostprocessSettings() {}
void onConfigurationStoreWritten(bool) {} void onSettingsStored(bool) {}
void onConfigurationStoreRead(bool) {} void onSettingsLoaded(bool) {}
#if HAS_MESH #if HAS_MESH
void onLevelingStart() {} void onLevelingStart() {}

5
Marlin/src/lcd/extui/nextion/nextion_extui.cpp

@ -79,12 +79,12 @@ namespace ExtUI {
// Called after loading or resetting stored settings // Called after loading or resetting stored settings
} }
void onConfigurationStoreWritten(bool success) { void onSettingsStored(bool success) {
// Called after the entire EEPROM has been written, // Called after the entire EEPROM has been written,
// whether successful or not. // whether successful or not.
} }
void onConfigurationStoreRead(bool success) { void onSettingsLoaded(bool success) {
// Called after the entire EEPROM has been read, // Called after the entire EEPROM has been read,
// whether successful or not. // whether successful or not.
} }
@ -117,6 +117,7 @@ namespace ExtUI {
void onSteppersDisabled() {} void onSteppersDisabled() {}
void onSteppersEnabled() {} void onSteppersEnabled() {}
} }
#endif // NEXTION_TFT #endif // NEXTION_TFT

4
Marlin/src/lcd/extui/ui_api.h

@ -420,8 +420,8 @@ namespace ExtUI {
void onStoreSettings(char *); void onStoreSettings(char *);
void onLoadSettings(const char *); void onLoadSettings(const char *);
void onPostprocessSettings(); void onPostprocessSettings();
void onConfigurationStoreWritten(bool success); void onSettingsStored(bool success);
void onConfigurationStoreRead(bool success); void onSettingsLoaded(bool success);
#if ENABLED(POWER_LOSS_RECOVERY) #if ENABLED(POWER_LOSS_RECOVERY)
void onPowerLossResume(); void onPowerLossResume();
#endif #endif

2
Marlin/src/module/printcounter.cpp

@ -177,7 +177,7 @@ void PrintCounter::saveStats() {
persistentStore.write_data(address + sizeof(uint8_t), (uint8_t*)&data, sizeof(printStatistics)); persistentStore.write_data(address + sizeof(uint8_t), (uint8_t*)&data, sizeof(printStatistics));
persistentStore.access_finish(); persistentStore.access_finish();
TERN_(EXTENSIBLE_UI, ExtUI::onConfigurationStoreWritten(true)); TERN_(EXTENSIBLE_UI, ExtUI::onSettingsStored(true));
} }
#if HAS_SERVICE_INTERVALS #if HAS_SERVICE_INTERVALS

4
Marlin/src/module/settings.cpp

@ -1595,7 +1595,7 @@ void MarlinSettings::postprocess() {
TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_SETTINGS_STORED))); TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_SETTINGS_STORED)));
} }
TERN_(EXTENSIBLE_UI, ExtUI::onConfigurationStoreWritten(!eeprom_error)); TERN_(EXTENSIBLE_UI, ExtUI::onSettingsStored(!eeprom_error));
return !eeprom_error; return !eeprom_error;
} }
@ -2598,7 +2598,7 @@ void MarlinSettings::postprocess() {
bool MarlinSettings::load() { bool MarlinSettings::load() {
if (validate()) { if (validate()) {
const bool success = _load(); const bool success = _load();
TERN_(EXTENSIBLE_UI, ExtUI::onConfigurationStoreRead(success)); TERN_(EXTENSIBLE_UI, ExtUI::onSettingsLoaded(success));
return success; return success;
} }
reset(); reset();

Loading…
Cancel
Save