From e28a3342cb7bddeaf1da73d7e06875acfc193852 Mon Sep 17 00:00:00 2001 From: Adrian Scillato Date: Tue, 28 Sep 2021 15:53:14 -0300 Subject: [PATCH 1/3] Allow KNX and Zigbee --- tasmota/tasmota_configurations.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasmota/tasmota_configurations.h b/tasmota/tasmota_configurations.h index 64d1ac0de..59810fccd 100644 --- a/tasmota/tasmota_configurations.h +++ b/tasmota/tasmota_configurations.h @@ -503,7 +503,7 @@ #define USE_TLS // flag indicates we need to include TLS code #endif // USE_ZBBRIDGE_TLS -#undef USE_KNX // Disable KNX IP Protocol Support +//#undef USE_KNX // Disable KNX IP Protocol Support //#undef USE_WEBSERVER // Disable Webserver #undef USE_ENHANCED_GUI_WIFI_SCAN // Disable wifi scan output with BSSID (+0k5 code) //#undef USE_WEBSEND_RESPONSE // Disable command WebSend response message (+1k code) From e49dfa72965e75f6ae39b9cb816655ae1ed6dbf4 Mon Sep 17 00:00:00 2001 From: Adrian Scillato Date: Tue, 28 Sep 2021 15:55:38 -0300 Subject: [PATCH 2/3] KNX: Fix Energy Driver dependency --- tasmota/xdrv_11_knx.ino | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tasmota/xdrv_11_knx.ino b/tasmota/xdrv_11_knx.ino index 12d663d9d..428286dcf 100644 --- a/tasmota/xdrv_11_knx.ino +++ b/tasmota/xdrv_11_knx.ino @@ -644,6 +644,7 @@ void KNX_CB_Action(message_t const &msg, void *arg) knx.answer_4byte_float(msg.received_on, last_hum); } } +#if defined(USE_ENERGY_SENSOR) else if (chan->type == KNX_ENERGY_VOLTAGE) // Reply KNX_ENERGY_VOLTAGE { knx.answer_4byte_float(msg.received_on, Energy.voltage[0]); @@ -701,6 +702,7 @@ void KNX_CB_Action(message_t const &msg, void *arg) knx.answer_4byte_float(msg.received_on, Energy.total); } } +#endif #ifdef USE_RULES else if ((chan->type >= KNX_SLOT1) && (chan->type <= KNX_SLOT5)) // KNX RX SLOTs (read command) { From b10772562006dbe0c738a608832438b5566e24d4 Mon Sep 17 00:00:00 2001 From: Adrian Scillato Date: Tue, 28 Sep 2021 15:56:39 -0300 Subject: [PATCH 3/3] Allow KNX and Zigbee to be compiled together --- platformio_tasmota_env.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio_tasmota_env.ini b/platformio_tasmota_env.ini index 082112834..68d4b17e4 100644 --- a/platformio_tasmota_env.ini +++ b/platformio_tasmota_env.ini @@ -61,7 +61,7 @@ lib_extra_dirs = lib/lib_basic [env:tasmota-zbbridge] build_flags = ${env.build_flags} -DFIRMWARE_ZBBRIDGE board = esp8266_zbbridge -lib_extra_dirs = lib/lib_basic, lib/lib_ssl +lib_extra_dirs = lib/lib_basic, lib/lib_ssl, lib/lib_div [env:tasmota-zigbee] build_flags = ${env.build_flags} -DUSE_ZIGBEE -DUSE_CCLOADER -DUSE_UFILESYS