From c8711bd02e4f12de6f7d04c814ce9261ad874868 Mon Sep 17 00:00:00 2001 From: Henry Winkel Date: Thu, 19 Jan 2023 16:09:30 +0100 Subject: [PATCH] ADD: integrated the whisper-comm update --- include/SimCore/Messages/Track.hpp | 2 +- libs/whisper-com | 2 +- src/SimCore/Messages/RadarTrack.cpp | 2 +- src/SimCore/Messages/Track.cpp | 4 ++-- src/SimCore/Sensor.cpp | 4 ++-- tests/test_TrackClass.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/SimCore/Messages/Track.hpp b/include/SimCore/Messages/Track.hpp index b2edcd9..1fdfa85 100644 --- a/include/SimCore/Messages/Track.hpp +++ b/include/SimCore/Messages/Track.hpp @@ -58,7 +58,7 @@ namespace SimCore { * * @return */ - Track(std::uint32_t deviceID, WHISPER::SourceType src,SimCore::Identifier id); + Track( WHISPER::SourceType src,SimCore::Identifier id); diff --git a/libs/whisper-com b/libs/whisper-com index f7d57cc..73b15d2 160000 --- a/libs/whisper-com +++ b/libs/whisper-com @@ -1 +1 @@ -Subproject commit f7d57ccbb8230f5b6039a6c9b3566ae8ebd77c4b +Subproject commit 73b15d235a9bf75488f013f88a6df096276104ac diff --git a/src/SimCore/Messages/RadarTrack.cpp b/src/SimCore/Messages/RadarTrack.cpp index 7d2193a..df45192 100644 --- a/src/SimCore/Messages/RadarTrack.cpp +++ b/src/SimCore/Messages/RadarTrack.cpp @@ -52,7 +52,7 @@ RadarTrack::RadarTrack(std::string receivedMessage) { RadarTrack::RadarTrack(std::uint32_t deviceID, WHISPER::SourceType src, SimCore::Identifier id) - : Message(deviceID, WHISPER::MsgTopics::TRACK, WHISPER::RAW_TRACK, src), + : Message(id.getParentNumber(),id.getNumber(), WHISPER::MsgTopics::TRACK, WHISPER::RAW_TRACK, src), ID_(id) { packToMessage(); diff --git a/src/SimCore/Messages/Track.cpp b/src/SimCore/Messages/Track.cpp index 766ae53..b8fe0d8 100644 --- a/src/SimCore/Messages/Track.cpp +++ b/src/SimCore/Messages/Track.cpp @@ -52,8 +52,8 @@ namespace SimCore { - Track::Track(std::uint32_t deviceID, WHISPER::SourceType src,SimCore::Identifier id): - Message(deviceID,WHISPER::MsgTopics::TRACK,WHISPER::RAW_TRACK,src),external_(id.isExternal()),ID_(id) + Track::Track(WHISPER::SourceType src,SimCore::Identifier id): + Message(id.getParentNumber(),id.getNumber(),WHISPER::MsgTopics::TRACK,WHISPER::RAW_TRACK,src),external_(id.isExternal()),ID_(id) { packToMessage(); diff --git a/src/SimCore/Sensor.cpp b/src/SimCore/Sensor.cpp index 1438e23..3248b6d 100644 --- a/src/SimCore/Sensor.cpp +++ b/src/SimCore/Sensor.cpp @@ -23,8 +23,8 @@ namespace SimCore { incommingTrackMessages = std::make_shared>(); - GroundTruthUDPService_ = std::make_shared(OwnID.getNumber(),WHISPER::SENSOR,8000,SimCore::UtilFunctions::implode(ip,'.'),ownIP); - ParentUDPService_ = std::make_shared(OwnID.getNumber(),WHISPER::SENSOR,ParentPort,ParentIPAddress_,ownIP); + GroundTruthUDPService_ = std::make_shared(OwnID.getParentNumber(),OwnID.getNumber(),WHISPER::SENSOR,8000,SimCore::UtilFunctions::implode(ip,'.'),ownIP); + ParentUDPService_ = std::make_shared(OwnID.getParentNumber(),OwnID.getNumber(),WHISPER::SENSOR,ParentPort,ParentIPAddress_,ownIP); }; diff --git a/tests/test_TrackClass.cpp b/tests/test_TrackClass.cpp index 586a14c..29f8e42 100644 --- a/tests/test_TrackClass.cpp +++ b/tests/test_TrackClass.cpp @@ -39,7 +39,7 @@ SCENARIO("Testing the SimCore Track") WHEN("constructing Track Object with data") { SimCore::Position pos( GeocentPos1(SimCore::GeocentricPosition::X), GeocentPos1(SimCore::GeocentricPosition::Y), GeocentPos1(SimCore::GeocentricPosition::Z)); - SimCore::Track track(1,WHISPER::SourceType::SHIP,*ID.get()); + SimCore::Track track(WHISPER::SourceType::SHIP,*ID.get()); track.setCourse(course); track.setSpeed(speed); track.setPosition(GeocentPos1(SimCore::X),GeocentPos1(SimCore::Y),GeocentPos1(SimCore::Z));