Pārlūkot izejas kodu

Fix preheat menu formatting

Scott Lahteine 7 gadus atpakaļ
vecāks
revīzija
7e3aab889d
2 mainītis faili ar 16 papildinājumiem un 13 dzēšanām
  1. 6
    3
      Marlin/language_en.h
  2. 10
    10
      Marlin/ultralcd.cpp

+ 6
- 3
Marlin/language_en.h Parādīt failu

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

+ 10
- 10
Marlin/ultralcd.cpp Parādīt failu

1106
       #if HOTENDS == 1
1106
       #if HOTENDS == 1
1107
         #if TEMP_SENSOR_BED != 0
1107
         #if TEMP_SENSOR_BED != 0
1108
           MENU_ITEM(function, MSG_PREHEAT_1, lcd_preheat_m1_e0);
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
         #else
1110
         #else
1111
           MENU_ITEM(function, MSG_PREHEAT_1, lcd_preheat_m1_e0_only);
1111
           MENU_ITEM(function, MSG_PREHEAT_1, lcd_preheat_m1_e0_only);
1112
         #endif
1112
         #endif
1113
       #else
1113
       #else
1114
         #if TEMP_SENSOR_BED != 0
1114
         #if TEMP_SENSOR_BED != 0
1115
           MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H1, lcd_preheat_m1_e0);
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
           MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H2, lcd_preheat_m1_e1);
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
         #else
1119
         #else
1120
           MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H1, lcd_preheat_m1_e0_only);
1120
           MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H1, lcd_preheat_m1_e0_only);
1121
           MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H2, lcd_preheat_m1_e1_only);
1121
           MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H2, lcd_preheat_m1_e1_only);
1124
           MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H3, lcd_preheat_m1_e2_only);
1124
           MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H3, lcd_preheat_m1_e2_only);
1125
           #if TEMP_SENSOR_BED != 0
1125
           #if TEMP_SENSOR_BED != 0
1126
             MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H3, lcd_preheat_m1_e2);
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
           #else
1128
           #else
1129
             MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H3, lcd_preheat_m1_e2_only);
1129
             MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H3, lcd_preheat_m1_e2_only);
1130
           #endif
1130
           #endif
1131
           #if HOTENDS > 3
1131
           #if HOTENDS > 3
1132
             #if TEMP_SENSOR_BED != 0
1132
             #if TEMP_SENSOR_BED != 0
1133
               MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H4, lcd_preheat_m1_e3);
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
             #else
1135
             #else
1136
               MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H4, lcd_preheat_m1_e3_only);
1136
               MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H4, lcd_preheat_m1_e3_only);
1137
             #endif
1137
             #endif
1151
       #if HOTENDS == 1
1151
       #if HOTENDS == 1
1152
         #if TEMP_SENSOR_BED != 0
1152
         #if TEMP_SENSOR_BED != 0
1153
           MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_m2_e0);
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
         #else
1155
         #else
1156
           MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_m2_e0_only);
1156
           MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_m2_e0_only);
1157
         #endif
1157
         #endif
1158
       #else
1158
       #else
1159
         #if TEMP_SENSOR_BED != 0
1159
         #if TEMP_SENSOR_BED != 0
1160
           MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H1, lcd_preheat_m2_e0);
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
           MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H2, lcd_preheat_m2_e1);
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
         #else
1164
         #else
1165
           MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H1, lcd_preheat_m2_e0_only);
1165
           MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H1, lcd_preheat_m2_e0_only);
1166
           MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H2, lcd_preheat_m2_e1_only);
1166
           MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H2, lcd_preheat_m2_e1_only);
1169
           MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H3, lcd_preheat_m2_e2_only);
1169
           MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H3, lcd_preheat_m2_e2_only);
1170
           #if TEMP_SENSOR_BED != 0
1170
           #if TEMP_SENSOR_BED != 0
1171
             MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H3, lcd_preheat_m2_e2);
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
           #else
1173
           #else
1174
             MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H3, lcd_preheat_m2_e2_only);
1174
             MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H3, lcd_preheat_m2_e2_only);
1175
           #endif
1175
           #endif
1176
           #if HOTENDS > 3
1176
           #if HOTENDS > 3
1177
             #if TEMP_SENSOR_BED != 0
1177
             #if TEMP_SENSOR_BED != 0
1178
               MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H4, lcd_preheat_m2_e3);
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
             #else
1180
             #else
1181
               MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H4, lcd_preheat_m2_e3_only);
1181
               MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H4, lcd_preheat_m2_e3_only);
1182
             #endif
1182
             #endif

Notiek ielāde…
Atcelt
Saglabāt