diff --git a/examples/knx-demo/platformio-ci.ini b/examples/knx-demo/platformio-ci.ini index 57c4188..6d3c4dc 100644 --- a/examples/knx-demo/platformio-ci.ini +++ b/examples/knx-demo/platformio-ci.ini @@ -19,7 +19,7 @@ lib_deps = knx build_flags = - -DMEDIUM_TYPE=2 + -DMASK_VERSION=0x27B0 -Wno-unknown-pragmas ;----------------------------------------------------------- diff --git a/examples/knx-demo/platformio.ini b/examples/knx-demo/platformio.ini index 6134de6..94beed3 100644 --- a/examples/knx-demo/platformio.ini +++ b/examples/knx-demo/platformio.ini @@ -28,7 +28,7 @@ lib_deps = knx build_flags = - -DMEDIUM_TYPE=2 + -DMASK_VERSION=0x27B0 -Wno-unknown-pragmas ;----------------------------------------------------------- diff --git a/examples/knx-linux-coupler/CMakeLists.txt b/examples/knx-linux-coupler/CMakeLists.txt index dce9641..90d48de 100644 --- a/examples/knx-linux-coupler/CMakeLists.txt +++ b/examples/knx-linux-coupler/CMakeLists.txt @@ -136,3 +136,4 @@ include_directories(../../src) set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wno-unknown-pragmas -g -O0") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wno-unknown-pragmas -g -O0") set_property(TARGET knx-linux PROPERTY CXX_STANDARD 11) +add_definitions(-DMASK_VERSION=0x091A) diff --git a/examples/knx-linux-coupler/main.cpp b/examples/knx-linux-coupler/main.cpp index a860db0..ac564d2 100644 --- a/examples/knx-linux-coupler/main.cpp +++ b/examples/knx-linux-coupler/main.cpp @@ -32,8 +32,13 @@ bool isSendHidReportPossible() return false; } +#if MASK_VERSION == 0x091A KnxFacade knx; // IP/TP1 coupler -//KnxFacade knx; // TP1/RF coupler +#elif MASK_VERSION == 0x2920 +KnxFacade knx; // TP1/RF coupler +#else +#error Mask version not supported yet! +#endif void appLoop() { diff --git a/examples/knx-linux/CMakeLists.txt b/examples/knx-linux/CMakeLists.txt index fc85f93..a36092d 100644 --- a/examples/knx-linux/CMakeLists.txt +++ b/examples/knx-linux/CMakeLists.txt @@ -136,4 +136,4 @@ include_directories(../../src) set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wno-unknown-pragmas -g -O0") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wno-unknown-pragmas -g -O0") set_property(TARGET knx-linux PROPERTY CXX_STANDARD 11) - +add_definitions(-DMASK_VERSION=0x57B0) diff --git a/examples/knx-usb/platformio-ci.ini b/examples/knx-usb/platformio-ci.ini index 0dd3625..5f96f44 100644 --- a/examples/knx-usb/platformio-ci.ini +++ b/examples/knx-usb/platformio-ci.ini @@ -24,7 +24,7 @@ lib_deps = knx build_flags = - -DMEDIUM_TYPE=2 + -DMASK_VERSION=0x27B0 -DUSE_USB -DUSE_TINYUSB -Wno-unknown-pragmas diff --git a/examples/knx-usb/platformio.ini b/examples/knx-usb/platformio.ini index b3ae3ad..c4b69f1 100644 --- a/examples/knx-usb/platformio.ini +++ b/examples/knx-usb/platformio.ini @@ -32,7 +32,7 @@ lib_deps = knx build_flags = - -DMEDIUM_TYPE=2 + -DMASK_VERSION=0x27B0 -DUSE_USB -DUSE_TINYUSB -Wno-unknown-pragmas diff --git a/src/knx/config.h b/src/knx/config.h index 3abb23a..19dc3d8 100644 --- a/src/knx/config.h +++ b/src/knx/config.h @@ -13,7 +13,7 @@ #endif // Normal devices -#define MASK_VERSION 0x07B0 +//#define MASK_VERSION 0x07B0 //#define MASK_VERSION 0x27B0 //#define MASK_VERSION 0x57B0