From 1465cb558c15d51f423877b2f8e71925fe08a364 Mon Sep 17 00:00:00 2001 From: Thomas Kunze Date: Sat, 28 Dec 2019 09:54:02 +0100 Subject: [PATCH] split USE_USB from USE_CEMI_SERVER --- examples/knx-usb/platformio-ci.ini | 2 +- examples/knx-usb/platformio.ini | 2 +- src/knx/config.h | 7 ++++++- src/knx/usb_tunnel_interface.cpp | 2 +- src/knx/usb_tunnel_interface.h | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/examples/knx-usb/platformio-ci.ini b/examples/knx-usb/platformio-ci.ini index 299002a..aaaa387 100644 --- a/examples/knx-usb/platformio-ci.ini +++ b/examples/knx-usb/platformio-ci.ini @@ -25,6 +25,6 @@ lib_deps = build_flags = -DMEDIUM_TYPE=2 - -DUSE_CEMI_SERVER + -DUSE_USB -DUSE_TINYUSB -Wno-unknown-pragmas diff --git a/examples/knx-usb/platformio.ini b/examples/knx-usb/platformio.ini index 1ca791c..b3ae3ad 100644 --- a/examples/knx-usb/platformio.ini +++ b/examples/knx-usb/platformio.ini @@ -33,7 +33,7 @@ lib_deps = build_flags = -DMEDIUM_TYPE=2 - -DUSE_CEMI_SERVER + -DUSE_USB -DUSE_TINYUSB -Wno-unknown-pragmas diff --git a/src/knx/config.h b/src/knx/config.h index cfd23a6..2c09a56 100644 --- a/src/knx/config.h +++ b/src/knx/config.h @@ -10,7 +10,12 @@ #define GPIO_GDO0_PIN 24 // GPIO 24 (GPIO_GEN5) -> WiringPi: 5 -> Pin number on header: 18 #endif -//#define USE_CEMI_SERVER + #define USE_RF #define USE_TP #define USE_IP +//#define USE_USB +//#define USE_CEMI_SERVER +#ifdef USE_USB +#define USE_CEMI_SERVER +#endif diff --git a/src/knx/usb_tunnel_interface.cpp b/src/knx/usb_tunnel_interface.cpp index edb0b6d..b2e197f 100644 --- a/src/knx/usb_tunnel_interface.cpp +++ b/src/knx/usb_tunnel_interface.cpp @@ -1,5 +1,5 @@ #include "config.h" -#ifdef USE_CEMI_SERVER +#ifdef USE_USB #include "bits.h" #include "usb_tunnel_interface.h" diff --git a/src/knx/usb_tunnel_interface.h b/src/knx/usb_tunnel_interface.h index fa5af95..b47209f 100644 --- a/src/knx/usb_tunnel_interface.h +++ b/src/knx/usb_tunnel_interface.h @@ -1,7 +1,7 @@ #pragma once #include "config.h" -#ifdef USE_CEMI_SERVER +#ifdef USE_USB #include class CemiServer;