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

Merge pull request #947 from PavelSindler/snmm_v2

Browse Source 
Snmm v2
This commit is contained in:
XPila 2018-07-20 18:33:27 +02:00 committed by GitHub
commit ce7c4aa737
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
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
@ -6621,27 +6622,6 @@ Sigma_Exit:
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;
#endif //FILAMENTCHANGEENABLE #endif //FILAMENTCHANGEENABLE
@ -9062,7 +9042,7 @@ bool mmu_get_reponse() {
while (!uart2_rx_ok()) while (!uart2_rx_ok())
{ {
delay_keep_alive(100); delay_keep_alive(100);
if (mmu_get_reponse_timeout.expired(30 * 1000ul)) { //PINDA cooling from 60 C to 35 C takes about 7 minutes if (mmu_get_reponse_timeout.expired(180 * 1000ul)) { //3 minutes timeout
response = false; response = false;
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);

3
Firmware/variants/1_75mm_MK3-MMU-EINSy10a-E3Dv6full.h
View File

@ -88,7 +88,10 @@
#define SHEET_PRINT_ZERO_REF_Y -2.f #define SHEET_PRINT_ZERO_REF_Y -2.f
#define DEFAULT_MAX_FEEDRATE {200, 200, 12, 120} // (mm/sec) max feedrate (M203) #define DEFAULT_MAX_FEEDRATE {200, 200, 12, 120} // (mm/sec) max feedrate (M203)
#define DEFAULT_MAX_FEEDRATE_SILENT {172, 172, 12, 120} // (mm/sec) max feedrate (M203), silent mode
#define DEFAULT_MAX_ACCELERATION {1000, 1000, 200, 5000} // (mm/sec^2) max acceleration (M201) #define DEFAULT_MAX_ACCELERATION {1000, 1000, 200, 5000} // (mm/sec^2) max acceleration (M201)
#define DEFAULT_MAX_ACCELERATION_SILENT {960, 960, 200, 5000} // (mm/sec^2) max acceleration (M201), silent mode
#define DEFAULT_ACCELERATION 1250 // X, Y, Z and E max acceleration in mm/s^2 for printing moves (M204S) #define DEFAULT_ACCELERATION 1250 // X, Y, Z and E max acceleration in mm/s^2 for printing moves (M204S)