Skip to content

Hack/force sensor #686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

Hack/force sensor #686

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
afd0b52
Merge branch 'feature/pmd_depth_cam'
karenbodie Dec 2, 2019
c49270c
add force sensor plugin
karenbodie Dec 3, 2019
966062b
Remove extra bracket
karenbodie Dec 4, 2019
ed1e6c5
better d gains in tiltrotor
karenbodie Dec 8, 2019
df955c4
big hack for force sensor testing
karenbodie Dec 8, 2019
247292b
Add measurement divisor to IMU plugin.
karenbodie Jan 22, 2020
01344b1
Parametrize pid tilt gains.
karenbodie Jan 23, 2020
547415a
Mini-Voliro simulation rear rotor changes
May 20, 2021
46e55ef
Builds with OpenCV4
May 21, 2020
d2eba6a
Merge pull request #681 from ethz-asl/fix/hack/force_sensor/opencv
rikba Oct 11, 2021
728407a
Revert "Mini-Voliro simulation rear rotor changes". Take out this com…
maxb91 Nov 18, 2021
67694ce
Merge branch 'master' into hack/force_sensor
maxb91 Nov 18, 2021
c9e0b23
update hack, according to the current ft sensor pose wrt. body
grzemal Mar 11, 2022
76cb7b7
delete obsolete, enable running the simulation
grzemal Mar 11, 2022
cf08489
Removed hard coded tilt-motor number for single-tilt motors
clanegge Oct 9, 2022
1a7b888
realistic mav mass
mikeallenspach Dec 14, 2022
5ad9319
Merge branch 'hack/force_sensor' of github.com:ethz-asl/rotors_simula…
mikeallenspach Dec 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Builds with OpenCV4
  • Loading branch information
@rikba
Kevin Michael Frick authored and rikba committed Oct 11, 2021
commit 46e55efb91d93f56bcf94e1b89a141d0330e884a
4 changes: 1 addition & 3 deletions rotors_gazebo_plugins/src/external/gazebo_geotagged_images_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
#include <iostream>

#include <boost/filesystem.hpp>
#include <cv.h>
#include <highgui.h>
#include <opencv2/opencv.hpp>

#include "rotors_gazebo_plugins/common.h"
Expand Down Expand Up @@ -140,7 +138,7 @@ void GeotaggedImagesPlugin::OnNewFrame(const unsigned char * image)
Mat frame = Mat(height_, width_, CV_8UC3);
Mat frameBGR = Mat(height_, width_, CV_8UC3);
frame.data = (uchar*)image; //frame has not the right color format yet -> convert
cvtColor(frame, frameBGR, CV_RGB2BGR);
cvtColor(frame, frameBGR, cv::COLOR_RGB2BGR);

char file_name[256];
snprintf(file_name, sizeof(file_name), "%s/DSC%05i.jpg", storageDir_.c_str(), imageCounter_);
Expand Down
2 changes: 1 addition & 1 deletion rotors_gazebo_plugins/src/gazebo_odometry_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ void GazeboOdometryPlugin::Load(physics::ModelPtr _model,
if (_sdf->HasElement("covarianceImage")) {
std::string image_name =
_sdf->GetElement("covarianceImage")->Get<std::string>();
covariance_image_ = cv::imread(image_name, CV_LOAD_IMAGE_GRAYSCALE);
covariance_image_ = cv::imread(image_name, cv::IMREAD_GRAYSCALE);
if (covariance_image_.data == NULL)
gzerr << "loading covariance image " << image_name << " failed"
<< std::endl;
Expand Down