3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'MK2' into MK2

Browse source
This commit is contained in:
PavelSindler 2017-04-19 17:48:53 +02:00 committed by GitHub
commit b06b985ca7
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Firmware/Configuration.h
View file

@ -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

1
Firmware/Marlin_main.cpp
View file

@ -2791,7 +2791,6 @@ void process_commands()
}
break;
case 76: //PINDA probe temperature calibration
{
setTargetBed(PINDA_MIN_T);

6
Firmware/ultralcd.cpp
View file

@ -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