diff --git a/modules/catkin_ws/src/CMakeLists.txt b/modules/catkin_ws/src/CMakeLists.txt index 581e61db89fce59006b1ceb2d208d9f3e5fbcb5e..3421623bd042f7eb4d2675c8c9ca624feb01cd4f 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 b78165f48705949412bcf2611e2979a506ad8cfb..fd96d3072adb2484e8c89959599d36e752a93732 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();