From cf5169b3ae46c86cf69d18338b3e5b27a4bb7d39 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Thu, 13 Oct 2022 12:58:59 +0200 Subject: [PATCH] Restore Shelly 2.5 low reactive power channels --- tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino b/tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino index e3a462ec8..627bd0b9a 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino @@ -406,13 +406,10 @@ void Ade7953GetData(void) { } else { Ade7953.active_power[channel] = abs(reg[channel][1]); apparent_power[channel] = abs(reg[channel][2]); - - uint32_t swapped_channel = channel; - if (ADE7953_SHELLY_25 == Ade7953.model) { - swapped_channel = ~channel; + reactive_power[channel] = abs(reg[channel][3]); + if ((ADE7953_SHELLY_EM == Ade7953.model) && ((acc_mode & VARNLOAD[channel]) != 0)) { + reactive_power[channel] = 0; } - - reactive_power[channel] = ((acc_mode & VARNLOAD[swapped_channel]) != 0) ? 0 : abs(reg[channel][3]); } }