Merge pull request #188 from HyperloopUPV-H8/backend/enums-hotfix

msanlli · web-flow · commit 0ddee776fd00 · 2025-01-01T16:19:13.000+01:00
[backend] Fix enum logic
diff --git a/backend/cmd/JSON_ADE b/backend/cmd/JSON_ADE
@@ -1 +1 @@
-Subproject commit c5f6b5712e5d9dc7ef80ade201796fe66c295ad5
+Subproject commit 7a3da66976be16f28cab96e9c63f18fb0ab664f7
diff --git a/backend/internal/pod_data/measurement.go b/backend/internal/pod_data/measurement.go
@@ -55,13 +55,11 @@ func getNumericMeasurement(adeMeas adj.Measurement, globalUnits map[string]utils
 	warningRange := adeMeas.WarningRange
 
 	displayUnits, err := utils.ParseUnits(adeMeas.DisplayUnits, globalUnits)
-
 	if err != nil {
 		measErrs.Add(err)
 	}
 
 	podUnits, err := utils.ParseUnits(adeMeas.PodUnits, globalUnits)
-
 	if err != nil {
 		measErrs.Add(err)
 	}
@@ -87,14 +85,10 @@ func getEnumMeasurement(adeMeas adj.Measurement) EnumMeasurement {
 		Id:      adeMeas.Id,
 		Name:    adeMeas.Name,
 		Type:    EnumType,
-		Options: getEnumMembers(adeMeas.EnumValues),
+		Options: adeMeas.EnumValues,
 	}
 }
 
-func getEnumMembers(enumExp []string) []string {
-	return enumExp
-}
-
 func getBooleanMeasurement(adeMeas adj.Measurement) BooleanMeasurement {
 	return BooleanMeasurement{
 		Id:   adeMeas.Id,
diff --git a/backend/internal/pod_data/pod_data.go b/backend/internal/pod_data/pod_data.go
@@ -38,8 +38,6 @@ func getBoard(adjBoard adj.Board, globalUnits map[string]utils.Operations) (Boar
 
 	packets := make([]Packet, 0)
 
-	// TESTING
-
 	for _, adjPacket := range adjBoard.Packets {
 		packet, err := getPacket(adjPacket) // Black magic fuck
 		if err != nil {
diff --git a/backend/internal/utils/range.go b/backend/internal/utils/range.go
