Merge pull request #462 from Hyperloop-UPV/develop

production again

Author: JFisica

.github/workflows/build.yaml

@@ -53,11 +53,13 @@ jobs:
       competition-view: ${{ steps.filter.outputs.competition-view == 'true' || github.event.inputs.rebuild-competition-view == 'true' || inputs.build-competition-view == true }}
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - uses: dorny/paths-filter@v3
         id: filter
         with:
-          ref: "production"
+          base: ${{ github.event.before }} 
           filters: |
             backend:
               - 'backend/**/*'
@@ -113,7 +115,7 @@ jobs:
         with:
           workflow: build.yaml
           branch: production
-          workflow_conclusion: success
+          workflow_conclusion: completed
           name: backend-${{ matrix.platform }}
           path: backend/cmd
 

.github/workflows/frontend-tests.yaml

@@ -41,5 +41,8 @@ jobs:
       - name: Install dependencies
         run: pnpm install --frozen-lockfile --filter=testing-view --filter=ui --filter=core
 
+      - name: Build frontend
+        run: pnpm build --filter="./frontend/**"
+
       - name: Run tests
         run: pnpm test --filter="./frontend/**"

.github/workflows/release.yaml

@@ -86,6 +86,12 @@ jobs:
           echo "Updated version to:"
           cat package.json | grep version
 
+      - name: Install Linux build dependencies
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y rpm libarchive-tools
+
       # Download ONLY the appropriate backend for this platform
       - name: Download Linux backend
         if: runner.os == 'Linux'
@@ -182,6 +188,8 @@ jobs:
             electron-app/dist/*.exe
             electron-app/dist/*.AppImage
             electron-app/dist/*.deb
+            electron-app/dist/*.rpm
+            electron-app/dist/*.pacman
             electron-app/dist/*.dmg
             electron-app/dist/*.zip
             electron-app/dist/*.yml

README.md

@@ -1,4 +1,5 @@
 # Hyperloop Control Station H11
+ ![Testing View](https://raw.githubusercontent.com/Hyperloop-UPV/webpage/5c1c827d82d380689856ee61af43da30da22e0fc/src/assets/backgrounds/testing-view.png)
 
 ## Monorepo usage
 

backend/cmd/config.toml

@@ -33,12 +33,6 @@ max_retries = 0              # Maximum retries before cycling (0 = infinite retr
 connection_timeout_ms = 1000 # Connection timeout in milliseconds
 keep_alive_ms = 1000         # Keep-alive interval in milliseconds
 
-# BLCU (Boot Loader Control Unit) Configuration
-[blcu]
-ip = "127.0.0.1"      # TFTP server IP address
-download_order_id = 0 # Packet ID for download orders (0 = use default)
-upload_order_id = 0   # Packet ID for upload orders (0 = use default)
-
 # TFTP Configuration
 [tftp]
 block_size = 131072    # TFTP block size in bytes (128kB)

backend/cmd/dev-config.toml

@@ -66,11 +66,7 @@ timeout_ms = 5000      # Timeout for TFTP operations in milliseconds
 backoff_factor = 2     # Backoff factor for retries
 enable_progress = true # Enable progress updates during transfers
 
-# BLCU Configuration
-[blcu]
-ip = "10.10.10.5"     # BLCU IP address
-download_order_id = 0 # Order ID for download operations (0 = use default)
-upload_order_id = 0   # Order ID for upload operations (0 = use default)
+
 
 # Logging Configuration
 [logging]

backend/cmd/main.go

@@ -5,12 +5,12 @@ import (
 	"os"
 	"os/signal"
 
-	adj_module "github.com/HyperloopUPV-H8/h9-backend/internal/adj"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/config"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/flags"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/pod_data"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/update_factory"
 	vehicle_models "github.com/HyperloopUPV-H8/h9-backend/internal/vehicle/models"
+	adj_module "github.com/HyperloopUPV-H8/h9-backend/pkg/adj"
 	"github.com/HyperloopUPV-H8/h9-backend/pkg/transport"
 	"github.com/HyperloopUPV-H8/h9-backend/pkg/websocket"
 	trace "github.com/rs/zerolog/log"
@@ -23,7 +23,6 @@ const (
 	TcpServer        = "TCP_SERVER"
 	UDP              = "UDP"
 	SNTP             = "SNTP"
-	BlcuAck          = "blcu_ack"
 	AddStateOrder    = "add_state_order"
 	RemoveStateOrder = "remove_state_order"
 )
@@ -62,7 +61,7 @@ func main() {
 	}
 
 	// <--- vehicle orders --->
-	vehicleOrders, err := vehicle_models.NewVehicleOrders(podData.Boards, adj.Info.Addresses[BLCU])
+	vehicleOrders, err := vehicle_models.NewVehicleOrders(podData.Boards)
 	if err != nil {
 		trace.Fatal().Err(err).Msg("creating vehicleOrders")
 	}

backend/cmd/orchestrator.go

@@ -7,11 +7,11 @@ import (
 	"runtime/pprof"
 	"strings"
 
-	adj_module "github.com/HyperloopUPV-H8/h9-backend/internal/adj"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/config"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/flags"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/pod_data"
 	"github.com/HyperloopUPV-H8/h9-backend/pkg/abstraction"
+	adj_module "github.com/HyperloopUPV-H8/h9-backend/pkg/adj"
 	"github.com/HyperloopUPV-H8/h9-backend/pkg/logger"
 	data_logger "github.com/HyperloopUPV-H8/h9-backend/pkg/logger/data"
 	order_logger "github.com/HyperloopUPV-H8/h9-backend/pkg/logger/order"

backend/cmd/setup_transport.go

@@ -7,17 +7,15 @@ import (
 	"net"
 	"time"
 
-	adj_module "github.com/HyperloopUPV-H8/h9-backend/internal/adj"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/common"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/config"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/pod_data"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/utils"
 	"github.com/HyperloopUPV-H8/h9-backend/pkg/abstraction"
-	"github.com/HyperloopUPV-H8/h9-backend/pkg/boards"
+	adj_module "github.com/HyperloopUPV-H8/h9-backend/pkg/adj"
 	"github.com/HyperloopUPV-H8/h9-backend/pkg/transport"
 	"github.com/HyperloopUPV-H8/h9-backend/pkg/transport/network/tcp"
 	"github.com/HyperloopUPV-H8/h9-backend/pkg/transport/network/udp"
-	blcu_packet "github.com/HyperloopUPV-H8/h9-backend/pkg/transport/packet/blcu"
 	"github.com/HyperloopUPV-H8/h9-backend/pkg/transport/packet/data"
 	"github.com/HyperloopUPV-H8/h9-backend/pkg/transport/packet/order"
 	"github.com/HyperloopUPV-H8/h9-backend/pkg/transport/packet/protection"
@@ -45,11 +43,6 @@ func configureTransport(
 		transp.SetTargetIp(adj.Info.Addresses[board.Name], abstraction.TransportTarget(board.Name))
 	}
 
-	// If BLCU is configured set BLCU packet ID mappings
-	if common.Contains(config.Vehicle.Boards, "BLCU") {
-		configureBLCUTransport(adj, transp, config)
-	}
-
 	// Start handling TCP CLIENT connections
 	configureTCPClientTransport(adj, podData, transp, config)
 
@@ -61,36 +54,6 @@ func configureTransport(
 
 }
 
-// configureBLCUTransport sets the packet IDs and target IP for the BLCU board.
-// It prefers values from config, falls back to ADJ and finally to a loopback default.
-func configureBLCUTransport(adj adj_module.ADJ,
-	transp *transport.Transport,
-	config config.Config) {
-	// Use configurable packet IDs or defaults
-	downloadOrderID := config.Blcu.DownloadOrderId
-	uploadOrderID := config.Blcu.UploadOrderId
-	if downloadOrderID == 0 {
-		downloadOrderID = boards.DefaultBlcuDownloadOrderId
-	}
-	if uploadOrderID == 0 {
-		uploadOrderID = boards.DefaultBlcuUploadOrderId
-	}
-
-	transp.SetIdTarget(abstraction.PacketId(downloadOrderID), abstraction.TransportTarget("BLCU"))
-	transp.SetIdTarget(abstraction.PacketId(uploadOrderID), abstraction.TransportTarget("BLCU"))
-
-	// Use BLCU address from config, ADJ, or default
-	blcuIP := config.Blcu.IP
-	if blcuIP == "" {
-		if adjBlcuIP, exists := adj.Info.Addresses[BLCU]; exists {
-			blcuIP = adjBlcuIP
-		} else {
-			blcuIP = "127.0.0.1"
-		}
-	}
-	transp.SetTargetIp(blcuIP, abstraction.TransportTarget("BLCU"))
-}
-
 func configureTCPClientTransport(
 	adj adj_module.ADJ,
 	podData pod_data.PodData,
@@ -247,9 +210,6 @@ func getTransportDecEnc(info adj_module.Info, podData pod_data.PodData) (*presen
 		encoder.SetPacketEncoder(id, dataEncoder)
 	}
 
-	// Register BLCU ack decoder
-	decoder.SetPacketDecoder(abstraction.PacketId(info.MessageIds[BlcuAck]), blcu_packet.NewDecoder())
-
 	// TODO Solve this foking mess, I have tried...
 	stateOrdersDecoder := order.NewDecoder(binary.LittleEndian)
 	stateOrdersDecoder.SetActionId(abstraction.PacketId(info.MessageIds[AddStateOrder]), stateOrdersDecoder.DecodeAdd)

backend/cmd/setup_vehicle.go

@@ -12,15 +12,13 @@ import (
 	h "github.com/HyperloopUPV-H8/h9-backend/pkg/http"
 	"github.com/HyperloopUPV-H8/h9-backend/pkg/websocket"
 
-	adj_module "github.com/HyperloopUPV-H8/h9-backend/internal/adj"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/common"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/config"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/pod_data"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/update_factory"
 	"github.com/HyperloopUPV-H8/h9-backend/pkg/abstraction"
-	"github.com/HyperloopUPV-H8/h9-backend/pkg/boards"
+	adj_module "github.com/HyperloopUPV-H8/h9-backend/pkg/adj"
 	"github.com/HyperloopUPV-H8/h9-backend/pkg/broker"
-	blcu_topics "github.com/HyperloopUPV-H8/h9-backend/pkg/broker/topics/blcu"
 	connection_topic "github.com/HyperloopUPV-H8/h9-backend/pkg/broker/topics/connection"
 	data_topic "github.com/HyperloopUPV-H8/h9-backend/pkg/broker/topics/data"
 	logger_topic "github.com/HyperloopUPV-H8/h9-backend/pkg/broker/topics/logger"
@@ -75,7 +73,6 @@ func configureBroker(subloggers abstraction.SubloggersMap, loggerHandler *logger
 	})
 
 	broker.SetPool(pool)
-	blcu_topics.RegisterTopics(broker, pool)
 
 	return broker, cleanup
 }
@@ -101,45 +98,6 @@ func configureVehicle(
 	vehicle.SetIdToBoardName(idToBoard)
 	vehicle.SetTransport(transp)
 
-	// Register BLCU board for handling bootloader operations
-	if blcuIP, exists := adj.Info.Addresses[BLCU]; exists {
-		blcuId, idExists := adj.Info.BoardIds["BLCU"]
-		if !idExists {
-			return fmt.Errorf("BLCU IP found in ADJ but board ID missing")
-		} else {
-			// Get configurable order IDs or use defaults
-			downloadOrderId := config.Blcu.DownloadOrderId
-			uploadOrderId := config.Blcu.UploadOrderId
-			if downloadOrderId == 0 {
-				downloadOrderId = boards.DefaultBlcuDownloadOrderId
-			}
-			if uploadOrderId == 0 {
-				uploadOrderId = boards.DefaultBlcuUploadOrderId
-			}
-
-			tftpConfig := boards.TFTPConfig{
-				BlockSize:      config.TFTP.BlockSize,
-				Retries:        config.TFTP.Retries,
-				TimeoutMs:      config.TFTP.TimeoutMs,
-				BackoffFactor:  config.TFTP.BackoffFactor,
-				EnableProgress: config.TFTP.EnableProgress,
-			}
-			blcuBoard := boards.NewWithConfig(blcuIP, tftpConfig, abstraction.BoardId(blcuId), downloadOrderId, uploadOrderId)
-			vehicle.AddBoard(blcuBoard)
-			vehicle.SetBlcuId(abstraction.BoardId(blcuId))
-
-			trace.
-				Info().
-				Str("ip", blcuIP).
-				Int("id", int(blcuId)).
-				Uint16("download_order_id", downloadOrderId).
-				Uint16("upload_order_id", uploadOrderId).
-				Msg("BLCU board registered")
-		}
-	} else {
-		trace.Warn().Msg("BLCU not found in ADJ configuration - bootloader operations unavailable")
-	}
-
 	return nil
 
 }