Simplified ESP8266 detection macro

This commit is contained in:
jgromes 2020-03-27 14:09:46 +01:00
parent 8a496efd41
commit fd6ef55a06
3 changed files with 7 additions and 6 deletions

View file

@ -44,9 +44,9 @@
#endif #endif
#include "modules/CC1101/CC1101.h" #include "modules/CC1101/CC1101.h"
#ifndef ESP8266 //#if !defined(ESP8266) && !defined(ARDUINO_ARDUINO_NANO33BLE)
#include "modules/ESP8266/ESP8266.h" #include "modules/ESP8266/ESP8266.h"
#endif //#endif
#include "modules/HC05/HC05.h" #include "modules/HC05/HC05.h"
#include "modules/JDY08/JDY08.h" #include "modules/JDY08/JDY08.h"
#include "modules/nRF24/nRF24.h" #include "modules/nRF24/nRF24.h"
@ -54,6 +54,7 @@
#include "modules/RFM9x/RFM95.h" #include "modules/RFM9x/RFM95.h"
#include "modules/RFM9x/RFM96.h" #include "modules/RFM9x/RFM96.h"
#include "modules/RFM9x/RFM97.h" #include "modules/RFM9x/RFM97.h"
//#include "modules/Si443x/Si4432.h"
#include "modules/SX1231/SX1231.h" #include "modules/SX1231/SX1231.h"
#include "modules/SX126x/SX1261.h" #include "modules/SX126x/SX1261.h"
#include "modules/SX126x/SX1262.h" #include "modules/SX126x/SX1262.h"
@ -73,11 +74,11 @@
#include "protocols/RTTY/RTTY.h" #include "protocols/RTTY/RTTY.h"
// transport layer protocols // transport layer protocols
#ifndef ESP8266 //#if !defined(ESP8266) && !defined(ARDUINO_ARDUINO_NANO33BLE)
#include "protocols/TransportLayer/TransportLayer.h" #include "protocols/TransportLayer/TransportLayer.h"
#include "protocols/HTTP/HTTP.h" #include "protocols/HTTP/HTTP.h"
#include "protocols/MQTT/MQTT.h" #include "protocols/MQTT/MQTT.h"
#endif //#endif
// only create Radio class when using RadioShield // only create Radio class when using RadioShield
#ifdef RADIOLIB_RADIOSHIELD #ifdef RADIOLIB_RADIOSHIELD

View file

@ -1,4 +1,4 @@
#ifndef ESP8266 #if !defined(ESP8266) && !defined(ARDUINO_ARDUINO_NANO33BLE)
#include "ESP8266.h" #include "ESP8266.h"
ESP8266::ESP8266(Module* module) { ESP8266::ESP8266(Module* module) {

View file

@ -1,4 +1,4 @@
#if !defined(_RADIOLIB_ESP8266_H) && !defined(ESP8266) #if !defined(_RADIOLIB_ESP8266_H)
#define _RADIOLIB_ESP8266_H #define _RADIOLIB_ESP8266_H
#include "../../Module.h" #include "../../Module.h"