From 85aed3a17de1cb74d3f147d51a7fa5cfecb713a7 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Sat, 1 Jul 2023 14:31:03 +0200 Subject: [PATCH] Remove phase_count_virtual --- tasmota/tasmota_xdrv_driver/xdrv_03_energy.ino | 1 - tasmota/tasmota_xdrv_driver/xdrv_03_esp32_energy.ino | 1 - tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_energy.ino | 9 ++++----- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/tasmota/tasmota_xdrv_driver/xdrv_03_energy.ino b/tasmota/tasmota_xdrv_driver/xdrv_03_energy.ino index 66fb190e1..ffe80ba22 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_03_energy.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_03_energy.ino @@ -109,7 +109,6 @@ typedef struct { uint8_t data_valid[ENERGY_MAX_PHASES]; uint8_t phase_count; // Number of phases active - uint8_t phase_count_virtual; // Number of virtual relays bool voltage_common; // Use common voltage bool frequency_common; // Use common frequency bool use_overtemp; // Use global temperature as overtemp trigger on internal energy monitor hardware diff --git a/tasmota/tasmota_xdrv_driver/xdrv_03_esp32_energy.ino b/tasmota/tasmota_xdrv_driver/xdrv_03_esp32_energy.ino index d37de61b8..7662bc5af 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_03_esp32_energy.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_03_esp32_energy.ino @@ -173,7 +173,6 @@ typedef struct { uint8_t data_valid[ENERGY_MAX_PHASES]; uint8_t phase_count; // Number of phases active - uint8_t phase_count_virtual; // Number of virtual relays uint8_t fifth_second; uint8_t command_code; uint8_t power_steady_counter; // Allow for power on stabilization diff --git a/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_energy.ino b/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_energy.ino index 3b3fa33a1..e29037ae0 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_energy.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_energy.ino @@ -33,15 +33,15 @@ extern "C" { #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Winvalid-offsetof" // avoid warnings since we're using offsetof() in a risky way - + static const char * be_ctypes_instance_mappings[] = { NULL - }; + }; extern "C" const be_ctypes_structure_t be_energy_struct = { sizeof(tEnergy), /* size in bytes */ - 89, /* number of elements */ + 88, /* number of elements */ be_ctypes_instance_mappings, - (const be_ctypes_structure_item_t[89]) { + (const be_ctypes_structure_item_t[88]) { { "active_power", offsetof(tEnergy, active_power[0]), 0, 0, ctypes_float, 0 }, { "active_power_2", offsetof(tEnergy, active_power[1]), 0, 0, ctypes_float, 0 }, { "active_power_3", offsetof(tEnergy, active_power[2]), 0, 0, ctypes_float, 0 }, @@ -88,7 +88,6 @@ extern "C" { { "period_2", offsetof(tEnergy, period_kWh[1]), 0, 0, ctypes_float, 0 }, { "period_3", offsetof(tEnergy, period_kWh[2]), 0, 0, ctypes_float, 0 }, { "phase_count", offsetof(tEnergy, phase_count), 0, 0, ctypes_u8, 0 }, - { "phase_count_virtual", offsetof(tEnergy, phase_count_virtual), 0, 0, ctypes_u8, 0 }, { "power_factor", offsetof(tEnergy, power_factor[0]), 0, 0, ctypes_float, 0 }, { "power_factor_2", offsetof(tEnergy, power_factor[1]), 0, 0, ctypes_float, 0 }, { "power_factor_3", offsetof(tEnergy, power_factor[2]), 0, 0, ctypes_float, 0 },