Merge branch 'develop' into backend/logger-implementation-hotfix

Author: msanlli

.github/workflows/build-backend.yaml

@@ -6,6 +6,9 @@ on:
       SECRET:
         required: true
   workflow_dispatch:
+  pull_request:
+    paths:
+      - backend/**
 
 env:
   SECRET: ${{ secrets.SECRET }}
@@ -26,7 +29,9 @@ jobs:
     - name: "Install packages"
       run: apk update && apk add --no-cache libpcap-dev musl-dev gcc go
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+      with:
+        sparse-checkout: backend
 
     - name: "Create output path"
       working-directory: "${{env.BACKEND_DIR}}"
@@ -47,10 +52,12 @@ jobs:
         go build -ldflags '-linkmode external -extldflags "-static"' -o ../output/backend-linux-64
 
     - name: "Upload build"
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: backend-linux
         path: "${{env.BACKEND_DIR}}/output/*"
+        retention-days: 3
+        compression-level: 9
 
   build-backend-windows:
     name: "Build backend for windows"
@@ -90,10 +97,12 @@ jobs:
         go build -o ..\output\backend-windows-64.exe
 
     - name: "Upload build"
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: backend-windows
         path: "${{env.BACKEND_DIR}}\\output\\*"
+        retention-days: 3
+        compression-level: 9
 
   build-backend-mac:
     name: "Build backend for macOS"
@@ -142,7 +151,9 @@ jobs:
         go build -o ../output/backend-macos-m1-64
       
     - name: "Upload build"
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: backend-macos
         path: "${{env.BACKEND_DIR}}/output/*"
+        retention-days: 3
+        compression-level: 9

.github/workflows/build-ethernet-view.yaml

@@ -3,6 +3,10 @@ name: Build ethernet view
 on:
   workflow_call:
   workflow_dispatch:
+  pull_request:
+    paths:
+      - ethernet-view/**
+      - common-front/**
 
 jobs:
   build-ethernet-view:
@@ -14,7 +18,11 @@ jobs:
       COMMON_DIR: ./common-front
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+      with:
+        sparse-checkout: |
+          ethernet-view
+          common-front
 
     - name: "Install common front dependencies"
       working-directory: "${{env.COMMON_DIR}}"
@@ -36,7 +44,9 @@ jobs:
 
 
     - name: "Upload build"
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ethernet-view
         path: "${{env.FRONTEND_DIR}}/static/*"
+        retention-days: 3
+        compression-level: 9

.github/workflows/test-backend.yaml

@@ -0,0 +1,45 @@
+name: Test backend
+
+on:
+    push:
+      paths:
+        - backend/**
+    pull_request:
+      paths:
+        - backend/**
+    workflow_dispatch:
+
+env:
+  SECRET: ${{ secrets.SECRET }}
+
+jobs:
+  test-backend:
+    name: "Test backend"
+    runs-on: ubuntu-latest
+
+    env:
+      BACKEND_DIR: ./backend
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: 1.21
+          cache: false
+          
+
+      - name: Install Dependencies
+        run: |
+          sudo apt-get update && sudo apt-get install -y libpcap-dev
+
+      - name: "Load secret"
+        working-directory: "${{env.BACKEND_DIR}}"
+        run: |
+          ./load-secret.sh "$SECRET"
+
+      - name: Test with Go
+        working-directory: "${{env.BACKEND_DIR}}"
+        run: go test -v -timeout 30s ./...

backend/cmd/main.go

@@ -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/message_transfer"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/order_transfer"
@@ -445,27 +446,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))
 					}
@@ -509,6 +512,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)

backend/pkg/transport/packet/data/converter.go

@@ -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
+}

backend/pkg/transport/packet/data/descriptors.go

@@ -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),
 	}
 }
 
@@ -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,
 	}
 }
 
@@ -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,
 	}
 }