diff --git a/backend/cmd/JSON_ADE b/backend/cmd/JSON_ADE index c5f6b5712..7a3da6697 160000 --- 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 index 869c69168..b75247146 100644 --- 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 index a85bc7644..156bc42b8 100644 --- 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 deleted file mode 100644 index 2a6695c8e..000000000 --- a/backend/internal/utils/range.go +++ /dev/null @@ -1,47 +0,0 @@ -package utils - -import ( - "errors" - "strconv" - "strings" -) - -func ParseRange(literal string) ([]*float64, error) { - if literal == "" { - return []*float64{nil, nil}, nil - } - - strRange := strings.Split(strings.TrimSuffix(strings.TrimPrefix(strings.Replace(literal, " ", "", -1), "["), "]"), ",") - - if len(strRange) != 2 { - return nil, errors.New("invalid range") - } - - numRange := make([]*float64, 0) - - if strRange[0] != "" { - lowerBound, errLowerBound := strconv.ParseFloat(strRange[0], 64) - - if errLowerBound != nil { - return nil, errors.New("parsing lower bound") - } - - numRange = append(numRange, &lowerBound) - } else { - numRange = append(numRange, nil) - } - - if strRange[1] != "" { - upperBound, errUpperBound := strconv.ParseFloat(strRange[1], 64) - - if errUpperBound != nil { - return nil, errors.New("parsing upper bound") - } - - numRange = append(numRange, &upperBound) - } else { - numRange = append(numRange, nil) - } - - return numRange, nil -}