|
|
|
|
@ -57,16 +57,12 @@
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(G26_MESH_VALIDATION)
|
|
|
|
|
bool lcd_external_control;
|
|
|
|
|
bool lcd_external_control; // = false
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
// Initialized by settings.load()
|
|
|
|
|
int16_t lcd_preheat_hotend_temp[2], lcd_preheat_bed_temp[2], lcd_preheat_fan_speed[2];
|
|
|
|
|
|
|
|
|
|
#if ENABLED(LCD_SET_PROGRESS_MANUALLY) && (ENABLED(LCD_PROGRESS_BAR) || ENABLED(DOGLCD))
|
|
|
|
|
uint8_t progress_bar_percent;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if ENABLED(FILAMENT_LCD_DISPLAY) && ENABLED(SDSUPPORT)
|
|
|
|
|
millis_t previous_lcd_status_ms = 0;
|
|
|
|
|
#endif
|
|
|
|
|
@ -92,6 +88,10 @@ char lcd_status_message[3 * (LCD_WIDTH) + 1] = WELCOME_MSG; // worst case is kan
|
|
|
|
|
uint8_t filename_scroll_pos, filename_scroll_max, filename_scroll_hash;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if ENABLED(LCD_SET_PROGRESS_MANUALLY)
|
|
|
|
|
uint8_t progress_bar_percent;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if ENABLED(DOGLCD)
|
|
|
|
|
#include "ultralcd_impl_DOGM.h"
|
|
|
|
|
#include <U8glib.h>
|
|
|
|
|
@ -259,10 +259,6 @@ uint16_t max_display_update_time = 0;
|
|
|
|
|
//////////// Menu System Macros ////////////
|
|
|
|
|
////////////////////////////////////////////
|
|
|
|
|
|
|
|
|
|
#ifndef ENCODER_FEEDRATE_DEADZONE
|
|
|
|
|
#define ENCODER_FEEDRATE_DEADZONE 6
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* MENU_ITEM generates draw & handler code for a menu item, potentially calling:
|
|
|
|
|
*
|
|
|
|
|
@ -734,7 +730,7 @@ void kill_screen(const char* lcd_msg) {
|
|
|
|
|
* Audio feedback for controller clicks
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
void lcd_buzz(long duration, uint16_t freq) {
|
|
|
|
|
void lcd_buzz(const long duration, const uint16_t freq) {
|
|
|
|
|
#if ENABLED(LCD_USE_I2C_BUZZER)
|
|
|
|
|
lcd.buzz(duration, freq);
|
|
|
|
|
#elif PIN_EXISTS(BEEPER)
|
|
|
|
|
@ -1180,7 +1176,7 @@ void kill_screen(const char* lcd_msg) {
|
|
|
|
|
return mesh_edit_value;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void lcd_mesh_edit_setup(float initial) {
|
|
|
|
|
void lcd_mesh_edit_setup(const float initial) {
|
|
|
|
|
mesh_edit_value = mesh_edit_accumulator = initial;
|
|
|
|
|
lcd_goto_screen(_lcd_mesh_edit_NOP);
|
|
|
|
|
}
|
|
|
|
|
@ -1332,9 +1328,9 @@ void kill_screen(const char* lcd_msg) {
|
|
|
|
|
#if FAN_COUNT > 0
|
|
|
|
|
#if HAS_FAN0
|
|
|
|
|
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED FAN_SPEED_1_SUFFIX, &fanSpeeds[0], 0, 255);
|
|
|
|
|
#if ENABLED(EXTRA_FAN_SPEED)
|
|
|
|
|
#if ENABLED(EXTRA_FAN_SPEED)
|
|
|
|
|
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_EXTRA_FAN_SPEED FAN_SPEED_1_SUFFIX, &new_fanSpeeds[0], 3, 255);
|
|
|
|
|
#endif
|
|
|
|
|
#endif
|
|
|
|
|
#endif
|
|
|
|
|
#if HAS_FAN1
|
|
|
|
|
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED " 2", &fanSpeeds[1], 0, 255);
|
|
|
|
|
@ -1836,7 +1832,6 @@ void kill_screen(const char* lcd_msg) {
|
|
|
|
|
/**
|
|
|
|
|
* Step 6: Display "Next point: 1 / 9" while waiting for move to finish
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
void _lcd_level_bed_moving() {
|
|
|
|
|
if (lcdDrawUpdate) {
|
|
|
|
|
char msg[10];
|
|
|
|
|
@ -2649,7 +2644,7 @@ void kill_screen(const char* lcd_msg) {
|
|
|
|
|
|
|
|
|
|
void lcd_move_z();
|
|
|
|
|
|
|
|
|
|
void _man_probe_pt(const float rx, const float ry) {
|
|
|
|
|
void _man_probe_pt(const float &rx, const float &ry) {
|
|
|
|
|
#if HAS_LEVELING
|
|
|
|
|
reset_bed_level(); // After calibration bed-level data is no longer valid
|
|
|
|
|
#endif
|
|
|
|
|
@ -2712,7 +2707,7 @@ void kill_screen(const char* lcd_msg) {
|
|
|
|
|
void lcd_delta_settings() {
|
|
|
|
|
START_MENU();
|
|
|
|
|
MENU_BACK(MSG_DELTA_CALIBRATE);
|
|
|
|
|
MENU_ITEM_EDIT_CALLBACK(float52, MSG_DELTA_DIAG_ROG, &delta_diagonal_rod, delta_diagonal_rod - 5.0, delta_diagonal_rod + 5.0, recalc_delta_settings);
|
|
|
|
|
MENU_ITEM_EDIT_CALLBACK(float52, MSG_DELTA_DIAG_ROD, &delta_diagonal_rod, delta_diagonal_rod - 5.0, delta_diagonal_rod + 5.0, recalc_delta_settings);
|
|
|
|
|
MENU_ITEM_EDIT_CALLBACK(float52, MSG_DELTA_HEIGHT, &delta_height, delta_height - 10.0, delta_height + 10.0, recalc_delta_settings);
|
|
|
|
|
MENU_ITEM_EDIT_CALLBACK(float43, "Ex", &delta_endstop_adj[A_AXIS], -5.0, 5.0, recalc_delta_settings);
|
|
|
|
|
MENU_ITEM_EDIT_CALLBACK(float43, "Ey", &delta_endstop_adj[B_AXIS], -5.0, 5.0, recalc_delta_settings);
|
|
|
|
|
@ -2785,10 +2780,7 @@ void kill_screen(const char* lcd_msg) {
|
|
|
|
|
manual_move_offset = 0.0;
|
|
|
|
|
manual_move_axis = (int8_t)NO_AXIS;
|
|
|
|
|
|
|
|
|
|
// DELTA and SCARA machines use segmented moves, which could fill the planner during the call to
|
|
|
|
|
// move_to_destination. This will cause idle() to be called, which can then call this function while the
|
|
|
|
|
// previous invocation is being blocked. Modifications to manual_move_offset shouldn't be made while
|
|
|
|
|
// processing_manual_move is true or the planner will get out of sync.
|
|
|
|
|
// Set a blocking flag so no new moves can be added until all segments are done
|
|
|
|
|
processing_manual_move = true;
|
|
|
|
|
prepare_move_to_destination(); // will call set_current_from_destination()
|
|
|
|
|
processing_manual_move = false;
|
|
|
|
|
@ -2868,7 +2860,6 @@ void kill_screen(const char* lcd_msg) {
|
|
|
|
|
#if ENABLED(MAX_SOFTWARE_ENDSTOP_Z)
|
|
|
|
|
max = soft_endstop_max[Z_AXIS];
|
|
|
|
|
#endif
|
|
|
|
|
break;
|
|
|
|
|
default: break;
|
|
|
|
|
}
|
|
|
|
|
#endif // MIN_SOFTWARE_ENDSTOPS || MAX_SOFTWARE_ENDSTOPS
|
|
|
|
|
@ -3142,7 +3133,7 @@ void kill_screen(const char* lcd_msg) {
|
|
|
|
|
MENU_ITEM(submenu, MSG_FILAMENT, lcd_control_filament_menu);
|
|
|
|
|
|
|
|
|
|
#if HAS_LCD_CONTRAST
|
|
|
|
|
MENU_ITEM_EDIT_CALLBACK(int3, MSG_CONTRAST, (int*)&lcd_contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX, lcd_callback_set_contrast, true);
|
|
|
|
|
MENU_ITEM_EDIT_CALLBACK(int3, MSG_CONTRAST, &lcd_contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX, lcd_callback_set_contrast, true);
|
|
|
|
|
#endif
|
|
|
|
|
#if ENABLED(FWRETRACT)
|
|
|
|
|
MENU_ITEM(submenu, MSG_RETRACT, lcd_control_retract_menu);
|
|
|
|
|
@ -4339,6 +4330,7 @@ void kill_screen(const char* lcd_msg) {
|
|
|
|
|
} \
|
|
|
|
|
typedef void _name
|
|
|
|
|
|
|
|
|
|
DEFINE_MENU_EDIT_TYPE(uint32_t, long5, ftostr5rj, 0.01);
|
|
|
|
|
DEFINE_MENU_EDIT_TYPE(int16_t, int3, itostr3, 1);
|
|
|
|
|
DEFINE_MENU_EDIT_TYPE(uint8_t, int8, i8tostr3, 1);
|
|
|
|
|
DEFINE_MENU_EDIT_TYPE(float, float3, ftostr3, 1.0);
|
|
|
|
|
@ -4348,7 +4340,6 @@ void kill_screen(const char* lcd_msg) {
|
|
|
|
|
DEFINE_MENU_EDIT_TYPE(float, float51, ftostr51sign, 10.0);
|
|
|
|
|
DEFINE_MENU_EDIT_TYPE(float, float52, ftostr52sign, 100.0);
|
|
|
|
|
DEFINE_MENU_EDIT_TYPE(float, float62, ftostr62rj, 100.0);
|
|
|
|
|
DEFINE_MENU_EDIT_TYPE(uint32_t, long5, ftostr5rj, 0.01);
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
*
|
|
|
|
|
@ -4611,8 +4602,13 @@ void lcd_update() {
|
|
|
|
|
|
|
|
|
|
#if ENABLED(ULTIPANEL)
|
|
|
|
|
static millis_t return_to_status_ms = 0;
|
|
|
|
|
|
|
|
|
|
// Handle any queued Move Axis motion
|
|
|
|
|
manage_manual_move();
|
|
|
|
|
|
|
|
|
|
// Update button states for LCD_CLICKED, etc.
|
|
|
|
|
// After state changes the next button update
|
|
|
|
|
// may be delayed 300-500ms.
|
|
|
|
|
lcd_buttons_update();
|
|
|
|
|
|
|
|
|
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
|
|
|
|
@ -4947,7 +4943,7 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; }
|
|
|
|
|
#define encrot3 1
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#define GET_BUTTON_STATES(DST) \
|
|
|
|
|
#define GET_SHIFT_BUTTON_STATES(DST) \
|
|
|
|
|
uint8_t new_##DST = 0; \
|
|
|
|
|
WRITE(SHIFT_LD, LOW); \
|
|
|
|
|
WRITE(SHIFT_LD, HIGH); \
|
|
|
|
|
@ -4966,7 +4962,7 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; }
|
|
|
|
|
*/
|
|
|
|
|
void lcd_buttons_update() {
|
|
|
|
|
static uint8_t lastEncoderBits;
|
|
|
|
|
millis_t now = millis();
|
|
|
|
|
const millis_t now = millis();
|
|
|
|
|
if (ELAPSED(now, next_button_update_ms)) {
|
|
|
|
|
|
|
|
|
|
#if ENABLED(NEWPANEL)
|
|
|
|
|
@ -5047,13 +5043,15 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; }
|
|
|
|
|
|
|
|
|
|
#elif ENABLED(REPRAPWORLD_KEYPAD)
|
|
|
|
|
|
|
|
|
|
GET_BUTTON_STATES(buttons_reprapworld_keypad);
|
|
|
|
|
GET_SHIFT_BUTTON_STATES(buttons_reprapworld_keypad);
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
GET_BUTTON_STATES(buttons);
|
|
|
|
|
#endif // !NEWPANEL
|
|
|
|
|
#else // !NEWPANEL
|
|
|
|
|
|
|
|
|
|
GET_SHIFT_BUTTON_STATES(buttons);
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
} // next_button_update_ms
|
|
|
|
|
|
|
|
|
|
|
Scott Lahteine
6 years ago