Просмотр исходного кода

🚸 Misc. JyersUI tweaks (#26228)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Andrew 1 год назад
Родитель
Сommit
6d3122d4e8

+ 6 - 0
Marlin/src/lcd/e3v2/common/dwin_set.h

@@ -145,3 +145,9 @@
 #define ICON_ProbeOffsetZ ICON_StepZ
 #define ICON_ProbeOffsetZ ICON_StepZ
 #define ICON_PIDNozzle    ICON_SetEndTemp
 #define ICON_PIDNozzle    ICON_SetEndTemp
 #define ICON_PIDbed       ICON_SetBedTemp
 #define ICON_PIDbed       ICON_SetBedTemp
+#define ICON_FWRetract    ICON_StepE
+#define ICON_FWRetLength  ICON_StepE
+#define ICON_FWRetSpeed   ICON_Setspeed
+#define ICON_FWRetZRaise  ICON_MoveZ
+#define ICON_FWRecSpeed   ICON_Setspeed
+#define ICON_FWRecExtra   ICON_StepE

Разница между файлами не показана из-за своего большого размера
+ 176 - 152
Marlin/src/lcd/e3v2/jyersui/dwin.cpp


+ 2 - 3
Marlin/src/lcd/e3v2/jyersui/dwin.h

@@ -83,6 +83,7 @@ enum menuID : uint8_t {
       ID_Preheat,
       ID_Preheat,
       ID_ChangeFilament,
       ID_ChangeFilament,
       ID_MenuCustom,
       ID_MenuCustom,
+      OPTITEM(FWRETRACT, ID_FWMenu)
     ID_Control,
     ID_Control,
       ID_TempMenu,
       ID_TempMenu,
         ID_PID,
         ID_PID,
@@ -105,9 +106,7 @@ enum menuID : uint8_t {
         ID_ColorSettings,
         ID_ColorSettings,
       ID_Advanced,
       ID_Advanced,
         ID_ProbeMenu,
         ID_ProbeMenu,
-        #if HAS_TRINAMIC_CONFIG
-          ID_TMCMenu,
-        #endif
+        OPTITEM(HAS_TRINAMIC_CONFIG, ID_TMCMenu)
       ID_Info,
       ID_Info,
     ID_Leveling,
     ID_Leveling,
       ID_LevelManual,
       ID_LevelManual,

+ 0 - 6
Marlin/src/lcd/e3v2/proui/dwinui.h

@@ -54,12 +54,6 @@
 #define ICON_FilUnload            ICON_ReadEEPROM
 #define ICON_FilUnload            ICON_ReadEEPROM
 #define ICON_Flow                 ICON_StepE
 #define ICON_Flow                 ICON_StepE
 #define ICON_Folder               ICON_More
 #define ICON_Folder               ICON_More
-#define ICON_FWRetract            ICON_StepE
-#define ICON_FWRetLength          ICON_StepE
-#define ICON_FWRetSpeed           ICON_Setspeed
-#define ICON_FWRetZRaise          ICON_MoveZ
-#define ICON_FWRecSpeed           ICON_Setspeed
-#define ICON_FWRecExtra           ICON_StepE
 #define ICON_HomeX                ICON_MoveX
 #define ICON_HomeX                ICON_MoveX
 #define ICON_HomeY                ICON_MoveY
 #define ICON_HomeY                ICON_MoveY
 #define ICON_HomeZ                ICON_MoveZ
 #define ICON_HomeZ                ICON_MoveZ

+ 1 - 0
Marlin/src/lcd/language/language_en.h

@@ -901,6 +901,7 @@ namespace LanguageNarrow_en {
 namespace LanguageWide_en {
 namespace LanguageWide_en {
   using namespace LanguageNarrow_en;
   using namespace LanguageNarrow_en;
   #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
   #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
+    LSTR MSG_LIVE_MOVE                    = _UxGT("Live Movement");
     LSTR MSG_HOST_START_PRINT             = _UxGT("Start Host Print");
     LSTR MSG_HOST_START_PRINT             = _UxGT("Start Host Print");
     LSTR MSG_PRINTING_OBJECT              = _UxGT("Printing Object");
     LSTR MSG_PRINTING_OBJECT              = _UxGT("Printing Object");
     LSTR MSG_CANCEL_OBJECT                = _UxGT("Cancel Object");
     LSTR MSG_CANCEL_OBJECT                = _UxGT("Cancel Object");

Некоторые файлы не были показаны из-за большого количества измененных файлов