From d13e7547c58f995843e3bebdf2a91bb988f6ef74 Mon Sep 17 00:00:00 2001 From: ig Date: Wed, 8 Mar 2023 16:14:22 +0100 Subject: [PATCH] Remove Energy related measurements from EmuMeterDriver for the time being --- csharp/App/EmuMeterDriver/Config.cs | 46 ++++++++++++++--------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/csharp/App/EmuMeterDriver/Config.cs b/csharp/App/EmuMeterDriver/Config.cs index ee0ad64db..0b5182735 100644 --- a/csharp/App/EmuMeterDriver/Config.cs +++ b/csharp/App/EmuMeterDriver/Config.cs @@ -20,32 +20,32 @@ public static class Config public static readonly IReadOnlyList Signals = new Signal[] { - new(s => s.CurrentL1, "/Ac/L1/Current", "0.0 A"), - new(s => s.CurrentL2, "/Ac/L2/Current", "0.0 A"), - new(s => s.CurrentL3, "/Ac/L3/Current", "0.0 A"), - new(s => s.CurrentL123, "/Ac/Current", "0.0 A"), + new(s => s.Ac.L1.Current, "/Ac/L1/Current", "0.0 A"), + new(s => s.Ac.L2.Current, "/Ac/L2/Current", "0.0 A"), + new(s => s.Ac.L3.Current, "/Ac/L3/Current", "0.0 A"), + new(s => s.Ac.L1.Current + s.Ac.L2.Current + s.Ac.L3.Current, "/Ac/Current", "0.0 A"), - new(s => s.VoltageL1N, "/Ac/L1/Voltage", "0.0 A"), - new(s => s.VoltageL2N, "/Ac/L2/Voltage", "0.0 A"), - new(s => s.VoltageL3N, "/Ac/L3/Voltage", "0.0 A"), - new(s => (s.VoltageL1N + s.VoltageL2N + s.VoltageL3N) / 3.0m, "/Ac/Voltage", "0.0 A"), + new(s => s.Ac.L1.Voltage, "/Ac/L1/Voltage", "0.0 A"), + new(s => s.Ac.L2.Voltage, "/Ac/L2/Voltage", "0.0 A"), + new(s => s.Ac.L3.Voltage, "/Ac/L3/Voltage", "0.0 A"), + new(s => (s.Ac.L1.Voltage + s.Ac.L2.Voltage + s.Ac.L3.Voltage) / 3.0m, "/Ac/Voltage", "0.0 A"), - new(s => s.ActivePowerL1, "/Ac/L1/Power", "0 W"), - new(s => s.ActivePowerL2, "/Ac/L2/Power", "0 W"), - new(s => s.ActivePowerL3, "/Ac/L3/Power", "0 W"), - new(s => s.ActivePowerL123, "/Ac/Power", "0 W"), + new(s => s.Ac.L1.ActivePower, "/Ac/L1/Power", "0 W"), + new(s => s.Ac.L2.ActivePower, "/Ac/L2/Power", "0 W"), + new(s => s.Ac.L3.ActivePower, "/Ac/L3/Power", "0 W"), + new(s => s.Ac.ActivePower, "/Ac/Power", "0 W"), - new(s => s.EnergyImportL123, "Ac/Energy/Forward", "0.00 kWh"), - new(s => s.EnergyExportL123, "Ac/Energy/Reverse", "0.00 kWh"), - - new(s => s.EnergyImportL1, "Ac/L1/Energy/Forward", "0.00 kWh"), - new(s => s.EnergyExportL1, "Ac/L1/Energy/Reverse", "0.00 kWh"), - - new(s => s.EnergyImportL2, "Ac/L2/Energy/Forward", "0.00 kWh"), - new(s => s.EnergyExportL2, "Ac/L2/Energy/Reverse", "0.00 kWh"), - - new(s => s.EnergyImportL3, "Ac/L3/Energy/Forward", "0.00 kWh"), - new(s => s.EnergyExportL3, "Ac/L3/Energy/Reverse", "0.00 kWh"), + // new(s => s.EnergyImportL123, "Ac/Energy/Forward", "0.00 kWh"), + // new(s => s.EnergyExportL123, "Ac/Energy/Reverse", "0.00 kWh"), + // + // new(s => s.EnergyImportL1, "Ac/L1/Energy/Forward", "0.00 kWh"), + // new(s => s.EnergyExportL1, "Ac/L1/Energy/Reverse", "0.00 kWh"), + // + // new(s => s.EnergyImportL2, "Ac/L2/Energy/Forward", "0.00 kWh"), + // new(s => s.EnergyExportL2, "Ac/L2/Energy/Reverse", "0.00 kWh"), + // + // new(s => s.EnergyImportL3, "Ac/L3/Energy/Forward", "0.00 kWh"), + // new(s => s.EnergyExportL3, "Ac/L3/Energy/Reverse", "0.00 kWh"), }; public static VeProperties DefaultProperties => new VeProperties