From 83a1d3a46b1e12c65d0eadbd663315c400fe022f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 6 Sep 2021 16:33:24 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Misc.=20code=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Marlin/src/gcode/stats/M75-M78.cpp | 26 +++++++++----------
Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h | 1 -
Marlin/src/lcd/extui/mks_ui/tft_Language_sp.h | 2 --
3 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/Marlin/src/gcode/stats/M75-M78.cpp b/Marlin/src/gcode/stats/M75-M78.cpp
index f74d9204bde..66f9f8eb8dd 100644
--- a/Marlin/src/gcode/stats/M75-M78.cpp
+++ b/Marlin/src/gcode/stats/M75-M78.cpp
@@ -54,24 +54,24 @@ void GcodeSuite::M77() {
#if ENABLED(PRINTCOUNTER)
/**
- * M78: Show print statistics
- */
+ * M78: Show print statistics
+ */
void GcodeSuite::M78() {
if (parser.intval('S') == 78) { // "M78 S78" will reset the statistics
- print_job_timer.initStats();
- ui.reset_status();
- return;
- }
-
- #if HAS_SERVICE_INTERVALS
- if (parser.seenval('R')) {
- print_job_timer.resetServiceInterval(parser.value_int());
+ print_job_timer.initStats();
ui.reset_status();
- return;
+ return;
}
- #endif
- print_job_timer.showStats();
+ #if HAS_SERVICE_INTERVALS
+ if (parser.seenval('R')) {
+ print_job_timer.resetServiceInterval(parser.value_int());
+ ui.reset_status();
+ return;
+ }
+ #endif
+
+ print_job_timer.showStats();
}
#endif // PRINTCOUNTER
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h
index f6b3231737d..fd52f2cfa9e 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h
+++ b/Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h
@@ -194,7 +194,6 @@
#define TITLE_HOME_RU "Home"
#define TITLE_EXTRUDE_RU "экструзия"
#define TITLE_LEVELING_RU "уровень"
-#define TITLE_MLEVELING_RU "углы"
#define TITLE_SET_RU "настройки"
#define TITLE_MORE_RU "больше"
#define TITLE_CHOOSEFILE_RU "файла"
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_Language_sp.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_sp.h
index a75bc69ab73..6bba3a3edfe 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_Language_sp.h
+++ b/Marlin/src/lcd/extui/mks_ui/tft_Language_sp.h
@@ -29,7 +29,6 @@
#define PRINT_TEXT_SP "Imprimir"
#define EXTRUDE_TEXT_SP "Extrusor"
#define LEVELING_TEXT_SP "Leveling"
-#define MLEVELING_TEXT_SP "Leveling"
#define AUTO_LEVELING_TEXT_SP "Autolevel"
#define SET_TEXT_SP "Config"
#define MORE_TEXT_SP "Más"
@@ -53,7 +52,6 @@
#define TOOL_MOVE_SP "Mover"
#define TOOL_HOME_SP "Origen"
#define TOOL_LEVELING_SP "Leveling"
-#define TOOL_MLEVELING_SP "Leveling"
#define TOOL_AUTO_LEVELING_SP "Autolevel"
#define TOOL_FILAMENT_SP "Filamento"
#define TOOL_MORE_SP "Más"