Reorganize some core headers (#11983)

This commit is contained in:
Scott Lahteine
2018-10-02 04:25:46 -05:00
committed by GitHub
parent ab4549d2bc
commit 0dedb3e139
14 changed files with 194 additions and 208 deletions

View File

@ -38,9 +38,9 @@
#ifndef _ENDSTOP_INTERRUPTS_H_
#define _ENDSTOP_INTERRUPTS_H_
#include "../../core/macros.h"
#include <stdint.h>
#include "../../module/endstops.h"
#include "../../inc/MarlinConfig.h"
#include <stdint.h>
// One ISR for all EXT-Interrupts
void endstop_ISR(void) { endstops.update(); }

View File

@ -22,13 +22,13 @@
#ifdef ARDUINO_ARCH_SAM
#include "../../core/macros.h"
#include "../../core/serial.h"
#include <stdarg.h>
#include "../shared/backtrace/unwinder.h"
#include "../shared/backtrace/unwmemaccess.h"
#include <stdarg.h>
// Debug monitor that dumps to the Programming port all status when
// an exception or WDT timeout happens - And then resets the board

View File

@ -105,7 +105,7 @@
* \brief Marking \a v as a unused parameter or value.
*/
#ifndef UNUSED
#define UNUSED(x) (void) (x)
#define UNUSED(x) ((void)(x))
#endif
/**

View File

@ -47,12 +47,10 @@
#ifndef _CONF_USB_H_
#define _CONF_USB_H_
#undef UNUSED /* To avoid a macro clash as macros.h already defines it */
#include "../../../core/macros.h" /* For ENABLED()/DISABLED() */
#include "../../../../Configuration.h" /* For CUSTOM_MACHINE_NAME definition - We just need the name, no C++ allowed! */
#include "../../../core/macros.h" /* For ENABLED, DISABLED, MIN, MAX */
#include "../../../../Configuration.h" /* For SDSUPPORT and CUSTOM_MACHINE_NAME definition - We just need the name, no C++ allowed! */
#include "compiler.h"
/**
* USB Device Configuration
* @{

View File

@ -23,7 +23,7 @@
#ifndef SPI_PINS_LPC1768_H
#define SPI_PINS_LPC1768_H
#include "src/core/macros.h"
#include "../../inc/MarlinConfigPre.h"
#if ENABLED(SDSUPPORT) && ENABLED(DOGLCD) && (LCD_PINS_D4 == SCK_PIN || LCD_PINS_ENABLE == MOSI_PIN || DOGLCD_SCK == SCK_PIN || DOGLCD_MOSI == MOSI_PIN)
#define LPC_SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently