Merge pull request #113 from HyperloopUPV-H8/develop

Merge for v0.3.0

Author: jmaralo

.github/workflows/build-backend.yaml

@@ -72,16 +72,16 @@ jobs:
     - name: "Setup Go"
       uses: actions/setup-go@v4
       with:
-        go-version: "1.19"
+        go-version: "1.21.3"
         cache-dependency-path: "${{env.BACKEND_DIR}}\\go.sum"
 
     - name: "Load secret"
       working-directory: "${{env.BACKEND_DIR}}"
       run: |
-        echo "${{env.SECRET}}" > ".\internal\excel\secret.json" &&
-        echo "${{env.SECRET}}" > ".\internal\excel_adapter\internals\secret.json" &&
-        echo "${{env.SECRET}}" > ".\pkg\excel\secret.json" &&
-        echo "${{env.SECRET}}" > ".\pkg\excel_adapter\internals\secret.json"
+        echo "$env:SECRET" > ".\internal\excel\secret.json"
+        echo "$env:SECRET" > ".\internal\excel_adapter\internals\secret.json"
+        echo "$env:SECRET" > ".\pkg\excel\secret.json"
+        echo "$env:SECRET" > ".\pkg\excel_adapter\internals\secret.json"
 
     - name: "Create output path"
       working-directory: "${{env.BACKEND_DIR}}"
@@ -118,7 +118,7 @@ jobs:
     - name: "Setup Go"
       uses: actions/setup-go@v4
       with:
-        go-version: "1.19"
+        go-version: "1.21.3"
         cache-dependency-path: "${{env.BACKEND_DIR}}/go.sum"
 
     - uses: actions/checkout@v3

backend/.gitignore

@@ -11,7 +11,8 @@ Backend-H8
 backend
 !build
 # MacOS build
-cmd
+cmd/cmd
+cmd/logger/
 
 # EXCEL
 *.xlsx

backend/cmd/config.go

@@ -1,32 +1,13 @@
 package main
 
 import (
-	"github.com/HyperloopUPV-H8/h9-backend/internal/blcu"
-	"github.com/HyperloopUPV-H8/h9-backend/internal/connection_transfer"
-	"github.com/HyperloopUPV-H8/h9-backend/internal/data_transfer"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/excel_adapter"
-	"github.com/HyperloopUPV-H8/h9-backend/internal/file_logger"
-	"github.com/HyperloopUPV-H8/h9-backend/internal/logger_handler"
-	"github.com/HyperloopUPV-H8/h9-backend/internal/message_transfer"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/server"
-	"github.com/HyperloopUPV-H8/h9-backend/internal/value_logger"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/vehicle"
 )
 
 type Config struct {
-	Excel            excel_adapter.ExcelAdapterConfig
-	Connections      connection_transfer.ConnectionTransferConfig
-	LoggerHandler    logger_handler.Config `toml:"logger_handler"`
-	PacketLogger     file_logger.Config    `toml:"packet_logger"`
-	ValueLogger      value_logger.Config   `toml:"value_logger"`
-	OrderLogger      file_logger.Config    `toml:"order_logger"`
-	ProtectionLogger file_logger.Config    `toml:"protection_logger"`
-	Vehicle          vehicle.Config
-	DataTransfer     data_transfer.DataTransferConfig `toml:"data_transfer"`
-	Orders           struct {
-		SendTopic string `toml:"send_topic"`
-	}
-	Messages message_transfer.MessageTransferConfig
-	Server   server.Config
-	BLCU     blcu.BLCUConfig `toml:"blcu"`
+	Excel   excel_adapter.ExcelAdapterConfig
+	Vehicle vehicle.Config
+	Server  server.Config
 }

backend/cmd/config.toml

@@ -8,30 +8,11 @@ pod_data = "/podDataStructure"
 order_data = "/orderStructures"
 programable_boards = "/uploadableBoards"
 connections = "/backend"
-file_server = "/"
+files = "/"
 
 [vehicle]
 boards = ["VCU"]
 
-[vehicle.network]
-tcp_client_tag = "TCP_CLIENT"
-tcp_server_tag = "TCP_SERVER"
-udp_tag = "UDP"
-# sniffer = { mtu = 1500, interface = "lo" }
-mtu = 1500
-interface = "lo"
-# blcu_ack_id = "blcu_ack"
-timeout = "1s"
-
-[vehicle.messages]
-info_id_key = "info"
-fault_id_key = "fault"
-warning_id_key = "warning"
-error_id_key = "error"
-blcu_ack_id_key = "blcu_ack"
-add_state_orders_id_key = "add_state_orders"
-remove_state_orders_id_key = "remove_state_orders"
-
 [excel.download]
 id="1NyNaAOw_6iWtnCpEg73AtSSFx1fMdhPRmmdOhjgjCZI"
 name = "ade.xlsx"
@@ -49,49 +30,3 @@ units_table = "units"
 ports_table = "ports"
 board_ids_table = "board_ids"
 message_ids_table = "message_ids"
-
-[logger_handler]
-topics = { enable = "logger/enable" }
-base_path = "log"
-flush_interval = "5s"
-
-[packet_logger]
-file_name = "packets"
-flush_interval = "5s"
-
-[value_logger]
-folder_name = "values"
-flush_interval = "5s"
-
-[order_logger]
-file_name = "orders"
-flush_interval = "5s"
-
-[protection_logger]
-file_name = "protections"
-flush_interval = "5s"
-
-[orders]
-send_topic = "order/send"
-
-[messages]
-update_topic = "message/update"
-
-[data_transfer]
-fps = 20
-topics = { update = "podData/update" }
-
-[connections]
-update_topic = "connection/update"
-
-[blcu]
-download_path = "downloads"
-
-[blcu.packets]
-upload = { id = 700, field = "write_board" }
-download = { id = 701, field = "read_board" }
-ack = { name = "tftp_ack" }
-
-[blcu.topics]
-upload = "blcu/upload"
-download = "blcu/download"