Browse Source

Fix preheat menu formatting

Scott Lahteine 7 years ago
parent
commit
7e3aab889d
2 changed files with 16 additions and 13 deletions
  1. 6
    3
      Marlin/language_en.h
  2. 10
    10
      Marlin/ultralcd.cpp

+ 6
- 3
Marlin/language_en.h View File

@@ -105,6 +105,9 @@
105 105
 #ifndef MSG_PREHEAT_1_ALL
106 106
   #define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 _UxGT(" All")
107 107
 #endif
108
+#ifndef MSG_PREHEAT_1_END
109
+  #define MSG_PREHEAT_1_END                   MSG_PREHEAT_1 _UxGT(" End")
110
+#endif
108 111
 #ifndef MSG_PREHEAT_1_BEDONLY
109 112
   #define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1 _UxGT(" Bed")
110 113
 #endif
@@ -120,6 +123,9 @@
120 123
 #ifndef MSG_PREHEAT_2_ALL
121 124
   #define MSG_PREHEAT_2_ALL                   MSG_PREHEAT_2 _UxGT(" All")
122 125
 #endif
126
+#ifndef MSG_PREHEAT_2_END
127
+  #define MSG_PREHEAT_2_END                   MSG_PREHEAT_2 _UxGT(" End")
128
+#endif
123 129
 #ifndef MSG_PREHEAT_2_BEDONLY
124 130
   #define MSG_PREHEAT_2_BEDONLY               MSG_PREHEAT_2 _UxGT(" Bed")
125 131
 #endif
@@ -129,9 +135,6 @@
129 135
 #ifndef MSG_COOLDOWN
130 136
   #define MSG_COOLDOWN                        _UxGT("Cooldown")
131 137
 #endif
132
-#ifndef MSG_HOTEND
133
-  #define MSG_HOTEND                          _UxGT("Hotend")
134
-#endif
135 138
 #ifndef MSG_SWITCH_PS_ON
136 139
   #define MSG_SWITCH_PS_ON                    _UxGT("Switch power on")
137 140
 #endif

+ 10
- 10
Marlin/ultralcd.cpp View File

@@ -1106,16 +1106,16 @@ void kill_screen(const char* lcd_msg) {
1106 1106
       #if HOTENDS == 1
1107 1107
         #if TEMP_SENSOR_BED != 0
1108 1108
           MENU_ITEM(function, MSG_PREHEAT_1, lcd_preheat_m1_e0);
1109
-          MENU_ITEM(function, MSG_PREHEAT_1 MSG_HOTEND, lcd_preheat_m1_e0_only);
1109
+          MENU_ITEM(function, MSG_PREHEAT_1_END, lcd_preheat_m1_e0_only);
1110 1110
         #else
1111 1111
           MENU_ITEM(function, MSG_PREHEAT_1, lcd_preheat_m1_e0_only);
1112 1112
         #endif
1113 1113
       #else
1114 1114
         #if TEMP_SENSOR_BED != 0
1115 1115
           MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H1, lcd_preheat_m1_e0);
1116
-          MENU_ITEM(function, MSG_PREHEAT_1_N MSG_HOTEND " " MSG_E1, lcd_preheat_m1_e0_only);
1116
+          MENU_ITEM(function, MSG_PREHEAT_1_END " " MSG_E1, lcd_preheat_m1_e0_only);
1117 1117
           MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H2, lcd_preheat_m1_e1);
1118
-          MENU_ITEM(function, MSG_PREHEAT_1_N MSG_HOTEND " " MSG_E2, lcd_preheat_m1_e1_only);
1118
+          MENU_ITEM(function, MSG_PREHEAT_1_END " " MSG_E2, lcd_preheat_m1_e1_only);
1119 1119
         #else
1120 1120
           MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H1, lcd_preheat_m1_e0_only);
1121 1121
           MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H2, lcd_preheat_m1_e1_only);
@@ -1124,14 +1124,14 @@ void kill_screen(const char* lcd_msg) {
1124 1124
           MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H3, lcd_preheat_m1_e2_only);
1125 1125
           #if TEMP_SENSOR_BED != 0
1126 1126
             MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H3, lcd_preheat_m1_e2);
1127
-            MENU_ITEM(function, MSG_PREHEAT_1_N MSG_HOTEND " " MSG_E3, lcd_preheat_m1_e2_only);
1127
+            MENU_ITEM(function, MSG_PREHEAT_1_END " " MSG_E3, lcd_preheat_m1_e2_only);
1128 1128
           #else
1129 1129
             MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H3, lcd_preheat_m1_e2_only);
1130 1130
           #endif
1131 1131
           #if HOTENDS > 3
1132 1132
             #if TEMP_SENSOR_BED != 0
1133 1133
               MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H4, lcd_preheat_m1_e3);
1134
-              MENU_ITEM(function, MSG_PREHEAT_1_N MSG_HOTEND " " MSG_E4, lcd_preheat_m1_e3_only);
1134
+              MENU_ITEM(function, MSG_PREHEAT_1_END " " MSG_E4, lcd_preheat_m1_e3_only);
1135 1135
             #else
1136 1136
               MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H4, lcd_preheat_m1_e3_only);
1137 1137
             #endif
@@ -1151,16 +1151,16 @@ void kill_screen(const char* lcd_msg) {
1151 1151
       #if HOTENDS == 1
1152 1152
         #if TEMP_SENSOR_BED != 0
1153 1153
           MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_m2_e0);
1154
-          MENU_ITEM(function, MSG_PREHEAT_2 MSG_HOTEND, lcd_preheat_m2_e0_only);
1154
+          MENU_ITEM(function, MSG_PREHEAT_2_END, lcd_preheat_m2_e0_only);
1155 1155
         #else
1156 1156
           MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_m2_e0_only);
1157 1157
         #endif
1158 1158
       #else
1159 1159
         #if TEMP_SENSOR_BED != 0
1160 1160
           MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H1, lcd_preheat_m2_e0);
1161
-          MENU_ITEM(function, MSG_PREHEAT_2_N MSG_HOTEND " " MSG_E1, lcd_preheat_m2_e0_only);
1161
+          MENU_ITEM(function, MSG_PREHEAT_2_END " " MSG_E1, lcd_preheat_m2_e0_only);
1162 1162
           MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H2, lcd_preheat_m2_e1);
1163
-          MENU_ITEM(function, MSG_PREHEAT_2_N MSG_HOTEND " " MSG_E2, lcd_preheat_m2_e1_only);
1163
+          MENU_ITEM(function, MSG_PREHEAT_2_END " " MSG_E2, lcd_preheat_m2_e1_only);
1164 1164
         #else
1165 1165
           MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H1, lcd_preheat_m2_e0_only);
1166 1166
           MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H2, lcd_preheat_m2_e1_only);
@@ -1169,14 +1169,14 @@ void kill_screen(const char* lcd_msg) {
1169 1169
           MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H3, lcd_preheat_m2_e2_only);
1170 1170
           #if TEMP_SENSOR_BED != 0
1171 1171
             MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H3, lcd_preheat_m2_e2);
1172
-            MENU_ITEM(function, MSG_PREHEAT_2_N MSG_HOTEND " " MSG_E3, lcd_preheat_m2_e2_only);
1172
+            MENU_ITEM(function, MSG_PREHEAT_2_END " " MSG_E3, lcd_preheat_m2_e2_only);
1173 1173
           #else
1174 1174
             MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H3, lcd_preheat_m2_e2_only);
1175 1175
           #endif
1176 1176
           #if HOTENDS > 3
1177 1177
             #if TEMP_SENSOR_BED != 0
1178 1178
               MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H4, lcd_preheat_m2_e3);
1179
-              MENU_ITEM(function, MSG_PREHEAT_2_N MSG_HOTEND " " MSG_E4, lcd_preheat_m2_e3_only);
1179
+              MENU_ITEM(function, MSG_PREHEAT_2_END " " MSG_E4, lcd_preheat_m2_e3_only);
1180 1180
             #else
1181 1181
               MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H4, lcd_preheat_m2_e3_only);
1182 1182
             #endif

Loading…
Cancel
Save