Skip to content

Commit da60524

Browse files
committed
feat!: upgrade to rovercom V2
1 parent f35b937 commit da60524

3 files changed

Lines changed: 13 additions & 22 deletions

File tree

go.mod

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@ go 1.21.6
55
toolchain go1.22.10
66

77
require (
8-
github.com/VU-ASE/rovercom v1.7.0
9-
github.com/VU-ASE/roverlib-go v1.2.7
8+
github.com/VU-ASE/rovercom/v2 v2.0.0
9+
github.com/VU-ASE/roverlib-go/v2 v2.0.0
1010
github.com/rs/zerolog v1.33.0
11-
gocv.io/x/gocv v0.39.0
12-
google.golang.org/protobuf v1.34.2
1311
)
1412

1513
require (
1614
github.com/mattn/go-colorable v0.1.13 // indirect
1715
github.com/mattn/go-isatty v0.0.20 // indirect
1816
github.com/pebbe/zmq4 v1.2.11 // indirect
1917
golang.org/x/sys v0.14.0 // indirect
18+
google.golang.org/protobuf v1.34.2 // indirect
2019
)

go.sum

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
1-
github.com/VU-ASE/rovercom v1.5.1 h1:2lbaZ0ZS1AC8XamyBzCKAsvKX7JFiTibS/fdWdKRwtU=
2-
github.com/VU-ASE/rovercom v1.5.1/go.mod h1:1T9bXpOPMMkubm6YBa847vseBRALFzq8lkDx96w0Hr8=
3-
github.com/VU-ASE/rovercom v1.7.0 h1:Ip6HaQtsoNAVnAZKt345nN8VK7lIR3qOARc3K4FXQ/c=
4-
github.com/VU-ASE/rovercom v1.7.0/go.mod h1:1T9bXpOPMMkubm6YBa847vseBRALFzq8lkDx96w0Hr8=
5-
github.com/VU-ASE/roverlib-go v1.2.0 h1:52fEzJAExaWqOLy0meBmAExWBEOnrxAsIzQK0ErdM3k=
6-
github.com/VU-ASE/roverlib-go v1.2.0/go.mod h1:wCre2f0pgcCOjM+9HPNdWxqF/ZsS/EgEyy6bJWjXjW0=
7-
github.com/VU-ASE/roverlib-go v1.2.6 h1:2AxTKCJeOt1XT1O6q5nMQmSrbOfrlBhgS/mBf3rZ6JE=
8-
github.com/VU-ASE/roverlib-go v1.2.6/go.mod h1:wCre2f0pgcCOjM+9HPNdWxqF/ZsS/EgEyy6bJWjXjW0=
9-
github.com/VU-ASE/roverlib-go v1.2.7 h1:hUSlJsMmR61GID4Y49cXFR67gQEW0KcFCqG9dqoks3o=
10-
github.com/VU-ASE/roverlib-go v1.2.7/go.mod h1:1qLI93E/CI8tzh7HEPejqopRzFbe/D7Ag13kkFl0J40=
1+
github.com/VU-ASE/rovercom/v2 v2.0.0 h1:2LUExP8Utji7ynEOxZfG7MEdwXcqIh3E19sf8QDj2f4=
2+
github.com/VU-ASE/rovercom/v2 v2.0.0/go.mod h1:ON3KbCs65HXqBfyWLTOggBrBvX/iU8YV39UlnbV34n0=
3+
github.com/VU-ASE/roverlib-go/v2 v2.0.0 h1:5jzXskTixq1kCm35GgnyFczzXVZfHVyIiWYr4Wn1Bf8=
4+
github.com/VU-ASE/roverlib-go/v2 v2.0.0/go.mod h1:PeboTMTKUyjw6dx/hpTsdRqtpQ5IKhZhQsoB9Y0veT0=
115
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
126
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
137
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
@@ -24,8 +18,6 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
2418
github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
2519
github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
2620
github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
27-
gocv.io/x/gocv v0.39.0 h1:vWHupDE22LebZW6id2mVeT767j1YS8WqGt+ZiV7XJXE=
28-
gocv.io/x/gocv v0.39.0/go.mod h1:zYdWMj29WAEznM3Y8NsU3A0TRq/wR/cy75jeUypThqU=
2921
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3022
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3123
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

src/main.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"os"
66
"time"
77

8-
pb_outputs "github.com/VU-ASE/rovercom/packages/go/outputs"
9-
roverlib "github.com/VU-ASE/roverlib-go/src"
8+
pb_outputs "github.com/VU-ASE/rovercom/v2/packages/go/outputs"
9+
roverlib "github.com/VU-ASE/roverlib-go/v2/src"
1010

1111
"github.com/rs/zerolog/log"
1212
)
@@ -69,11 +69,11 @@ func run(service roverlib.Service, configuration *roverlib.ServiceConfiguration)
6969
if imagingData == nil {
7070
return fmt.Errorf("Message does not contain camera output. What did imaging do??")
7171
}
72-
log.Info().Msgf("Imaging service captured a %d by %d image", imagingData.Trajectory.Width, imagingData.Trajectory.Height)
72+
log.Info().Msgf("Imaging service captured a %d by %d image", imagingData.Resolution.Width, imagingData.Resolution.Height)
7373

7474
// Print the X and Y coordinates of the middle point of the track that Imaging has detected
75-
if len(imagingData.Trajectory.Points) > 0 {
76-
log.Info().Msgf("The X: %d and Y: %d values of the middle point of the track", imagingData.Trajectory.Points[0].X, imagingData.Trajectory.Points[0].Y)
75+
if len(imagingData.HorizontalScans) > 0 {
76+
log.Info().Msgf("The left side of the track is at X: %d, and the right side of the track is at X: %d. Both are at Y: %d", imagingData.HorizontalScans[0].XLeft, imagingData.HorizontalScans[0].XRight, imagingData.HorizontalScans[0].Y)
7777
} else {
7878
log.Info().Msgf("imaging could didn't detect track edges. Is the Rover on the track?")
7979
}
@@ -85,7 +85,7 @@ func run(service roverlib.Service, configuration *roverlib.ServiceConfiguration)
8585
actuatorMsg := pb_outputs.SensorOutput{
8686
Timestamp: uint64(time.Now().UnixMilli()), // milliseconds since epoch
8787
Status: 0, // all is well
88-
SensorId: 1,
88+
SensorId: 1,
8989
SensorOutput: &pb_outputs.SensorOutput_ControllerOutput{
9090
ControllerOutput: &pb_outputs.ControllerOutput{
9191
SteeringAngle: steerPosition,

0 commit comments

Comments
 (0)