Move resolution out of formats

vapourismo · Aug 29, 2024 · 1c067d1 · 1c067d1
1 parent 5048c80
commit 1c067d1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 43 deletions.
diff --git a/knx/dpt/formats.go b/knx/dpt/formats.go
@@ -228,43 +228,6 @@ func unpackV16(data []byte, i *int16) error {
 	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)
 

diff --git a/knx/dpt/types_8.go b/knx/dpt/types_8.go
@@ -5,6 +5,7 @@ package dpt
 
 import (
 	"fmt"
+	"math"
 )
 
 // DPT_8001 represents DPT 8.001 / Counter.
@@ -49,11 +50,16 @@ func (d DPT_8002) String() string {
 type DPT_8003 int32
 
 func (d DPT_8003) Pack() []byte {
-	return packV32AsV16(int32(d), 10)
+	return packV16(int16(int32(d) / 10))
 }
 
 func (d *DPT_8003) Unpack(data []byte) error {
-	return unpackV16AsV32(data, (*int32)(d), 10)
+	var i int16
+	if err := unpackV16(data, &i); err != nil {
+		return nil
+	}
+	*d = DPT_8003(int32(i) * 10)
+	return nil
 }
 
 func (d DPT_8003) Unit() string {
@@ -68,11 +74,16 @@ func (d DPT_8003) String() string {
 type DPT_8004 int32
 
 func (d DPT_8004) Pack() []byte {
-	return packV32AsV16(int32(d), 100)
+	return packV16(int16(int32(d) / 100))
 }
 
 func (d *DPT_8004) Unpack(data []byte) error {
-	return unpackV16AsV32(data, (*int32)(d), 100)
+	var i int16
+	if err := unpackV16(data, &i); err != nil {
+		return nil
+	}
+	*d = DPT_8004(int32(i) * 100)
+	return nil
 }
 
 func (d DPT_8004) Unit() string {
@@ -144,11 +155,16 @@ func (d DPT_8007) String() string {
 type DPT_8010 float32
 
 func (d DPT_8010) Pack() []byte {
-	return packFloat32AsV16(float32(d), 0.01)
+	return packV16(int16(math.Round(float64(d) / 0.01)))
 }
 
 func (d *DPT_8010) Unpack(data []byte) error {
-	return unpackV16AsFloat32(data, (*float32)(d), 0.01)
+	var i int16
+	if err := unpackV16(data, &i); err != nil {
+		return nil
+	}
+	*d = DPT_8010(float32(i) * 0.01)
+	return nil
 }
 
 func (d DPT_8010) Unit() string {