Support ABB initilization

volkszaehler · Aug 26, 2019 · 3f3392f · 3f3392f
1 parent f9762f5
commit 3f3392f
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 19 deletions.
diff --git a/meters/rs485/abb.go b/meters/rs485/abb.go
@@ -3,14 +3,14 @@ package rs485
 import (
 	"math"
 
+	"github.com/grid-x/modbus"
 	. "github.com/volkszaehler/mbmd/meters"
 )
 
 func init() {
 	Register(NewABBProducer)
 }
 
-
 type signedness int
 
 const (
@@ -69,6 +69,10 @@ func (p *ABBProducer) Description() string {
 	return "ABB A/B-Series meters"
 }
 
+func (p *ABBProducer) Initialize(client modbus.Client, descriptor *DeviceDescriptor) error {
+	return initializeMID(client, descriptor)
+}
+
 // wrapTransform validates if reading result is undefined and returns NaN in that case
 func wrapTransform(byteCount uint16, sign signedness, transform RTUTransform) RTUTransform {
 	var nan []byte

diff --git a/meters/rs485/janitza.go b/meters/rs485/janitza.go
@@ -1,9 +1,6 @@
 package rs485
 
 import (
-	"encoding/binary"
-	"fmt"
-
 	"github.com/grid-x/modbus"
 	. "github.com/volkszaehler/mbmd/meters"
 )
@@ -59,21 +56,7 @@ func (p *JanitzaProducer) Description() string {
 }
 
 func (p *JanitzaProducer) Initialize(client modbus.Client, descriptor *DeviceDescriptor) error {
-	// serial
-	if bytes, err := client.ReadHoldingRegisters(0x8900, 2); err == nil {
-		descriptor.Serial = fmt.Sprintf("%4d", binary.BigEndian.Uint32(bytes))
-	}
-	// firmware
-	if bytes, err := client.ReadHoldingRegisters(0x8908, 8); err == nil {
-		descriptor.Version = string(bytes)
-	}
-	// type
-	if bytes, err := client.ReadHoldingRegisters(0x8960, 6); err == nil {
-		descriptor.Model = string(bytes)
-	}
-
-	// assume success
-	return nil
+	return initializeMID(client, descriptor)
 }
 
 func (p *JanitzaProducer) snip(iec Measurement) Operation {

diff --git a/meters/rs485/rs485.go b/meters/rs485/rs485.go
@@ -1,6 +1,7 @@
 package rs485
 
 import (
+	"encoding/binary"
 	"fmt"
 	"time"
 
@@ -119,3 +120,22 @@ func (d *rs485) Query(client modbus.Client) (res []meters.MeasurementResult, err
 
 	return res, nil
 }
+
+// MID meters initialization method used by Janitza and ABB
+func initializeMID(client modbus.Client, descriptor *meters.DeviceDescriptor) error {
+	// serial
+	if bytes, err := client.ReadHoldingRegisters(0x8900, 2); err == nil {
+		descriptor.Serial = fmt.Sprintf("%4d", binary.BigEndian.Uint32(bytes))
+	}
+	// firmware
+	if bytes, err := client.ReadHoldingRegisters(0x8908, 8); err == nil {
+		descriptor.Version = string(bytes)
+	}
+	// type
+	if bytes, err := client.ReadHoldingRegisters(0x8960, 6); err == nil {
+		descriptor.Model = string(bytes)
+	}
+
+	// assume success
+	return nil
+}