From 6deeb08ae0375dc07bec6e4f88a3b9a6764776fb Mon Sep 17 00:00:00 2001 From: ajlajlajl Date: Thu, 22 Oct 2020 17:17:03 +0330 Subject: [PATCH] add forgotten defined() in environment checking '#elif's --- src/knx/bits.h | 6 +++--- src/knx_facade.cpp | 8 ++++---- src/knx_facade.h | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/knx/bits.h b/src/knx/bits.h index bfaea22..54c9712 100644 --- a/src/knx/bits.h +++ b/src/knx/bits.h @@ -34,7 +34,7 @@ uint32_t digitalRead(uint32_t dwPin); typedef void (*voidFuncPtr)(void); 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 #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 ntohl(x) htonl(x) -#elif ARDUINO_ARCH_ESP8266 +#elif defined(ARDUINO_ARCH_ESP8266) #include #include -#elif ARDUINO_ARCH_ESP32 +#elif defined(ARDUINO_ARCH_ESP32) #include #include #endif diff --git a/src/knx_facade.cpp b/src/knx_facade.cpp index fb95b18..8ed0c99 100644 --- a/src/knx_facade.cpp +++ b/src/knx_facade.cpp @@ -14,7 +14,7 @@ #error Mask version not supported on ARDUINO_ARCH_SAMD #endif -#elif ARDUINO_ARCH_ESP8266 +#elif defined(ARDUINO_ARCH_ESP8266) // predefined global instance for IP only #if MASK_VERSION == 0x57B0 KnxFacade knx; @@ -22,7 +22,7 @@ #error Mask version not supported on ARDUINO_ARCH_ESP8266 #endif -#elif ARDUINO_ARCH_ESP32 +#elif defined(ARDUINO_ARCH_ESP32) // predefined global instance for TP or IP or TP/IP coupler #if MASK_VERSION == 0x07B0 KnxFacade knx; @@ -34,13 +34,13 @@ #error Mask version not supported on ARDUINO_ARCH_ESP8266 #endif -#elif ARDUINO_ARCH_STM32 +#elif defined(ARDUINO_ARCH_STM32) #if MASK_VERSION == 0x07B0 KnxFacade knx; #else #error Mask version not supported on ARDUINO_ARCH_STM32 #endif -#elif __linux__ +#elif defined(__linux__) // no predefined global instance #endif diff --git a/src/knx_facade.h b/src/knx_facade.h index e35334a..c82f67e 100644 --- a/src/knx_facade.h +++ b/src/knx_facade.h @@ -8,16 +8,16 @@ #include "knx/bau07B0.h" #include "knx/bau27B0.h" #include "knx/bau2920.h" -#elif ARDUINO_ARCH_ESP8266 +#elif defined(ARDUINO_ARCH_ESP8266) #include "esp_platform.h" #include "knx/bau57B0.h" -#elif ARDUINO_ARCH_ESP32 +#elif defined(ARDUINO_ARCH_ESP32) #define LED_BUILTIN 13 #include "esp32_platform.h" #include "knx/bau07B0.h" #include "knx/bau57B0.h" #include "knx/bau091A.h" -#elif ARDUINO_ARCH_STM32 +#elif defined(ARDUINO_ARCH_STM32) #include "stm32_platform.h" #include "knx/bau07B0.h" #else @@ -332,14 +332,14 @@ template class KnxFacade : private SaveRestore #else #error "Mask version not supported on ARDUINO_ARCH_SAMD" #endif -#elif ARDUINO_ARCH_ESP8266 +#elif defined(ARDUINO_ARCH_ESP8266) // predefined global instance for IP only #if MASK_VERSION == 0x57B0 extern KnxFacade knx; #else #error "Mask version not supported on ARDUINO_ARCH_ESP8266" #endif -#elif ARDUINO_ARCH_ESP32 +#elif defined(ARDUINO_ARCH_ESP32) // predefined global instance for TP or IP or TP/IP coupler #if MASK_VERSION == 0x07B0 extern KnxFacade knx; @@ -350,13 +350,13 @@ template class KnxFacade : private SaveRestore #else #error "Mask version not supported on ARDUINO_ARCH_ESP32" #endif -#elif ARDUINO_ARCH_STM32 +#elif defined(ARDUINO_ARCH_STM32) // predefined global instance for TP only #if MASK_VERSION == 0x07B0 extern KnxFacade knx; #else #error Mask version not supported on ARDUINO_ARCH_STM32 #endif -#elif __linux__ +#elif defined(__linux__) // no predefined global instance #endif