Переглянути джерело

💥 Rename ExtUI settings methods

Scott Lahteine 2 роки тому
джерело
коміт
d6fcae40c4

+ 2
- 2
Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp Переглянути файл

@@ -94,12 +94,12 @@ namespace ExtUI {
94 94
     // Called after loading or resetting stored settings
95 95
   }
96 96
 
97
-  void onConfigurationStoreWritten(bool success) {
97
+  void onSettingsStored(bool success) {
98 98
     // Called after the entire EEPROM has been written,
99 99
     // whether successful or not.
100 100
   }
101 101
 
102
-  void onConfigurationStoreRead(bool success) {
102
+  void onSettingsLoaded(bool success) {
103 103
     // Called after the entire EEPROM has been read,
104 104
     // whether successful or not.
105 105
   }

+ 2
- 2
Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp Переглянути файл

@@ -83,12 +83,12 @@ namespace ExtUI {
83 83
     // Called after loading or resetting stored settings
84 84
   }
85 85
 
86
-  void onConfigurationStoreWritten(bool success) {
86
+  void onSettingsStored(bool success) {
87 87
     // Called after the entire EEPROM has been written,
88 88
     // whether successful or not.
89 89
   }
90 90
 
91
-  void onConfigurationStoreRead(bool success) {
91
+  void onSettingsLoaded(bool success) {
92 92
     // Called after the entire EEPROM has been read,
93 93
     // whether successful or not.
94 94
   }

+ 2
- 2
Marlin/src/lcd/extui/dgus/dgus_extui.cpp Переглянути файл

@@ -102,12 +102,12 @@ namespace ExtUI {
102 102
     // Called after loading or resetting stored settings
103 103
   }
104 104
 
105
-  void onConfigurationStoreWritten(bool success) {
105
+  void onSettingsStored(bool success) {
106 106
     // Called after the entire EEPROM has been written,
107 107
     // whether successful or not.
108 108
   }
109 109
 
110
-  void onConfigurationStoreRead(bool success) {
110
+  void onSettingsLoaded(bool success) {
111 111
     // Called after the entire EEPROM has been read,
112 112
     // whether successful or not.
113 113
   }

+ 2
- 2
Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp Переглянути файл

@@ -100,11 +100,11 @@ namespace ExtUI {
100 100
 
101 101
   void onPostprocessSettings() {}
102 102
 
103
-  void onConfigurationStoreWritten(bool success) {
103
+  void onSettingsStored(bool success) {
104 104
     dgus_screen_handler.ConfigurationStoreWritten(success);
105 105
   }
106 106
 
107
-  void onConfigurationStoreRead(bool success) {
107
+  void onSettingsLoaded(bool success) {
108 108
     dgus_screen_handler.ConfigurationStoreRead(success);
109 109
   }
110 110
 

+ 2
- 2
Marlin/src/lcd/extui/example/example.cpp Переглянути файл

@@ -88,12 +88,12 @@ namespace ExtUI {
88 88
     // Called after loading or resetting stored settings
89 89
   }
90 90
 
91
-  void onConfigurationStoreWritten(bool success) {
91
+  void onSettingsStored(bool success) {
92 92
     // Called after the entire EEPROM has been written,
93 93
     // whether successful or not.
94 94
   }
95 95
 
96
-  void onConfigurationStoreRead(bool success) {
96
+  void onSettingsLoaded(bool success) {
97 97
     // Called after the entire EEPROM has been read,
98 98
     // whether successful or not.
99 99
   }

+ 2
- 2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp Переглянути файл

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

+ 2
- 2
Marlin/src/lcd/extui/malyan/malyan_extui.cpp Переглянути файл

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

+ 3
- 2
Marlin/src/lcd/extui/nextion/nextion_extui.cpp Переглянути файл

@@ -79,12 +79,12 @@ namespace ExtUI {
79 79
     // Called after loading or resetting stored settings
80 80
   }
81 81
 
82
-  void onConfigurationStoreWritten(bool success) {
82
+  void onSettingsStored(bool success) {
83 83
     // Called after the entire EEPROM has been written,
84 84
     // whether successful or not.
85 85
   }
86 86
 
87
-  void onConfigurationStoreRead(bool success) {
87
+  void onSettingsLoaded(bool success) {
88 88
     // Called after the entire EEPROM has been read,
89 89
     // whether successful or not.
90 90
   }
@@ -117,6 +117,7 @@ namespace ExtUI {
117 117
 
118 118
   void onSteppersDisabled() {}
119 119
   void onSteppersEnabled()  {}
120
+
120 121
 }
121 122
 
122 123
 #endif // NEXTION_TFT

+ 2
- 2
Marlin/src/lcd/extui/ui_api.h Переглянути файл

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

+ 1
- 1
Marlin/src/module/printcounter.cpp Переглянути файл

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

+ 2
- 2
Marlin/src/module/settings.cpp Переглянути файл

@@ -1595,7 +1595,7 @@ void MarlinSettings::postprocess() {
1595 1595
       TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_SETTINGS_STORED)));
1596 1596
     }
1597 1597
 
1598
-    TERN_(EXTENSIBLE_UI, ExtUI::onConfigurationStoreWritten(!eeprom_error));
1598
+    TERN_(EXTENSIBLE_UI, ExtUI::onSettingsStored(!eeprom_error));
1599 1599
 
1600 1600
     return !eeprom_error;
1601 1601
   }
@@ -2598,7 +2598,7 @@ void MarlinSettings::postprocess() {
2598 2598
   bool MarlinSettings::load() {
2599 2599
     if (validate()) {
2600 2600
       const bool success = _load();
2601
-      TERN_(EXTENSIBLE_UI, ExtUI::onConfigurationStoreRead(success));
2601
+      TERN_(EXTENSIBLE_UI, ExtUI::onSettingsLoaded(success));
2602 2602
       return success;
2603 2603
     }
2604 2604
     reset();

Завантаження…
Відмінити
Зберегти