From fe32bb09f36d8caaa9e9aeb0d34852c5a86f80ea Mon Sep 17 00:00:00 2001
From: Franz Bethke <bethke@math.hu-berlin.de>
Date: Sat, 28 Apr 2018 19:38:37 +0200
Subject: [PATCH] Fix wrong pull in PlatoonController:updateSpeed
---
modules/catkin_ws/src/car/src/mainNode/PlatoonController.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/catkin_ws/src/car/src/mainNode/PlatoonController.cpp b/modules/catkin_ws/src/car/src/mainNode/PlatoonController.cpp
index b5bf068a..7c74a5ad 100644
--- a/modules/catkin_ws/src/car/src/mainNode/PlatoonController.cpp
+++ b/modules/catkin_ws/src/car/src/mainNode/PlatoonController.cpp
@@ -30,7 +30,7 @@ void PlatoonController::updatePcConfig() {
}
void PlatoonController::updateDesSpeed() {
- pc2car::TimedValue<float> otherDesSpeed = pc->getInnerPlatoonDistance();
+ pc2car::TimedValue<float> otherDesSpeed = pc->getSpeed();
if ( otherDesSpeed.getTimestamp() > desSpeed.getTimestamp() ) { desSpeed = otherDesSpeed; }
cruiseControllerNotify();
--
GitLab