henry/SimCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ADD: integrated the whisper-comm update

Browse Source
This commit is contained in:
Henry Winkel
2023-01-19 16:09:30 +01:00
parent 3bc56734da
commit c8711bd02e
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/SimCore/Messages/Track.hpp
View File

@@ -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);

2
libs/whisper-com

Submodule libs/whisper-com updated: f7d57ccbb8...73b15d235a

2
src/SimCore/Messages/RadarTrack.cpp
View File

@@ -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();

4
src/SimCore/Messages/Track.cpp
View File

@@ -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();

4
src/SimCore/Sensor.cpp
View File

@@ -23,8 +23,8 @@ namespace SimCore {
incommingTrackMessages = std::make_shared<WHISPER::threadSafeQueue<SimCore::Track>>();
GroundTruthUDPService_ = std::make_shared<WHISPER::InternalUDPService>(OwnID.getNumber(),WHISPER::SENSOR,8000,SimCore::UtilFunctions::implode(ip,'.'),ownIP);
ParentUDPService_ = std::make_shared<WHISPER::InternalUDPService>(OwnID.getNumber(),WHISPER::SENSOR,ParentPort,ParentIPAddress_,ownIP);
GroundTruthUDPService_ = std::make_shared<WHISPER::InternalUDPService>(OwnID.getParentNumber(),OwnID.getNumber(),WHISPER::SENSOR,8000,SimCore::UtilFunctions::implode(ip,'.'),ownIP);
ParentUDPService_ = std::make_shared<WHISPER::InternalUDPService>(OwnID.getParentNumber(),OwnID.getNumber(),WHISPER::SENSOR,ParentPort,ParentIPAddress_,ownIP);
};

2
tests/test_TrackClass.cpp
View File

@@ -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));