aleks/flix
1
0
Fork 0
mirror of https://github.com/okalachev/flix.git synced 2026-01-11 13:36:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor updates

Browse Source
This commit is contained in:
Oleg Kalachev
2024-07-25 02:44:47 +03:00
parent ce87234a51
commit 627233f862
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gazebo/Arduino.h
View File

@@ -7,6 +7,7 @@
#include <cmath> #include <cmath>
#include <string> #include <string>
#include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include <sys/poll.h> #include <sys/poll.h>

4
gazebo/simulator.cpp
View File

@@ -47,8 +47,8 @@ public:
this->model = _parent; this->model = _parent;
this->body = this->model->GetLink("body"); this->body = this->model->GetLink("body");
this->imu = dynamic_pointer_cast<sensors::ImuSensor>(sensors::get_sensor(model->GetScopedName(true) + "::body::imu")); // default::flix::body::imu this->imu = dynamic_pointer_cast<sensors::ImuSensor>(sensors::get_sensor(model->GetScopedName(true) + "::body::imu")); // default::flix::body::imu
this->updateConnection = event::Events::ConnectWorldUpdateBegin(bind(&ModelFlix::OnUpdate, this)); this->updateConnection = event::Events::ConnectWorldUpdateBegin(std::bind(&ModelFlix::OnUpdate, this));
this->resetConnection = event::Events::ConnectWorldReset(bind(&ModelFlix::OnReset, this)); this->resetConnection = event::Events::ConnectWorldReset(std::bind(&ModelFlix::OnReset, this));
initNode(); initNode();
Serial.begin(0); Serial.begin(0);
gzmsg << "Flix plugin loaded" << endl; gzmsg << "Flix plugin loaded" << endl;

2
tools/csv_to_ulog/csv_to_ulog.cpp
View File

@@ -4,10 +4,10 @@
// Tool for conversion CSV log file to ULog format // Tool for conversion CSV log file to ULog format
#include <ulog_cpp/simple_writer.hpp> #include <ulog_cpp/simple_writer.hpp>
#include <rapidcsv.h>
#include <vector> #include <vector>
#include <string> #include <string>
#include <filesystem> #include <filesystem>
#include "rapidcsv.h"
using std::vector; using std::vector;
using std::string; using std::string;