jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-23 18:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove phase_count_virtual

Browse Source
This commit is contained in:
Theo Arends 2023-07-01 14:31:03 +02:00
parent 139ac367f0
commit 85aed3a17d
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tasmota/tasmota_xdrv_driver/xdrv_03_energy.ino
View File

@ -109,7 +109,6 @@ typedef struct {
uint8_t data_valid[ENERGY_MAX_PHASES]; uint8_t data_valid[ENERGY_MAX_PHASES];
uint8_t phase_count; // Number of phases active uint8_t phase_count; // Number of phases active
uint8_t phase_count_virtual; // Number of virtual relays
bool voltage_common; // Use common voltage bool voltage_common; // Use common voltage
bool frequency_common; // Use common frequency bool frequency_common; // Use common frequency
bool use_overtemp; // Use global temperature as overtemp trigger on internal energy monitor hardware bool use_overtemp; // Use global temperature as overtemp trigger on internal energy monitor hardware

1
tasmota/tasmota_xdrv_driver/xdrv_03_esp32_energy.ino
View File

@ -173,7 +173,6 @@ typedef struct {
uint8_t data_valid[ENERGY_MAX_PHASES]; uint8_t data_valid[ENERGY_MAX_PHASES];
uint8_t phase_count; // Number of phases active uint8_t phase_count; // Number of phases active
uint8_t phase_count_virtual; // Number of virtual relays
uint8_t fifth_second; uint8_t fifth_second;
uint8_t command_code; uint8_t command_code;
uint8_t power_steady_counter; // Allow for power on stabilization uint8_t power_steady_counter; // Allow for power on stabilization

9
tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_energy.ino
View File

@ -33,15 +33,15 @@
extern "C" { extern "C" {
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Winvalid-offsetof" // avoid warnings since we're using offsetof() in a risky way #pragma GCC diagnostic ignored "-Winvalid-offsetof" // avoid warnings since we're using offsetof() in a risky way
static const char * be_ctypes_instance_mappings[] = { static const char * be_ctypes_instance_mappings[] = {
NULL NULL
}; };
extern "C" const be_ctypes_structure_t be_energy_struct = { extern "C" const be_ctypes_structure_t be_energy_struct = {
sizeof(tEnergy), /* size in bytes */ sizeof(tEnergy), /* size in bytes */
89, /* number of elements */ 88, /* number of elements */
be_ctypes_instance_mappings, 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", 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_2", offsetof(tEnergy, active_power[1]), 0, 0, ctypes_float, 0 },
{ "active_power_3", offsetof(tEnergy, active_power[2]), 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_2", offsetof(tEnergy, period_kWh[1]), 0, 0, ctypes_float, 0 },
{ "period_3", offsetof(tEnergy, period_kWh[2]), 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", 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", 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_2", offsetof(tEnergy, power_factor[1]), 0, 0, ctypes_float, 0 },
{ "power_factor_3", offsetof(tEnergy, power_factor[2]), 0, 0, ctypes_float, 0 }, { "power_factor_3", offsetof(tEnergy, power_factor[2]), 0, 0, ctypes_float, 0 },