Update Develop (V2.0.0)

.gitignore

@@ -1,13 +1,11 @@
 build
 profiles
-
-# ADJ
-JSON_ADE
+backend/cmd/cmd
 
 # MacOS Files
 .DS_Store
 
 # Code Editor
 .idea/
 .vscode/
-.prettierrc
+.prettierrc

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "backend/cmd/JSON_ADE"]
+	path = backend/cmd/JSON_ADE
+	url = https://github.com/HyperloopUPV-H8/JSON_ADE.git
+	branch = main

backend/cmd/main.go

@@ -559,12 +559,16 @@ func getIPIPfilter() string {
 }
 
 func getUDPFilter(addrs []net.IP, backendAddr net.IP, port uint16) string {
-	udpPort := fmt.Sprintf("udp port %d", port)
-	udpAddrs := common.Map(addrs, func(addr net.IP) string {
+	udpPort := "udp" // TODO use proper ports for the filter
+	srcUdpAddrs := common.Map(addrs, func(addr net.IP) string {
 		return fmt.Sprintf("(src host %s)", addr)
 	})
+	dstUdpAddrs := common.Map(addrs, func(addr net.IP) string {
+		return fmt.Sprintf("(dst host %s)", addr)
+	})
 
-	udpAddrsStr := strings.Join(udpAddrs, " or ")
+	srcUdpAddrsStr := strings.Join(srcUdpAddrs, " or ")
+	dstUdpAddrsStr := strings.Join(dstUdpAddrs, " or ")
 
-	return fmt.Sprintf("(%s) and (%s) and (dst host %s)", udpPort, udpAddrsStr, backendAddr)
+	return fmt.Sprintf("(%s) and (%s) and (%s or (dst host %s))", udpPort, srcUdpAddrsStr, dstUdpAddrsStr, backendAddr)
 }

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,

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 {