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

Merge pull request #2562 from leptun/MK3_fix_DEBUG_BUILD 

Mk3 fix debug build - Dcodes
This commit is contained in:
DRracer 2020-03-30 16:08:02 +02:00 committed by GitHub
parent 5106831ba2 f13269d8a9
commit ff8cb9312b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/Dcodes.cpp
View File

@ -1,5 +1,6 @@
#include "Dcodes.h" #include "Dcodes.h"
//#include "Marlin.h" //#include "Marlin.h"
#include "Configuration.h"
#include "language.h" #include "language.h"
#include "cmdqueue.h" #include "cmdqueue.h"
#include <stdio.h> #include <stdio.h>
@ -185,7 +186,6 @@ void dcode_3()
#define BOOT_APP_FLG_COPY 0x02 #define BOOT_APP_FLG_COPY 0x02
#define BOOT_APP_FLG_FLASH 0x04 #define BOOT_APP_FLG_FLASH 0x04
extern uint8_t fsensor_log;
extern float current_temperature_pinda; extern float current_temperature_pinda;
extern float axis_steps_per_unit[NUM_AXIS]; extern float axis_steps_per_unit[NUM_AXIS];
@ -843,11 +843,13 @@ void dcode_9125()
pat9125_y = (int)code_value(); pat9125_y = (int)code_value();
LOG("pat9125_y=%d\n", pat9125_y); LOG("pat9125_y=%d\n", pat9125_y);
} }
#ifdef DEBUG_FSENSOR_LOG
if (code_seen('L')) if (code_seen('L'))
{ {
fsensor_log = (int)code_value(); fsensor_log = (int)code_value();
LOG("fsensor_log=%d\n", fsensor_log); LOG("fsensor_log=%d\n", fsensor_log);
} }
#endif //DEBUG_FSENSOR_LOG
} }
#endif //PAT9125 #endif //PAT9125

2
Firmware/fsensor.cpp
View File

@ -69,8 +69,10 @@ unsigned long fsensor_softfail_last = 0;
uint8_t fsensor_softfail_ccnt = 0; uint8_t fsensor_softfail_ccnt = 0;
#endif #endif
#ifdef DEBUG_FSENSOR_LOG
//! log flag: 0=log disabled, 1=log enabled //! log flag: 0=log disabled, 1=log enabled
uint8_t fsensor_log = 1; uint8_t fsensor_log = 1;
#endif //DEBUG_FSENSOR_LOG
//! @name filament autoload variables //! @name filament autoload variables

3
Firmware/fsensor.h
View File

@ -72,6 +72,9 @@ extern bool fsensor_oq_result(void);
//! @{ //! @{
extern void fsensor_st_block_chunk(int cnt); 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 // 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 // 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 // redundant. LA1.5 might not always do that during a coasting move, so attempt