From 8f281ed30491d6e1fe4d169ba0ce5a6c8377f636 Mon Sep 17 00:00:00 2001 From: Boernsman Date: Tue, 25 May 2021 21:25:49 +0200 Subject: [PATCH] fixed bg e-tech energy meter register map --- energymeters/bg-etechmodbusregister.h | 22 +++++++++++----------- energymeters/inepromodbusregister.h | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/energymeters/bg-etechmodbusregister.h b/energymeters/bg-etechmodbusregister.h index 34bd78f..b16c4eb 100644 --- a/energymeters/bg-etechmodbusregister.h +++ b/energymeters/bg-etechmodbusregister.h @@ -34,17 +34,17 @@ #include "registerdescriptor.h" static const QHash sdm630RegisterMap { - {ModbusRegisterType::VoltageL1, ModbusRegisterDescriptor(30001, 4, 2, "V", "float")}, - {ModbusRegisterType::VoltageL2, ModbusRegisterDescriptor(30003, 4, 2, "V", "float")}, - {ModbusRegisterType::VoltageL3, ModbusRegisterDescriptor(30005, 4, 2, "V", "float")}, - {ModbusRegisterType::CurrentL1, ModbusRegisterDescriptor(30007, 4, 2, "A", "float")}, - {ModbusRegisterType::CurrentL2, ModbusRegisterDescriptor(30009, 4, 2, "A", "float")}, - {ModbusRegisterType::CurrentL3, ModbusRegisterDescriptor(30011, 4, 2, "A", "float")}, - {ModbusRegisterType::ActivePower, ModbusRegisterDescriptor(30053, 4, 2, "W", "float")}, //Total system power - {ModbusRegisterType::Frequency, ModbusRegisterDescriptor(30071, 4, 2, "Hz", "float")}, - {ModbusRegisterType::PowerFactor, ModbusRegisterDescriptor(30067, 4, 2, "Degree", "float")}, //Total system phase angle - {ModbusRegisterType::EnergyConsumed, ModbusRegisterDescriptor(30073, 4, 2, "kWh", "float")}, //Total Import kWh - {ModbusRegisterType::EnergyProduced, ModbusRegisterDescriptor(30075, 4, 2, "kWh", "float")} //Total Export kWh + {ModbusRegisterType::VoltageL1, ModbusRegisterDescriptor(0x00, 4, 2, "V", "float")}, + {ModbusRegisterType::VoltageL2, ModbusRegisterDescriptor(0x02, 4, 2, "V", "float")}, + {ModbusRegisterType::VoltageL3, ModbusRegisterDescriptor(0x04, 4, 2, "V", "float")}, + {ModbusRegisterType::CurrentL1, ModbusRegisterDescriptor(0x06, 4, 2, "A", "float")}, + {ModbusRegisterType::CurrentL2, ModbusRegisterDescriptor(0x08, 4, 2, "A", "float")}, + {ModbusRegisterType::CurrentL3, ModbusRegisterDescriptor(0x0A, 4, 2, "A", "float")}, + {ModbusRegisterType::ActivePower, ModbusRegisterDescriptor(0x34, 4, 2, "W", "float")}, //Total system power + {ModbusRegisterType::Frequency, ModbusRegisterDescriptor(0x46, 4, 2, "Hz", "float")}, + {ModbusRegisterType::PowerFactor, ModbusRegisterDescriptor(0x3E, 4, 2, "", "float")}, //Total system power factor + {ModbusRegisterType::EnergyConsumed, ModbusRegisterDescriptor(0x48, 4, 2, "kWh", "float")}, //Total Import kWh + {ModbusRegisterType::EnergyProduced, ModbusRegisterDescriptor(0x4A, 4, 2, "kWh", "float")} //Total Export kWh }; #endif // BGETECHMODBUSREGISTER_H diff --git a/energymeters/inepromodbusregister.h b/energymeters/inepromodbusregister.h index e419c9d..b6071b4 100644 --- a/energymeters/inepromodbusregister.h +++ b/energymeters/inepromodbusregister.h @@ -41,7 +41,7 @@ static const QHash pro380RegisterM {ModbusRegisterType::CurrentL3, ModbusRegisterDescriptor(0x5010, 3, 2, "A", "float")}, //L3 Current {ModbusRegisterType::ActivePower, ModbusRegisterDescriptor(0x5012, 3, 2, "kW", "float")}, //Total active power {ModbusRegisterType::Frequency, ModbusRegisterDescriptor(0x5008, 3, 2, "Hz", "float")}, - {ModbusRegisterType::PowerFactor, ModbusRegisterDescriptor(0x502A, 3, 2, "Degree", "float")}, + {ModbusRegisterType::PowerFactor, ModbusRegisterDescriptor(0x502A, 3, 2, "", "float")}, {ModbusRegisterType::EnergyConsumed, ModbusRegisterDescriptor(0x600C, 3, 2, "kWh", "float")}, //Forward active energy {ModbusRegisterType::EnergyProduced, ModbusRegisterDescriptor(0x6018, 3, 2, "kWh", "float")} //Reverse active energy };