|
@@ -341,7 +341,7 @@ millis_t next_lcd_update_ms;
|
341
|
341
|
|
342
|
342
|
// Used to print static text with no visible cursor.
|
343
|
343
|
// Parameters: label [, bool center [, bool invert [, char *value] ] ]
|
344
|
|
- #define STATIC_ITEM_P(LABEL, ...) \
|
|
344
|
+ #define STATIC_ITEM_P(LABEL, ...) do{ \
|
345
|
345
|
if (_menuLineNr == _thisItemNr) { \
|
346
|
346
|
if (_skipStatic && encoderLine <= _thisItemNr) { \
|
347
|
347
|
encoderPosition += ENCODER_STEPS_PER_MENU_ITEM; \
|
|
@@ -350,7 +350,7 @@ millis_t next_lcd_update_ms;
|
350
|
350
|
if (lcdDrawUpdate) \
|
351
|
351
|
lcd_implementation_drawmenu_static(_lcdLineNr, LABEL, ## __VA_ARGS__); \
|
352
|
352
|
} \
|
353
|
|
- ++_thisItemNr
|
|
353
|
+ ++_thisItemNr; } while(0)
|
354
|
354
|
|
355
|
355
|
#define STATIC_ITEM(LABEL, ...) STATIC_ITEM_P(PSTR(LABEL), ## __VA_ARGS__)
|
356
|
356
|
|
|
@@ -3225,10 +3225,17 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
3225
|
3225
|
break;
|
3226
|
3226
|
}
|
3227
|
3227
|
}
|
3228
|
|
- MENU_BACK(MSG_MOVE_AXIS);
|
3229
|
|
- MENU_ITEM(submenu, MSG_MOVE_10MM, lcd_move_menu_10mm);
|
3230
|
|
- MENU_ITEM(submenu, MSG_MOVE_1MM, lcd_move_menu_1mm);
|
3231
|
|
- MENU_ITEM(submenu, MSG_MOVE_01MM, lcd_move_menu_01mm);
|
|
3228
|
+ #if ENABLED(PREVENT_COLD_EXTRUSION)
|
|
3229
|
+ if (thermalManager.tooColdToExtrude(active_extruder))
|
|
3230
|
+ MENU_BACK(MSG_HOTEND_TOO_COLD);
|
|
3231
|
+ else
|
|
3232
|
+ #endif
|
|
3233
|
+ {
|
|
3234
|
+ MENU_BACK(MSG_MOVE_AXIS);
|
|
3235
|
+ MENU_ITEM(submenu, MSG_MOVE_10MM, lcd_move_menu_10mm);
|
|
3236
|
+ MENU_ITEM(submenu, MSG_MOVE_1MM, lcd_move_menu_1mm);
|
|
3237
|
+ MENU_ITEM(submenu, MSG_MOVE_01MM, lcd_move_menu_01mm);
|
|
3238
|
+ }
|
3232
|
3239
|
END_MENU();
|
3233
|
3240
|
}
|
3234
|
3241
|
void lcd_move_get_x_amount() { _lcd_move_distance_menu(X_AXIS, lcd_move_x); }
|