Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2024-10-20 20:07:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix bad commit

Browse Source
This commit is contained in:
etrinh 2020-04-02 18:16:15 +02:00
parent 147a3942ad
commit 34df27ee87
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/knx_facade.h
View File

@ -334,14 +334,11 @@ template <class P, class B> class KnxFacade : private SaveRestore
// predefined global instance for IP only // predefined global instance for IP only
extern KnxFacade<EspPlatform, Bau57B0> knx; extern KnxFacade<EspPlatform, Bau57B0> knx;
#elif ARDUINO_ARCH_ESP32 #elif ARDUINO_ARCH_ESP32
<<<<<<< Updated upstream
// predefined global instance for IP only // predefined global instance for IP only
extern KnxFacade<Esp32Platform, Bau57B0> knx; extern KnxFacade<Esp32Platform, Bau57B0> knx;
=======
extern KnxFacade<Esp32Platform, Bau57B0> knx;
#elif ARDUINO_ARCH_STM32 #elif ARDUINO_ARCH_STM32
extern KnxFacade<Stm32Platform, Bau57B0> knx; // predefined global instance for TP only
>>>>>>> Stashed changes extern KnxFacade<Stm32Platform, Bau57B0> knx;
#elif __linux__ #elif __linux__
// no predefined global instance // no predefined global instance
#endif #endif