From 73df7fd28cd903ea968f95d9a6c938b3dd9ebfc5 Mon Sep 17 00:00:00 2001 From: rueckix <39458989+rueckix@users.noreply.github.com> Date: Thu, 10 Dec 2020 19:17:45 +0100 Subject: [PATCH] Fix: "bool BauSystemBCoupler::configured()" (#112) * Fix: "bool BauSystemBCoupler::configured()" always returns false when KNXSecure is not supported/configured in ETS * Update platformio-ci.ini activate optional USE_DATASECURE * Update platformio-ci.ini activate optional USE_DATASECURE * Update platformio-ci.ini activate optional USE_DATASECURE --- examples/knx-demo-coupler/platformio-ci.ini | 3 +++ examples/knx-demo/platformio-ci.ini | 9 +++++++-- examples/knx-usb/platformio-ci.ini | 1 + src/knx/config.h | 3 ++- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/examples/knx-demo-coupler/platformio-ci.ini b/examples/knx-demo-coupler/platformio-ci.ini index 1a2bd5f..4a3e3d9 100644 --- a/examples/knx-demo-coupler/platformio-ci.ini +++ b/examples/knx-demo-coupler/platformio-ci.ini @@ -21,6 +21,7 @@ lib_deps = build_flags = -DMASK_VERSION=0x2920 -Wno-unknown-pragmas + -DUSE_DATASECURE ;----------------------------------------------------------- @@ -37,6 +38,7 @@ build_flags = #build_flags = # -DMASK_VERSION=0x091A # -Wno-unknown-pragmas +# -DUSE_DATASECURE ;--------------------------------------------------------- @@ -52,3 +54,4 @@ lib_deps = build_flags = -DMASK_VERSION=0x091A -Wno-unknown-pragmas + -DUSE_DATASECURE diff --git a/examples/knx-demo/platformio-ci.ini b/examples/knx-demo/platformio-ci.ini index 2fee107..e2b04e2 100644 --- a/examples/knx-demo/platformio-ci.ini +++ b/examples/knx-demo/platformio-ci.ini @@ -21,6 +21,7 @@ lib_deps = build_flags = -DMASK_VERSION=0x27B0 -Wno-unknown-pragmas + -DUSE_DATASECURE ;----------------------------------------------------------- @@ -34,8 +35,9 @@ lib_deps = knx build_flags = - -DMASK_VERSION=0x57B0 - -Wno-unknown-pragmas + -DMASK_VERSION=0x57B0 + -Wno-unknown-pragmas + -DUSE_DATASECURE [env:nodemcuv2_tp] platform = espressif8266 @@ -48,6 +50,7 @@ lib_deps = build_flags = -DMASK_VERSION=0x07B0 -Wno-unknown-pragmas + -DUSE_DATASECURE ;--------------------------------------------------------- @@ -63,6 +66,7 @@ lib_deps = build_flags = -DMASK_VERSION=0x57B0 -Wno-unknown-pragmas + -DUSE_DATASECURE [env:esp32dev_tp] platform = espressif32 @@ -74,3 +78,4 @@ lib_deps = build_flags = -DMASK_VERSION=0x07B0 -Wno-unknown-pragmas + -DUSE_DATASECURE diff --git a/examples/knx-usb/platformio-ci.ini b/examples/knx-usb/platformio-ci.ini index 5f96f44..4e3322b 100644 --- a/examples/knx-usb/platformio-ci.ini +++ b/examples/knx-usb/platformio-ci.ini @@ -28,3 +28,4 @@ build_flags = -DUSE_USB -DUSE_TINYUSB -Wno-unknown-pragmas + -DUSE_DATASECURE diff --git a/src/knx/config.h b/src/knx/config.h index 2ef1b85..0b3ce64 100644 --- a/src/knx/config.h +++ b/src/knx/config.h @@ -57,7 +57,8 @@ #endif // KNX Data Secure Options -#define USE_DATASECURE +// Define via a compiler -D flag if required +// #define USE_DATASECURE #endif