From 4296ddb92cd9401620601a0aa2082c1a4a181631 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 8 May 2024 18:37:16 -0500
Subject: [PATCH] =?UTF-8?q?also=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/proui/proui_extui.cpp                   | 4 ++--
 Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp       | 6 +++---
 Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp     | 2 +-
 Marlin/src/lcd/extui/anycubic_vyper/vyper_extui.cpp         | 6 +++---
 Marlin/src/lcd/extui/dgus/dgus_extui.cpp                    | 6 +++---
 Marlin/src/lcd/extui/dgus_e3s1pro/dgus_e3s1pro_extui.cpp    | 6 +++---
 Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp  | 2 +-
 Marlin/src/lcd/extui/example/example.cpp                    | 2 +-
 .../extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp   | 2 +-
 .../lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.h | 2 +-
 Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp   | 4 ++--
 .../lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp   | 2 +-
 .../src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.h | 2 +-
 Marlin/src/lcd/extui/ia_creality/ia_creality_extui.cpp      | 2 +-
 Marlin/src/lcd/extui/ia_creality/ia_creality_rts.cpp        | 2 +-
 Marlin/src/lcd/extui/malyan/malyan_extui.cpp                | 2 +-
 Marlin/src/lcd/extui/nextion/nextion_extui.cpp              | 2 +-
 Marlin/src/lcd/extui/ui_api.h                               | 4 ++--
 Marlin/src/lcd/marlinui.cpp                                 | 2 +-
 19 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/proui/proui_extui.cpp b/Marlin/src/lcd/e3v2/proui/proui_extui.cpp
index d7aad208cc..ae85a5a60c 100644
--- a/Marlin/src/lcd/e3v2/proui/proui_extui.cpp
+++ b/Marlin/src/lcd/e3v2/proui/proui_extui.cpp
@@ -65,8 +65,8 @@ namespace ExtUI {
   void onIdle() {}
   void onPrinterKilled(FSTR_P const error, FSTR_P const component) {}
 
-  void onMediaInserted() {}
-  void onMediaError() {}
+  void onMediaMounted() {}
+  void onMediaError()   {}
   void onMediaRemoved() {}
 
   void onHeatingError(const heater_id_t heater_id) {
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp
index 78a8ffa3a2..b983fa3740 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp
@@ -45,9 +45,9 @@ namespace ExtUI {
     chiron.printerKilled(error, component);
   }
 
-  void onMediaInserted() { chiron.mediaEvent(AC_media_inserted); }
-  void onMediaError()    { chiron.mediaEvent(AC_media_error);    }
-  void onMediaRemoved()  { chiron.mediaEvent(AC_media_removed);  }
+  void onMediaMounted() { chiron.mediaEvent(AC_media_inserted); }
+  void onMediaError()   { chiron.mediaEvent(AC_media_error);    }
+  void onMediaRemoved() { chiron.mediaEvent(AC_media_removed);  }
 
   void onHeatingError(const heater_id_t header_id) {}
   void onMinTempError(const heater_id_t header_id) {}
diff --git a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp
index 79738fab10..7070c22602 100644
--- a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp
+++ b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp
@@ -39,7 +39,7 @@ namespace ExtUI {
   void onIdle()           { anycubicTFT.onCommandScan(); }
   void onPrinterKilled(FSTR_P const error, FSTR_P const component) { anycubicTFT.onKillTFT(); }
 
-  void onMediaInserted()  { anycubicTFT.onSDCardStateChange(true); }
+  void onMediaMounted()   { anycubicTFT.onSDCardStateChange(true); }
   void onMediaError()     { anycubicTFT.onSDCardError(); }
   void onMediaRemoved()   { anycubicTFT.onSDCardStateChange(false); }
 
diff --git a/Marlin/src/lcd/extui/anycubic_vyper/vyper_extui.cpp b/Marlin/src/lcd/extui/anycubic_vyper/vyper_extui.cpp
index b21bee7a7a..4b18b0a380 100644
--- a/Marlin/src/lcd/extui/anycubic_vyper/vyper_extui.cpp
+++ b/Marlin/src/lcd/extui/anycubic_vyper/vyper_extui.cpp
@@ -45,9 +45,9 @@ namespace ExtUI {
     dgus.printerKilled(error, component);
   }
 
-  void onMediaInserted() { dgus.mediaEvent(AC_media_inserted); }
-  void onMediaError()    { dgus.mediaEvent(AC_media_error);    }
-  void onMediaRemoved()  { dgus.mediaEvent(AC_media_removed);  }
+  void onMediaMounted() { dgus.mediaEvent(AC_media_inserted); }
+  void onMediaError()   { dgus.mediaEvent(AC_media_error);    }
+  void onMediaRemoved() { dgus.mediaEvent(AC_media_removed);  }
 
   void onHeatingError(const heater_id_t header_id) {}
   void onMinTempError(const heater_id_t header_id) {}
diff --git a/Marlin/src/lcd/extui/dgus/dgus_extui.cpp b/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
index 2bc6e0d461..adc78caf07 100644
--- a/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
+++ b/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
@@ -48,9 +48,9 @@ namespace ExtUI {
     while (!screen.loop());  // Wait while anything is left to be sent
   }
 
-  void onMediaInserted() { TERN_(HAS_MEDIA, screen.sdCardInserted()); }
-  void onMediaError()    { TERN_(HAS_MEDIA, screen.sdCardError()); }
-  void onMediaRemoved()  { TERN_(HAS_MEDIA, screen.sdCardRemoved()); }
+  void onMediaMounted() { TERN_(HAS_MEDIA, screen.sdCardInserted()); }
+  void onMediaError()   { TERN_(HAS_MEDIA, screen.sdCardError()); }
+  void onMediaRemoved() { TERN_(HAS_MEDIA, screen.sdCardRemoved()); }
 
   void onHeatingError(const heater_id_t header_id) {}
   void onMinTempError(const heater_id_t header_id) {}
diff --git a/Marlin/src/lcd/extui/dgus_e3s1pro/dgus_e3s1pro_extui.cpp b/Marlin/src/lcd/extui/dgus_e3s1pro/dgus_e3s1pro_extui.cpp
index f3f4ff961c..3b3f6db5b2 100644
--- a/Marlin/src/lcd/extui/dgus_e3s1pro/dgus_e3s1pro_extui.cpp
+++ b/Marlin/src/lcd/extui/dgus_e3s1pro/dgus_e3s1pro_extui.cpp
@@ -55,9 +55,9 @@ namespace ExtUI {
     screen.printerKilled(error, component);
   }
 
-  void onMediaInserted() { TERN_(HAS_MEDIA, screen.sdCardInserted()); }
-  void onMediaError()    { TERN_(HAS_MEDIA, screen.sdCardError()); }
-  void onMediaRemoved()  { TERN_(HAS_MEDIA, screen.sdCardRemoved()); }
+  void onMediaMounted() { TERN_(HAS_MEDIA, screen.sdCardInserted()); }
+  void onMediaError()   { TERN_(HAS_MEDIA, screen.sdCardError()); }
+  void onMediaRemoved() { TERN_(HAS_MEDIA, screen.sdCardRemoved()); }
 
   void onHeatingError(const heater_id_t header_id) {}
   void onMinTempError(const heater_id_t header_id) {}
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp b/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp
index fad878a212..c1a75a8db0 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp
@@ -50,7 +50,7 @@ namespace ExtUI {
     screen.printerKilled(error, component);
   }
 
-  void onMediaInserted() { TERN_(HAS_MEDIA, screen.sdCardInserted()); }
+  void onMediaMounted() { TERN_(HAS_MEDIA, screen.sdCardInserted()); }
   void onMediaError()    { TERN_(HAS_MEDIA, screen.sdCardError()); }
   void onMediaRemoved()  { TERN_(HAS_MEDIA, screen.sdCardRemoved()); }
 
diff --git a/Marlin/src/lcd/extui/example/example.cpp b/Marlin/src/lcd/extui/example/example.cpp
index fb033b9655..05d4730149 100644
--- a/Marlin/src/lcd/extui/example/example.cpp
+++ b/Marlin/src/lcd/extui/example/example.cpp
@@ -48,7 +48,7 @@ namespace ExtUI {
   void onIdle() {}
   void onPrinterKilled(FSTR_P const error, FSTR_P const component) {}
 
-  void onMediaInserted() {}
+  void onMediaMounted() {}
   void onMediaError() {}
   void onMediaRemoved() {}
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
index 04c49ec449..b273ac7dde 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
@@ -431,7 +431,7 @@ void StatusScreen::onIdle() {
   }
 }
 
-void StatusScreen::onMediaInserted() {
+void StatusScreen::onMediaMounted() {
   if (AT_SCREEN(StatusScreen))
     setStatusMessage(GET_TEXT_F(MSG_MEDIA_INSERTED));
 }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.h
index 57cf2308ab..4833bbd941 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.h
@@ -58,6 +58,6 @@ class StatusScreen : public BaseScreen, public CachedScreen<STATUS_SCREEN_CACHE,
     static bool onTouchHeld(uint8_t tag);
     static bool onTouchEnd(uint8_t tag);
     static void onIdle();
-    static void onMediaInserted();
+    static void onMediaMounted();
     static void onMediaRemoved();
 };
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
index 48c136bd6e..93a83e21f8 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
@@ -44,10 +44,10 @@ namespace ExtUI {
     KillScreen::show(str);
   }
 
-  void onMediaInserted() {
+  void onMediaMounted() {
     #if HAS_MEDIA
       sound.play(media_inserted, PLAY_ASYNCHRONOUS);
-      StatusScreen::onMediaInserted();
+      StatusScreen::onMediaMounted();
     #endif
   }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp
index c89d82ed9f..aec3ad6836 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp
@@ -453,7 +453,7 @@ bool StatusScreen::onTouchEnd(uint8_t tag) {
   return true;
 }
 
-void StatusScreen::onMediaInserted() {
+void StatusScreen::onMediaMounted() {
   if (AT_SCREEN(StatusScreen))
     setStatusMessage(GET_TEXT_F(MSG_MEDIA_INSERTED));
 }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.h
index 62e632756a..6cf95e207a 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.h
@@ -42,6 +42,6 @@ class StatusScreen : public BaseScreen, public CachedScreen<STATUS_SCREEN_CACHE,
     static void onEntry();
     static void onIdle();
     static bool onTouchEnd(uint8_t tag);
-    static void onMediaInserted();
+    static void onMediaMounted();
     static void onMediaRemoved();
 };
diff --git a/Marlin/src/lcd/extui/ia_creality/ia_creality_extui.cpp b/Marlin/src/lcd/extui/ia_creality/ia_creality_extui.cpp
index 3440cf987d..4fb974da23 100644
--- a/Marlin/src/lcd/extui/ia_creality/ia_creality_extui.cpp
+++ b/Marlin/src/lcd/extui/ia_creality/ia_creality_extui.cpp
@@ -59,7 +59,7 @@ void onPrinterKilled(FSTR_P const error, FSTR_P const component) {
   delay_ms(10);
 }
 
-void onMediaInserted() {
+void onMediaMounted() {
   filenavigator.reset();
   filenavigator.getFiles(0);
   fileIndex = 0;
diff --git a/Marlin/src/lcd/extui/ia_creality/ia_creality_rts.cpp b/Marlin/src/lcd/extui/ia_creality/ia_creality_rts.cpp
index d5d182ca61..a6087ad770 100644
--- a/Marlin/src/lcd/extui/ia_creality/ia_creality_rts.cpp
+++ b/Marlin/src/lcd/extui/ia_creality/ia_creality_rts.cpp
@@ -252,7 +252,7 @@ void RTS::onIdle() {
   }
   else if (startprogress < 250) {
     if (isMediaMounted()) // Re init media as it happens too early on STM32 boards often
-      onMediaInserted();
+      onMediaMounted();
     else
       injectCommands(F("M22\nM21"));
     startprogress = 254;
diff --git a/Marlin/src/lcd/extui/malyan/malyan_extui.cpp b/Marlin/src/lcd/extui/malyan/malyan_extui.cpp
index 9287091cfe..3ed4678a41 100644
--- a/Marlin/src/lcd/extui/malyan/malyan_extui.cpp
+++ b/Marlin/src/lcd/extui/malyan/malyan_extui.cpp
@@ -141,7 +141,7 @@ namespace ExtUI {
   // Not needed for Malyan LCD
   void onStatusChanged(const char * const) {}
 
-  void onMediaInserted() {}
+  void onMediaMounted() {}
   void onMediaError() {}
   void onMediaRemoved() {}
 
diff --git a/Marlin/src/lcd/extui/nextion/nextion_extui.cpp b/Marlin/src/lcd/extui/nextion/nextion_extui.cpp
index e72167d380..633f69b8ae 100644
--- a/Marlin/src/lcd/extui/nextion/nextion_extui.cpp
+++ b/Marlin/src/lcd/extui/nextion/nextion_extui.cpp
@@ -39,7 +39,7 @@ namespace ExtUI {
   void onIdle() { nextion.idleLoop(); }
   void onPrinterKilled(FSTR_P const error, FSTR_P const component) { nextion.printerKilled(error, component); }
 
-  void onMediaInserted() {}
+  void onMediaMounted() {}
   void onMediaError() {}
   void onMediaRemoved() {}
 
diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
index f08551fc4f..638f8d88b8 100644
--- a/Marlin/src/lcd/extui/ui_api.h
+++ b/Marlin/src/lcd/extui/ui_api.h
@@ -101,7 +101,7 @@ namespace ExtUI {
 
   /**
    * The Extensible UI API is a utility class that can be used to implement:
-   * - An LCD view that responds to standard events, e.g., onMediaInserted(...)
+   * - An LCD view that responds to standard events, e.g., onMediaMounted(...)
    * - An LCD that polls firmware states and settings in a standard manner.
    *   (e.g., With tool indexes and extruder indexes).
    * - Standard hooks to send data to a serial-based controller.
@@ -495,7 +495,7 @@ namespace ExtUI {
   void onStartup();
   void onIdle();
 
-  void onMediaInserted();
+  void onMediaMounted();
   void onMediaError();
   void onMediaRemoved();
 
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index dad17814c6..a76bc38475 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -1821,7 +1821,7 @@ void MarlinUI::host_notify(const char * const cstr) {
     if (status) {
       if (old_status < 2) {
         #if ENABLED(EXTENSIBLE_UI)
-          ExtUI::onMediaInserted();
+          ExtUI::onMediaMounted();
         #elif ENABLED(BROWSE_MEDIA_ON_INSERT)
           clear_menu_history();
           quick_feedback();