Merge branch 'develop' into backend/version-system

Author: JESUSJH18

README.md

@@ -18,15 +18,6 @@ The main project file is inside `backend/cmd`. Ensure you have the proper `confi
 
 See [CONTRIBUTING.md](./CONTRIBUTING.md) for ways to contribute to the Control Station.
 
-### Authors
-
-- [Juan Martinez Alonso](https://github.com/jmaralo)
-- [Marc Sanchis Llinares](https://github.com/msanlli)
-- [Sergio Moreno Suay](https://github.com/smorsua)
-- [Felipe Zaballa Martinez](https://github.com/lipezaballa)
-- [Andrés de la Torre Mora](https://github.com/andresdlt03)
-- [Alejandro Losa](https://github.com/Losina24)
-
 ### About
 
 HyperloopUPV is a student team based at Universitat Politècnica de València (Spain), which works every year to develop the transport of the future, the hyperloop. Check out [our website](https://hyperloopupv.com/#/)

backend/cmd/adj

@@ -0,0 +1 @@
+Subproject commit fd87ad3fac5aa62e7b274b5ae00412caa544c0a0

backend/internal/adj/git.go

@@ -2,6 +2,7 @@ package adj
 
 import (
 	"os"
+	"path/filepath"
 
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
@@ -21,6 +22,27 @@ func updateRepo(AdjBranch string) error {
 			SingleBranch:  true,
 			Depth:         1,
 		}
+
+		// Try to clone the ADJ to a temp directory to check for accessibility to the repo (also checks internet connection)
+		tempPath := filepath.Join(os.TempDir(), "temp_adj")
+
+		// Remove previous failed cloning attempts
+		if err = os.RemoveAll(tempPath); err != nil {
+			return err
+		}
+
+		// Try to import the ADJ to the temp directory
+		_, err = git.PlainClone(tempPath, false, cloneOptions)
+		if err != nil {
+			// If the clone fails, work with the local ADJ
+			return nil
+		}
+
+		// If the clone is succesful, delete the temp files
+		if err = os.RemoveAll(tempPath); err != nil {
+			return err
+		}
+
 		if _, err = os.Stat(RepoPath); os.IsNotExist(err) {
 			_, err = git.PlainClone(RepoPath, false, cloneOptions)
 			if err != nil {

backend/pkg/adj/git.go

@@ -2,6 +2,7 @@ package adj
 
 import (
 	"os"
+	"path/filepath"
 
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
@@ -21,6 +22,27 @@ func updateRepo(AdjBranch string) error {
 			SingleBranch:  true,
 			Depth:         1,
 		}
+
+		// Try to clone the ADJ to a temp directory to check for accessibility to the repo (also checks internet connection)
+		tempPath := filepath.Join(os.TempDir(), "temp_adj")
+
+		// Remove previous failed cloning attempts
+		if err = os.RemoveAll(tempPath); err != nil {
+			return err
+		}
+
+		// Try to import the ADJ to the temp directory
+		_, err = git.PlainClone(tempPath, false, cloneOptions)
+		if err != nil {
+			// If the clone fails, work with the local ADJ
+			return nil
+		}
+
+		// If the clone is succesful, delete the temp files
+		if err = os.RemoveAll(tempPath); err != nil {
+			return err
+		}
+
 		if _, err = os.Stat(RepoPath); os.IsNotExist(err) {
 			_, err = git.PlainClone(RepoPath, false, cloneOptions)
 			if err != nil {

backend/pkg/logger/data/logger.go

@@ -137,8 +137,9 @@ func (sublogger *Logger) getFile(valueName data.ValueName) (*file.CSV, error) {
 
 func (sublogger *Logger) createFile(valueName data.ValueName) (*os.File, error) {
 	filename := path.Join(
-		"logger", "data",
+		"logger",
 		loggerHandler.Timestamp.Format(loggerHandler.TimestampFormat),
+		"data",
 		fmt.Sprintf("%s.csv", valueName),
 	)
 

backend/pkg/logger/order/logger.go

@@ -59,8 +59,9 @@ func (sublogger *Logger) Start() error {
 
 func (sublogger *Logger) createFile() (*os.File, error) {
 	filename := path.Join(
-		"logger", "order",
+		"logger",
 		logger.Timestamp.Format(logger.TimestampFormat),
+		"order",
 		"order.csv",
 	)
 

backend/pkg/logger/protection/logger.go

@@ -118,8 +118,9 @@ func (sublogger *Logger) createFile(boardId abstraction.BoardId) (*os.File, erro
 	}
 
 	filename := path.Join(
-		"logger", "protections",
+		"logger",
 		logger.Timestamp.Format(logger.TimestampFormat),
+		"protections",
 		fmt.Sprintf("%s.csv", boardName),
 	)
 

backend/pkg/logger/state/logger.go

@@ -94,8 +94,9 @@ func (sublogger *Logger) PushRecord(record abstraction.LoggerRecord) error {
 
 func (sublogger *Logger) createFile(timestamp time.Time) (*file.CSV, error) {
 	filename := path.Join(
-		"logger", "state",
+		"logger",
 		logger.Timestamp.Format(logger.TimestampFormat),
+		"state",
 		fmt.Sprintf("%s.csv", timestamp.Format(logger.TimestampFormat)),
 	)
 

backend/pkg/vehicle/notification.go

@@ -43,6 +43,8 @@ func (vehicle *Vehicle) Notification(notification abstraction.TransportNotificat
 }
 
 func (vehicle *Vehicle) handlePacketNotification(notification transport.PacketNotification) error {
+	var from string
+	var to string
 
 	switch p := notification.Packet.(type) {
 	case *data.Packet:
@@ -53,10 +55,25 @@ func (vehicle *Vehicle) handlePacketNotification(notification transport.PacketNo
 			return errors.Join(fmt.Errorf("update data to frontend (data with id %d from %s to %s)", p.Id(), notification.From, notification.To), err)
 		}
 
+		from_ip := strings.Split(notification.From, ":")[0]
+		to_ip := strings.Split(notification.To, ":")[0]
+
+		if from_ip == "192.168.0.9" {
+			from = "backend"
+		} else {
+			from = vehicle.idToBoardName[uint16(vehicle.ipToBoardId[from_ip])]
+		}
+
+		if to_ip == "192.168.0.9" {
+			to = "backend"
+		} else {
+			to = vehicle.idToBoardName[uint16(vehicle.ipToBoardId[to_ip])]
+		}
+
 		err = vehicle.logger.PushRecord(&data_logger.Record{
 			Packet:    p,
-			From:      notification.From,
-			To:        notification.To,
+			From:      from,
+			To:        to,
 			Timestamp: notification.Timestamp,
 		})
 

control-station/src/App.tsx

@@ -21,6 +21,7 @@ export const App = () => {
                         items={[
                             { path: '/vehicle', icon: <Wheel /> },
                             { path: '/cameras', icon: <Cameras /> },
+                            { path: '/guiBooster', icon: <Gui /> }
                         ]}
                     />
                     <Outlet />