From a7e139ad8d1b533835346692c7f2499afdf9f23a Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 20 Jul 2018 17:38:24 +0200 Subject: [PATCH 1/3] limist added to configuration files --- Firmware/variants/1_75mm_MK3-MMU-EINSy10a-E3Dv6full.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Firmware/variants/1_75mm_MK3-MMU-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-MMU-EINSy10a-E3Dv6full.h index f57c6da1..bf1c0c3d 100644 --- a/Firmware/variants/1_75mm_MK3-MMU-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-MMU-EINSy10a-E3Dv6full.h @@ -87,8 +87,11 @@ */ #define SHEET_PRINT_ZERO_REF_Y -2.f -#define DEFAULT_MAX_FEEDRATE {200, 200, 12, 120} // (mm/sec) max feedrate (M203) -#define DEFAULT_MAX_ACCELERATION {1000, 1000, 200, 5000} // (mm/sec^2) max acceleration (M201) +#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_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) From 80ca5f3d336c5ca34aa8556baa10f929e507bfff Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 20 Jul 2018 17:51:44 +0200 Subject: [PATCH 2/3] merge with upstream fixes --- Firmware/Marlin_main.cpp | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index aad6b756..07c3f78b 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3162,13 +3162,14 @@ void gcode_M701() loading_flag = false; custom_message = false; custom_message_type = 0; -#endif + fsensor_err_cnt = 0; 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 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")); +#endif } /** * @brief Get serial number from 32U2 processor @@ -6620,27 +6621,6 @@ Sigma_Exit: lcd_setstatuspgm(_T(WELCOME_MSG)); custom_message = false; 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; @@ -9171,14 +9151,14 @@ void M600_load_filament(bool fsensor_enabled) { KEEPALIVE_STATE(PAUSED_FOR_USER); #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 while(!lcd_clicked()) { manage_heater(); manage_inactivity(true); #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); delay_keep_alive(50); @@ -9189,7 +9169,7 @@ void M600_load_filament(bool fsensor_enabled) { } #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 KEEPALIVE_STATE(IN_HANDLER); From eac963e3a0d95494012f0be9ee89e07283729044 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 20 Jul 2018 18:03:52 +0200 Subject: [PATCH 3/3] timeout prolonged --- Firmware/Marlin_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 07c3f78b..2c9ce1be 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -9042,7 +9042,7 @@ bool mmu_get_reponse() { while (!uart2_rx_ok()) { 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; break; }