Skip to content

[backend] Unit Converter #70

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

Merged
jmaralo merged 2 commits into from
Dec 20, 2023
Merged

[backend] Unit Converter #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81e1276
Unit Converter definition
jmaralo Dec 18, 2023
9f14a04
Load units to unit converter
jmaralo Dec 19, 2023
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
34 changes: 24 additions & 10 deletions backend/cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"github.com/HyperloopUPV-H8/h9-backend/internal/data_transfer"
"github.com/HyperloopUPV-H8/h9-backend/internal/excel"
"github.com/HyperloopUPV-H8/h9-backend/internal/excel/ade"
"github.com/HyperloopUPV-H8/h9-backend/internal/excel/utils"
"github.com/HyperloopUPV-H8/h9-backend/internal/info"
"github.com/HyperloopUPV-H8/h9-backend/internal/logger_handler"
protection_logger "github.com/HyperloopUPV-H8/h9-backend/internal/message_logger"
Expand Down Expand Up @@ -436,27 +437,29 @@ func getTransportDecEnc(info info.Info, podData pod_data.PodData) (*presentation
for i, measurement := range packet.Measurements {
switch meas := measurement.(type) {
case pod_data.NumericMeasurement:
podOps := getOps(meas.PodUnits)
displayOps := getOps(meas.DisplayUnits)
switch meas.Type {
case "uint8":
descriptor[i] = data.NewNumericDescriptor[uint8](data.ValueName(meas.Id))
descriptor[i] = data.NewNumericDescriptor[uint8](data.ValueName(meas.Id), podOps, displayOps)
case "uint16":
descriptor[i] = data.NewNumericDescriptor[uint16](data.ValueName(meas.Id))
descriptor[i] = data.NewNumericDescriptor[uint16](data.ValueName(meas.Id), podOps, displayOps)
case "uint32":
descriptor[i] = data.NewNumericDescriptor[uint32](data.ValueName(meas.Id))
descriptor[i] = data.NewNumericDescriptor[uint32](data.ValueName(meas.Id), podOps, displayOps)
case "uint64":
descriptor[i] = data.NewNumericDescriptor[uint64](data.ValueName(meas.Id))
descriptor[i] = data.NewNumericDescriptor[uint64](data.ValueName(meas.Id), podOps, displayOps)
case "int8":
descriptor[i] = data.NewNumericDescriptor[int8](data.ValueName(meas.Id))
descriptor[i] = data.NewNumericDescriptor[int8](data.ValueName(meas.Id), podOps, displayOps)
case "int16":
descriptor[i] = data.NewNumericDescriptor[int16](data.ValueName(meas.Id))
descriptor[i] = data.NewNumericDescriptor[int16](data.ValueName(meas.Id), podOps, displayOps)
case "int32":
descriptor[i] = data.NewNumericDescriptor[int32](data.ValueName(meas.Id))
descriptor[i] = data.NewNumericDescriptor[int32](data.ValueName(meas.Id), podOps, displayOps)
case "int64":
descriptor[i] = data.NewNumericDescriptor[int64](data.ValueName(meas.Id))
descriptor[i] = data.NewNumericDescriptor[int64](data.ValueName(meas.Id), podOps, displayOps)
case "float32":
descriptor[i] = data.NewNumericDescriptor[float32](data.ValueName(meas.Id))
descriptor[i] = data.NewNumericDescriptor[float32](data.ValueName(meas.Id), podOps, displayOps)
case "float64":
descriptor[i] = data.NewNumericDescriptor[float64](data.ValueName(meas.Id))
descriptor[i] = data.NewNumericDescriptor[float64](data.ValueName(meas.Id), podOps, displayOps)
default:
panic(fmt.Sprintf("unexpected numeric type for %s: %s", meas.Id, meas.Type))
}
Expand Down Expand Up @@ -500,6 +503,17 @@ func getTransportDecEnc(info info.Info, podData pod_data.PodData) (*presentation
return decoder, encoder
}

func getOps(units utils.Units) data.ConversionDescriptor {
output := make(data.ConversionDescriptor, len(units.Operations))
for i, operation := range units.Operations {
output[i] = data.Operation{
Operator: operation.Operator,
Operand: operation.Operand,
}
}
return output
}

type TransportAPI struct {
OnNotification func(abstraction.TransportNotification)
OnConnectionUpdate func(abstraction.TransportTarget, bool)
Expand Down
81 changes: 81 additions & 0 deletions backend/pkg/transport/packet/data/converter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
package data

type valueConverter func(Value) Value
type valueReverter func(Value) Value

type ConversionDescriptor []Operation

type Operation struct {
Operator string
Operand float64
}

func newConvertNumeric[N numeric](podConversion, displayConversion ConversionDescriptor) valueConverter {
return func(value Value) Value {
numeric := value.(NumericValue[N])
for _, operation := range append(podConversion, displayConversion...) {
switch operation.Operator {
case "+":
numeric.inner += N(operation.Operand)
case "-":
numeric.inner -= N(operation.Operand)
case "*":
numeric.inner *= N(operation.Operand)
case "/":
numeric.inner /= N(operation.Operand)
}
}
return numeric
}
}

func newRevertNumeric[N numeric](podConversion, displayConversion ConversionDescriptor) valueReverter {
return func(value Value) Value {
numeric := value.(NumericValue[N])
for i := len(displayConversion) - 1; i >= 0; i-- {
operation := displayConversion[i]
switch operation.Operator {
case "+":
numeric.inner -= N(operation.Operand)
case "-":
numeric.inner += N(operation.Operand)
case "*":
numeric.inner /= N(operation.Operand)
case "/":
numeric.inner *= N(operation.Operand)
}
}

for i := len(podConversion) - 1; i >= 0; i-- {
operation := podConversion[i]
switch operation.Operator {
case "+":
numeric.inner -= N(operation.Operand)
case "-":
numeric.inner += N(operation.Operand)
case "*":
numeric.inner /= N(operation.Operand)
case "/":
numeric.inner *= N(operation.Operand)
}
}

return numeric
}
}

func convertBoolean(value Value) Value {
return value
}

func revertBoolean(value Value) Value {
return value
}

func convertEnum(value Value) Value {
return value
}

func revertEnum(value Value) Value {
return value
}
50 changes: 31 additions & 19 deletions backend/pkg/transport/packet/data/descriptors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,40 @@ type Descriptor []valueDescriptor

// valueDescriptor describes a value of a packet
type valueDescriptor struct {
Name ValueName
Type valueType
decode valueDecoder
encode valueEncoder
Name ValueName
Type valueType
decode valueDecoder
encode valueEncoder
convert valueConverter
revert valueReverter
}

// Decode decodes the next value from the reader using its decoding method
func (descriptor *valueDescriptor) Decode(endianness binary.ByteOrder, reader io.Reader) (Value, error) {
return descriptor.decode(endianness, reader)
value, err := descriptor.decode(endianness, reader)
if err != nil {
return value, err
}
return descriptor.convert(value), nil
}

// Encode encodes the provided value into the writer using its encoding method
func (descriptor *valueDescriptor) Encode(endianness binary.ByteOrder, value Value, writer io.Writer) error {
return descriptor.encode(endianness, value, writer)
return descriptor.encode(endianness, descriptor.revert(value), writer)
}

// NewNumericDescriptor creates a new NumericDescriptor
//
// name is the name for the value
func NewNumericDescriptor[N numeric](name ValueName) valueDescriptor {
func NewNumericDescriptor[N numeric](name ValueName, podUnits, displayUnits ConversionDescriptor) valueDescriptor {
var n N
return valueDescriptor{
Name: name,
Type: valueType(reflect.TypeOf(n).Name()),
decode: decodeNumeric[N],
encode: encodeNumeric[N],
Name: name,
Type: valueType(reflect.TypeOf(n).Name()),
decode: decodeNumeric[N],
encode: encodeNumeric[N],
convert: newConvertNumeric[N](podUnits, displayUnits),
revert: newRevertNumeric[N](podUnits, displayUnits),
}
}

Expand All @@ -45,10 +53,12 @@ func NewNumericDescriptor[N numeric](name ValueName) valueDescriptor {
// name is the name for the value
func NewBooleanDescriptor(name ValueName) valueDescriptor {
return valueDescriptor{
Name: name,
Type: BoolType,
decode: decodeBool,
encode: encodeBool,
Name: name,
Type: BoolType,
decode: decodeBool,
encode: encodeBool,
convert: convertBoolean,
revert: revertBoolean,
}
}

Expand All @@ -57,9 +67,11 @@ func NewBooleanDescriptor(name ValueName) valueDescriptor {
// name is the name for the value and descriptor is the variants the enum has
func NewEnumDescriptor(name ValueName, descriptor EnumDescriptor) valueDescriptor {
return valueDescriptor{
Name: name,
Type: EnumType,
decode: newDecodeEnum(name, descriptor),
encode: newEncodeEnum(name, descriptor),
Name: name,
Type: EnumType,
decode: newDecodeEnum(name, descriptor),
encode: newEncodeEnum(name, descriptor),
convert: convertEnum,
revert: revertEnum,
}
}
82 changes: 41 additions & 41 deletions backend/pkg/transport/presentation/decoder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1056,20 +1056,20 @@ func getDecoder(endianness binary.ByteOrder) *presentation.Decoder {

dataDecoder := data.NewDecoder(endianness)
dataDecoder.SetDescriptor(9, data.Descriptor{
data.NewNumericDescriptor[uint8]("uint8"),
data.NewNumericDescriptor[uint16]("uint16"),
data.NewNumericDescriptor[uint32]("uint32"),
data.NewNumericDescriptor[uint64]("uint64"),
data.NewNumericDescriptor[uint8]("uint8", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[uint16]("uint16", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[uint32]("uint32", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[uint64]("uint64", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
})
dataDecoder.SetDescriptor(10, data.Descriptor{
data.NewNumericDescriptor[int8]("int8"),
data.NewNumericDescriptor[int16]("int16"),
data.NewNumericDescriptor[int32]("int32"),
data.NewNumericDescriptor[int64]("int64"),
data.NewNumericDescriptor[int8]("int8", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[int16]("int16", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[int32]("int32", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[int64]("int64", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
})
dataDecoder.SetDescriptor(11, data.Descriptor{
data.NewNumericDescriptor[float32]("float32"),
data.NewNumericDescriptor[float64]("float64"),
data.NewNumericDescriptor[float32]("float32", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[float64]("float64", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
})
dataDecoder.SetDescriptor(12, data.Descriptor{
data.NewBooleanDescriptor("bool"),
Expand All @@ -1078,9 +1078,9 @@ func getDecoder(endianness binary.ByteOrder) *presentation.Decoder {
data.NewEnumDescriptor("enum", data.EnumDescriptor{"a", "b", "c", "d"}),
})
dataDecoder.SetDescriptor(14, data.Descriptor{
data.NewNumericDescriptor[uint8]("uint8_1"),
data.NewNumericDescriptor[uint8]("uint8_2"),
data.NewNumericDescriptor[float64]("float64"),
data.NewNumericDescriptor[uint8]("uint8_1", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[uint8]("uint8_2", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[float64]("float64", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewBooleanDescriptor("bool"),
data.NewEnumDescriptor("enum", data.EnumDescriptor{"a", "b", "c"}),
})
Expand All @@ -1097,36 +1097,36 @@ func getDecoder(endianness binary.ByteOrder) *presentation.Decoder {
data.NewEnumDescriptor("enum_5", data.EnumDescriptor{"a", "b", "c", "d", "e", "f", "g", "h", "i", "j"}),
})
dataDecoder.SetDescriptor(17, data.Descriptor{
data.NewNumericDescriptor[uint8]("uint8_1"),
data.NewNumericDescriptor[uint8]("uint8_2"),
data.NewNumericDescriptor[uint8]("uint8_3"),
data.NewNumericDescriptor[uint8]("uint8_4"),
data.NewNumericDescriptor[uint8]("uint8_5"),
data.NewNumericDescriptor[uint8]("uint8_6"),
data.NewNumericDescriptor[uint8]("uint8_7"),
data.NewNumericDescriptor[uint8]("uint8_8"),
data.NewNumericDescriptor[uint8]("uint8_9"),
data.NewNumericDescriptor[uint8]("uint8_10"),
data.NewNumericDescriptor[uint8]("uint8_1", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[uint8]("uint8_2", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[uint8]("uint8_3", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[uint8]("uint8_4", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[uint8]("uint8_5", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[uint8]("uint8_6", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[uint8]("uint8_7", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[uint8]("uint8_8", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[uint8]("uint8_9", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[uint8]("uint8_10", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
})
dataDecoder.SetDescriptor(18, data.Descriptor{
data.NewNumericDescriptor[uint64]("uint64_1"),
data.NewNumericDescriptor[int64]("int64_1"),
data.NewNumericDescriptor[float64]("float64_1"),
data.NewNumericDescriptor[uint64]("uint64_2"),
data.NewNumericDescriptor[int64]("int64_2"),
data.NewNumericDescriptor[float64]("float64_2"),
data.NewNumericDescriptor[uint64]("uint64_3"),
data.NewNumericDescriptor[int64]("int64_3"),
data.NewNumericDescriptor[float64]("float64_3"),
data.NewNumericDescriptor[uint64]("uint64_4"),
data.NewNumericDescriptor[int64]("int64_4"),
data.NewNumericDescriptor[float64]("float64_4"),
data.NewNumericDescriptor[uint64]("uint64_5"),
data.NewNumericDescriptor[int64]("int64_5"),
data.NewNumericDescriptor[float64]("float64_5"),
data.NewNumericDescriptor[uint64]("uint64_6"),
data.NewNumericDescriptor[int64]("int64_6"),
data.NewNumericDescriptor[float64]("float64_6"),
data.NewNumericDescriptor[uint64]("uint64_1", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[int64]("int64_1", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[float64]("float64_1", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[uint64]("uint64_2", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[int64]("int64_2", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[float64]("float64_2", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[uint64]("uint64_3", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[int64]("int64_3", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[float64]("float64_3", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[uint64]("uint64_4", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[int64]("int64_4", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[float64]("float64_4", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[uint64]("uint64_5", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[int64]("int64_5", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[float64]("float64_5", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[uint64]("uint64_6", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[int64]("int64_6", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
data.NewNumericDescriptor[float64]("float64_6", make(data.ConversionDescriptor, 0), make(data.ConversionDescriptor, 0)),
})
decoder.SetPacketDecoder(9, dataDecoder)
decoder.SetPacketDecoder(10, dataDecoder)
Expand Down
Loading