From 627233f862b84b06fca3c6d40a7af5da4cc6cb16 Mon Sep 17 00:00:00 2001 From: Oleg Kalachev Date: Thu, 25 Jul 2024 02:44:47 +0300 Subject: [PATCH] Minor updates --- gazebo/Arduino.h | 1 + gazebo/simulator.cpp | 4 ++-- tools/csv_to_ulog/csv_to_ulog.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gazebo/Arduino.h b/gazebo/Arduino.h index 16e0808..b902257 100644 --- a/gazebo/Arduino.h +++ b/gazebo/Arduino.h @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/gazebo/simulator.cpp b/gazebo/simulator.cpp index f7da906..f36ec9b 100644 --- a/gazebo/simulator.cpp +++ b/gazebo/simulator.cpp @@ -47,8 +47,8 @@ public: this->model = _parent; this->body = this->model->GetLink("body"); this->imu = dynamic_pointer_cast(sensors::get_sensor(model->GetScopedName(true) + "::body::imu")); // default::flix::body::imu - this->updateConnection = event::Events::ConnectWorldUpdateBegin(bind(&ModelFlix::OnUpdate, this)); - this->resetConnection = event::Events::ConnectWorldReset(bind(&ModelFlix::OnReset, this)); + this->updateConnection = event::Events::ConnectWorldUpdateBegin(std::bind(&ModelFlix::OnUpdate, this)); + this->resetConnection = event::Events::ConnectWorldReset(std::bind(&ModelFlix::OnReset, this)); initNode(); Serial.begin(0); gzmsg << "Flix plugin loaded" << endl; diff --git a/tools/csv_to_ulog/csv_to_ulog.cpp b/tools/csv_to_ulog/csv_to_ulog.cpp index 1affddb..3b6544a 100644 --- a/tools/csv_to_ulog/csv_to_ulog.cpp +++ b/tools/csv_to_ulog/csv_to_ulog.cpp @@ -4,10 +4,10 @@ // Tool for conversion CSV log file to ULog format #include +#include #include #include #include -#include "rapidcsv.h" using std::vector; using std::string;