From 700fcaffc25ff1257c947ed834abcbefaec1d8f8 Mon Sep 17 00:00:00 2001
From: Franz Bethke <bethke@math.hu-berlin.de>
Date: Thu, 17 May 2018 13:21:50 +0200
Subject: [PATCH] Add log mesg to PLC
---
modules/catkin_ws/src/CMakeLists.txt | 2 +-
modules/catkin_ws/src/car/src/mainNode/PlatoonController.cpp | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/modules/catkin_ws/src/CMakeLists.txt b/modules/catkin_ws/src/CMakeLists.txt
index 581e61db..3421623b 120000
--- a/modules/catkin_ws/src/CMakeLists.txt
+++ b/modules/catkin_ws/src/CMakeLists.txt
@@ -1 +1 @@
-/opt/ros/kinetic/share/catkin/cmake/toplevel.cmake
\ No newline at end of file
+/opt/ros/lunar/share/catkin/cmake/toplevel.cmake
\ No newline at end of file
diff --git a/modules/catkin_ws/src/car/src/mainNode/PlatoonController.cpp b/modules/catkin_ws/src/car/src/mainNode/PlatoonController.cpp
index b78165f4..fd96d307 100644
--- a/modules/catkin_ws/src/car/src/mainNode/PlatoonController.cpp
+++ b/modules/catkin_ws/src/car/src/mainNode/PlatoonController.cpp
@@ -67,8 +67,6 @@ void PlatoonController::setupC2C()
void PlatoonController::run()
{
- messageOStream.write("run", "");
-
switch (currState.load())
{
case PlatoonState::ACC:
@@ -91,6 +89,7 @@ void PlatoonController::run()
void PlatoonController::run_ACC()
{
+ messageOStream.write("run - ACC", "");
bool wantsPlatoon = pc->isPlatoonEnabled().get();
if (!wantsPlatoon)
@@ -145,6 +144,7 @@ void PlatoonController::run_ACC()
void PlatoonController::run_CACC_FV()
{
+ messageOStream.write("run - FV", "");
bool inPlatoon = c2c.isPlatoonRunning();
bool wantsPlatoon = pc->isPlatoonEnabled().get();
@@ -173,6 +173,7 @@ void PlatoonController::run_CACC_FV()
void PlatoonController::run_CACC_LV()
{
+ messageOStream.write("run - LV", "");
bool inPlatoon = c2c.isPlatoonRunning();
bool wantsPlatoon = pc->isPlatoonEnabled().get();
--
GitLab