Merge pull request #173 from HyperloopUPV-H8/backend/adj

[backend][3] ADJ
HyperloopUPV-H8 · Dec 2, 2024 · f47c01e · f47c01e
2 parents 3ddc5c1 + cd8a82e
commit f47c01e
Show file tree

Hide file tree

Showing 32 changed files with 14 additions and 1,526 deletions.
diff --git a/.github/workflows/build-control-station.yaml b/.github/workflows/build-control-station.yaml
@@ -1,7 +1,6 @@
 name: Build control station
 
 on:
-    workflow_call:
     workflow_dispatch:
     pull_request:
         paths:

diff --git a/.github/workflows/build-ethernet-view.yaml b/.github/workflows/build-ethernet-view.yaml
@@ -1,7 +1,6 @@
 name: Build ethernet view
 
 on:
-  workflow_call:
   workflow_dispatch:
   pull_request:
     paths:

diff --git a/backend/cmd/main.go b/backend/cmd/main.go
@@ -6,7 +6,6 @@ import (
 	"encoding/binary"
 	"flag"
 	"fmt"
-	"github.com/HyperloopUPV-H8/h9-backend/pkg/excel/utils"
 
 	"log"
 	"net"
@@ -24,6 +23,7 @@ import (
 	"github.com/HyperloopUPV-H8/h9-backend/internal/common"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/pod_data"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/update_factory"
+	"github.com/HyperloopUPV-H8/h9-backend/internal/utils"
 	vehicle_models "github.com/HyperloopUPV-H8/h9-backend/internal/vehicle/models"
 	"github.com/HyperloopUPV-H8/h9-backend/pkg/abstraction"
 	"github.com/HyperloopUPV-H8/h9-backend/pkg/broker"

diff --git a/backend/internal/adj/adj.go b/backend/internal/adj/adj.go
@@ -97,8 +97,6 @@ func getBoards(info Info, boardsList map[string]string) (map[string]Board, error
 			return nil, err
 		}
 
-		// board.Structures = getBoardStructures( boardJSON.StructuresPaths) // TODO: Issued in JSON_ADE #1
-
 		boards[boardName] = board
 	}
 

diff --git a/backend/internal/adj/models.go b/backend/internal/adj/models.go
@@ -1,15 +1,17 @@
 package adj
 
+import "github.com/HyperloopUPV-H8/h9-backend/internal/utils"
+
 type ADJ struct {
 	Info   Info
 	Boards map[string]Board
 }
 
 type Info struct {
-	Ports      map[string]uint16 `json:"ports"`
-	Addresses  map[string]string `json:"addresses"`
-	Units      map[string]string `json:"units"`
-	MessageIds map[string]uint16 `json:"message_ids"`
+	Ports      map[string]uint16           `json:"ports"`
+	Addresses  map[string]string           `json:"addresses"`
+	Units      map[string]utils.Operations `json:"units"`
+	MessageIds map[string]uint16           `json:"message_ids"`
 	BoardIds   map[string]uint16
 }
 

diff --git a/backend/internal/pod_data/measurement.go b/backend/internal/pod_data/measurement.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/HyperloopUPV-H8/h9-backend/internal/adj"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/common"
-	"github.com/HyperloopUPV-H8/h9-backend/internal/excel/adj"
-	"github.com/HyperloopUPV-H8/h9-backend/internal/excel/utils"
+	"github.com/HyperloopUPV-H8/h9-backend/internal/utils"
 )
 
 const EnumType = "enum"
@@ -114,7 +114,7 @@ func getBooleanMeasurement(adeMeas adj.Measurement) BooleanMeasurement {
 }
 
 func isNumeric(kind string) bool {
-	return (kind == "uint8" ||
+	return kind == "uint8" ||
 		kind == "uint16" ||
 		kind == "uint32" ||
 		kind == "uint64" ||
@@ -123,5 +123,5 @@ func isNumeric(kind string) bool {
 		kind == "int32" ||
 		kind == "int64" ||
 		kind == "float32" ||
-		kind == "float64")
+		kind == "float64"
 }
diff --git a/backend/internal/pod_data/models.go b/backend/internal/pod_data/models.go
@@ -1,6 +1,6 @@
 package pod_data
 
-import "github.com/HyperloopUPV-H8/h9-backend/internal/excel/utils"
+import "github.com/HyperloopUPV-H8/h9-backend/internal/utils"
 
 type PodData struct {
 	Boards []Board `json:"boards"`

diff --git a/backend/internal/pod_data/pod_data.go b/backend/internal/pod_data/pod_data.go
@@ -1,11 +1,11 @@
 package pod_data
 
 import (
+	"github.com/HyperloopUPV-H8/h9-backend/internal/utils"
 	"strconv"
 
+	"github.com/HyperloopUPV-H8/h9-backend/internal/adj"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/common"
-	"github.com/HyperloopUPV-H8/h9-backend/internal/excel/adj"
-	"github.com/HyperloopUPV-H8/h9-backend/internal/excel/utils"
 )
 
 func NewPodData(adeBoards map[string]adj.Board, globalUnits map[string]utils.Operations) (PodData, error) {

diff --git a/backend/pkg/excel/utils/range.go → backend/internal/utils/range.go b/backend/pkg/excel/utils/range.go → backend/internal/utils/range.go
diff --git a/backend/pkg/excel/utils/units.go → backend/internal/utils/units.go b/backend/pkg/excel/utils/units.go → backend/internal/utils/units.go
diff --git a/backend/pkg/excel/ade/ade.go b/backend/pkg/excel/ade/ade.go
-Original file line number
+Diff line change
@@ Expand Up @@
     			return nil, err
     		}
-    		// board.Structures = getBoardStructures( boardJSON.StructuresPaths) // TODO: Issued in JSON_ADE #1
     		boards[boardName] = board
     	}
@@ Expand Down @@