Skip to content

Commit 2e4d5b7

Browse files
msanllimsanlli
authored
Merge pull request #235 from HyperloopUPV-H8/main
Update Develop
2 parents 9c2358c + e34d111 commit 2e4d5b7

6 files changed

Lines changed: 40 additions & 24 deletions

File tree

‎backend/cmd/config.toml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[vehicle]
2+
boards = ["HVSCU", "PCU"]
13
[server.ethernet-view]
24
address = "127.0.0.1:4040"
35
static = "./ethernet-view"
@@ -16,9 +18,8 @@ order_data = "/orderStructures"
1618
programable_boards = "/uploadableBoards"
1719
connections = "/backend"
1820
files = "/"
19-
[network]
20-
manual = false
21-
2221
[adj]
2322
branch = "sw-bcu" # Leave blank when using ADJ as a submodule (like this: "")
2423
test = true
24+
[network]
25+
manual = false

‎backend/cmd/main.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ import (
5353
"github.com/google/gopacket/pcap"
5454
"github.com/jmaralo/sntp"
5555
"github.com/pelletier/go-toml/v2"
56+
"github.com/pkg/browser"
5657
trace "github.com/rs/zerolog/log"
5758
)
5859

@@ -101,7 +102,7 @@ func main() {
101102

102103
// <--- ADJ --->
103104

104-
adj, err := adj_module.NewADJ(config.Adj.Branch)
105+
adj, err := adj_module.NewADJ(config.Adj.Branch, config.Adj.Test)
105106
if err != nil {
106107
trace.Fatal().Err(err).Msg("setting up ADJ")
107108
}
@@ -324,6 +325,9 @@ func main() {
324325
}()
325326
}
326327

328+
browser.OpenURL("http://" + config.Server["ethernet-view"].Addr)
329+
browser.OpenURL("http://" + config.Server["control-station"].Addr)
330+
327331
interrupt := make(chan os.Signal, 1)
328332
signal.Notify(interrupt, os.Interrupt)
329333

‎backend/go.mod‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ require (
2929
github.com/mattn/go-colorable v0.1.13 // indirect
3030
github.com/mattn/go-isatty v0.0.17 // indirect
3131
github.com/pjbgf/sha1cd v0.3.0 // indirect
32+
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
3233
github.com/pkg/errors v0.9.1 // indirect
3334
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
3435
github.com/skeema/knownhosts v1.2.2 // indirect

‎backend/go.sum‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ github.com/pin/tftp/v3 v3.0.0 h1:o9cQpmWBSbgiaYXuN+qJAB12XBIv4dT7OuOONucn2l0=
7474
github.com/pin/tftp/v3 v3.0.0/go.mod h1:xwQaN4viYL019tM4i8iecm++5cGxSqen6AJEOEyEI0w=
7575
github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
7676
github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
77+
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
78+
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
7779
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
7880
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
7981
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -146,6 +148,7 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
146148
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
147149
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
148150
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
151+
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
149152
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
150153
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
151154
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

‎backend/internal/adj/adj.go‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ const (
1414
RepoPath = "./adj/" // Path where the ADJ repository is cloned
1515
)
1616

17-
func NewADJ(AdjBranch string) (ADJ, error) {
18-
infoRaw, boardsRaw, err := downloadADJ(AdjBranch)
17+
func NewADJ(AdjBranch string, test bool) (ADJ, error) {
18+
infoRaw, boardsRaw, err := downloadADJ(AdjBranch, test)
1919
if err != nil {
2020
return ADJ{}, err
2121
}
@@ -69,15 +69,16 @@ func NewADJ(AdjBranch string) (ADJ, error) {
6969
return adj, nil
7070
}
7171

72-
func downloadADJ(AdjBranch string) (json.RawMessage, json.RawMessage, error) {
72+
func downloadADJ(AdjBranch string, test bool) (json.RawMessage, json.RawMessage, error) {
7373
updateRepo(AdjBranch)
7474

75-
// The BoardIds are applied in the NewADJ function by the getBoardIds function
76-
//Execute the script testadj.py (fix bug)
77-
test := exec.Command("python3", "testadj.py")
78-
out, err := test.CombinedOutput()
79-
if err != nil || len(out) != 0 {
80-
log.Fatalf("python test failed:\nError: %v\nOutput: %s\n", err, string(out))
75+
//Execute the script testadj.py if indicated in config.toml
76+
if test {
77+
test := exec.Command("python3", "testadj.py")
78+
out, err := test.CombinedOutput()
79+
if err != nil || len(out) != 0 {
80+
log.Fatalf("python test failed:\nError: %v\nOutput: %s\n", err, string(out))
81+
}
8182
}
8283

8384
info, err := os.ReadFile(RepoPath + "general_info.json")

‎backend/pkg/adj/adj.go‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ package adj
22

33
import (
44
"encoding/json"
5+
"log"
56
"os"
7+
"os/exec"
68

79
"github.com/HyperloopUPV-H8/h9-backend/internal/utils"
810
)
@@ -12,8 +14,8 @@ const (
1214
RepoPath = "./adj/" // Path where the ADJ repository is cloned
1315
)
1416

15-
func NewADJ(AdjBranch string) (ADJ, error) {
16-
infoRaw, boardsRaw, err := downloadADJ(AdjBranch)
17+
func NewADJ(AdjBranch string, test bool) (ADJ, error) {
18+
infoRaw, boardsRaw, err := downloadADJ(AdjBranch, test)
1719
if err != nil {
1820
return ADJ{}, err
1921
}
@@ -36,21 +38,17 @@ func NewADJ(AdjBranch string) (ADJ, error) {
3638
}
3739
}
3840

39-
type BoardList struct {
40-
Boards map[string]string `json:"boards"`
41-
}
42-
43-
var boardsList BoardList
41+
var boardsList map[string]string
4442
if err := json.Unmarshal(boardsRaw, &boardsList); err != nil {
4543
return ADJ{}, err
4644
}
4745

48-
boards, err := getBoards(boardsList.Boards)
46+
boards, err := getBoards(boardsList)
4947
if err != nil {
5048
return ADJ{}, err
5149
}
5250

53-
info.BoardIds, err = getBoardIds(boardsList.Boards)
51+
info.BoardIds, err = getBoardIds(boardsList)
5452
if err != nil {
5553
return ADJ{}, err
5654
}
@@ -71,10 +69,18 @@ func NewADJ(AdjBranch string) (ADJ, error) {
7169
return adj, nil
7270
}
7371

74-
func downloadADJ(AdjBranch string) (json.RawMessage, json.RawMessage, error) {
72+
func downloadADJ(AdjBranch string, test bool) (json.RawMessage, json.RawMessage, error) {
7573
updateRepo(AdjBranch)
7674

77-
// The BoardIds are applied in the NewADJ function by the getBoardIds function
75+
//Execute the script testadj.py if indicated in config.toml
76+
if test {
77+
test := exec.Command("python3", "testadj.py")
78+
out, err := test.CombinedOutput()
79+
if err != nil || len(out) != 0 {
80+
log.Fatalf("python test failed:\nError: %v\nOutput: %s\n", err, string(out))
81+
}
82+
}
83+
7884
info, err := os.ReadFile(RepoPath + "general_info.json")
7985
if err != nil {
8086
return nil, nil, err

0 commit comments

Comments
 (0)