From 9960c80bf7217bc5f7443305c6eb4ba5039ace00 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 4 Oct 2018 16:12:41 +0200 Subject: [PATCH] Additional check always with enabled oq_meassure + variant files --- Firmware/fsensor.cpp | 16 ++++++++-------- .../variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 2 ++ .../variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 2 ++ .../variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 3 +++ 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Firmware/fsensor.cpp b/Firmware/fsensor.cpp index 80702882..2891b770 100644 --- a/Firmware/fsensor.cpp +++ b/Firmware/fsensor.cpp @@ -446,6 +446,8 @@ void fsensor_update(void) { bool autoload_enabled_tmp = fsensor_autoload_enabled; fsensor_autoload_enabled = false; + bool oq_meassure_enabled_tmp = fsensor_oq_meassure_enabled; + fsensor_oq_meassure_enabled = true; fsensor_stop_and_save_print(); @@ -482,14 +484,11 @@ void fsensor_update(void) bool err = false; err |= (err_cnt > 1); -#ifdef FSENSOR_QUALITY - if (fsensor_oq_meassure_enabled) - { - err |= (fsensor_oq_er_sum > 2); - err |= (fsensor_oq_yd_sum < (4 * FSENSOR_OQ_MIN_YD)); - } -#endif //FSENSOR_QUALITY - if (!err) + + err |= (fsensor_oq_er_sum > 2); + err |= (fsensor_oq_yd_sum < (4 * FSENSOR_OQ_MIN_YD)); + + if (!err) { printf_P(PSTR("fsensor_err_cnt = 0\n")); fsensor_restore_print_and_continue(); @@ -504,6 +503,7 @@ void fsensor_update(void) fsensor_watch_runout = false; } fsensor_autoload_enabled = autoload_enabled_tmp; + fsensor_oq_meassure_enabled = oq_meassure_enabled_tmp; } } diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index 626c64e8..627e284a 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -145,6 +145,8 @@ //#define CMD_DIAGNOSTICS //Show cmd queue length on printer display #endif /* DEBUG_BUILD */ +#define FSENSOR_QUALITY + /*------------------------------------ EXTRUDER SETTINGS diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index cb13e8ad..7c76a8b3 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -146,6 +146,8 @@ //#define CMD_DIAGNOSTICS //Show cmd queue length on printer display #endif /* DEBUG_BUILD */ +#define FSENSOR_QUALITY + /*------------------------------------ EXTRUDER SETTINGS diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index ea1951f4..6f4729a6 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -183,6 +183,9 @@ #define CMD_DIAGNOSTICS //Show cmd queue length on printer display #endif /* DEBUG_BUILD */ +#define FSENSOR_QUALITY + + #define LINEARITY_CORRECTION #define TMC2130_LINEARITY_CORRECTION #define TMC2130_LINEARITY_CORRECTION_XYZ