From 56c2752c8f6dd479b5163a9389395a60e728cb64 Mon Sep 17 00:00:00 2001 From: Franz Bethke <bethke@math.hu-berlin.de> Date: Mon, 16 Apr 2018 10:49:16 +0200 Subject: [PATCH] WIP mainNode --- modules/catkin_ws/src/car/include/mainNode/MainNode.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/catkin_ws/src/car/include/mainNode/MainNode.h b/modules/catkin_ws/src/car/include/mainNode/MainNode.h index ff91be4d..effc8517 100644 --- a/modules/catkin_ws/src/car/include/mainNode/MainNode.h +++ b/modules/catkin_ws/src/car/include/mainNode/MainNode.h @@ -7,8 +7,8 @@ #include "NotifiableThread.h" #include "NetworkingLib/Networking.h" -// #include "PlatoonProtocolLib/Vehicle.h" -#include "C2CBase.h" + +#include "PlatoonProtocolLib/VehicleFacade.h" #include "PC2CarLib/CommandReceiver.h" #include "PlatoonController.h" @@ -34,7 +34,8 @@ private: // OLD needs to be removed after test! networking::Networking c2cNet; // thread + event queue // OLD needs to be removed after test! platoonProtocol::Vehicle::Ptr c2c; - C2CBase c2c; + platoonProtocol:: + networking::Networking pcNet; // thread + event queue pc2car::CommandReceiver::Ptr pc; -- GitLab