From 988ba6d8b080b9dea1892c5e8b612f037cceb368 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Mon, 30 Mar 2020 15:37:05 +0300 Subject: [PATCH 1/3] Fix DEBUG_BUILD --- Firmware/Dcodes.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Firmware/Dcodes.cpp b/Firmware/Dcodes.cpp index 79695c9e..cda53171 100644 --- a/Firmware/Dcodes.cpp +++ b/Firmware/Dcodes.cpp @@ -1,5 +1,6 @@ #include "Dcodes.h" //#include "Marlin.h" +#include "configuration.h" #include "language.h" #include "cmdqueue.h" #include @@ -185,7 +186,6 @@ void dcode_3() #define BOOT_APP_FLG_COPY 0x02 #define BOOT_APP_FLG_FLASH 0x04 -extern uint8_t fsensor_log; extern float current_temperature_pinda; extern float axis_steps_per_unit[NUM_AXIS]; @@ -194,6 +194,8 @@ extern float axis_steps_per_unit[NUM_AXIS]; #endif //0 #define LOG(args...) +extern uint8_t fsensor_log; + /*! * ### D-1 - Endless Loop D-1: Endless Loop From 104f81cd27feae620055a19f0f5a2f9ec8c9e8e2 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Mon, 30 Mar 2020 15:42:30 +0300 Subject: [PATCH 2/3] Fix case sensitive include --- Firmware/Dcodes.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Dcodes.cpp b/Firmware/Dcodes.cpp index cda53171..8a7e63e5 100644 --- a/Firmware/Dcodes.cpp +++ b/Firmware/Dcodes.cpp @@ -1,6 +1,6 @@ #include "Dcodes.h" //#include "Marlin.h" -#include "configuration.h" +#include "Configuration.h" #include "language.h" #include "cmdqueue.h" #include From f13269d8a9f9ac9eb4c4078e37f57f3eea86d838 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Mon, 30 Mar 2020 16:50:50 +0300 Subject: [PATCH 3/3] Code cleanup --- Firmware/Dcodes.cpp | 4 ++-- Firmware/fsensor.cpp | 2 ++ Firmware/fsensor.h | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Firmware/Dcodes.cpp b/Firmware/Dcodes.cpp index 8a7e63e5..67cf1eb8 100644 --- a/Firmware/Dcodes.cpp +++ b/Firmware/Dcodes.cpp @@ -194,8 +194,6 @@ extern float axis_steps_per_unit[NUM_AXIS]; #endif //0 #define LOG(args...) -extern uint8_t fsensor_log; - /*! * ### D-1 - Endless Loop D-1: Endless Loop @@ -845,11 +843,13 @@ void dcode_9125() pat9125_y = (int)code_value(); LOG("pat9125_y=%d\n", pat9125_y); } +#ifdef DEBUG_FSENSOR_LOG if (code_seen('L')) { fsensor_log = (int)code_value(); LOG("fsensor_log=%d\n", fsensor_log); } +#endif //DEBUG_FSENSOR_LOG } #endif //PAT9125 diff --git a/Firmware/fsensor.cpp b/Firmware/fsensor.cpp index cfb378ed..219ab4f8 100755 --- a/Firmware/fsensor.cpp +++ b/Firmware/fsensor.cpp @@ -69,8 +69,10 @@ unsigned long fsensor_softfail_last = 0; uint8_t fsensor_softfail_ccnt = 0; #endif +#ifdef DEBUG_FSENSOR_LOG //! log flag: 0=log disabled, 1=log enabled uint8_t fsensor_log = 1; +#endif //DEBUG_FSENSOR_LOG //! @name filament autoload variables diff --git a/Firmware/fsensor.h b/Firmware/fsensor.h index 19f96812..4949381b 100755 --- a/Firmware/fsensor.h +++ b/Firmware/fsensor.h @@ -72,6 +72,9 @@ extern bool fsensor_oq_result(void); //! @{ extern void fsensor_st_block_chunk(int cnt); +// debugging +extern uint8_t fsensor_log; + // There's really nothing to do in block_begin: the stepper ISR likely has // called us already at the end of the last block, making this integration // redundant. LA1.5 might not always do that during a coasting move, so attempt