From 07265e36cd2bc5cb0edd7f113a246c7df8ea6dbb Mon Sep 17 00:00:00 2001 From: Adrian Scillato <35405447+ascillato@users.noreply.github.com> Date: Tue, 13 Apr 2021 16:58:27 -0300 Subject: [PATCH 1/3] KNX: Fix Energy Yesterday Value --- tasmota/xdrv_11_knx.ino | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tasmota/xdrv_11_knx.ino b/tasmota/xdrv_11_knx.ino index 445bcf0f0..037f22b73 100644 --- a/tasmota/xdrv_11_knx.ino +++ b/tasmota/xdrv_11_knx.ino @@ -107,7 +107,7 @@ device_parameters_t device_param[] = { { KNX_ENERGY_POWER , false, false, KNX_Empty }, { KNX_ENERGY_POWERFACTOR , false, false, KNX_Empty }, { KNX_ENERGY_DAILY , false, false, KNX_Empty }, - { KNX_ENERGY_START , false, false, KNX_Empty }, + { KNX_ENERGY_YESTERDAY , false, false, KNX_Empty }, { KNX_ENERGY_TOTAL , false, false, KNX_Empty }, { KNX_SLOT1 , false, false, KNX_Empty }, { KNX_SLOT2 , false, false, KNX_Empty }, @@ -501,7 +501,7 @@ void KNX_INIT(void) if ( TasmotaGlobal.energy_driver != ENERGY_NONE ) { device_param[KNX_ENERGY_POWER-1].show = true; device_param[KNX_ENERGY_DAILY-1].show = true; - device_param[KNX_ENERGY_START-1].show = true; + device_param[KNX_ENERGY_YESTERDAY-1].show = true; device_param[KNX_ENERGY_TOTAL-1].show = true; device_param[KNX_ENERGY_VOLTAGE-1].show = true; device_param[KNX_ENERGY_CURRENT-1].show = true; @@ -684,13 +684,14 @@ void KNX_CB_Action(message_t const &msg, void *arg) } } } - else if (chan->type == KNX_ENERGY_START) // Reply KNX_ENERGY_START + else if (chan->type == KNX_ENERGY_YESTERDAY) // Reply KNX_ENERGY_YESTERDAY { if (Energy.data_valid[0]) { - knx.answer_4byte_float(msg.received_on, Energy.start_energy); + float energy_kWhyesterday = (float)Settings.energy_kWhyesterday / 100000; + knx.answer_4byte_float(msg.received_on, energy_kWhyesterday); if (Settings.flag.knx_enable_enhancement) { - knx.answer_4byte_float(msg.received_on, Energy.start_energy); - knx.answer_4byte_float(msg.received_on, Energy.start_energy); + knx.answer_4byte_float(msg.received_on, energy_kWhyesterday); + knx.answer_4byte_float(msg.received_on, energy_kWhyesterday); } } } @@ -813,7 +814,7 @@ void KnxSensor(uint8_t sensor_type, float value) knx.write_4byte_float(KNX_addr, value); } - AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_KNX "%s " D_SENT_TO " %d.%d.%d "), + AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_KNX "%s " D_SENT_TO " %d.%d.%d"), device_param_ga[sensor_type -1], KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member); From 6b35cb94d3d3a12e40a35b6b2ca5466602000dea Mon Sep 17 00:00:00 2001 From: Adrian Scillato <35405447+ascillato@users.noreply.github.com> Date: Tue, 13 Apr 2021 17:00:36 -0300 Subject: [PATCH 2/3] KNX: Fix Energy Yesterday --- tasmota/tasmota.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasmota/tasmota.h b/tasmota/tasmota.h index f270e5cef..c9d58fd05 100644 --- a/tasmota/tasmota.h +++ b/tasmota/tasmota.h @@ -234,7 +234,7 @@ const uint32_t LOOP_SLEEP_DELAY = 50; // Lowest number of milliseconds to #define KNX_ENERGY_POWER 21 #define KNX_ENERGY_POWERFACTOR 22 #define KNX_ENERGY_DAILY 23 -#define KNX_ENERGY_START 24 +#define KNX_ENERGY_YESTERDAY 24 #define KNX_ENERGY_TOTAL 25 #define KNX_SLOT1 26 #define KNX_SLOT2 27 From cbea6f21efdec2cc5052bf18eb69af4730bfe638 Mon Sep 17 00:00:00 2001 From: Adrian Scillato <35405447+ascillato@users.noreply.github.com> Date: Tue, 13 Apr 2021 17:01:27 -0300 Subject: [PATCH 3/3] KNX: Fix Energy Yesterday --- tasmota/xdrv_03_energy.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasmota/xdrv_03_energy.ino b/tasmota/xdrv_03_energy.ino index 9351ceb9b..b9697dfca 100644 --- a/tasmota/xdrv_03_energy.ino +++ b/tasmota/xdrv_03_energy.ino @@ -1144,7 +1144,7 @@ void EnergyShow(bool json) } KnxSensor(KNX_ENERGY_DAILY, Energy.daily); KnxSensor(KNX_ENERGY_TOTAL, Energy.total); - KnxSensor(KNX_ENERGY_START, Energy.start_energy); + KnxSensor(KNX_ENERGY_YESTERDAY, (float)Settings.energy_kWhyesterday / 100000); } #endif // USE_KNX #ifdef USE_WEBSERVER