|
@@ -109,44 +109,44 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
|
109
|
109
|
#if E_STEPPERS == 1
|
110
|
110
|
PGM_P const msg0 = GET_TEXT(MSG_FILAMENTCHANGE);
|
111
|
111
|
if (thermalManager.targetTooColdToExtrude(active_extruder))
|
112
|
|
- MENU_ITEM_P(submenu, msg0, []{ _menu_temp_filament_op(PauseMode(editable.int8), 0); });
|
|
112
|
+ SUBMENU_P(msg0, []{ _menu_temp_filament_op(PauseMode(editable.int8), 0); });
|
113
|
113
|
else
|
114
|
|
- MENU_ITEM_P(gcode, msg0, PSTR("M600 B0"));
|
|
114
|
+ GCODES_ITEM_P(msg0, PSTR("M600 B0"));
|
115
|
115
|
#else
|
116
|
116
|
PGM_P const msg0 = GET_TEXT(MSG_FILAMENTCHANGE_E0);
|
117
|
117
|
PGM_P const msg1 = GET_TEXT(MSG_FILAMENTCHANGE_E1);
|
118
|
118
|
if (thermalManager.targetTooColdToExtrude(0))
|
119
|
|
- MENU_ITEM_P(submenu, msg0, []{ _menu_temp_filament_op(PauseMode(editable.int8), 0); });
|
|
119
|
+ SUBMENU_P(msg0, []{ _menu_temp_filament_op(PauseMode(editable.int8), 0); });
|
120
|
120
|
else
|
121
|
|
- MENU_ITEM_P(gcode, msg0, PSTR("M600 B0 T0"));
|
|
121
|
+ GCODES_ITEM_P(msg0, PSTR("M600 B0 T0"));
|
122
|
122
|
if (thermalManager.targetTooColdToExtrude(1))
|
123
|
|
- MENU_ITEM_P(submenu, msg1, []{ _menu_temp_filament_op(PauseMode(editable.int8), 1); });
|
|
123
|
+ SUBMENU_P(msg1, []{ _menu_temp_filament_op(PauseMode(editable.int8), 1); });
|
124
|
124
|
else
|
125
|
|
- MENU_ITEM_P(gcode, msg1, PSTR("M600 B0 T1"));
|
|
125
|
+ GCODES_ITEM_P(msg1, PSTR("M600 B0 T1"));
|
126
|
126
|
#if E_STEPPERS > 2
|
127
|
127
|
PGM_P const msg2 = GET_TEXT(MSG_FILAMENTCHANGE_E2);
|
128
|
128
|
if (thermalManager.targetTooColdToExtrude(2))
|
129
|
|
- MENU_ITEM_P(submenu, msg2, []{ _menu_temp_filament_op(PauseMode(editable.int8), 2); });
|
|
129
|
+ SUBMENU_P(msg2, []{ _menu_temp_filament_op(PauseMode(editable.int8), 2); });
|
130
|
130
|
else
|
131
|
|
- MENU_ITEM_P(gcode, msg2, PSTR("M600 B0 T2"));
|
|
131
|
+ GCODES_ITEM_P(msg2, PSTR("M600 B0 T2"));
|
132
|
132
|
#if E_STEPPERS > 3
|
133
|
133
|
PGM_P const msg3 = GET_TEXT(MSG_FILAMENTCHANGE_E3);
|
134
|
134
|
if (thermalManager.targetTooColdToExtrude(3))
|
135
|
|
- MENU_ITEM_P(submenu, msg3, []{ _menu_temp_filament_op(PauseMode(editable.int8), 3); });
|
|
135
|
+ SUBMENU_P(msg3, []{ _menu_temp_filament_op(PauseMode(editable.int8), 3); });
|
136
|
136
|
else
|
137
|
|
- MENU_ITEM_P(gcode, msg3, PSTR("M600 B0 T3"));
|
|
137
|
+ GCODES_ITEM_P(msg3, PSTR("M600 B0 T3"));
|
138
|
138
|
#if E_STEPPERS > 4
|
139
|
139
|
PGM_P const msg4 = GET_TEXT(MSG_FILAMENTCHANGE_E4);
|
140
|
140
|
if (thermalManager.targetTooColdToExtrude(4))
|
141
|
|
- MENU_ITEM_P(submenu, msg4, []{ _menu_temp_filament_op(PauseMode(editable.int8), 4); });
|
|
141
|
+ SUBMENU_P(msg4, []{ _menu_temp_filament_op(PauseMode(editable.int8), 4); });
|
142
|
142
|
else
|
143
|
|
- MENU_ITEM_P(gcode, msg4, PSTR("M600 B0 T4"));
|
|
143
|
+ GCODES_ITEM_P(msg4, PSTR("M600 B0 T4"));
|
144
|
144
|
#if E_STEPPERS > 5
|
145
|
145
|
PGM_P const msg5 = GET_TEXT(MSG_FILAMENTCHANGE_E5);
|
146
|
146
|
if (thermalManager.targetTooColdToExtrude(5))
|
147
|
|
- MENU_ITEM_P(submenu, msg5, []{ _menu_temp_filament_op(PauseMode(editable.int8), 5); });
|
|
147
|
+ SUBMENU_P(msg5, []{ _menu_temp_filament_op(PauseMode(editable.int8), 5); });
|
148
|
148
|
else
|
149
|
|
- MENU_ITEM_P(gcode, msg5, PSTR("M600 B0 T5"));
|
|
149
|
+ GCODES_ITEM_P(msg5, PSTR("M600 B0 T5"));
|
150
|
150
|
#endif // E_STEPPERS > 5
|
151
|
151
|
#endif // E_STEPPERS > 4
|
152
|
152
|
#endif // E_STEPPERS > 3
|
|
@@ -159,44 +159,44 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
|
159
|
159
|
#if E_STEPPERS == 1
|
160
|
160
|
PGM_P const msg0 = GET_TEXT(MSG_FILAMENTLOAD);
|
161
|
161
|
if (thermalManager.targetTooColdToExtrude(active_extruder))
|
162
|
|
- MENU_ITEM_P(submenu, msg0, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 0); });
|
|
162
|
+ SUBMENU_P(msg0, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 0); });
|
163
|
163
|
else
|
164
|
|
- MENU_ITEM_P(gcode, msg0, PSTR("M701"));
|
|
164
|
+ GCODES_ITEM_P(msg0, PSTR("M701"));
|
165
|
165
|
#else
|
166
|
166
|
PGM_P const msg0 = GET_TEXT(MSG_FILAMENTLOAD_E0);
|
167
|
167
|
PGM_P const msg1 = GET_TEXT(MSG_FILAMENTLOAD_E1);
|
168
|
168
|
if (thermalManager.targetTooColdToExtrude(0))
|
169
|
|
- MENU_ITEM_P(submenu, msg0, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 0); });
|
|
169
|
+ SUBMENU_P(msg0, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 0); });
|
170
|
170
|
else
|
171
|
|
- MENU_ITEM_P(gcode, msg0, PSTR("M701 T0"));
|
|
171
|
+ GCODES_ITEM_P(msg0, PSTR("M701 T0"));
|
172
|
172
|
if (thermalManager.targetTooColdToExtrude(1))
|
173
|
|
- MENU_ITEM_P(submenu, msg1, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 1); });
|
|
173
|
+ SUBMENU_P(msg1, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 1); });
|
174
|
174
|
else
|
175
|
|
- MENU_ITEM_P(gcode, msg1, PSTR("M701 T1"));
|
|
175
|
+ GCODES_ITEM_P(msg1, PSTR("M701 T1"));
|
176
|
176
|
#if E_STEPPERS > 2
|
177
|
177
|
PGM_P const msg2 = GET_TEXT(MSG_FILAMENTLOAD_E2);
|
178
|
178
|
if (thermalManager.targetTooColdToExtrude(2))
|
179
|
|
- MENU_ITEM_P(submenu, msg2, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 2); });
|
|
179
|
+ SUBMENU_P(msg2, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 2); });
|
180
|
180
|
else
|
181
|
|
- MENU_ITEM_P(gcode, msg2, PSTR("M701 T2"));
|
|
181
|
+ GCODES_ITEM_P(msg2, PSTR("M701 T2"));
|
182
|
182
|
#if E_STEPPERS > 3
|
183
|
183
|
PGM_P const msg3 = GET_TEXT(MSG_FILAMENTLOAD_E3);
|
184
|
184
|
if (thermalManager.targetTooColdToExtrude(3))
|
185
|
|
- MENU_ITEM_P(submenu, msg3, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 3); });
|
|
185
|
+ SUBMENU_P(msg3, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 3); });
|
186
|
186
|
else
|
187
|
|
- MENU_ITEM_P(gcode, msg3, PSTR("M701 T3"));
|
|
187
|
+ GCODES_ITEM_P(msg3, PSTR("M701 T3"));
|
188
|
188
|
#if E_STEPPERS > 4
|
189
|
189
|
PGM_P const msg4 = GET_TEXT(MSG_FILAMENTLOAD_E4);
|
190
|
190
|
if (thermalManager.targetTooColdToExtrude(4))
|
191
|
|
- MENU_ITEM_P(submenu, msg4, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 4); });
|
|
191
|
+ SUBMENU_P(msg4, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 4); });
|
192
|
192
|
else
|
193
|
|
- MENU_ITEM_P(gcode, msg4, PSTR("M701 T4"));
|
|
193
|
+ GCODES_ITEM_P(msg4, PSTR("M701 T4"));
|
194
|
194
|
#if E_STEPPERS > 5
|
195
|
195
|
PGM_P const msg5 = GET_TEXT(MSG_FILAMENTLOAD_E5);
|
196
|
196
|
if (thermalManager.targetTooColdToExtrude(5))
|
197
|
|
- MENU_ITEM_P(submenu, msg5, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 5); });
|
|
197
|
+ SUBMENU_P(msg5, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 5); });
|
198
|
198
|
else
|
199
|
|
- MENU_ITEM_P(gcode, msg5, PSTR("M701 T5"));
|
|
199
|
+ GCODES_ITEM_P(msg5, PSTR("M701 T5"));
|
200
|
200
|
#endif // E_STEPPERS > 5
|
201
|
201
|
#endif // E_STEPPERS > 4
|
202
|
202
|
#endif // E_STEPPERS > 3
|