Skip to content

Commit d6fcae4

Browse files
committed
💥 Rename ExtUI settings methods
1 parent 4edfb69 commit d6fcae4

File tree

11 files changed

+22
-21
lines changed

11 files changed

+22
-21
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ namespace ExtUI {
9494
// Called after loading or resetting stored settings
9595
}
9696

97-
void onConfigurationStoreWritten(bool success) {
97+
void onSettingsStored(bool success) {
9898
// Called after the entire EEPROM has been written,
9999
// whether successful or not.
100100
}
101101

102-
void onConfigurationStoreRead(bool success) {
102+
void onSettingsLoaded(bool success) {
103103
// Called after the entire EEPROM has been read,
104104
// whether successful or not.
105105
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,12 @@ namespace ExtUI {
8383
// Called after loading or resetting stored settings
8484
}
8585

86-
void onConfigurationStoreWritten(bool success) {
86+
void onSettingsStored(bool success) {
8787
// Called after the entire EEPROM has been written,
8888
// whether successful or not.
8989
}
9090

91-
void onConfigurationStoreRead(bool success) {
91+
void onSettingsLoaded(bool success) {
9292
// Called after the entire EEPROM has been read,
9393
// whether successful or not.
9494
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,12 @@ namespace ExtUI {
102102
// Called after loading or resetting stored settings
103103
}
104104

105-
void onConfigurationStoreWritten(bool success) {
105+
void onSettingsStored(bool success) {
106106
// Called after the entire EEPROM has been written,
107107
// whether successful or not.
108108
}
109109

110-
void onConfigurationStoreRead(bool success) {
110+
void onSettingsLoaded(bool success) {
111111
// Called after the entire EEPROM has been read,
112112
// whether successful or not.
113113
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ namespace ExtUI {
100100

101101
void onPostprocessSettings() {}
102102

103-
void onConfigurationStoreWritten(bool success) {
103+
void onSettingsStored(bool success) {
104104
dgus_screen_handler.ConfigurationStoreWritten(success);
105105
}
106106

107-
void onConfigurationStoreRead(bool success) {
107+
void onSettingsLoaded(bool success) {
108108
dgus_screen_handler.ConfigurationStoreRead(success);
109109
}
110110

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,12 @@ namespace ExtUI {
8888
// Called after loading or resetting stored settings
8989
}
9090

91-
void onConfigurationStoreWritten(bool success) {
91+
void onSettingsStored(bool success) {
9292
// Called after the entire EEPROM has been written,
9393
// whether successful or not.
9494
}
9595

96-
void onConfigurationStoreRead(bool success) {
96+
void onSettingsLoaded(bool success) {
9797
// Called after the entire EEPROM has been read,
9898
// whether successful or not.
9999
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ namespace ExtUI {
9797
void onLoadSettings(const char *buff) { InterfaceSettingsScreen::loadSettings(buff); }
9898
void onPostprocessSettings() {} // Called after loading or resetting stored settings
9999

100-
void onConfigurationStoreWritten(bool success) {
100+
void onSettingsStored(bool success) {
101101
#ifdef ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE
102102
if (success && InterfaceSettingsScreen::backupEEPROM()) {
103103
SERIAL_ECHOLNPGM("EEPROM backed up to SPI Flash");
@@ -106,7 +106,7 @@ namespace ExtUI {
106106
UNUSED(success);
107107
#endif
108108
}
109-
void onConfigurationStoreRead(bool) {}
109+
void onSettingsLoaded(bool) {}
110110

111111
void onPlayTone(const uint16_t frequency, const uint16_t duration) { sound.play_tone(frequency, duration); }
112112

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ namespace ExtUI {
147147
void onStoreSettings(char*) {}
148148
void onLoadSettings(const char*) {}
149149
void onPostprocessSettings() {}
150-
void onConfigurationStoreWritten(bool) {}
151-
void onConfigurationStoreRead(bool) {}
150+
void onSettingsStored(bool) {}
151+
void onSettingsLoaded(bool) {}
152152

153153
#if HAS_MESH
154154
void onLevelingStart() {}

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ namespace ExtUI {
7979
// Called after loading or resetting stored settings
8080
}
8181

82-
void onConfigurationStoreWritten(bool success) {
82+
void onSettingsStored(bool success) {
8383
// Called after the entire EEPROM has been written,
8484
// whether successful or not.
8585
}
8686

87-
void onConfigurationStoreRead(bool success) {
87+
void onSettingsLoaded(bool success) {
8888
// Called after the entire EEPROM has been read,
8989
// whether successful or not.
9090
}
@@ -117,6 +117,7 @@ namespace ExtUI {
117117

118118
void onSteppersDisabled() {}
119119
void onSteppersEnabled() {}
120+
120121
}
121122

122123
#endif // NEXTION_TFT

Marlin/src/lcd/extui/ui_api.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -420,8 +420,8 @@ namespace ExtUI {
420420
void onStoreSettings(char *);
421421
void onLoadSettings(const char *);
422422
void onPostprocessSettings();
423-
void onConfigurationStoreWritten(bool success);
424-
void onConfigurationStoreRead(bool success);
423+
void onSettingsStored(bool success);
424+
void onSettingsLoaded(bool success);
425425
#if ENABLED(POWER_LOSS_RECOVERY)
426426
void onPowerLossResume();
427427
#endif

Marlin/src/module/printcounter.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ void PrintCounter::saveStats() {
171171
persistentStore.write_data(address + sizeof(uint8_t), (uint8_t*)&data, sizeof(printStatistics));
172172
persistentStore.access_finish();
173173

174-
TERN_(EXTENSIBLE_UI, ExtUI::onConfigurationStoreWritten(true));
174+
TERN_(EXTENSIBLE_UI, ExtUI::onSettingsStored(true));
175175
}
176176

177177
#if HAS_SERVICE_INTERVALS

Marlin/src/module/settings.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1595,7 +1595,7 @@ void MarlinSettings::postprocess() {
15951595
TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_SETTINGS_STORED)));
15961596
}
15971597

1598-
TERN_(EXTENSIBLE_UI, ExtUI::onConfigurationStoreWritten(!eeprom_error));
1598+
TERN_(EXTENSIBLE_UI, ExtUI::onSettingsStored(!eeprom_error));
15991599

16001600
return !eeprom_error;
16011601
}
@@ -2598,7 +2598,7 @@ void MarlinSettings::postprocess() {
25982598
bool MarlinSettings::load() {
25992599
if (validate()) {
26002600
const bool success = _load();
2601-
TERN_(EXTENSIBLE_UI, ExtUI::onConfigurationStoreRead(success));
2601+
TERN_(EXTENSIBLE_UI, ExtUI::onSettingsLoaded(success));
26022602
return success;
26032603
}
26042604
reset();

0 commit comments

Comments
 (0)