Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2025-08-22 13:46:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

add forgotten defined() in environment checking '#elif's

Browse Source
This commit is contained in:
ajlajlajl 2020-10-22 17:17:03 +03:30
parent 659f9ff088
commit 6deeb08ae0
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/knx/bits.h
View File

@ -34,7 +34,7 @@ uint32_t digitalRead(uint32_t dwPin);
typedef void (*voidFuncPtr)(void); typedef void (*voidFuncPtr)(void);
void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode); void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode);
#elif ARDUINO_ARCH_SAMD || ARDUINO_ARCH_STM32 #elif defined(ARDUINO_ARCH_SAMD) || defined(ARDUINO_ARCH_STM32)
#include <Arduino.h> #include <Arduino.h>
#define getbyte(x,n) (*(((uint8_t*)&(x))+n)) #define getbyte(x,n) (*(((uint8_t*)&(x))+n))
@ -43,10 +43,10 @@ void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode);
#define ntohs(x) htons(x) #define ntohs(x) htons(x)
#define ntohl(x) htonl(x) #define ntohl(x) htonl(x)
#elif ARDUINO_ARCH_ESP8266 #elif defined(ARDUINO_ARCH_ESP8266)
#include <Arduino.h> #include <Arduino.h>
#include <user_interface.h> #include <user_interface.h>
#elif ARDUINO_ARCH_ESP32 #elif defined(ARDUINO_ARCH_ESP32)
#include <Arduino.h> #include <Arduino.h>
#include <esp_wifi.h> #include <esp_wifi.h>
#endif #endif

8
src/knx_facade.cpp
View File

@ -14,7 +14,7 @@
#error Mask version not supported on ARDUINO_ARCH_SAMD #error Mask version not supported on ARDUINO_ARCH_SAMD
#endif #endif
#elif ARDUINO_ARCH_ESP8266 #elif defined(ARDUINO_ARCH_ESP8266)
// predefined global instance for IP only // predefined global instance for IP only
#if MASK_VERSION == 0x57B0 #if MASK_VERSION == 0x57B0
KnxFacade<EspPlatform, Bau57B0> knx; KnxFacade<EspPlatform, Bau57B0> knx;
@ -22,7 +22,7 @@
#error Mask version not supported on ARDUINO_ARCH_ESP8266 #error Mask version not supported on ARDUINO_ARCH_ESP8266
#endif #endif
#elif ARDUINO_ARCH_ESP32 #elif defined(ARDUINO_ARCH_ESP32)
// predefined global instance for TP or IP or TP/IP coupler // predefined global instance for TP or IP or TP/IP coupler
#if MASK_VERSION == 0x07B0 #if MASK_VERSION == 0x07B0
KnxFacade<Esp32Platform, Bau07B0> knx; KnxFacade<Esp32Platform, Bau07B0> knx;
@ -34,13 +34,13 @@
#error Mask version not supported on ARDUINO_ARCH_ESP8266 #error Mask version not supported on ARDUINO_ARCH_ESP8266
#endif #endif
#elif ARDUINO_ARCH_STM32 #elif defined(ARDUINO_ARCH_STM32)
#if MASK_VERSION == 0x07B0 #if MASK_VERSION == 0x07B0
KnxFacade<Stm32Platform, Bau07B0> knx; KnxFacade<Stm32Platform, Bau07B0> knx;
#else #else
#error Mask version not supported on ARDUINO_ARCH_STM32 #error Mask version not supported on ARDUINO_ARCH_STM32
#endif #endif
#elif __linux__ #elif defined(__linux__)
// no predefined global instance // no predefined global instance
#endif #endif

14
src/knx_facade.h
View File

@ -8,16 +8,16 @@
#include "knx/bau07B0.h" #include "knx/bau07B0.h"
#include "knx/bau27B0.h" #include "knx/bau27B0.h"
#include "knx/bau2920.h" #include "knx/bau2920.h"
#elif ARDUINO_ARCH_ESP8266 #elif defined(ARDUINO_ARCH_ESP8266)
#include "esp_platform.h" #include "esp_platform.h"
#include "knx/bau57B0.h" #include "knx/bau57B0.h"
#elif ARDUINO_ARCH_ESP32 #elif defined(ARDUINO_ARCH_ESP32)
#define LED_BUILTIN 13 #define LED_BUILTIN 13
#include "esp32_platform.h" #include "esp32_platform.h"
#include "knx/bau07B0.h" #include "knx/bau07B0.h"
#include "knx/bau57B0.h" #include "knx/bau57B0.h"
#include "knx/bau091A.h" #include "knx/bau091A.h"
#elif ARDUINO_ARCH_STM32 #elif defined(ARDUINO_ARCH_STM32)
#include "stm32_platform.h" #include "stm32_platform.h"
#include "knx/bau07B0.h" #include "knx/bau07B0.h"
#else #else
@ -332,14 +332,14 @@ template <class P, class B> class KnxFacade : private SaveRestore
#else #else
#error "Mask version not supported on ARDUINO_ARCH_SAMD" #error "Mask version not supported on ARDUINO_ARCH_SAMD"
#endif #endif
#elif ARDUINO_ARCH_ESP8266 #elif defined(ARDUINO_ARCH_ESP8266)
// predefined global instance for IP only // predefined global instance for IP only
#if MASK_VERSION == 0x57B0 #if MASK_VERSION == 0x57B0
extern KnxFacade<EspPlatform, Bau57B0> knx; extern KnxFacade<EspPlatform, Bau57B0> knx;
#else #else
#error "Mask version not supported on ARDUINO_ARCH_ESP8266" #error "Mask version not supported on ARDUINO_ARCH_ESP8266"
#endif #endif
#elif ARDUINO_ARCH_ESP32 #elif defined(ARDUINO_ARCH_ESP32)
// predefined global instance for TP or IP or TP/IP coupler // predefined global instance for TP or IP or TP/IP coupler
#if MASK_VERSION == 0x07B0 #if MASK_VERSION == 0x07B0
extern KnxFacade<Esp32Platform, Bau07B0> knx; extern KnxFacade<Esp32Platform, Bau07B0> knx;
@ -350,13 +350,13 @@ template <class P, class B> class KnxFacade : private SaveRestore
#else #else
#error "Mask version not supported on ARDUINO_ARCH_ESP32" #error "Mask version not supported on ARDUINO_ARCH_ESP32"
#endif #endif
#elif ARDUINO_ARCH_STM32 #elif defined(ARDUINO_ARCH_STM32)
// predefined global instance for TP only // predefined global instance for TP only
#if MASK_VERSION == 0x07B0 #if MASK_VERSION == 0x07B0
extern KnxFacade<Stm32Platform, Bau07B0> knx; extern KnxFacade<Stm32Platform, Bau07B0> knx;
#else #else
#error Mask version not supported on ARDUINO_ARCH_STM32 #error Mask version not supported on ARDUINO_ARCH_STM32
#endif #endif
#elif __linux__ #elif defined(__linux__)
// no predefined global instance // no predefined global instance
#endif #endif