SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Change Marlin debug flag names to fix conflicts (#12340)

Browse source 
In reference to #11000
This commit is contained in:
Scott Lahteine 2018-11-05 22:48:28 -06:00 committed by GitHub
parent f7e682eeee
commit b3b4e6dc45
Signed by: GitHub
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 13 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Marlin/src/HAL/HAL_STM32/HAL.h
View file

@ -23,7 +23,6 @@
#pragma once #pragma once
#define CPU_32_BIT #define CPU_32_BIT
#undef DEBUG_NONE
#ifndef vsnprintf_P #ifndef vsnprintf_P
#define vsnprintf_P vsnprintf #define vsnprintf_P vsnprintf

10
Marlin/src/HAL/HAL_STM32F1/HAL.h
View file

@ -27,7 +27,6 @@
*/ */
#define CPU_32_BIT #define CPU_32_BIT
#undef DEBUG_NONE
#ifndef vsnprintf_P #ifndef vsnprintf_P
#define vsnprintf_P vsnprintf #define vsnprintf_P vsnprintf
@ -41,15 +40,6 @@
#include <util/atomic.h> #include <util/atomic.h>
#include <Arduino.h> #include <Arduino.h>
// --------------------------------------------------------------------------
// Undefine DEBUG_ settings
// --------------------------------------------------------------------------
#undef DEBUG_NONE
#undef DEBUG_FAULT
#undef DEBUG_ALL
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// Includes // Includes
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------

9
Marlin/src/HAL/HAL_STM32F1/README.md
View file

@ -13,13 +13,6 @@ After these lines:
#endif #endif
<> <>
Add the following 3 lines:
<>
#undef DEBUG_NONE
#undef DEBUG_FAULT
#undef DEBUG_ALL
<>
### Main developers: ### Main developers:
Victorpv Victorpv
xC000005 xC000005
@ -30,5 +23,3 @@ https://github.com/victorpv/Marlin/tree/bugfix-2.0.x
PRs should only be sent to Marlin bugfix-2.0.x branch once tested in printing so not to introduce new bugs. PRs should only be sent to Marlin bugfix-2.0.x branch once tested in printing so not to introduce new bugs.
For testing/dev, you can submit to the above branch For testing/dev, you can submit to the above branch

1
Marlin/src/HAL/HAL_STM32F4/HAL.h
View file

@ -23,7 +23,6 @@
#pragma once #pragma once
#define CPU_32_BIT #define CPU_32_BIT
#undef DEBUG_NONE
#ifndef vsnprintf_P #ifndef vsnprintf_P
#define vsnprintf_P vsnprintf #define vsnprintf_P vsnprintf

1
Marlin/src/HAL/HAL_STM32F7/HAL.h
View file

@ -23,7 +23,6 @@
#pragma once #pragma once
#define CPU_32_BIT #define CPU_32_BIT
#undef DEBUG_NONE
#ifndef vsnprintf_P #ifndef vsnprintf_P
#define vsnprintf_P vsnprintf #define vsnprintf_P vsnprintf

2
Marlin/src/core/serial.cpp
View file

@ -22,7 +22,7 @@
#include "serial.h" #include "serial.h"
uint8_t marlin_debug_flags = DEBUG_NONE; uint8_t marlin_debug_flags = MARLIN_DEBUG_NONE;
const char errormagic[] PROGMEM = "Error:"; const char errormagic[] PROGMEM = "Error:";
const char echomagic[] PROGMEM = "echo:"; const char echomagic[] PROGMEM = "echo:";

22
Marlin/src/core/serial.h
View file

@ -27,20 +27,20 @@
/** /**
* Define debug bit-masks * Define debug bit-masks
*/ */
enum DebugFlags : unsigned char { enum MarlinDebugFlags : uint8_t {
DEBUG_NONE = 0, MARLIN_DEBUG_NONE = 0,
DEBUG_ECHO = _BV(0), ///< Echo commands in order as they are processed MARLIN_DEBUG_ECHO = _BV(0), ///< Echo commands in order as they are processed
DEBUG_INFO = _BV(1), ///< Print messages for code that has debug output MARLIN_DEBUG_INFO = _BV(1), ///< Print messages for code that has debug output
DEBUG_ERRORS = _BV(2), ///< Not implemented MARLIN_DEBUG_ERRORS = _BV(2), ///< Not implemented
DEBUG_DRYRUN = _BV(3), ///< Ignore temperature setting and E movement commands MARLIN_DEBUG_DRYRUN = _BV(3), ///< Ignore temperature setting and E movement commands
DEBUG_COMMUNICATION = _BV(4), ///< Not implemented MARLIN_DEBUG_COMMUNICATION = _BV(4), ///< Not implemented
DEBUG_LEVELING = _BV(5), ///< Print detailed output for homing and leveling MARLIN_DEBUG_LEVELING = _BV(5), ///< Print detailed output for homing and leveling
DEBUG_MESH_ADJUST = _BV(6), ///< UBL bed leveling MARLIN_DEBUG_MESH_ADJUST = _BV(6), ///< UBL bed leveling
DEBUG_ALL = 0xFF MARLIN_DEBUG_ALL = 0xFF
}; };
extern uint8_t marlin_debug_flags; extern uint8_t marlin_debug_flags;
#define DEBUGGING(F) (marlin_debug_flags & (DEBUG_## F)) #define DEBUGGING(F) (marlin_debug_flags & (MARLIN_DEBUG_## F))
#if TX_BUFFER_SIZE < 1 #if TX_BUFFER_SIZE < 1
#define SERIAL_FLUSHTX_P(p) #define SERIAL_FLUSHTX_P(p)

2
Marlin/src/gcode/bedlevel/abl/G29.cpp
View file

@ -157,7 +157,7 @@ G29_TYPE GcodeSuite::G29() {
// G29 Q is also available if debugging // G29 Q is also available if debugging
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
const uint8_t old_debug_flags = marlin_debug_flags; const uint8_t old_debug_flags = marlin_debug_flags;
if (seenQ) marlin_debug_flags |= DEBUG_LEVELING; if (seenQ) marlin_debug_flags |= MARLIN_DEBUG_LEVELING;
if (DEBUGGING(LEVELING)) { if (DEBUGGING(LEVELING)) {
DEBUG_POS(">>> G29", current_position); DEBUG_POS(">>> G29", current_position);
log_machine_info(); log_machine_info();