From a88c95dce8c47c3bb63d91bd6cf35d45addbb215 Mon Sep 17 00:00:00 2001 From: andig Date: Sat, 13 Jan 2024 17:06:42 +0100 Subject: [PATCH 1/3] chore: rename modbus meter to mbmd --- evcc.dist.yaml | 2 +- meter/{modbus.go => mbmd.go} | 24 +++++++++---------- ...odbus_decorators.go => mbmd_decorators.go} | 2 +- templates/definition/meter/abb-ab.yaml | 2 +- templates/definition/meter/be-mpm3pm.yaml | 2 +- templates/definition/meter/cg-em24.yaml | 2 +- templates/definition/meter/cg-emt3xx.yaml | 2 +- templates/definition/meter/dzg.yaml | 2 +- .../definition/meter/eastron-sdm120.yaml | 2 +- .../definition/meter/eastron-sdm220_230.yaml | 2 +- templates/definition/meter/eastron-sdm72.yaml | 2 +- .../definition/meter/eastron-sdm72v2_630.yaml | 2 +- templates/definition/meter/fronius-gen24.yaml | 2 +- templates/definition/meter/inepro.yaml | 2 +- templates/definition/meter/janitza.yaml | 2 +- .../definition/meter/keba-kecontact.yaml | 2 +- templates/definition/meter/kostal-ksem.yaml | 2 +- templates/definition/meter/orno.yaml | 2 +- templates/definition/meter/sbc-axx3.yaml | 2 +- .../definition/meter/schneider-iem3000.yaml | 2 +- .../definition/meter/siemens-pac2200.yaml | 2 +- .../definition/meter/sunspec-hybrid.yaml | 2 +- .../definition/meter/sunspec-inverter.yaml | 2 +- 23 files changed, 34 insertions(+), 34 deletions(-) rename meter/{modbus.go => mbmd.go} (86%) rename meter/{modbus_decorators.go => mbmd_decorators.go} (99%) diff --git a/evcc.dist.yaml b/evcc.dist.yaml index 65a78e45f6..8d80dcbee3 100644 --- a/evcc.dist.yaml +++ b/evcc.dist.yaml @@ -56,7 +56,7 @@ modbusproxy: # for documentation see https://docs.evcc.io/docs/devices/meters meters: - name: grid - type: modbus + type: mbmd model: sdm # SDM630 uri: rs485.fritz.box:23 rtu: true # rs485 device connected using ethernet adapter diff --git a/meter/modbus.go b/meter/mbmd.go similarity index 86% rename from meter/modbus.go rename to meter/mbmd.go index f82af7edb9..ead36fb5c4 100644 --- a/meter/modbus.go +++ b/meter/mbmd.go @@ -13,8 +13,8 @@ import ( "github.com/volkszaehler/mbmd/meters/sunspec" ) -// Modbus is an api.Meter implementation with configurable getters and setters. -type Modbus struct { +// ModbusMbmd is an api.Meter implementation with configurable getters and setters. +type ModbusMbmd struct { conn *modbus.Connection device meters.Device opPower modbus.Operation @@ -23,13 +23,13 @@ type Modbus struct { } func init() { - registry.Add("modbus", NewModbusFromConfig) + registry.Add("mbmd", NewModbusMbmdFromConfig) } //go:generate go run ../cmd/tools/decorate.go -f decorateModbus -b api.Meter -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)" -t "api.PhaseVoltages,Voltages,func() (float64, float64, float64, error)" -t "api.PhasePowers,Powers,func() (float64, float64, float64, error)" -t "api.Battery,Soc,func() (float64, error)" -t "api.BatteryCapacity,Capacity,func() float64" -// NewModbusFromConfig creates api.Meter from config -func NewModbusFromConfig(other map[string]interface{}) (api.Meter, error) { +// NewModbusMbmdFromConfig creates api.Meter from config +func NewModbusMbmdFromConfig(other map[string]interface{}) (api.Meter, error) { cc := struct { Model string capacity `mapstructure:",squash"` @@ -91,7 +91,7 @@ func NewModbusFromConfig(other map[string]interface{}) (api.Meter, error) { return nil, err } - m := &Modbus{ + m := &ModbusMbmd{ conn: conn, device: device, } @@ -138,10 +138,10 @@ func NewModbusFromConfig(other map[string]interface{}) (api.Meter, error) { soc = m.soc } - return decorateModbus(m, totalEnergy, currentsG, voltagesG, powersG, soc, cc.capacity.Decorator()), nil + return decorateModbusMbmd(m, totalEnergy, currentsG, voltagesG, powersG, soc, cc.capacity.Decorator()), nil } -func (m *Modbus) buildPhaseProviders(readings []string) (func() (float64, float64, float64, error), error) { +func (m *ModbusMbmd) buildPhaseProviders(readings []string) (func() (float64, float64, float64, error), error) { var res func() (float64, float64, float64, error) if len(readings) > 0 { if len(readings) != 3 { @@ -170,7 +170,7 @@ func (m *Modbus) buildPhaseProviders(readings []string) (func() (float64, float6 } // floatGetter executes configured modbus read operation and implements func() (float64, error) -func (m *Modbus) floatGetter(op modbus.Operation) (float64, error) { +func (m *ModbusMbmd) floatGetter(op modbus.Operation) (float64, error) { var res meters.MeasurementResult var err error @@ -201,16 +201,16 @@ func (m *Modbus) floatGetter(op modbus.Operation) (float64, error) { } // CurrentPower implements the api.Meter interface -func (m *Modbus) CurrentPower() (float64, error) { +func (m *ModbusMbmd) CurrentPower() (float64, error) { return m.floatGetter(m.opPower) } // totalEnergy implements the api.MeterEnergy interface -func (m *Modbus) totalEnergy() (float64, error) { +func (m *ModbusMbmd) totalEnergy() (float64, error) { return m.floatGetter(m.opEnergy) } // soc implements the api.Battery interface -func (m *Modbus) soc() (float64, error) { +func (m *ModbusMbmd) soc() (float64, error) { return m.floatGetter(m.opSoc) } diff --git a/meter/modbus_decorators.go b/meter/mbmd_decorators.go similarity index 99% rename from meter/modbus_decorators.go rename to meter/mbmd_decorators.go index 2a37e3e4bd..0404490217 100644 --- a/meter/modbus_decorators.go +++ b/meter/mbmd_decorators.go @@ -6,7 +6,7 @@ import ( "github.com/evcc-io/evcc/api" ) -func decorateModbus(base api.Meter, meterEnergy func() (float64, error), phaseCurrents func() (float64, float64, float64, error), phaseVoltages func() (float64, float64, float64, error), phasePowers func() (float64, float64, float64, error), battery func() (float64, error), batteryCapacity func() float64) api.Meter { +func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), phaseCurrents func() (float64, float64, float64, error), phaseVoltages func() (float64, float64, float64, error), phasePowers func() (float64, float64, float64, error), battery func() (float64, error), batteryCapacity func() float64) api.Meter { switch { case battery == nil && batteryCapacity == nil && meterEnergy == nil && phaseCurrents == nil && phasePowers == nil && phaseVoltages == nil: return base diff --git a/templates/definition/meter/abb-ab.yaml b/templates/definition/meter/abb-ab.yaml index e033643995..8831966df4 100644 --- a/templates/definition/meter/abb-ab.yaml +++ b/templates/definition/meter/abb-ab.yaml @@ -9,7 +9,7 @@ params: - name: modbus choice: ["rs485"] render: | - type: modbus + type: mbmd {{- include "modbus" . }} model: abb power: Power diff --git a/templates/definition/meter/be-mpm3pm.yaml b/templates/definition/meter/be-mpm3pm.yaml index 6706b42d50..1235496823 100644 --- a/templates/definition/meter/be-mpm3pm.yaml +++ b/templates/definition/meter/be-mpm3pm.yaml @@ -9,7 +9,7 @@ params: - name: modbus choice: ["rs485"] render: | - type: modbus + type: mbmd {{- include "modbus" . }} model: MPM power: Power diff --git a/templates/definition/meter/cg-em24.yaml b/templates/definition/meter/cg-em24.yaml index 642d41b9a4..af096d5f50 100644 --- a/templates/definition/meter/cg-em24.yaml +++ b/templates/definition/meter/cg-em24.yaml @@ -9,7 +9,7 @@ params: - name: modbus choice: ["rs485", "tcpip"] render: | - type: modbus + type: mbmd {{- include "modbus" . }} model: cgem24 power: Power diff --git a/templates/definition/meter/cg-emt3xx.yaml b/templates/definition/meter/cg-emt3xx.yaml index 2a77be6a93..f5fcc100fc 100644 --- a/templates/definition/meter/cg-emt3xx.yaml +++ b/templates/definition/meter/cg-emt3xx.yaml @@ -9,7 +9,7 @@ params: - name: modbus choice: ["rs485", "tcpip"] render: | - type: modbus + type: mbmd {{- include "modbus" . }} model: cgex3x0 power: Power diff --git a/templates/definition/meter/dzg.yaml b/templates/definition/meter/dzg.yaml index 2ef8ae45b6..b8020c551d 100644 --- a/templates/definition/meter/dzg.yaml +++ b/templates/definition/meter/dzg.yaml @@ -9,7 +9,7 @@ params: - name: modbus choice: ["rs485"] render: | - type: modbus + type: mbmd {{- include "modbus" . }} model: dzg power: ImportPower diff --git a/templates/definition/meter/eastron-sdm120.yaml b/templates/definition/meter/eastron-sdm120.yaml index 9050b02d23..b2eeda52f9 100644 --- a/templates/definition/meter/eastron-sdm120.yaml +++ b/templates/definition/meter/eastron-sdm120.yaml @@ -9,7 +9,7 @@ params: - name: modbus choice: ["rs485"] render: | - type: modbus + type: mbmd {{- include "modbus" . }} model: sdm power: Power diff --git a/templates/definition/meter/eastron-sdm220_230.yaml b/templates/definition/meter/eastron-sdm220_230.yaml index d3d79cfce4..bfe7d4ddaf 100644 --- a/templates/definition/meter/eastron-sdm220_230.yaml +++ b/templates/definition/meter/eastron-sdm220_230.yaml @@ -9,7 +9,7 @@ params: - name: modbus choice: ["rs485"] render: | - type: modbus + type: mbmd {{- include "modbus" . }} model: sdm220 power: Power diff --git a/templates/definition/meter/eastron-sdm72.yaml b/templates/definition/meter/eastron-sdm72.yaml index e46c1bb10e..79635c6791 100644 --- a/templates/definition/meter/eastron-sdm72.yaml +++ b/templates/definition/meter/eastron-sdm72.yaml @@ -9,7 +9,7 @@ params: - name: modbus choice: ["rs485"] render: | - type: modbus + type: mbmd {{- include "modbus" . }} model: sdm72 power: Power diff --git a/templates/definition/meter/eastron-sdm72v2_630.yaml b/templates/definition/meter/eastron-sdm72v2_630.yaml index 9a1b80b1b9..287f476c2c 100644 --- a/templates/definition/meter/eastron-sdm72v2_630.yaml +++ b/templates/definition/meter/eastron-sdm72v2_630.yaml @@ -12,7 +12,7 @@ params: - name: modbus choice: ["rs485"] render: | - type: modbus + type: mbmd {{- include "modbus" . }} model: sdm power: Power diff --git a/templates/definition/meter/fronius-gen24.yaml b/templates/definition/meter/fronius-gen24.yaml index e4291da050..cb1f50215f 100644 --- a/templates/definition/meter/fronius-gen24.yaml +++ b/templates/definition/meter/fronius-gen24.yaml @@ -20,7 +20,7 @@ params: render: | # reference: https://github.com/volkszaehler/mbmd/blob/master/meters/sunspec/models.go {{- if eq .usage "grid" }} - type: modbus + type: mbmd uri: {{ .host }}:{{ .port }} id: 200 model: sunspec diff --git a/templates/definition/meter/inepro.yaml b/templates/definition/meter/inepro.yaml index d1fdf1d8c0..8af19f7763 100644 --- a/templates/definition/meter/inepro.yaml +++ b/templates/definition/meter/inepro.yaml @@ -9,7 +9,7 @@ params: - name: modbus choice: ["rs485"] render: | - type: modbus + type: mbmd {{- include "modbus" . }} model: inepro power: Power diff --git a/templates/definition/meter/janitza.yaml b/templates/definition/meter/janitza.yaml index b163d9cfe0..b0d4cece13 100644 --- a/templates/definition/meter/janitza.yaml +++ b/templates/definition/meter/janitza.yaml @@ -9,7 +9,7 @@ params: - name: modbus choice: ["rs485", "tcpip"] render: | - type: modbus + type: mbmd {{- include "modbus" . }} model: janitza power: Power diff --git a/templates/definition/meter/keba-kecontact.yaml b/templates/definition/meter/keba-kecontact.yaml index deca220ef7..3c69666986 100644 --- a/templates/definition/meter/keba-kecontact.yaml +++ b/templates/definition/meter/keba-kecontact.yaml @@ -11,7 +11,7 @@ params: choice: ["tcpip"] id: 1 render: | - type: modbus + type: mbmd {{- include "modbus" . }} model: sunspec power: Power diff --git a/templates/definition/meter/kostal-ksem.yaml b/templates/definition/meter/kostal-ksem.yaml index 7aa554b3ab..489db64c61 100644 --- a/templates/definition/meter/kostal-ksem.yaml +++ b/templates/definition/meter/kostal-ksem.yaml @@ -10,7 +10,7 @@ params: choice: ["tcpip"] id: 71 render: | - type: modbus + type: mbmd {{- include "modbus" . }} model: sunspec power: Power diff --git a/templates/definition/meter/orno.yaml b/templates/definition/meter/orno.yaml index feee0d79e0..f2b2e8337b 100644 --- a/templates/definition/meter/orno.yaml +++ b/templates/definition/meter/orno.yaml @@ -9,7 +9,7 @@ params: - name: modbus choice: ["rs485"] render: | - type: modbus + type: mbmd {{- include "modbus" . }} model: orno3p power: Power diff --git a/templates/definition/meter/sbc-axx3.yaml b/templates/definition/meter/sbc-axx3.yaml index 5334b5bba2..9aca36bb8e 100644 --- a/templates/definition/meter/sbc-axx3.yaml +++ b/templates/definition/meter/sbc-axx3.yaml @@ -9,7 +9,7 @@ params: - name: modbus choice: ["rs485"] render: | - type: modbus + type: mbmd {{- include "modbus" . }} model: sbc power: Power diff --git a/templates/definition/meter/schneider-iem3000.yaml b/templates/definition/meter/schneider-iem3000.yaml index 461a7e8c30..50941a6916 100644 --- a/templates/definition/meter/schneider-iem3000.yaml +++ b/templates/definition/meter/schneider-iem3000.yaml @@ -9,7 +9,7 @@ params: - name: modbus choice: ["rs485"] render: | - type: modbus + type: mbmd {{- include "modbus" . }} model: iem3000 power: Power diff --git a/templates/definition/meter/siemens-pac2200.yaml b/templates/definition/meter/siemens-pac2200.yaml index 2439ebef36..8f0fb719fd 100644 --- a/templates/definition/meter/siemens-pac2200.yaml +++ b/templates/definition/meter/siemens-pac2200.yaml @@ -9,7 +9,7 @@ params: - name: modbus choice: ["rs485", "tcpip"] render: | - type: modbus + type: mbmd {{- include "modbus" . }} model: pac2200 power: Power diff --git a/templates/definition/meter/sunspec-hybrid.yaml b/templates/definition/meter/sunspec-hybrid.yaml index beb3abb3ef..37474a58ec 100644 --- a/templates/definition/meter/sunspec-hybrid.yaml +++ b/templates/definition/meter/sunspec-hybrid.yaml @@ -24,7 +24,7 @@ params: advanced: true render: | {{- if eq .usage "grid" }} - type: modbus + type: mbmd {{- include "modbus" . }} {{- if eq .integer "true" }} # sunspec model 203 (int+sf) meter diff --git a/templates/definition/meter/sunspec-inverter.yaml b/templates/definition/meter/sunspec-inverter.yaml index acfa63849c..85d723d363 100644 --- a/templates/definition/meter/sunspec-inverter.yaml +++ b/templates/definition/meter/sunspec-inverter.yaml @@ -21,7 +21,7 @@ params: - name: capacity advanced: true render: | - type: modbus + type: mbmd {{- include "modbus" . }} {{- if eq .usage "grid" }} model: sunspec From ec1f6a84c4c43eef1b99745a6401a102571461a8 Mon Sep 17 00:00:00 2001 From: andig Date: Sat, 13 Jan 2024 17:13:58 +0100 Subject: [PATCH 2/3] wip --- meter/mbmd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meter/mbmd.go b/meter/mbmd.go index ead36fb5c4..e869ed6d72 100644 --- a/meter/mbmd.go +++ b/meter/mbmd.go @@ -26,7 +26,7 @@ func init() { registry.Add("mbmd", NewModbusMbmdFromConfig) } -//go:generate go run ../cmd/tools/decorate.go -f decorateModbus -b api.Meter -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)" -t "api.PhaseVoltages,Voltages,func() (float64, float64, float64, error)" -t "api.PhasePowers,Powers,func() (float64, float64, float64, error)" -t "api.Battery,Soc,func() (float64, error)" -t "api.BatteryCapacity,Capacity,func() float64" +//go:generate go run ../cmd/tools/decorate.go -f decorateModbusMbmd -b api.Meter -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)" -t "api.PhaseVoltages,Voltages,func() (float64, float64, float64, error)" -t "api.PhasePowers,Powers,func() (float64, float64, float64, error)" -t "api.Battery,Soc,func() (float64, error)" -t "api.BatteryCapacity,Capacity,func() float64" // NewModbusMbmdFromConfig creates api.Meter from config func NewModbusMbmdFromConfig(other map[string]interface{}) (api.Meter, error) { From b069e93ec84bfa9df6dfd6a5d131f30ce942b17e Mon Sep 17 00:00:00 2001 From: andig Date: Sun, 14 Jan 2024 15:29:58 +0100 Subject: [PATCH 3/3] wip --- meter/mbmd_decorators.go | 408 +++++++++++++++++++-------------------- 1 file changed, 204 insertions(+), 204 deletions(-) diff --git a/meter/mbmd_decorators.go b/meter/mbmd_decorators.go index 0404490217..9ee5e4d98f 100644 --- a/meter/mbmd_decorators.go +++ b/meter/mbmd_decorators.go @@ -17,7 +17,7 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.MeterEnergy }{ Meter: base, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, } @@ -28,7 +28,7 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseCurrents }{ Meter: base, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, } @@ -40,10 +40,10 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseCurrents }{ Meter: base, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, } @@ -54,7 +54,7 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -66,10 +66,10 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -81,10 +81,10 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -97,13 +97,13 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -114,7 +114,7 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhasePowers }{ Meter: base, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, } @@ -126,10 +126,10 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhasePowers }{ Meter: base, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, } @@ -141,10 +141,10 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhasePowers }{ Meter: base, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, } @@ -157,13 +157,13 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhasePowers }{ Meter: base, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, } @@ -175,10 +175,10 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -191,13 +191,13 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -210,13 +210,13 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -230,16 +230,16 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -250,7 +250,7 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.Battery }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, } @@ -262,10 +262,10 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.MeterEnergy }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, } @@ -277,10 +277,10 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseCurrents }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, } @@ -293,13 +293,13 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseCurrents }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, } @@ -311,10 +311,10 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -327,13 +327,13 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -346,13 +346,13 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -366,16 +366,16 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -387,10 +387,10 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhasePowers }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, } @@ -403,13 +403,13 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhasePowers }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, } @@ -422,13 +422,13 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhasePowers }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, } @@ -442,16 +442,16 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhasePowers }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, } @@ -464,13 +464,13 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -484,16 +484,16 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -507,16 +507,16 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -531,19 +531,19 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -554,7 +554,7 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.BatteryCapacity }{ Meter: base, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, } @@ -566,10 +566,10 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.MeterEnergy }{ Meter: base, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, } @@ -581,10 +581,10 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseCurrents }{ Meter: base, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, } @@ -597,13 +597,13 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseCurrents }{ Meter: base, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, } @@ -615,10 +615,10 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -631,13 +631,13 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -650,13 +650,13 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -670,16 +670,16 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -691,10 +691,10 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhasePowers }{ Meter: base, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, } @@ -707,13 +707,13 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhasePowers }{ Meter: base, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, } @@ -726,13 +726,13 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhasePowers }{ Meter: base, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, } @@ -746,16 +746,16 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhasePowers }{ Meter: base, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, } @@ -768,13 +768,13 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -788,16 +788,16 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -811,16 +811,16 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -835,19 +835,19 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -859,10 +859,10 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.BatteryCapacity }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, } @@ -875,13 +875,13 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.MeterEnergy }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, } @@ -894,13 +894,13 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseCurrents }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, } @@ -914,16 +914,16 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseCurrents }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, } @@ -936,13 +936,13 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -956,16 +956,16 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -979,16 +979,16 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -1003,19 +1003,19 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -1028,13 +1028,13 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhasePowers }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, } @@ -1048,16 +1048,16 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhasePowers }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, } @@ -1071,16 +1071,16 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhasePowers }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, } @@ -1095,19 +1095,19 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhasePowers }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, } @@ -1121,16 +1121,16 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -1145,19 +1145,19 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -1172,19 +1172,19 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -1200,22 +1200,22 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha api.PhaseVoltages }{ Meter: base, - Battery: &decorateModbusBatteryImpl{ + Battery: &decorateModbusMbmdBatteryImpl{ battery: battery, }, - BatteryCapacity: &decorateModbusBatteryCapacityImpl{ + BatteryCapacity: &decorateModbusMbmdBatteryCapacityImpl{ batteryCapacity: batteryCapacity, }, - MeterEnergy: &decorateModbusMeterEnergyImpl{ + MeterEnergy: &decorateModbusMbmdMeterEnergyImpl{ meterEnergy: meterEnergy, }, - PhaseCurrents: &decorateModbusPhaseCurrentsImpl{ + PhaseCurrents: &decorateModbusMbmdPhaseCurrentsImpl{ phaseCurrents: phaseCurrents, }, - PhasePowers: &decorateModbusPhasePowersImpl{ + PhasePowers: &decorateModbusMbmdPhasePowersImpl{ phasePowers: phasePowers, }, - PhaseVoltages: &decorateModbusPhaseVoltagesImpl{ + PhaseVoltages: &decorateModbusMbmdPhaseVoltagesImpl{ phaseVoltages: phaseVoltages, }, } @@ -1224,50 +1224,50 @@ func decorateModbusMbmd(base api.Meter, meterEnergy func() (float64, error), pha return nil } -type decorateModbusBatteryImpl struct { +type decorateModbusMbmdBatteryImpl struct { battery func() (float64, error) } -func (impl *decorateModbusBatteryImpl) Soc() (float64, error) { +func (impl *decorateModbusMbmdBatteryImpl) Soc() (float64, error) { return impl.battery() } -type decorateModbusBatteryCapacityImpl struct { +type decorateModbusMbmdBatteryCapacityImpl struct { batteryCapacity func() float64 } -func (impl *decorateModbusBatteryCapacityImpl) Capacity() float64 { +func (impl *decorateModbusMbmdBatteryCapacityImpl) Capacity() float64 { return impl.batteryCapacity() } -type decorateModbusMeterEnergyImpl struct { +type decorateModbusMbmdMeterEnergyImpl struct { meterEnergy func() (float64, error) } -func (impl *decorateModbusMeterEnergyImpl) TotalEnergy() (float64, error) { +func (impl *decorateModbusMbmdMeterEnergyImpl) TotalEnergy() (float64, error) { return impl.meterEnergy() } -type decorateModbusPhaseCurrentsImpl struct { +type decorateModbusMbmdPhaseCurrentsImpl struct { phaseCurrents func() (float64, float64, float64, error) } -func (impl *decorateModbusPhaseCurrentsImpl) Currents() (float64, float64, float64, error) { +func (impl *decorateModbusMbmdPhaseCurrentsImpl) Currents() (float64, float64, float64, error) { return impl.phaseCurrents() } -type decorateModbusPhasePowersImpl struct { +type decorateModbusMbmdPhasePowersImpl struct { phasePowers func() (float64, float64, float64, error) } -func (impl *decorateModbusPhasePowersImpl) Powers() (float64, float64, float64, error) { +func (impl *decorateModbusMbmdPhasePowersImpl) Powers() (float64, float64, float64, error) { return impl.phasePowers() } -type decorateModbusPhaseVoltagesImpl struct { +type decorateModbusMbmdPhaseVoltagesImpl struct { phaseVoltages func() (float64, float64, float64, error) } -func (impl *decorateModbusPhaseVoltagesImpl) Voltages() (float64, float64, float64, error) { +func (impl *decorateModbusMbmdPhaseVoltagesImpl) Voltages() (float64, float64, float64, error) { return impl.phaseVoltages() }