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

Fixed blocked lcd buttons

Browse Source 
build = 137y
This commit is contained in:
Robert Pelnar 2017-12-20 21:33:07 +01:00
parent 25dd6dd673
commit c88938e813
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Configuration.h
View File

@ -11,7 +11,7 @@
#define FW_version "3.1.1-RC2"
#define FW_build 137
//#define FW_build --BUILD-NUMBER--
#define FW_version_build FW_version " b" STR(FW_build) "x"
#define FW_version_build FW_version " b" STR(FW_build) "y"
#define FW_PRUSA3D_MAGIC "PRUSA3DFW"

2
Firmware/Configuration_prusa.h
View File

@ -114,7 +114,7 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o
//#define DEBUG_DISABLE_YMAXLIMIT //y max limit ignored
//#define DEBUG_DISABLE_ZMINLIMIT //z min limit ignored
//#define DEBUG_DISABLE_ZMAXLIMIT //z max limit ignored
#define DEBUG_DISABLE_STARTMSGS //no startup messages
//#define DEBUG_DISABLE_STARTMSGS //no startup messages
//#define DEBUG_DISABLE_MINTEMP //mintemp error ignored
//#define DEBUG_DISABLE_SWLIMITS //sw limits ignored
//#define DEBUG_DISABLE_LCD_STATUS_LINE //empty four lcd line

1
Firmware/temperature.cpp
View File

@ -1556,6 +1556,7 @@ void adc_ready(void) //callback from adc when sampling finished
ISR(TIMER0_COMPB_vect)
{
if (!temp_meas_ready) adc_cycle();
lcd_buttons_update();
static unsigned char pwm_count = (1 << SOFT_PWM_SCALE);
static unsigned char soft_pwm_0;