Func modifications

Author: JESUSJH18

packet-sender/PacketGenerator.go

@@ -10,59 +10,39 @@ import (
 	"strings"
 	"time"
 
-	excelAdapter "github.com/HyperloopUPV-H8/h9-backend/pkg/excel_adapter"
-	"github.com/HyperloopUPV-H8/h9-backend/pkg/excel_adapter/internals"
-	"github.com/HyperloopUPV-H8/h9-backend/pkg/excel_adapter/models"
+	"github.com/HyperloopUPV-H8/software/backend/internal/adj"
 )
 
 type PacketGenerator struct {
 	packets []Packet
 }
 
 func New() PacketGenerator {
-	excelAdapter := excelAdapter.New(excelAdapter.ExcelAdapterConfig{
-		Download: internals.DownloadConfig{
-			Id:   "1NyNaAOw_6iWtnCpEg73AtSSFx1fMdhPRmmdOhjgjCZI",
-			Path: ".",
-			Name: "ade.xlsx",
-		},
-		Parse: internals.ParseConfig{
-			GlobalSheetPrefix: "GLOBAL ",
-			BoardSheetPrefix:  "BOARD ",
-			TablePrefix:       "[TABLE] ",
-			Global: internals.GlobalParseConfig{
-				AddressTable:    "addresses",
-				BackendKey:      "Backend",
-				BLCUAddressKey:  "BLCU",
-				UnitsTable:      "units",
-				PortsTable:      "ports",
-				BoardIdsTable:   "board_ids",
-				MessageIdsTable: "message_ids",
-			},
-		},
-	})
+	adj, err := adj.NewADJ()
+	if err != nil {
+		log.Fatalf("Failed to load ADJ: %v\n", err)
+	}
 
-	boards := excelAdapter.GetBoards()
 	packets := make([]Packet, 0)
 
-	for _, board := range boards {
+	for _, board := range adj.Boards {
 		for _, packet := range board.Packets {
-			if packet.Description.Type != "data" {
+			if packet.Type != "data" {
 				continue
 			}
 
-			id, err := strconv.ParseUint(packet.Description.ID, 10, 16)
+			id, err := strconv.ParseUint(packet.Id, 10, 16)
 			if err != nil {
 				log.Fatalf("data transfer: AddPacket: %s\n", err)
 			}
 
 			packets = append(packets, Packet{
 				ID:           uint16(id),
-				Name:         packet.Description.Name,
+				Name:         packet.Name,
 				HexValue:     "",
 				Count:        0,
 				CycleTime:    0,
-				Measurements: getMeasurements(packet.Values),
+				Measurements: getMeasurements(packet.Variables),
 			})
 		}
 	}
@@ -212,19 +192,19 @@ func writeNumberAsBytes(number float64, numberType string, buff *bytes.Buffer) {
 	}
 }
 
-func (pg *PacketGenerator) AddPacket(boardName string, packet models.Packet) {
-	if packet.Description.Type != "data" {
+func (pg *PacketGenerator) AddPacket(boardName string, packet adj.Packet) {
+	if packet.Type != "data" {
 		return
 	}
 
-	id, err := strconv.ParseUint(packet.Description.ID, 10, 16)
+	id, err := strconv.ParseUint(packet.Id, 10, 16)
 	if err != nil {
 		log.Fatalf("data transfer: AddPacket: %s\n", err)
 	}
 
 	pg.packets = append(pg.packets, Packet{
 		ID:           uint16(id),
-		Name:         packet.Description.Name,
+		Name:         packet.Name,
 		HexValue:     "",
 		Count:        0,
 		CycleTime:    0,
@@ -233,7 +213,7 @@ func (pg *PacketGenerator) AddPacket(boardName string, packet models.Packet) {
 
 }
 
-func getMeasurements(values []models.Value) []Measurement {
+func getMeasurements(values []adj.Measurement) []Measurement {
 	measurements := make([]Measurement, 0, len(values))
 	for _, value := range values {
 		measurements = append(measurements,
@@ -252,7 +232,7 @@ func getMeasurements(values []models.Value) []Measurement {
 	return measurements
 }
 
-func parseRange(literal string) []float64 {
+func parseRange(literal string) []float64 { // adaptar con rangos del ADJ??
 	if literal == "" {
 		return make([]float64, 0)
 	}