From 944b85a6391ef2fe1e6c7b810f26424a8a1e59ad Mon Sep 17 00:00:00 2001
From: Hoop77 <p.badenhoop@gmx.de>
Date: Thu, 17 May 2018 13:34:27 +0200
Subject: [PATCH] changed gui label
---
modules/catkin_ws/src/PCGui/PCGui/CommandGui.qml | 2 +-
modules/catkin_ws/src/car/src/ultrasonic/Ultrasonic.cpp | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/modules/catkin_ws/src/PCGui/PCGui/CommandGui.qml b/modules/catkin_ws/src/PCGui/PCGui/CommandGui.qml
index ca724ffb..7173a386 100644
--- a/modules/catkin_ws/src/PCGui/PCGui/CommandGui.qml
+++ b/modules/catkin_ws/src/PCGui/PCGui/CommandGui.qml
@@ -111,7 +111,7 @@ ApplicationWindow {
// --- speed ---
Label {
id: speedLabel
- text: "Platoon Speed:"
+ text: "ACC Desired Speed:"
anchors.left: hostLabel.left
anchors.top: innerPlatoonDistanceLabel.bottom
diff --git a/modules/catkin_ws/src/car/src/ultrasonic/Ultrasonic.cpp b/modules/catkin_ws/src/car/src/ultrasonic/Ultrasonic.cpp
index 4137e638..847e7b17 100644
--- a/modules/catkin_ws/src/car/src/ultrasonic/Ultrasonic.cpp
+++ b/modules/catkin_ws/src/car/src/ultrasonic/Ultrasonic.cpp
@@ -22,16 +22,14 @@ void Ultrasonic::onInit()
messageOStream.write("onInit", "START");
ussData = nh.advertise<ussDataMsg>("ussData", 1);
- //sensor.init();
+ sensor.init();
timer = networking::time::Timer::create(net);
timer->startPeriodicTimeout(
std::chrono::milliseconds(UltrasonicSensor::DELAY),
[&]
{
ussDataMsg msg;
- //auto distance = streamMedianFilter.moveWindow(sensor.getDistance());
- static int distance = 0;
- distance++;
+ auto distance = streamMedianFilter.moveWindow(sensor.getDistance());
msg.distance = distance;
msg.timestamp = ros::Time::now();
ussData.publish(msg);
--
GitLab