Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add FLOAT64-IEEE support to inputs.modbus (#8361) (by @Nemecsek) #8474

Merged
merged 6 commits into from
Nov 30, 2020
Merged

Add FLOAT64-IEEE support to inputs.modbus (#8361) (by @Nemecsek) #8474

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1a8ba41
Add FLOAT64-IEEE support to inputs.modbus (by Nemecsek)
Nov 25, 2020
da67e96
Update plugins/inputs/modbus/modbus.go
soerman Nov 26, 2020
eda66fe
Added FLOAT64_IEEE to README.md
Nov 27, 2020
1e1b587
Update README.md
soerman Nov 27, 2020
b2d1143
correction in README.md
soerman Nov 27, 2020
86f4308
added cases for FLOAT64_IEEE in modbus_test.go
soerman Nov 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions plugins/inputs/modbus/modbus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,8 @@ const sampleConfig = `
## |---BA, DCBA - Little Endian
## |---BADC - Mid-Big Endian
## |---CDAB - Mid-Little Endian
## data_type - INT16, UINT16, INT32, UINT32, INT64, UINT64, FLOAT32-IEEE (the IEEE 754 binary representation)
## data_type - INT16, UINT16, INT32, UINT32, INT64, UINT64,
## FLOAT32-IEEE, FLOAT64-IEEE (the IEEE 754 binary representation)
## FLOAT32, FIXED, UFIXED (fixed-point representation on input)
## scale - the final numeric variable representation
## address - variable address
Expand Down Expand Up @@ -355,7 +356,7 @@ func validateFieldContainers(t []fieldContainer, n string) error {

// search data type
switch item.DataType {
case "UINT16", "INT16", "UINT32", "INT32", "UINT64", "INT64", "FLOAT32-IEEE", "FLOAT32", "FIXED", "UFIXED":
case "UINT16", "INT16", "UINT32", "INT32", "UINT64", "INT64", "FLOAT32-IEEE", "FLOAT64-IEEE", "FLOAT32", "FIXED", "UFIXED":
break
default:
return fmt.Errorf("invalid data type '%s' in '%s' - '%s'", item.DataType, n, item.Name)
Expand Down Expand Up @@ -512,6 +513,10 @@ func convertDataType(t fieldContainer, bytes []byte) interface{} {
e32 := convertEndianness32(t.ByteOrder, bytes)
f32 := math.Float32frombits(e32)
return scaleFloat32(t.Scale, f32)
case "FLOAT64-IEEE":
e64 := convertEndianness64(t.ByteOrder, bytes)
f64 := math.Float64frombits(e64)
return scaleFloat64(t.Scale, f64)
case "FIXED":
if len(bytes) == 2 {
e16 := convertEndianness16(t.ByteOrder, bytes)
Expand Down Expand Up @@ -662,6 +667,10 @@ func scaleFloat32(s float64, v float32) float32 {
return float32(float64(v) * s)
}

func scaleFloat64(s float64, v float64) float64 {
return float64(float64(v) * s)
soerman marked this conversation as resolved.
Show resolved Hide resolved
}

func scaleUint64(s float64, v uint64) uint64 {
return uint64(float64(v) * float64(s))
}
Expand Down