From 42b7b376864114b9cc0bddfff154a94a578969fd Mon Sep 17 00:00:00 2001
From: Franz Bethke <bethke@math.hu-berlin.de>
Date: Mon, 16 Apr 2018 15:36:28 +0200
Subject: [PATCH] Remove C2CBase
---
.../src/car/include/mainNode/C2CBase.h | 40 -------------------
.../src/car/src/mainNode/C2CBase.cpp | 32 ---------------
2 files changed, 72 deletions(-)
delete mode 100644 modules/catkin_ws/src/car/include/mainNode/C2CBase.h
delete mode 100644 modules/catkin_ws/src/car/src/mainNode/C2CBase.cpp
diff --git a/modules/catkin_ws/src/car/include/mainNode/C2CBase.h b/modules/catkin_ws/src/car/include/mainNode/C2CBase.h
deleted file mode 100644
index 97f17ade..00000000
--- a/modules/catkin_ws/src/car/include/mainNode/C2CBase.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef C2CBASE_H
-#define C2CBASE_H
-
-#include "PlatoonProtocolLib/Vehicle.h"
-#include "PlatoonProtocolLib/LeaderVehicle.h"
-#include "PlatoonProtocolLib/FollowerVehicle.h"
-#include "PlatoonProtocolLib/Protocol.h"
-#include "PlatoonState.h"
-
-namespace car
-{
-
-
-class C2CBase
-{
- friend class PlatoonController; // only the PlatoonControler should be able to use the swap functions below!
- public:
- C2CBase();
-
- private:
- PlatoonState curState = PlatoonState::ACC;
-
- networking::Networking c2cNetLeader; // thread + event queue
- networking::Networking c2cNetFollower; // thread + event queue
-
- platoonProtocol::LeaderVehicle::Ptr c2cLeader;
- platoonProtocol::FollowerVehicle::Ptr c2cFollower;
-
- void swap2LV();
- void swap2FV();
- void swap2ACC();
-
- bool isPlatoonRunning();
- platoonProtocol::PlatoonConfig getPlatoonConfig();
-
-};
-
-}
-
-#endif // C2CBASE_H
diff --git a/modules/catkin_ws/src/car/src/mainNode/C2CBase.cpp b/modules/catkin_ws/src/car/src/mainNode/C2CBase.cpp
deleted file mode 100644
index 64c3b3e0..00000000
--- a/modules/catkin_ws/src/car/src/mainNode/C2CBase.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "../../include/mainNode/C2CBase.h"
-
-namespace car {
-
- C2CBase::C2CBase(){}
-
- void C2CBase::swap2LV()
- {
- curState = PlatoonState::CACC_LV;
- }
-
- void C2CBase::swap2FV()
- {
- curState = PlatoonState::CACC_FV;
- }
-
- void C2CBase::swap2ACC()
- {
- curState = PlatoonState::ACC;
- }
-
- bool C2CBase::isPlatoonRunning()
- {
- std::cout << "C2CBase::isRunning" << std::endl;
- }
-
- platoonProtocol::PlatoonConfig C2CBase::getPlatoonConfig()
- {
- std::cout << "C2CBase::getPlatoonConfig" << std::endl;
- }
-
-}
--
GitLab