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

CHG: changes some enums

Browse Source
This commit is contained in:
Henry Winkel
2023-07-05 17:48:01 +02:00
parent 4c1fb526b1
commit 1a878af6a5
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,7 +63,7 @@ namespace SimCore
/// @brief creates a SimTrack out of a string message /// @brief creates a SimTrack out of a string message
/// @param msg /// @param msg
/// @return SimTrack Oject /// @return SimTrack Oject
static std::unique_ptr<SimCore::SimTrack> unpack(std::string msg); static std::unique_ptr<SimCore::SimTrack> unpack(std::string msgString);
public: public:
Data<double> Speed; Data<double> Speed;

1
include/SimCore/SimCore.hpp
View File

@@ -69,6 +69,7 @@ enum EffectorKind : std::uint32_t {
enum TrackKind : std::uint8_t { enum TrackKind : std::uint8_t {
UNKNOWN_TRACK, UNKNOWN_TRACK,
SIM_TRACK,
GROUND_TRUTH_TRACK, GROUND_TRUTH_TRACK,
OWN_TRACK, OWN_TRACK,
RADAR_TRACK, RADAR_TRACK,

2
libs/whisper-com

Submodule libs/whisper-com updated: b94f852137...1d154f71d4

8
src/SimCore/Messages/SimTrack.cpp
View File

@@ -70,7 +70,7 @@ namespace SimCore
WHISPER::Message SimTrack::buildMessage() WHISPER::Message SimTrack::buildMessage()
{ {
WHISPER::Message msg(ID_.getUUID(),WHISPER::MsgTopics::TRACK , WHISPER::MsgType::GROUND_TRUTH_TRACK, this->SourceType_); WHISPER::Message msg(ID_.getUUID(),WHISPER::MsgTopics::TRACK , WHISPER::MsgType::SIM_TRACK, this->SourceType_);
messages::SimTrack::SimTrack SimTrack; messages::SimTrack::SimTrack SimTrack;
@@ -202,11 +202,11 @@ namespace SimCore
std::unique_ptr<SimCore::SimTrack> SimTrack::unpack(std::string msg) std::unique_ptr<SimCore::SimTrack> SimTrack::unpack(std::string msgString)
{ {
if (std::empty(msg) == false && msg != "NULL") if (std::empty(msgString) == false && msgString != "NULL")
{ {
WHISPER::Message whisperMessage(msg); WHISPER::Message whisperMessage(msgString);
return std::make_unique<SimTrack>(std::move(unpack(whisperMessage))); return std::make_unique<SimTrack>(std::move(unpack(whisperMessage)));
} }