diff --git a/modules/catkin_ws/src/PCGui/PCGui/CommandGui.qml b/modules/catkin_ws/src/PCGui/PCGui/CommandGui.qml index ca724ffbf4d0ffddebf119bae7e49b3971a9cab1..7173a386bfc302df4b326dc36565147bded861ce 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 4137e638dcc6d19140fda78d176b13d682d03b52..847e7b1757f923de43974c8233c05e81e2badf24 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);