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

CHG: changed to fit to the new base message

Browse Source
This commit is contained in:
Henry Winkel
2023-08-11 11:04:49 +02:00
parent 1f96b32aff
commit 2bc36527a3
8 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/Entities/Entity.hpp
View File

@@ -99,6 +99,7 @@ namespace Entities {
std::atomic<bool> MovementWorkerStarted = false; std::atomic<bool> MovementWorkerStarted = false;
std::shared_ptr<DirectCommunication::DirectCommunicationServer> MovemtServer_ = nullptr; std::shared_ptr<DirectCommunication::DirectCommunicationServer> MovemtServer_ = nullptr;
void handleMovement(); void handleMovement();
std::string MovementPodUUID_;
std::shared_ptr<DirectCommunication::DirectCommunicationServer> CommandCommsServer_ = nullptr; std::shared_ptr<DirectCommunication::DirectCommunicationServer> CommandCommsServer_ = nullptr;

4
include/Orders/MoveOrder.hpp
View File

@@ -11,9 +11,9 @@ namespace Orders
class MoveOrder: public Order class MoveOrder: public Order
{ {
public: public:
MoveOrder(const SimCore::Identifier OwnID, WHISPER::SourceType srcType); MoveOrder(const SimCore::Identifier OwnID);
MoveOrder(const SimCore::Identifier OwnID,WHISPER::SourceType srcType,SimCore::Position pos,double speed = 0,double course = 0, int startTime = 0); MoveOrder(const SimCore::Identifier OwnID,SimCore::Position pos,double speed = 0,double course = 0, int startTime = 0);
~MoveOrder(); ~MoveOrder();

3
include/Orders/Order.hpp
View File

@@ -16,13 +16,12 @@ namespace Orders
class Order class Order
{ {
public: public:
Order(const SimCore::Identifier OwnID,const WHISPER::SourceType srcType, const Orders::OrderType OrderType_); Order(const SimCore::Identifier OwnID, const Orders::OrderType OrderType_);
const SimCore::Identifier getOrderID(); const SimCore::Identifier getOrderID();
const SimCore::Identifier getOwnID(); const SimCore::Identifier getOwnID();
const WHISPER::SourceType srcType;
const Orders::OrderType getOrderType(); const Orders::OrderType getOrderType();

2
libs/KubeControl

Submodule libs/KubeControl updated: 681338d945...f1e8b3a077

2
libs/SimCore

Submodule libs/SimCore updated: ed14aedf0c...b546628663

15
src/Entities/Entity.cpp
View File

@@ -45,7 +45,7 @@ namespace Entities
{ {
PodController_ = std::make_unique<kubecontrol::PodController>("docs/config"); PodController_ = std::make_unique<kubecontrol::PodController>("docs/config");
OwnShipTrack = std::make_shared<SimCore::SimTrack>(OwnID, OwnType, EntityKind); OwnShipTrack = std::make_shared<SimCore::SimTrack>(OwnID, EnttityName, EntityKind);
OwnShipTrack->setPosition(SimCore::Position()); OwnShipTrack->setPosition(SimCore::Position());
MovemtServer_ = std::make_shared<DirectCommunication::DirectCommunicationServer>(__MOVEMENT_SERVER_PORT__); MovemtServer_ = std::make_shared<DirectCommunication::DirectCommunicationServer>(__MOVEMENT_SERVER_PORT__);
@@ -70,7 +70,7 @@ namespace Entities
OwnShipTrack->setPosition(pos); OwnShipTrack->setPosition(pos);
LOG_S(INFO)<< "POS: LAT: "<< OwnShipTrack->getPosition().getGeodesicPos()(SimCore::LATITUDE) << " LON: " << OwnShipTrack->getPosition().getGeodesicPos()(SimCore::LONGITUDE); LOG_S(INFO)<< "POS: LAT: "<< OwnShipTrack->getPosition().getGeodesicPos()(SimCore::LATITUDE) << " LON: " << OwnShipTrack->getPosition().getGeodesicPos()(SimCore::LONGITUDE);
Orders::MoveOrder moveorder(OwnShipTrack->getIdentifier(),WHISPER::SourceType::ENTITY); Orders::MoveOrder moveorder(OwnShipTrack->getIdentifier());
moveorder.setPosition(pos); moveorder.setPosition(pos);
if(MovementWorkerStarted == true) if(MovementWorkerStarted == true)
{ {
@@ -81,7 +81,7 @@ namespace Entities
void Entity::setSpeed(double val) void Entity::setSpeed(double val)
{ {
OwnShipTrack->Speed.setValue(val); OwnShipTrack->Speed.setValue(val);
Orders::MoveOrder moveorder(OwnShipTrack->getIdentifier(),WHISPER::SourceType::ENTITY); Orders::MoveOrder moveorder(OwnShipTrack->getIdentifier());
moveorder.Speed.setValue(val); moveorder.Speed.setValue(val);
if(MovementWorkerStarted == true) if(MovementWorkerStarted == true)
{ {
@@ -92,7 +92,7 @@ namespace Entities
void Entity::setCourse(double val) void Entity::setCourse(double val)
{ {
OwnShipTrack->Course.setValue(val); OwnShipTrack->Course.setValue(val);
Orders::MoveOrder moveorder(OwnShipTrack->getIdentifier(),WHISPER::SourceType::ENTITY); Orders::MoveOrder moveorder(OwnShipTrack->getIdentifier());
moveorder.Course.setValue(val); moveorder.Course.setValue(val);
if(MovementWorkerStarted == true) if(MovementWorkerStarted == true)
{ {
@@ -144,7 +144,8 @@ namespace Entities
{ {
if (online_ == true) { if (online_ == true) {
LOG_S(INFO)<<"__ONLINE__"; LOG_S(INFO)<<"__ONLINE__";
auto MovementPod = kubecontrol::KubePod("movmentpod-"+EntityName_,xg::newGuid().str(),"movementimage:latest"); MovementPodUUID_ = xg::newGuid().str();
auto MovementPod = kubecontrol::KubePod(MovementPodUUID_,MovementPodUUID_,"movementimage:latest");
MovementPod.setEnvironmentVar("SERVER_IP", SimCore::UtilFunctions::getOwnIP()); MovementPod.setEnvironmentVar("SERVER_IP", SimCore::UtilFunctions::getOwnIP());
LOG_S(INFO)<< MovementPod.createYAML(); LOG_S(INFO)<< MovementPod.createYAML();
PodController_->startPod(MovementPod); PodController_->startPod(MovementPod);
@@ -182,13 +183,13 @@ namespace Entities
if (newTrack != nullptr) if (newTrack != nullptr)
{ {
OwnShipTrack->setPosition(newTrack->getPosition()); OwnShipTrack->setPosition(newTrack->getPosition());
// LOG_S(INFO)<< "new POS: LAT: "<< OwnShipTrack->getPosition().getGeodesicPos()(SimCore::LATITUDE) << " LON: " << OwnShipTrack->getPosition().getGeodesicPos()(SimCore::LONGITUDE); LOG_S(INFO)<< "new POS: LAT: "<< OwnShipTrack->getPosition().getGeodesicPos()(SimCore::LATITUDE) << " LON: " << OwnShipTrack->getPosition().getGeodesicPos()(SimCore::LONGITUDE);
} }
} }
if (MovemtServer_->countClients() == 0) if (MovemtServer_->countClients() == 0)
{ {
MovementWorkerStarted = false; MovementWorkerStarted = false;
} }
} }

12
src/Orders/MoveOrder.cpp
View File

@@ -10,8 +10,8 @@
namespace Orders namespace Orders
{ {
MoveOrder::MoveOrder(const SimCore::Identifier OwnID, WHISPER::SourceType srcType): MoveOrder::MoveOrder(const SimCore::Identifier OwnID):
Order(OwnID,srcType,Orders::MOVE_ORDER) Order(OwnID,Orders::MOVE_ORDER)
{ {
Speed = SimCore::Data<double>(); Speed = SimCore::Data<double>();
Course = SimCore::Data<double>(); Course = SimCore::Data<double>();
@@ -20,8 +20,8 @@ namespace Orders
} }
MoveOrder::MoveOrder(const SimCore::Identifier OwnID,WHISPER::SourceType srcType,SimCore::Position pos,double speed,double course , int startTime ): MoveOrder::MoveOrder(const SimCore::Identifier OwnID,SimCore::Position pos,double speed,double course , int startTime ):
Order(OwnID, srcType,Orders::MOVE_ORDER) Order(OwnID, Orders::MOVE_ORDER)
{ {
Speed = SimCore::Data<double>(); Speed = SimCore::Data<double>();
Course = SimCore::Data<double>(); Course = SimCore::Data<double>();
@@ -50,7 +50,7 @@ namespace Orders
WHISPER::Message MoveOrder::buildMessage() WHISPER::Message MoveOrder::buildMessage()
{ {
WHISPER::Message msg = WHISPER::Message(getOwnID().getUUID(), WHISPER::MsgTopics::COMMANDS , WHISPER::MsgType::COMMAND , srcType); WHISPER::Message msg = WHISPER::Message(getOwnID().getUUID(), WHISPER::MsgTopics::COMMANDS , WHISPER::MsgType::COMMAND);
messages::entity::order::MoveOrder MoveOrder = messages::entity::order::MoveOrder(); messages::entity::order::MoveOrder MoveOrder = messages::entity::order::MoveOrder();
@@ -117,7 +117,7 @@ namespace Orders
SimCore::Identifier OrderID(order.orderid()); SimCore::Identifier OrderID(order.orderid());
auto MoveOrderObj = std::make_unique<MoveOrder>(OrderID,(WHISPER::SourceType)msg.sourceType_); auto MoveOrderObj = std::make_unique<MoveOrder>(OrderID);
if (moveOrder.has_geocentricposition()) MoveOrderObj->setPosition(SimCore::Position(moveOrder.geocentricposition().x(),moveOrder.geocentricposition().y(),moveOrder.geocentricposition().z())); if (moveOrder.has_geocentricposition()) MoveOrderObj->setPosition(SimCore::Position(moveOrder.geocentricposition().x(),moveOrder.geocentricposition().y(),moveOrder.geocentricposition().z()));

3
src/Orders/Order.cpp
View File

@@ -5,10 +5,9 @@
namespace Orders namespace Orders
{ {
Order::Order(const SimCore::Identifier OwnID,const WHISPER::SourceType srcType, const Orders::OrderType OrderType_): Order::Order(const SimCore::Identifier OwnID,const Orders::OrderType OrderType_):
orderID_(SimCore::Identifier()), orderID_(SimCore::Identifier()),
OwnID_(OwnID), OwnID_(OwnID),
srcType(srcType),
OrderType_(OrderType_) OrderType_(OrderType_)
{ {