Skip to content
Snippets Groups Projects
Commit 597c2f72 authored by Hoop77's avatar Hoop77 Committed by lenoelda
Browse files

updated TerminalControl

parent 84c7ccff
Branches
No related merge requests found
...@@ -62,9 +62,8 @@ int main(int argc, char ** argv) ...@@ -62,9 +62,8 @@ int main(int argc, char ** argv)
std::atomic<float> speed{0.0f}; std::atomic<float> speed{0.0f};
std::atomic<float> stopDistance{0}; std::atomic<float> stopDistance{0};
std::mutex outputMutex; std::mutex outputMutex;
UltrasonicSensor sensor{readDevId()}; auto sensor = UltrasonicSensor::create(net, readDevId());
car::StreamMeanFilter streamMeanFilter{5}; car::StreamMeanFilter streamMeanFilter{5};
auto timer = networking::time::Timer::create(net);
auto conn = Connection::create(net); auto conn = Connection::create(net);
conn->open( conn->open(
"/dev/ttySAC0", "/dev/ttySAC0",
...@@ -78,13 +77,10 @@ int main(int argc, char ** argv) ...@@ -78,13 +77,10 @@ int main(int argc, char ** argv)
<< "\nSteering Angle: " << conn->getMeasuredSteeringAngle().get() << "\n\n"; << "\nSteering Angle: " << conn->getMeasuredSteeringAngle().get() << "\n\n";
}, [] {}); }, [] {});
sensor.init(); sensor->start(
timer = networking::time::Timer::create(net); [&](auto distance)
timer->startPeriodicTimeout(
std::chrono::milliseconds(UltrasonicSensor::DELAY),
[&]
{ {
auto originalDistance = sensor.getDistance(); auto originalDistance = distance;
auto filteredDistance = streamMeanFilter.moveWindow(originalDistance); auto filteredDistance = streamMeanFilter.moveWindow(originalDistance);
if (filteredDistance <= stopDistance) if (filteredDistance <= stopDistance)
conn->setSpeed(BRAKE_SPEED); conn->setSpeed(BRAKE_SPEED);
...@@ -150,7 +146,6 @@ int main(int argc, char ** argv) ...@@ -150,7 +146,6 @@ int main(int argc, char ** argv)
} }
} }
timer->stop();
conn->setSpeed(BRAKE_SPEED); conn->setSpeed(BRAKE_SPEED);
sleep(1); sleep(1);
conn->close(); conn->close();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment