Merge pull request #218 from HyperloopUPV-H8/main

Update Develop

Author: msanlli

backend/cmd/adj

@@ -8,8 +8,14 @@ import (
 type Adj struct {
 	Branch string
 }
+
+type Network struct {
+	Manual bool
+}
+
 type Config struct {
 	Vehicle vehicle.Config
 	Server  server.Config
+	Network Network
 	Adj     Adj
 }

backend/cmd/config.go

@@ -1,14 +1,23 @@
-
-[server.local]
+[server.ethernet-view]
+address = "127.0.0.1:4040"
+static = "./ethernet-view"
+[server.ethernet-view.endpoints]
+pod_data = "/podDataStructure"
+order_data = "/orderStructures"
+programable_boards = "/uploadableBoards"
+connections = "/backend"
+files = "/"
+[server.control-station]
 address = "127.0.0.1:4000"
-static = "./static"
-
-[server.local.endpoints]
+static = "./control-station"
+[server.control-station.endpoints]
 pod_data = "/podDataStructure"
 order_data = "/orderStructures"
 programable_boards = "/uploadableBoards"
 connections = "/backend"
 files = "/"
+[network]
+manual = false
 
 [adj]
-branch = "" # Leave blank when using ADJ as a submodule (like this: "")
+branch = "sw-bcu" # Leave blank when using ADJ as a submodule (like this: "")

backend/cmd/config.toml

@@ -129,7 +129,7 @@ func main() {
 
 		dev = devs[*networkDevice]
 	} else {
-		dev, err = selectDev()
+		dev, err = selectDev(adj.Info.Addresses, config)
 		if err != nil {
 			trace.Fatal().Err(err).Msg("Error selecting device")
 		}
@@ -354,26 +354,40 @@ func createPid(path string) {
 	}
 }
 
-func selectDev() (pcap.Interface, error) {
+func selectDev(adjAddr map[string]string, conf Config) (pcap.Interface, error) {
 	devs, err := pcap.FindAllDevs()
 	if err != nil {
 		return pcap.Interface{}, err
 	}
 
-	cyan := color.New(color.FgCyan)
+	if conf.Network.Manual {
+		cyan := color.New(color.FgCyan)
 
-	cyan.Print("select a device: ")
-	fmt.Printf("(0-%d)\n", len(devs)-1)
-	for i, dev := range devs {
-		displayDev(i, dev)
-	}
+		cyan.Print("select a device: ")
+		fmt.Printf("(0-%d)\n", len(devs)-1)
+		for i, dev := range devs {
+			displayDev(i, dev)
+		}
 
-	dev, err := acceptInput(len(devs))
-	if err != nil {
-		return pcap.Interface{}, err
-	}
+		dev, err := acceptInput(len(devs))
+		if err != nil {
+			return pcap.Interface{}, err
+		}
 
-	return devs[dev], nil
+		return devs[dev], nil
+	} else {
+		for _, dev := range devs {
+			for _, addr := range dev.Addresses {
+				if addr.IP.String() == adjAddr["backend"] {
+					println(dev.Name)
+					return dev, nil
+				}
+			}
+		}
+
+		log.Fatal("backend address not found in any device")
+		return pcap.Interface{}, nil
+	}
 }
 
 func displayDev(i int, dev pcap.Interface) {

backend/cmd/main.go

@@ -56,12 +56,6 @@ func getBoards(boardsList map[string]string) (map[string]Board, error) {
 
 		board.Structures = getBoardStructures(board)
 
-		// DEBUG
-		for _, meas := range board.Measurements {
-			println(meas.SafeRange[0], ", ", meas.SafeRange[1])
-			println(meas.WarningRange[0], ", ", meas.WarningRange[1])
-		}
-
 		boards[boardName] = board
 	}
 

backend/internal/adj/boards.go

@@ -9,86 +9,29 @@ import (
 
 // WARNING: Doing tricks on it
 func updateRepo(AdjBranch string) error {
-	var repo *git.Repository
 	var err error
 
 	if AdjBranch == "" {
-		// Makes use of submodule
+		// Makes use of user's custom ADJ
 		return nil
 	} else {
+		cloneOptions := &git.CloneOptions{
+			URL:           RepoUrl,
+			ReferenceName: plumbing.NewBranchReferenceName(AdjBranch),
+			SingleBranch:  true,
+			Depth:         1,
+		}
 		if _, err = os.Stat(RepoPath); os.IsNotExist(err) {
-			repo, err = git.PlainClone(RepoPath, false, &git.CloneOptions{
-				URL:           RepoUrl,
-				ReferenceName: plumbing.NewBranchReferenceName(AdjBranch),
-				SingleBranch:  true,
-				Depth:         1,
-			})
+			_, err = git.PlainClone(RepoPath, false, cloneOptions)
 			if err != nil {
 				return err
 			}
 		} else {
-			repo, err = git.PlainOpen(RepoPath)
-			if err != nil {
+			if err = os.RemoveAll(RepoPath); err != nil {
 				return err
 			}
-		}
-
-		err = repo.Fetch(&git.FetchOptions{
-			RemoteName: "origin",
-			Force:      true,
-		})
-		if err != nil && err != git.NoErrAlreadyUpToDate {
-			return err
-		}
-
-		head, err := repo.Head()
-		if err != nil {
-			return err
-		}
-
-		branch := head.Name().Short()
-
-		worktree, err := repo.Worktree()
-		if err != nil {
-			return err
-		}
-
-		if branch != AdjBranch {
-			localBranchRef := plumbing.NewBranchReferenceName(AdjBranch)
-			_, err = repo.Reference(localBranchRef, false)
+			_, err = git.PlainClone(RepoPath, false, cloneOptions)
 			if err != nil {
-				remoteBranchRef := plumbing.NewRemoteReferenceName("origin", AdjBranch)
-				remoteRef, err2 := repo.Reference(remoteBranchRef, true)
-				if err2 != nil {
-					return err2
-				}
-
-				err = worktree.Checkout(&git.CheckoutOptions{
-					Branch: localBranchRef,
-					Create: true,
-					Force:  true,
-					Hash:   remoteRef.Hash(),
-				})
-				if err != nil {
-					println(err.Error())
-					return err
-				}
-			} else {
-				err = worktree.Checkout(&git.CheckoutOptions{
-					Branch: localBranchRef,
-					Force:  true,
-				})
-			}
-		}
-
-		err = worktree.Pull(&git.PullOptions{
-			RemoteName:   "origin",
-			SingleBranch: true,
-		})
-		if err != nil {
-			if err == git.NoErrAlreadyUpToDate {
-				return nil
-			} else {
 				return err
 			}
 		}