Improve AVR arch detection
Replace ARDUINO_ARCH_AVR with __AVR__ to better detect architecture for non-Arduino dev environments. Resolves compile failure in PIO for 8-bit Teensduino targets More info: https://forum.pjrc.com/threads/33234-Using-Teensyduino-Selecting-Teensy-3-2-3-1-board-has-incorrect-platform-define http://www.atmel.com/webdoc/avrlibcreferencemanual/using_tools_1using_avr_gcc_mach_opt.html
This commit is contained in:
@@ -23,7 +23,7 @@
|
||||
*
|
||||
* Supports platforms :
|
||||
* ARDUINO_ARCH_SAM : For Arduino Due and other boards based on Atmel SAM3X8E
|
||||
* ARDUINO_ARCH_AVR : For all Atmel AVR boards
|
||||
* __AVR__ : For all Atmel AVR boards
|
||||
*/
|
||||
|
||||
#ifndef _HAL_H
|
||||
@@ -77,7 +77,7 @@ void spiRead(uint8_t* buf, uint16_t nbyte);
|
||||
/** Write token and then write from 512 byte buffer to SPI (for SD card) */
|
||||
void spiSendBlock(uint8_t token, const uint8_t* buf);
|
||||
|
||||
#ifdef ARDUINO_ARCH_AVR
|
||||
#ifdef __AVR__
|
||||
#include "HAL_AVR/HAL_AVR.h"
|
||||
#elif defined(ARDUINO_ARCH_SAM)
|
||||
#define CPU_32_BIT
|
||||
|
@@ -23,11 +23,11 @@
|
||||
/**
|
||||
* Description: HAL for AVR
|
||||
*
|
||||
* For ARDUINO_ARCH_AVR
|
||||
* For __AVR__
|
||||
*/
|
||||
|
||||
|
||||
#ifdef ARDUINO_ARCH_AVR
|
||||
#ifdef __AVR__
|
||||
|
||||
// --------------------------------------------------------------------------
|
||||
// Includes
|
||||
|
@@ -22,7 +22,7 @@
|
||||
/**
|
||||
* Description: HAL for AVR
|
||||
*
|
||||
* For ARDUINO_ARCH_AVR
|
||||
* For __AVR__
|
||||
*/
|
||||
|
||||
|
||||
|
@@ -28,10 +28,10 @@
|
||||
/**
|
||||
* Description: HAL for AVR - SPI functions
|
||||
*
|
||||
* For ARDUINO_ARCH_AVR
|
||||
* For __AVR__
|
||||
*/
|
||||
|
||||
#ifdef ARDUINO_ARCH_AVR
|
||||
#ifdef __AVR__
|
||||
|
||||
// --------------------------------------------------------------------------
|
||||
// Includes
|
||||
@@ -210,4 +210,4 @@ void spiBegin (void) {
|
||||
#endif // SOFTWARE_SPI
|
||||
|
||||
|
||||
#endif // ARDUINO_ARCH_AVR
|
||||
#endif // __AVR__
|
||||
|
@@ -28,7 +28,7 @@
|
||||
* Modified 28 September 2010 by Mark Sproul
|
||||
* Modified 14 February 2016 by Andreas Hardtung (added tx buffer)
|
||||
*/
|
||||
#ifdef ARDUINO_ARCH_AVR
|
||||
#ifdef __AVR__
|
||||
|
||||
#include "MarlinSerial.h"
|
||||
#include "../../Marlin.h"
|
||||
|
@@ -1,4 +1,4 @@
|
||||
#ifdef ARDUINO_ARCH_AVR
|
||||
#ifdef __AVR__
|
||||
|
||||
#include "../persistent_store_api.h"
|
||||
|
||||
@@ -52,4 +52,4 @@ void read_data(int &pos, uint8_t* value, uint16_t size, uint16_t *crc) {
|
||||
}
|
||||
|
||||
#endif // EEPROM_SETTINGS
|
||||
#endif // ARDUINO_ARCH_AVR
|
||||
#endif // __AVR__
|
||||
|
@@ -51,7 +51,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#ifdef ARDUINO_ARCH_AVR
|
||||
#ifdef __AVR__
|
||||
|
||||
#include "../../inc/MarlinConfig.h"
|
||||
|
||||
@@ -215,4 +215,4 @@ void finISR(timer16_Sequence_t timer) {
|
||||
|
||||
#endif // HAS_SERVOS
|
||||
|
||||
#endif // ARDUINO_ARCH_AVR
|
||||
#endif // __AVR__
|
||||
|
@@ -20,7 +20,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#ifdef ARDUINO_ARCH_AVR
|
||||
#ifdef __AVR__
|
||||
|
||||
#include "../../inc/MarlinConfig.h"
|
||||
|
||||
@@ -58,4 +58,4 @@ void watchdog_init() {
|
||||
#endif // WATCHDOG_RESET_MANUAL
|
||||
|
||||
#endif // USE_WATCHDOG
|
||||
#endif // ARDUINO_ARCH_AVR
|
||||
#endif // __AVR__
|
||||
|
@@ -52,4 +52,4 @@ void read_data(int &pos, uint8_t* value, uint16_t size, uint16_t *crc) {
|
||||
}
|
||||
|
||||
#endif // EEPROM_SETTINGS
|
||||
#endif // ARDUINO_ARCH_AVR
|
||||
#endif // __AVR__
|
||||
|
@@ -22,7 +22,7 @@
|
||||
|
||||
#ifndef HAL_SANITYCHECK_H
|
||||
|
||||
#ifdef ARDUINO_ARCH_AVR
|
||||
#ifdef __AVR__
|
||||
#include "HAL_AVR/SanityCheck_AVR_8_bit.h"
|
||||
#elif defined(ARDUINO_ARCH_SAM)
|
||||
#include "HAL_DUE/SanityCheck_Due.h"
|
||||
|
@@ -34,7 +34,7 @@ FORCE_INLINE void endstop_ISR_worker( void ) {
|
||||
// One ISR for all EXT-Interrupts
|
||||
void endstop_ISR(void) { endstop_ISR_worker(); }
|
||||
|
||||
#ifdef ARDUINO_ARCH_AVR
|
||||
#ifdef __AVR__
|
||||
|
||||
#include "HAL_AVR/endstop_interrupts.h"
|
||||
|
||||
|
@@ -23,7 +23,7 @@
|
||||
#ifndef HAL_PINSDEBUG_H
|
||||
#define HAL_PINSDEBUG_H
|
||||
|
||||
#ifdef ARDUINO_ARCH_AVR
|
||||
#ifdef __AVR__
|
||||
#include "HAL_AVR/pinsDebug_AVR_8_bit.h"
|
||||
#elif defined(ARDUINO_ARCH_SAM)
|
||||
#include "HAL_DUE/HAL_pinsDebug_Due.h"
|
||||
|
@@ -29,7 +29,7 @@
|
||||
#elif defined(IS_32BIT_TEENSY)
|
||||
#include "HAL_TEENSY35_36/spi_pins.h"
|
||||
|
||||
#elif defined(ARDUINO_ARCH_AVR)
|
||||
#elif defined(__AVR__)
|
||||
#include "HAL_AVR/spi_pins.h"
|
||||
|
||||
#elif defined(TARGET_LPC1768)
|
||||
|
@@ -78,7 +78,7 @@
|
||||
#else
|
||||
#include <stdint.h>
|
||||
|
||||
#if defined(ARDUINO_ARCH_AVR) || defined(ARDUINO_ARCH_SAM)
|
||||
#if defined(__AVR__) || defined(ARDUINO_ARCH_SAM)
|
||||
// we're good to go
|
||||
#else
|
||||
#error "This library only supports boards with an AVR or SAM3X processor."
|
||||
|
@@ -45,7 +45,7 @@
|
||||
#include <stdint.h>
|
||||
|
||||
// Architecture specific include
|
||||
#ifdef ARDUINO_ARCH_AVR
|
||||
#ifdef __AVR__
|
||||
#include "HAL_AVR/ServoTimers.h"
|
||||
#elif defined(ARDUINO_ARCH_SAM)
|
||||
#include "HAL_DUE/ServoTimers.h"
|
||||
|
Reference in New Issue
Block a user