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

pla preheat temp. changed, temp calibration on/off moved to settings menu

Browse source
This commit is contained in:
PavelSindler 2017-11-27 16:21:54 +01:00
parent 044ed951cb
commit 7c6d63ffb5
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Firmware/Configuration_prusa.h
View file

@ -381,7 +381,7 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o
#define FARM_PREHEAT_FAN_SPEED 0 #define FARM_PREHEAT_FAN_SPEED 0
#define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HOTEND_TEMP 215
#define PLA_PREHEAT_HPB_TEMP 55 #define PLA_PREHEAT_HPB_TEMP 60
#define PLA_PREHEAT_FAN_SPEED 0 #define PLA_PREHEAT_FAN_SPEED 0
#define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HOTEND_TEMP 255

18
Firmware/ultralcd.cpp
View file

@ -3301,12 +3301,6 @@ void lcd_pinda_calibration_menu()
START_MENU(); START_MENU();
MENU_ITEM(back, MSG_MENU_CALIBRATION, lcd_calibration_menu); MENU_ITEM(back, MSG_MENU_CALIBRATION, lcd_calibration_menu);
MENU_ITEM(submenu, MSG_CALIBRATE_PINDA, lcd_calibrate_pinda); MENU_ITEM(submenu, MSG_CALIBRATE_PINDA, lcd_calibrate_pinda);
if (temp_cal_active == false) {
MENU_ITEM(function, MSG_TEMP_CALIBRATION_OFF, lcd_temp_calibration_set);
}
else {
MENU_ITEM(function, MSG_TEMP_CALIBRATION_ON, lcd_temp_calibration_set);
}
END_MENU(); END_MENU();
} }
@ -3674,6 +3668,12 @@ static void lcd_settings_menu()
MENU_ITEM(function, MSG_CRASHDETECT_ON, lcd_crash_mode_set); MENU_ITEM(function, MSG_CRASHDETECT_ON, lcd_crash_mode_set);
} }
} }
if (temp_cal_active == false) {
MENU_ITEM(function, MSG_TEMP_CALIBRATION_OFF, lcd_temp_calibration_set);
}
else {
MENU_ITEM(function, MSG_TEMP_CALIBRATION_ON, lcd_temp_calibration_set);
}
if (!isPrintPaused && !homing_flag) if (!isPrintPaused && !homing_flag)
{ {
@ -3728,9 +3728,6 @@ static void lcd_calibration_menu()
#endif //MK1BP #endif //MK1BP
MENU_ITEM(submenu, MSG_BED_CORRECTION_MENU, lcd_adjust_bed); MENU_ITEM(submenu, MSG_BED_CORRECTION_MENU, lcd_adjust_bed);
#ifndef MK1BP
MENU_ITEM(submenu, MSG_CALIBRATION_PINDA_MENU, lcd_pinda_calibration_menu);
#endif //MK1BP
MENU_ITEM(submenu, MSG_PID_EXTRUDER, pid_extruder); MENU_ITEM(submenu, MSG_PID_EXTRUDER, pid_extruder);
MENU_ITEM(submenu, MSG_SHOW_END_STOPS, menu_show_end_stops); MENU_ITEM(submenu, MSG_SHOW_END_STOPS, menu_show_end_stops);
#ifndef MK1BP #ifndef MK1BP
@ -3739,6 +3736,9 @@ static void lcd_calibration_menu()
#ifndef SNMM #ifndef SNMM
//MENU_ITEM(function, MSG_RESET_CALIBRATE_E, lcd_extr_cal_reset); //MENU_ITEM(function, MSG_RESET_CALIBRATE_E, lcd_extr_cal_reset);
#endif #endif
#ifndef MK1BP
MENU_ITEM(submenu, MSG_CALIBRATION_PINDA_MENU, lcd_pinda_calibration_menu);
#endif //MK1BP
} }
END_MENU(); END_MENU();