Add support for dpt 8.xxx (attempt 2)

knx/dpt/formats.go

@@ -208,6 +208,63 @@ func unpackV8(data []byte, i *int8) error {
 	return nil
 }
 
+func packV16(i int16) []byte {
+	b := make([]byte, 3)
+
+	b[0] = 0
+	b[1] = byte((i >> 8) & 0xff)
+	b[2] = byte(i & 0xff)
+
+	return b
+}
+
+func unpackV16(data []byte, i *int16) error {
+	if len(data) != 3 {
+		return ErrInvalidLength
+	}
+
+	*i = int16(data[1])<<8 | int16(data[2])
+
+	return nil
+}
+
+func packV32AsV16(i int32, resolution int32) []byte {
+	return packV16(int16(i / resolution))
+}
+
+func unpackV16AsV32(data []byte, i *int32, resolution int32) error {
+	if len(data) != 3 {
+		return ErrInvalidLength
+	}
+	var i16 int16
+	err := unpackV16(data, &i16)
+	if err != nil {
+		return err
+	}
+
+	*i = int32(i16) * resolution
+	return nil
+}
+
+func packFloat32AsV16(f float32, resolution float32) []byte {
+	return packV16(int16(math.Round(float64(f / resolution))))
+}
+
+func unpackV16AsFloat32(data []byte, f *float32, resolution float32) error {
+	if len(data) != 3 {
+		return ErrInvalidLength
+	}
+
+	var i int16
+	if err := unpackV16(data, &i); err != nil {
+		return err
+	}
+
+	*f = float32(i) * resolution
+
+	return nil
+}
+
 func packV32(i int32) []byte {
 	b := make([]byte, 5)
 

knx/dpt/types_8.go

@@ -0,0 +1,179 @@
+// Copyright 2017 Ole Krüger.
+// Licensed under the MIT license which can be found in the LICENSE file.
+
+package dpt
+
+import (
+	"fmt"
+)
+
+// DPT_8001 represents DPT 8.001 / Counter.
+type DPT_8001 int16
+
+func (d DPT_8001) Pack() []byte {
+	return packV16(int16(d))
+}
+
+func (d *DPT_8001) Unpack(data []byte) error {
+	return unpackV16(data, (*int16)(d))
+}
+
+func (d DPT_8001) Unit() string {
+	return "pulses"
+}
+
+func (d DPT_8001) String() string {
+	return fmt.Sprintf("%d pulses", int16(d))
+}
+
+// DPT_8002 represents DPT 8.002 / delta time ms.
+type DPT_8002 int16
+
+func (d DPT_8002) Pack() []byte {
+	return packV16(int16(d))
+}
+
+func (d *DPT_8002) Unpack(data []byte) error {
+	return unpackV16(data, (*int16)(d))
+}
+
+func (d DPT_8002) Unit() string {
+	return "ms"
+}
+
+func (d DPT_8002) String() string {
+	return fmt.Sprintf("%d ms", int16(d))
+}
+
+// DPT_8003 represents DPT 8.003 / delta time ms (range -327.68 s ... 327.67 s)
+type DPT_8003 int32
+
+func (d DPT_8003) Pack() []byte {
+	return packV32AsV16(int32(d), 10)
+}
+
+func (d *DPT_8003) Unpack(data []byte) error {
+	return unpackV16AsV32(data, (*int32)(d), 10)
+}
+
+func (d DPT_8003) Unit() string {
+	return "ms"
+}
+
+func (d DPT_8003) String() string {
+	return fmt.Sprintf("%d ms", int32(d))
+}
+
+// DPT_8004 represents DPT 8.004 / delta time ms (range -3276.8 s ... 3276.7 s)
+type DPT_8004 int32
+
+func (d DPT_8004) Pack() []byte {
+	return packV32AsV16(int32(d), 100)
+}
+
+func (d *DPT_8004) Unpack(data []byte) error {
+	return unpackV16AsV32(data, (*int32)(d), 100)
+}
+
+func (d DPT_8004) Unit() string {
+	return "ms"
+}
+
+func (d DPT_8004) String() string {
+	return fmt.Sprintf("%d ms", int32(d))
+}
+
+// DPT_8005 represents DPT 8.005 / delta time seconds
+type DPT_8005 int16
+
+func (d DPT_8005) Pack() []byte {
+	return packV16(int16(d))
+}
+
+func (d *DPT_8005) Unpack(data []byte) error {
+	return unpackV16(data, (*int16)(d))
+}
+
+func (d DPT_8005) Unit() string {
+	return "s"
+}
+
+func (d DPT_8005) String() string {
+	return fmt.Sprintf("%d s", int16(d))
+}
+
+// DPT_8006 represents DPT 8.005 / delta time minutes
+type DPT_8006 int16
+
+func (d DPT_8006) Pack() []byte {
+	return packV16(int16(d))
+}
+
+func (d *DPT_8006) Unpack(data []byte) error {
+	return unpackV16(data, (*int16)(d))
+}
+
+func (d DPT_8006) Unit() string {
+	return "min"
+}
+
+func (d DPT_8006) String() string {
+	return fmt.Sprintf("%d min", int16(d))
+}
+
+// DPT_8007 represents DPT 8.007 / delta time hours
+type DPT_8007 int16
+
+func (d DPT_8007) Pack() []byte {
+	return packV16(int16(d))
+}
+
+func (d *DPT_8007) Unpack(data []byte) error {
+	return unpackV16(data, (*int16)(d))
+}
+
+func (d DPT_8007) Unit() string {
+	return "h"
+}
+
+func (d DPT_8007) String() string {
+	return fmt.Sprintf("%d h", int16(d))
+}
+
+// DPT_8010 represents DPT 8.010 / percentage difference
+type DPT_8010 float32
+
+func (d DPT_8010) Pack() []byte {
+	return packFloat32AsV16(float32(d), 0.01)
+}
+
+func (d *DPT_8010) Unpack(data []byte) error {
+	return unpackV16AsFloat32(data, (*float32)(d), 0.01)
+}
+
+func (d DPT_8010) Unit() string {
+	return "%"
+}
+
+func (d DPT_8010) String() string {
+	return fmt.Sprintf("%f %%", float32(d))
+}
+
+// DPT_8011 represents DPT 8.011 / Rotation angle °.
+type DPT_8011 int16
+
+func (d DPT_8011) Pack() []byte {
+	return packV16(int16(d))
+}
+
+func (d *DPT_8011) Unpack(data []byte) error {
+	return unpackV16(data, (*int16)(d))
+}
+
+func (d DPT_8011) Unit() string {
+	return "°"
+}
+
+func (d DPT_8011) String() string {
+	return fmt.Sprintf("%d °", int16(d))
+}