From 960c2e32fcd73b33e5573383f0a5731df482a5eb Mon Sep 17 00:00:00 2001 From: Adrian Scillato <35405447+ascillato@users.noreply.github.com> Date: Mon, 27 Aug 2018 02:26:21 -0300 Subject: [PATCH 1/2] KNX: Automatic Multicast Library Selection --- lib/esp-knx-ip-0.5.1/esp-knx-ip.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/lib/esp-knx-ip-0.5.1/esp-knx-ip.h b/lib/esp-knx-ip-0.5.1/esp-knx-ip.h index d8fde1dc9..515a5d843 100644 --- a/lib/esp-knx-ip-0.5.1/esp-knx-ip.h +++ b/lib/esp-knx-ip-0.5.1/esp-knx-ip.h @@ -7,14 +7,6 @@ #ifndef ESP_KNX_IP_H #define ESP_KNX_IP_H -//#define USE_ASYNC_UDP // UDP WIFI Library Selection for Multicast - // If commented out, the esp-knx-ip library will use WIFI_UDP Library that is compatible with ESP8266 Library Version 2.3.0 and up - // If not commented out, the esp-knx-ip library will use ESPAsyncUDP Library that is compatible with ESP8266 Library Version 2.4.0 and up - // The ESPAsyncUDP Library have a more reliable multicast communication - // Please Use it with Patch (https://github.com/me-no-dev/ESPAsyncUDP/pull/21) ) - // check line 57 on esp-knx-ip.h file is uncommented: #include - // Comment out that line when using UDP WIFI to avoid compiling issues on PlatformIO with ESP8266 Library Version 2.3.0 - /** * CONFIG * All MAX_ values must not exceed 255 (1 byte, except MAC_CONFIG_SPACE which can go up to 2 bytes, so 0xffff in theory) and must not be negative! @@ -54,8 +46,13 @@ #include #include +#include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0) +#ifndef ARDUINO_ESP8266_RELEASE_2_3_0 +#define USE_ASYNC_UDP // UDP WIFI Library Selection for Multicast +#endif + #ifdef USE_ASYNC_UDP -//#include +#include #else #include #endif From 84a715dc9ba534265d5e1319d8e9ff079aba698f Mon Sep 17 00:00:00 2001 From: Adrian Scillato <35405447+ascillato@users.noreply.github.com> Date: Mon, 27 Aug 2018 02:27:41 -0300 Subject: [PATCH 2/2] KNX: Automatic Multicast Library Selection --- lib/ESPAsyncUDP-master/src/AsyncUDP.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/ESPAsyncUDP-master/src/AsyncUDP.cpp b/lib/ESPAsyncUDP-master/src/AsyncUDP.cpp index 2a538c4c6..9e433b1f4 100644 --- a/lib/ESPAsyncUDP-master/src/AsyncUDP.cpp +++ b/lib/ESPAsyncUDP-master/src/AsyncUDP.cpp @@ -1,3 +1,6 @@ +#include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0) +#ifndef ARDUINO_ESP8266_RELEASE_2_3_0 // This Library will only work with ARDUINO_ESP8266_RELEASE_2_4_0 and up + #include "Arduino.h" #include "ESPAsyncUDP.h" @@ -425,3 +428,5 @@ size_t AsyncUDP::broadcast(AsyncUDPMessage &message) } return broadcast(message.data(), message.length()); } + +#endif