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

merge with upstream fixes

Browse source
This commit is contained in:
PavelSindler 2018-07-20 17:51:44 +02:00
parent a7e139ad8d
commit 80ca5f3d33
1 changed files with 5 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Firmware/Marlin_main.cpp
View file

@ -3162,13 +3162,14 @@ void gcode_M701()
loading_flag = false; loading_flag = false;
custom_message = false; custom_message = false;
custom_message_type = 0; custom_message_type = 0;
#endif
fsensor_err_cnt = 0; fsensor_err_cnt = 0;
fsensor_watch_runout = old_watch_runout; fsensor_watch_runout = old_watch_runout;
printf_P(_N("\nFSENSOR st_sum=%lu yd_sum=%lu er_sum=%lu\n"), fsensor_st_sum, fsensor_yd_sum, fsensor_er_sum); printf_P(_N("\nFSENSOR st_sum=%lu yd_sum=%lu er_sum=%lu\n"), fsensor_st_sum, fsensor_yd_sum, fsensor_er_sum);
printf_P(_N("\nFSENSOR yd_min=%hhu yd_max=%hhu yd_avg=%hhu\n"), fsensor_yd_min, fsensor_yd_max, fsensor_yd_sum * FSENSOR_CHUNK_LEN / fsensor_st_sum); printf_P(_N("\nFSENSOR yd_min=%hhu yd_max=%hhu yd_avg=%hhu\n"), fsensor_yd_min, fsensor_yd_max, fsensor_yd_sum * FSENSOR_CHUNK_LEN / fsensor_st_sum);
printf_P(PSTR("gcode_M701 end\n")); printf_P(PSTR("gcode_M701 end\n"));
#endif
} }
/** /**
* @brief Get serial number from 32U2 processor * @brief Get serial number from 32U2 processor
@ -6620,27 +6621,6 @@ Sigma_Exit:
lcd_setstatuspgm(_T(WELCOME_MSG)); lcd_setstatuspgm(_T(WELCOME_MSG));
custom_message = false; custom_message = false;
custom_message_type = 0; custom_message_type = 0;
#ifdef PAT9125
/*
// fsensor_enabled = old_fsensor_enabled; //temporary solution for unexpected restarting
if (fsensor_M600)
{
cmdqueue_pop_front(); //hack because M600 repeated 2x when enqueued to front
st_synchronize();
while (!is_buffer_empty())
{
process_commands();
cmdqueue_pop_front();
}
KEEPALIVE_STATE(IN_HANDLER);
// fsensor_enable();
fsensor_restore_print_and_continue();
}
fsensor_M600 = false;
*/
#endif //PAT9125
} }
break; break;
@ -9171,14 +9151,14 @@ void M600_load_filament(bool fsensor_enabled) {
KEEPALIVE_STATE(PAUSED_FOR_USER); KEEPALIVE_STATE(PAUSED_FOR_USER);
#ifdef PAT9125 #ifdef PAT9125
if (filament_autoload_enabled && (fsensor_enabled || fsensor_M600)) fsensor_autoload_check_start(); if (filament_autoload_enabled && (fsensor_enabled || fsensor_watch_runout)) fsensor_autoload_check_start();
#endif //PAT9125 #endif //PAT9125
while(!lcd_clicked()) while(!lcd_clicked())
{ {
manage_heater(); manage_heater();
manage_inactivity(true); manage_inactivity(true);
#ifdef PAT9125 #ifdef PAT9125
if (filament_autoload_enabled && (fsensor_enabled || fsensor_M600) && fsensor_check_autoload()) if (filament_autoload_enabled && (fsensor_enabled || fsensor_watch_runout) && fsensor_check_autoload())
{ {
tone(BEEPER, 1000); tone(BEEPER, 1000);
delay_keep_alive(50); delay_keep_alive(50);
@ -9189,7 +9169,7 @@ void M600_load_filament(bool fsensor_enabled) {
} }
#ifdef PAT9125 #ifdef PAT9125
if (filament_autoload_enabled && (fsensor_enabled || fsensor_M600)) fsensor_autoload_check_stop(); if (filament_autoload_enabled && (fsensor_enabled || fsensor_watch_runout)) fsensor_autoload_check_stop();
#endif //PAT9125 #endif //PAT9125
KEEPALIVE_STATE(IN_HANDLER); KEEPALIVE_STATE(IN_HANDLER);