bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 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
8 changed files with 13 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -13,13 +13,6 @@ After these lines:
#endif
<>
Add the following 3 lines:
<>
#undef DEBUG_NONE
#undef DEBUG_FAULT
#undef DEBUG_ALL
<>
### Main developers:
Victorpv
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.
For testing/dev, you can submit to the above branch