Skip to content

Commit ae0552a

Browse files
committed
ICON_ResumeEEPROM => ICON_ResetEEPROM
1 parent 2f02315 commit ae0552a

File tree

7 files changed

+16
-16
lines changed

7 files changed

+16
-16
lines changed

Marlin/src/lcd/e3v2/common/dwin_set.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
#define ICON_Motion 41
8383
#define ICON_WriteEEPROM 42
8484
#define ICON_ReadEEPROM 43
85-
#define ICON_ResumeEEPROM 44
85+
#define ICON_ResetEEPROM 44
8686
#define ICON_Info 45
8787

8888
#define ICON_SetEndTemp 46

Marlin/src/lcd/e3v2/creality/dwin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -905,7 +905,7 @@ void drawControlMenu() {
905905
#if ENABLED(EEPROM_SETTINGS)
906906
_TEMP_ICON(CONTROL_CASE_SAVE, ICON_WriteEEPROM, false);
907907
_TEMP_ICON(CONTROL_CASE_LOAD, ICON_ReadEEPROM, false);
908-
_TEMP_ICON(CONTROL_CASE_RESET, ICON_ResumeEEPROM, false);
908+
_TEMP_ICON(CONTROL_CASE_RESET, ICON_ResetEEPROM, false);
909909
#endif
910910
}
911911

Marlin/src/lcd/e3v2/jyersui/dwin.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,7 +1158,7 @@ void JyersDWIN::menuItemHandler(const uint8_t menu, const uint8_t item, bool dra
11581158
#if ENABLED(ADVANCED_PAUSE_FEATURE)
11591159
case PREPARE_CHANGEFIL:
11601160
if (draw) {
1161-
drawMenuItem(row, ICON_ResumeEEPROM, GET_TEXT_F(MSG_FILAMENTCHANGE)
1161+
drawMenuItem(row, ICON_ResetEEPROM, GET_TEXT_F(MSG_FILAMENTCHANGE)
11621162
#if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
11631163
, nullptr, true
11641164
#endif
@@ -1766,7 +1766,7 @@ void JyersDWIN::menuItemHandler(const uint8_t menu, const uint8_t item, bool dra
17661766
break;
17671767
case CHANGEFIL_CHANGE:
17681768
if (draw)
1769-
drawMenuItem(row, ICON_ResumeEEPROM, GET_TEXT_F(MSG_FILAMENTCHANGE));
1769+
drawMenuItem(row, ICON_ResetEEPROM, GET_TEXT_F(MSG_FILAMENTCHANGE));
17701770
else {
17711771
if (thermalManager.targetTooColdToExtrude(0))
17721772
popupHandler(Popup_ETemp);
@@ -3449,7 +3449,7 @@ void JyersDWIN::menuItemHandler(const uint8_t menu, const uint8_t item, bool dra
34493449
break;
34503450
case LEVELING_SETTINGS_PLANE:
34513451
if (draw)
3452-
drawMenuItem(row, ICON_ResumeEEPROM, F("Convert Mesh to Plane"));
3452+
drawMenuItem(row, ICON_ResetEEPROM, F("Convert Mesh to Plane"));
34533453
else {
34543454
if (mesh_conf.createPlaneFromMesh()) break;
34553455
gcode.process_subcommands_now(F("M420 S1"));
@@ -3594,7 +3594,7 @@ void JyersDWIN::menuItemHandler(const uint8_t menu, const uint8_t item, bool dra
35943594
#if ENABLED(AUTO_BED_LEVELING_UBL)
35953595
case LEVELING_M_UNDEF:
35963596
if (draw)
3597-
drawMenuItem(row, ICON_ResumeEEPROM, F("Clear Point Value"));
3597+
drawMenuItem(row, ICON_ResetEEPROM, F("Clear Point Value"));
35983598
else {
35993599
mesh_conf.manualValueUpdate(true);
36003600
redrawMenu(false);
@@ -3924,7 +3924,7 @@ void JyersDWIN::menuItemHandler(const uint8_t menu, const uint8_t item, bool dra
39243924
#if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
39253925
case TUNE_CHANGEFIL:
39263926
if (draw)
3927-
drawMenuItem(row, ICON_ResumeEEPROM, GET_TEXT_F(MSG_FILAMENTCHANGE));
3927+
drawMenuItem(row, ICON_ResetEEPROM, GET_TEXT_F(MSG_FILAMENTCHANGE));
39283928
else
39293929
popupHandler(Popup_ConfFilChange);
39303930
break;

Marlin/src/lcd/e3v2/proui/dwin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3123,7 +3123,7 @@ void drawControlMenu() {
31233123
#if ENABLED(EEPROM_SETTINGS)
31243124
MENU_ITEM(ICON_WriteEEPROM, MSG_STORE_EEPROM, onDrawWriteEeprom, writeEEPROM);
31253125
MENU_ITEM(ICON_ReadEEPROM, MSG_LOAD_EEPROM, onDrawReadEeprom, readEEPROM);
3126-
MENU_ITEM(ICON_ResumeEEPROM, MSG_RESTORE_DEFAULTS, onDrawResetEeprom, resetEEPROM);
3126+
MENU_ITEM(ICON_ResetEEPROM, MSG_RESTORE_DEFAULTS, onDrawResetEeprom, resetEEPROM);
31273127
#endif
31283128
MENU_ITEM(ICON_Reboot, MSG_RESET_PRINTER, onDrawMenuItem, rebootPrinter);
31293129
MENU_ITEM(ICON_Info, MSG_INFO_SCREEN, onDrawInfoSubMenu, gotoInfoMenu);

Marlin/src/lcd/e3v2/proui/dwinui.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@
4040
#define ICON_BedSizeY ICON_PrintSize
4141
#define ICON_BedTramming ICON_SetHome
4242
#define ICON_Binary ICON_Contact
43-
#define ICON_BLTouchReset ICON_ResumeEEPROM
43+
#define ICON_BLTouchReset ICON_ResetEEPROM
4444
#define ICON_Cancel ICON_StockConfiguration
4545
#define ICON_CustomPreheat ICON_BedTemp
4646
#define ICON_Error ICON_TempTooHigh
4747
#define ICON_esDiag ICON_Info
4848
#define ICON_ExtrudeMinT ICON_HotendTemp
4949
#define ICON_FilLoad ICON_WriteEEPROM
50-
#define ICON_FilMan ICON_ResumeEEPROM
51-
#define ICON_FilSet ICON_ResumeEEPROM
50+
#define ICON_FilMan ICON_ResetEEPROM
51+
#define ICON_FilSet ICON_ResetEEPROM
5252
#define ICON_FilUnload ICON_ReadEEPROM
5353
#define ICON_Flow ICON_StepE
5454
#define ICON_HomeX ICON_MoveX
@@ -80,7 +80,7 @@
8080
#define ICON_ParkPosY ICON_StepY
8181
#define ICON_ParkPosZ ICON_StepZ
8282
#define ICON_PhySet ICON_PrintSize
83-
#define ICON_PIDCycles ICON_ResumeEEPROM
83+
#define ICON_PIDCycles ICON_ResetEEPROM
8484
#define ICON_PIDValue ICON_Contact
8585
#define ICON_PrintStats ICON_PrintTime
8686
#define ICON_PrintStatsReset ICON_RemainTime
@@ -101,7 +101,7 @@
101101
#define ICON_ProbeTest ICON_Zoffset
102102
#define ICON_ProbeZSpeed ICON_MaxSpeedZ
103103
#define ICON_Pwrlossr ICON_Motion
104-
#define ICON_Reboot ICON_ResumeEEPROM
104+
#define ICON_Reboot ICON_ResetEEPROM
105105
#define ICON_Runout ICON_MaxAccE
106106
#define ICON_Scolor ICON_MaxSpeed
107107
#define ICON_SetBaudRate ICON_Setspeed
@@ -125,7 +125,7 @@
125125
#define ICON_TMCZSet ICON_MoveZ
126126
#define ICON_TMCESet ICON_Extruder
127127
#define ICON_UBLActive ICON_Fade
128-
#define ICON_UBLSlot ICON_ResumeEEPROM
128+
#define ICON_UBLSlot ICON_ResetEEPROM
129129
#define ICON_UBLMeshSave ICON_WriteEEPROM
130130
#define ICON_UBLMeshLoad ICON_ReadEEPROM
131131
#define ICON_UBLTiltGrid ICON_Tilt

buildroot/share/dwin/bin/DWIN_ICO.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ def serialize(self):
291291
41 : 'ICON_Motion',
292292
42 : 'ICON_WriteEEPROM',
293293
43 : 'ICON_ReadEEPROM',
294-
44 : 'ICON_ResumeEEPROM',
294+
44 : 'ICON_ResetEEPROM',
295295
45 : 'ICON_Info',
296296
46 : 'ICON_SetEndTemp',
297297
47 : 'ICON_SetBedTemp',
@@ -340,7 +340,7 @@ def serialize(self):
340340
90 : 'ICON_Info_0',
341341
91 : 'ICON_Info_1',
342342
93 : 'ICON_Printer_0',
343-
#94 : 'ICON_Printer_1',
343+
#94 : 'ICON_Printer_1',
344344
200 : 'ICON_Checkbox_F',
345345
201 : 'ICON_Checkbox_T',
346346
202 : 'ICON_Fade',

0 commit comments

Comments
 (0)