diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 15e85667..5d7802bd 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -5,7 +5,7 @@ #include "Configuration_prusa.h" // Firmware version -#define FW_version "3.0.11-alpha" +#define FW_version "3.0.10-9" #define FW_PRUSA3D_MAGIC "PRUSA3DFW" #define FW_PRUSA3D_MAGIC_LEN 10 diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 296fc9d8..7793431b 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -2791,7 +2791,6 @@ void process_commands() } break; - case 76: //PINDA probe temperature calibration { setTargetBed(PINDA_MIN_T); @@ -2927,7 +2926,7 @@ void process_commands() * */ - case 80: + case 80: case_G80: { mesh_bed_leveling_flag = true; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 07c23c13..6314a75a 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -114,6 +114,10 @@ long long_press_timer = millis(); long button_blanking_time = millis(); bool button_pressed = false; +bool long_press_active = false; +long long_press_timer = millis(); +bool button_pressed = false; + bool menuExiting = false; #ifdef FILAMENT_LCD_DISPLAY @@ -4823,7 +4827,6 @@ void lcd_buttons_update() } else if (currentMenu == lcd_move_z) lcd_quick_feedback(); //button_pressed is set back to false via lcd_quick_feedback function - } else { long_press_active = false; @@ -4833,7 +4836,6 @@ void lcd_buttons_update() else { //we are in modal mode if (READ(BTN_ENC) == 0) newbutton |= EN_C; - } #endif