Skip to content

Commit 2c3e0c6

Browse files
committed
fix pod_data logic
1 parent 96847c7 commit 2c3e0c6

1 file changed

Lines changed: 8 additions & 12 deletions

File tree

backend/internal/pod_data/pod_data.go

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package pod_data
22

33
import (
4-
"strconv"
5-
64
"github.com/HyperloopUPV-H8/h9-backend/internal/utils"
75

86
"github.com/HyperloopUPV-H8/h9-backend/internal/adj"
@@ -39,14 +37,17 @@ func getBoard(adjBoard adj.Board, globalUnits map[string]utils.Operations) (Boar
3937
packets := make([]Packet, 0)
4038

4139
for _, adjPacket := range adjBoard.Packets {
42-
packet, err := getPacket(adjPacket) // Black magic fuck
40+
packet, err := getPacket(adjPacket)
4341
if err != nil {
4442
return Board{}, err
4543
}
46-
for idx, packetVariable := range adjPacket.Variables {
47-
adjPacket.Variables[idx] = adjBoard.LookUpMeasurements[packetVariable.Name]
44+
45+
variablesADJ := make([]adj.Measurement, 0)
46+
for _, packetVariable := range adjPacket.Variables {
47+
packetVariable = adjBoard.LookUpMeasurements[packetVariable.Id]
48+
variablesADJ = append(variablesADJ, packetVariable)
4849
}
49-
packet.Measurements, err = getMeasurements(adjPacket, globalUnits) // TODO: Check if this is correct
50+
packet.Measurements, err = getMeasurements(variablesADJ, globalUnits)
5051
packets = append(packets, packet)
5152
}
5253

@@ -56,13 +57,8 @@ func getBoard(adjBoard adj.Board, globalUnits map[string]utils.Operations) (Boar
5657
}
5758

5859
func getPacket(packet adj.Packet) (Packet, error) {
59-
id, err := strconv.ParseUint(packet.Id, 10, 16)
60-
if err != nil {
61-
return Packet{}, err
62-
}
63-
6460
return Packet{
65-
Id: uint16(id),
61+
Id: packet.Id,
6662
Name: packet.Name,
6763
Type: packet.Type,
6864
HexValue: "000000",

0 commit comments

Comments
 (0)