MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Tweaks to core headers

Browse Source
This commit is contained in:
Scott Lahteine 2018-05-21 20:32:10 -05:00
parent 4b2f6e3b2b
commit 4118199ddd
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/HAL/HAL_AVR/SanityCheck.h
View File

@ -111,7 +111,7 @@
|| defined(E2_HARDWARE_SERIAL) \ || defined(E2_HARDWARE_SERIAL) \
|| defined(E3_HARDWARE_SERIAL) \ || defined(E3_HARDWARE_SERIAL) \
|| defined(E4_HARDWARE_SERIAL) ) || defined(E4_HARDWARE_SERIAL) )
#error "select hardware UART for TMC2208 to use both TMC2208 and ENDSTOP_INTERRUPTS_FEATURE." #error "Select hardware UART for TMC2208 to use both TMC2208 and ENDSTOP_INTERRUPTS_FEATURE."
#endif #endif
#endif // _SANITYCHECK_AVR_8_BIT_H_ #endif // _SANITYCHECK_AVR_8_BIT_H_

2
Marlin/src/core/macros.h
View File

@ -67,7 +67,7 @@
// Macros for bit masks // Macros for bit masks
#undef _BV #undef _BV
#define _BV(b) (1 << (b)) #define _BV(n) (1<<(n))
#define TEST(n,b) !!((n)&_BV(b)) #define TEST(n,b) !!((n)&_BV(b))
#define SBI(n,b) (n |= _BV(b)) #define SBI(n,b) (n |= _BV(b))
#define CBI(n,b) (n &= ~_BV(b)) #define CBI(n,b) (n &= ~_BV(b))

3
Marlin/src/inc/MarlinConfig.h
View File

@ -28,11 +28,14 @@
#include HAL_PATH(../HAL, HAL.h) #include HAL_PATH(../HAL, HAL.h)
#include "../pins/pins.h" #include "../pins/pins.h"
#if defined(__AVR__) && !defined(USBCON) #if defined(__AVR__) && !defined(USBCON)
#define HardwareSerial_h // trick to disable the standard HWserial #define HardwareSerial_h // trick to disable the standard HWserial
#endif #endif
#include "Conditionals_post.h" #include "Conditionals_post.h"
#include "SanityCheck.h" #include "SanityCheck.h"
#include HAL_PATH(../HAL, SanityCheck.h) #include HAL_PATH(../HAL, SanityCheck.h)
// Include all core headers // Include all core headers

3
Marlin/src/inc/MarlinConfigPre.h
View File

@ -26,12 +26,11 @@
#include "../HAL/platforms.h" #include "../HAL/platforms.h"
#include "../core/boards.h" #include "../core/boards.h"
#include "../core/macros.h" #include "../core/macros.h"
#include "../core/types.h"
#include "Version.h" #include "Version.h"
#include "../../Configuration.h" #include "../../Configuration.h"
#include "Conditionals_LCD.h" #include "Conditionals_LCD.h"
#include "../../Configuration_adv.h" #include "../../Configuration_adv.h"
#include "Conditionals_adv.h" #include "Conditionals_adv.h"
#include "../core/types.h"
#endif // _MARLIN_CONFIGPRE_H_ #endif // _MARLIN_CONFIGPRE_H_