Browse Source

Tweaks to core headers

pull/1/head
Scott Lahteine 6 years ago
parent
commit
4118199ddd
  1. 2
      Marlin/src/HAL/HAL_AVR/SanityCheck.h
  2. 2
      Marlin/src/core/macros.h
  3. 3
      Marlin/src/inc/MarlinConfig.h
  4. 3
      Marlin/src/inc/MarlinConfigPre.h

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

@ -111,7 +111,7 @@
|| defined(E2_HARDWARE_SERIAL) \
|| defined(E3_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 // _SANITYCHECK_AVR_8_BIT_H_

2
Marlin/src/core/macros.h

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

3
Marlin/src/inc/MarlinConfig.h

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

3
Marlin/src/inc/MarlinConfigPre.h

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

Loading…
Cancel
Save