From e3405300a6656ec99df91f3d499fce8690c3ae4d Mon Sep 17 00:00:00 2001 From: Andreas Linde Date: Mon, 22 Jan 2024 17:36:06 +0100 Subject: [PATCH] Update to latest ship and spine --- go.mod | 4 ++-- go.sum | 8 ++++---- service/service.go | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index cec1bb68..98232309 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module github.com/enbility/eebus-go go 1.21.1 require ( - github.com/enbility/ship-go v0.0.0-20240122150747-cde3451b810f - github.com/enbility/spine-go v0.0.0-20240122151802-321e0fe43a43 + github.com/enbility/ship-go v0.0.0-20240122162711-a00c33a16e7a + github.com/enbility/spine-go v0.0.0-20240122163315-8326589e7fdd github.com/stretchr/testify v1.8.4 ) diff --git a/go.sum b/go.sum index e31744c1..68345298 100644 --- a/go.sum +++ b/go.sum @@ -5,10 +5,10 @@ github.com/ahmetb/go-linq/v3 v3.2.0/go.mod h1:haQ3JfOeWK8HpVxMtHHEMPVgBKiYyQ+f1/ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/enbility/ship-go v0.0.0-20240122150747-cde3451b810f h1:6yWUydMGGS+PD2KiA+vNOVThpgK6MzGIU7bVjPQ646M= -github.com/enbility/ship-go v0.0.0-20240122150747-cde3451b810f/go.mod h1:6xPvus7uzBqq3p2mQRWmbjP8n1/gpMil3jikRNBDUCg= -github.com/enbility/spine-go v0.0.0-20240122151802-321e0fe43a43 h1:mbuwnwfh9v3UeoSNkczDuBicwbZUAQvbqGI8YevlWww= -github.com/enbility/spine-go v0.0.0-20240122151802-321e0fe43a43/go.mod h1:BcNplM7cqwn27J7v06IJs8RZy5aSRRz0t2QTX4lcsdI= +github.com/enbility/ship-go v0.0.0-20240122162711-a00c33a16e7a h1:BWK59DNijiUQ4lQYxAKjSLd/7t4sSmt0ptfapwcDAUw= +github.com/enbility/ship-go v0.0.0-20240122162711-a00c33a16e7a/go.mod h1:6xPvus7uzBqq3p2mQRWmbjP8n1/gpMil3jikRNBDUCg= +github.com/enbility/spine-go v0.0.0-20240122163315-8326589e7fdd h1:N/ii735+ElnoHGqwUJ1BnDG4YZXIVxuHXw5vVsBArV8= +github.com/enbility/spine-go v0.0.0-20240122163315-8326589e7fdd/go.mod h1:7VQRShAU9yVnFhl9sUwFV0Yvy8gZsHMZzeLUs60AVVI= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= diff --git a/service/service.go b/service/service.go index 481d1112..49c47cef 100644 --- a/service/service.go +++ b/service/service.go @@ -152,9 +152,9 @@ func (s *EEBUSServiceImpl) Setup() error { // I assume those two to mean the same. // TODO: clarify s.localService = shipapi.NewServiceDetails(ski) - s.localService.ShipID = sd.Identifier() - s.localService.DeviceType = string(sd.DeviceType()) - s.localService.RegisterAutoAccept = sd.RegisterAutoAccept() + s.localService.SetShipID(sd.Identifier()) + s.localService.SetDeviceType(string(sd.DeviceType())) + s.localService.SetRegisterAutoAccept(sd.RegisterAutoAccept()) logging.Log().Info("Local SKI: ", ski) @@ -193,7 +193,7 @@ func (s *EEBUSServiceImpl) Setup() error { // setup mDNS mdns := mdns.NewMDNS( - s.localService.SKI, sd.DeviceBrand(), sd.DeviceModel(), string(sd.DeviceType()), + s.localService.SKI(), sd.DeviceBrand(), sd.DeviceModel(), string(sd.DeviceType()), sd.Identifier(), sd.MdnsServiceName(), sd.Port(), sd.Interfaces()) // Setup connections hub with mDNS and websocket connection handling