No functional change, cleaning up shotgun-style #includes

This commit is contained in:
Phillip Burgess 2021-11-19 12:00:35 -08:00
parent 767a0664c8
commit cc1fd93f02
6 changed files with 16 additions and 20 deletions

View File

@ -1,12 +1,11 @@
#include <Adafruit_I2CDevice.h> #ifndef Adafruit_BusIO_Register_h
#include <Adafruit_SPIDevice.h> #define Adafruit_BusIO_Register_h
#include <Arduino.h>
#if !defined(SPI_INTERFACES_COUNT) || \ #if !defined(SPI_INTERFACES_COUNT) || \
(defined(SPI_INTERFACES_COUNT) && (SPI_INTERFACES_COUNT > 0)) (defined(SPI_INTERFACES_COUNT) && (SPI_INTERFACES_COUNT > 0))
#ifndef Adafruit_BusIO_Register_h #include <Adafruit_I2CDevice.h>
#define Adafruit_BusIO_Register_h #include <Adafruit_SPIDevice.h>
typedef enum _Adafruit_BusIO_SPIRegType { typedef enum _Adafruit_BusIO_SPIRegType {
ADDRBIT8_HIGH_TOREAD = 0, ADDRBIT8_HIGH_TOREAD = 0,
@ -100,6 +99,5 @@ private:
uint8_t _bits, _shift; uint8_t _bits, _shift;
}; };
#endif // BusIO_Register_h
#endif // SPI exists #endif // SPI exists
#endif // BusIO_Register_h

View File

@ -1,5 +1,4 @@
#include <Adafruit_I2CDevice.h> #include "Adafruit_I2CDevice.h"
#include <Arduino.h>
//#define DEBUG_SERIAL Serial //#define DEBUG_SERIAL Serial

View File

@ -1,9 +1,9 @@
#include <Arduino.h>
#include <Wire.h>
#ifndef Adafruit_I2CDevice_h #ifndef Adafruit_I2CDevice_h
#define Adafruit_I2CDevice_h #define Adafruit_I2CDevice_h
#include <Arduino.h>
#include <Wire.h>
///< The class which defines how we will talk to this device over I2C ///< The class which defines how we will talk to this device over I2C
class Adafruit_I2CDevice { class Adafruit_I2CDevice {
public: public:

View File

@ -1,7 +1,8 @@
#include "Adafruit_BusIO_Register.h"
#ifndef _ADAFRUIT_I2C_REGISTER_H_ #ifndef _ADAFRUIT_I2C_REGISTER_H_
#define _ADAFRUIT_I2C_REGISTER_H_ #define _ADAFRUIT_I2C_REGISTER_H_
#include "Adafruit_BusIO_Register.h"
typedef Adafruit_BusIO_Register Adafruit_I2CRegister; typedef Adafruit_BusIO_Register Adafruit_I2CRegister;
typedef Adafruit_BusIO_RegisterBits Adafruit_I2CRegisterBits; typedef Adafruit_BusIO_RegisterBits Adafruit_I2CRegisterBits;

View File

@ -1,5 +1,4 @@
#include <Adafruit_SPIDevice.h> #include "Adafruit_SPIDevice.h"
#include <Arduino.h>
#if !defined(SPI_INTERFACES_COUNT) || \ #if !defined(SPI_INTERFACES_COUNT) || \
(defined(SPI_INTERFACES_COUNT) && (SPI_INTERFACES_COUNT > 0)) (defined(SPI_INTERFACES_COUNT) && (SPI_INTERFACES_COUNT > 0))

View File

@ -1,13 +1,12 @@
#include <Arduino.h> #ifndef Adafruit_SPIDevice_h
#define Adafruit_SPIDevice_h
#if !defined(SPI_INTERFACES_COUNT) || \ #if !defined(SPI_INTERFACES_COUNT) || \
(defined(SPI_INTERFACES_COUNT) && (SPI_INTERFACES_COUNT > 0)) (defined(SPI_INTERFACES_COUNT) && (SPI_INTERFACES_COUNT > 0))
#include <Arduino.h>
#include <SPI.h> #include <SPI.h>
#ifndef Adafruit_SPIDevice_h
#define Adafruit_SPIDevice_h
// some modern SPI definitions don't have BitOrder enum // some modern SPI definitions don't have BitOrder enum
#if (defined(__AVR__) && !defined(ARDUINO_ARCH_MEGAAVR)) || \ #if (defined(__AVR__) && !defined(ARDUINO_ARCH_MEGAAVR)) || \
defined(ESP8266) || defined(TEENSYDUINO) || defined(SPARK) || \ defined(ESP8266) || defined(TEENSYDUINO) || defined(SPARK) || \
@ -103,5 +102,5 @@ private:
bool _begun; bool _begun;
}; };
#endif // Adafruit_SPIDevice_h
#endif // has SPI defined #endif // has SPI defined
#endif // Adafruit_SPIDevice_h