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

bugfix - Filament sensor enable from menu

Browse source
This commit is contained in:
Robert Pelnar 2017-11-29 00:15:45 +01:00
parent 9413eca52c
commit a56b0ccaf8
5 changed files with 14890 additions and 5 deletions

2
Firmware/Configuration.h
View file

@ -9,7 +9,7 @@
// Firmware version
#define FW_version "3.1.1-RC1"
#define FW_build 119
#define FW_build 120
//#define FW_build --BUILD-NUMBER--
#define FW_version_build FW_version " b" STR(FW_build)

14884
Firmware/builds/1_75mm_MK3-EINY04-E3Dv6full/Firmware.ino.rambo_b120.hex Normal file
View file

File diff suppressed because it is too large Load diff

4
Firmware/fsensor.cpp
View file

@ -50,8 +50,8 @@ bool fsensor_enable()
// fsensor_ignore_error = true;
fsensor_M600 = false;
fsensor_err_cnt = 0;
eeprom_update_byte((uint8_t*)EEPROM_FSENSOR, fsensor_enabled?0xFF:0x00);
FSensorStateMenu = fsensor_enabled?true:false;
eeprom_update_byte((uint8_t*)EEPROM_FSENSOR, fsensor_enabled?0x01:0x00);
FSensorStateMenu = fsensor_enabled?1:0;
return fsensor_enabled;
}

2
Firmware/pat9125.cpp
View file

@ -39,6 +39,8 @@ int pat9125_init(unsigned char xres, unsigned char yres)
pat9125_yres = yres;
pat9125_PID1 = pat9125_rd_reg(PAT9125_PID1);
pat9125_PID2 = pat9125_rd_reg(PAT9125_PID2);
// pat9125_PID1 = 0x31;
// pat9125_PID2 = 0x91;
if ((pat9125_PID1 != 0x31) || (pat9125_PID2 != 0x91))
{
return 0;

3
Firmware/ultralcd.cpp
View file

@ -3271,8 +3271,7 @@ static void lcd_fsensor_state_set()
if (FSensorStateMenu==0) {
fsensor_disable();
}else{
if (!fsensor_enable());
FSensorStateMenu = 0;
fsensor_enable();
}
if (IS_SD_PRINTING || is_usb_printing) lcd_goto_menu(lcd_tune_menu, 7);
else lcd_goto_menu(lcd_settings_menu, 7);