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

Merge pull request #1089 from MRprusa3d/PFW-524

Browse Source 
1-st Layer Calibration correction
This commit is contained in:
PavelSindler 2018-08-30 09:21:07 +02:00 committed by GitHub
commit 4555d96e50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Firmware/Marlin_main.cpp
View File

@ -3192,10 +3192,7 @@ void gcode_M701()
custom_message_type = CUSTOM_MSG_TYPE_F_LOAD; custom_message_type = CUSTOM_MSG_TYPE_F_LOAD;
#ifdef FILAMENT_SENSOR #ifdef FILAMENT_SENSOR
if (mmu_enabled == false) fsensor_oq_meassure_start(40);
{
fsensor_oq_meassure_start(40);
}
#endif //FILAMENT_SENSOR #endif //FILAMENT_SENSOR
lcd_setstatuspgm(_T(MSG_LOADING_FILAMENT)); lcd_setstatuspgm(_T(MSG_LOADING_FILAMENT));

2
Firmware/ultralcd.cpp
View File

@ -4404,6 +4404,7 @@ void lcd_wizard(int state) {
break; break;
case 5: //is filament loaded? case 5: //is filament loaded?
//start to preheat nozzle and bed to save some time later //start to preheat nozzle and bed to save some time later
lcd_commands_type = LCD_COMMAND_V2_CAL;
setTargetHotend(PLA_PREHEAT_HOTEND_TEMP, 0); setTargetHotend(PLA_PREHEAT_HOTEND_TEMP, 0);
setTargetBed(PLA_PREHEAT_HPB_TEMP); setTargetBed(PLA_PREHEAT_HPB_TEMP);
wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is filament loaded?"), false);////MSG_WIZARD_FILAMENT_LOADED c=20 r=2 wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is filament loaded?"), false);////MSG_WIZARD_FILAMENT_LOADED c=20 r=2
@ -4441,6 +4442,7 @@ void lcd_wizard(int state) {
#ifdef SNMM #ifdef SNMM
change_extr(0); change_extr(0);
#endif #endif
loading_flag = true;
gcode_M701(); gcode_M701();
state = 9; state = 9;
break; break;