Skip to content
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.

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

Model submission for QAV500 sensor configuration 1 by Marble #385

Merged
merged 53 commits into from
Jun 18, 2020
Merged
Show file tree
Hide file tree
Changes from 48 commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
d9b5892
creating qav500 branch
Mar 17, 2020
9696d64
working on qav500
Mar 17, 2020
7c5fe90
working on qav500. I need to remember to commit during the day
Mar 19, 2020
4c8fd43
Commented out bridge logger
Mar 24, 2020
5b8fd47
One functioning pico flexx camera pointing up
Mar 24, 2020
b60b98d
added bottom tof
Mar 24, 2020
9922d1d
modified position of downward tof camera
Mar 24, 2020
ddf0935
Added xacro file and modified description. Modified model.sdf to remo…
Mar 24, 2020
536856e
Somehow had two heads
Mar 24, 2020
f66a502
modified descriptions in model.config and package.xml
Mar 24, 2020
ed76b8a
Added point clouds to tof cameras
Mar 24, 2020
49156cf
Modified files to load properly in rviz. Added description on package
Mar 25, 2020
f4fe3c4
For some reason creates two heads! merging back
Mar 25, 2020
4b46e5a
Remove husky folder
Mar 25, 2020
becf398
Update IMU to reflect terms for Microstrain 3DM-GX5-15
Mar 25, 2020
b1967bb
Started editing the specs and package.xml
Mar 26, 2020
c21758a
Adding specifications file
Mar 26, 2020
55fe5cf
updated price in spec file
Mar 26, 2020
e2a88a6
Small update to specs to add Intel Nuc
Mar 26, 2020
2178572
modified inertia of vehicle
Mar 26, 2020
4456d2f
merging
Mar 26, 2020
2886f28
Merged default branch into this branch
Mar 26, 2020
fe24edb
Added light, needs fix
Mar 27, 2020
2e92ee0
modifying motor paramters
Mar 27, 2020
d2b36df
Reverted to original motor parameters
Mar 27, 2020
e4cbce7
Reverted motor parameters. Fixed ghost drone
Mar 27, 2020
ee275a6
Branch for pull request #428
nkoenig Apr 2, 2020
4dc5be6
Merged in derekvasquez/marble_submitted_models/submitted_models/marbl…
nkoenig Apr 7, 2020
0df36d5
Removed scientific notation in model.sdf IMU settings
realdealneil Apr 15, 2020
ca6b7bb
Merge pull request #3 from marblesubt/submitted_models/marble_qav500_…
realdealneil Apr 16, 2020
692738f
updated ouster lidar model
bfotheri Apr 16, 2020
cc117a2
Reduce the resolution of the rgbd camera on the qav500 to help the si…
realdealneil Apr 16, 2020
9ed1589
Fix the wideness of the light to mirror that on the ground vehicles
realdealneil Apr 17, 2020
295857c
Edited the velocity controller for the qav500 so that it holds yaw be…
realdealneil Apr 18, 2020
7857c72
fixed issue with tof point clouds not publishing
realdealneil May 5, 2020
ffead39
Merge pull request #4 from dsquez/model_pr_428
realdealneil May 5, 2020
992af49
Merge pull request #401 from realdealneil/model_pr_428
nkoenig May 12, 2020
236b297
Merge branch 'master' into model_pr_428
bfotheri Jun 3, 2020
7878d3e
updated to be compatible with latest OSRF changes
bfotheri Jun 3, 2020
8268664
Updated from OS1 gen 2 to OS1 gen 1
bfotheri Jun 9, 2020
f487ccb
marble_qav500 updated lidar rate from 15 to 20 to reflect actual sens…
bfotheri Jun 9, 2020
9b77c40
updated IMU to X1 model
bfotheri Jun 10, 2020
60713f7
Merge pull request #458 from realdealneil/model_pr_428
acschang Jun 11, 2020
de13bc7
Model maximum linear velocity limited to 4m/s and battery life is lim…
acschang Jun 11, 2020
e7e26b5
Readjusted OS1-64 to align with specification sheet for vertical FoV …
acschang Jun 11, 2020
0f4890a
Revert "Readjusted OS1-64 to align with specification sheet for verti…
acschang Jun 11, 2020
4443472
clarifications to specifications.md
adlarkin Jun 16, 2020
2528e03
added optical frame publisher
adlarkin Jun 16, 2020
9a634c5
added bridge_logger back in
adlarkin Jun 17, 2020
3622417
Model pr 428 -Improved UAV drift && Updated camera topic names (#467)
bfotheri Jun 18, 2020
1ca7e6d
reset model's max linear velocity to 4m/s
adlarkin Jun 18, 2020
47dd1f1
Merge branch 'cave_feature_release3' into model_pr_428
Jun 18, 2020
1bcdefe
Updated model, thumbnails, and added to download scipt
Jun 18, 2020
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
13 changes: 13 additions & 0 deletions submitted_models/marble_qav500_sensor_config_1/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
cmake_minimum_required(VERSION 2.8.3)
project(marble_qav500_sensor_config_1)

find_package(catkin REQUIRED)

catkin_package()

install(DIRECTORY launch meshes urdf materials
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})

install(FILES model.sdf model.config
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})

Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0"?>
<launch>
<arg name="name" doc="Name of Vehicle"/>
<param name="$(arg name)/robot_description" command="$(find xacro)/xacro '$(find marble_qav500_sensor_config_1)/urdf/model.xacro' name:=$(arg name)"/>
</launch>

170 changes: 170 additions & 0 deletions submitted_models/marble_qav500_sensor_config_1/launch/example.ign
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
<?xml version="1.0"?>
<!-- Usage: ign launch path/to/example.ign robotName:=<X1>

Parameters:
robotName: Name to be assigned to model
-->

<%
require_relative 'spawner'

# Modify these as needed
$enableGroundTruth = true
$headless = local_variables.include?(:headless) ? :headless : false

%>

<%

unless local_variables.include?(:robotName)
raise "missing parameters. robotName is a required parameter"
end

# This assumes that this launch file is in a directory below the model
modelURI = File.expand_path("../", File.dirname(__FILE__))
$worldName = 'example'
worldFile = File.join(File.expand_path("../worlds", File.dirname(__FILE__)), "#{$worldName}.sdf")

%>

<ignition version='1.0'>
<env>
<name>IGN_GAZEBO_SYSTEM_PLUGIN_PATH</name>
<value>$LD_LIBRARY_PATH</value>
</env>

<!-- Start ROS first. This is a bit hacky for now. -->
<!-- Make sure to source /opt/ros/melodic/setup.bash -->
<executable name='ros'>
<command>roslaunch subt_ros competition_init.launch world_name:=<%=$worldName%> vehicle_topics:=0 enable_ground_truth:=<%=($enableGroundTruth)?"1":"0"%> robot_names:=<%=robotName%></command>
</executable>

<plugin name="ignition::launch::GazeboServer"
filename="libignition-launch-gazebo.so">
<world_file><%= worldFile %></world_file>
<run>true</run>
<levels>false</levels>
<record>
<enabled>false</enabled>
</record>

<plugin entity_name="<%= $worldName %>"
entity_type="world"
filename="libignition-gazebo-physics-system.so"
name="ignition::gazebo::systems::Physics">
</plugin>

<plugin entity_name="<%= $worldName %>"
entity_type="world"
filename="libignition-gazebo-sensors-system.so"
name="ignition::gazebo::systems::Sensors">
<render_engine>ogre2</render_engine>
</plugin>
<plugin entity_name="<%= $worldName %>"
entity_type="world"
filename="libignition-gazebo-user-commands-system.so"
name="ignition::gazebo::systems::UserCommands">
</plugin>
<plugin entity_name="<%= $worldName %>"
entity_type="world"
filename="libignition-gazebo-scene-broadcaster-system.so"
name="ignition::gazebo::systems::SceneBroadcaster">
</plugin>
<plugin entity_name="<%= $worldName %>"
entity_type="world"
filename="libignition-gazebo-imu-system.so"
name="ignition::gazebo::systems::Imu">
</plugin>

<plugin entity_name="<%= $worldName %>"
entity_type="world"
filename="libignition-gazebo-magnetometer-system.so"
name="ignition::gazebo::systems::Magnetometer">
</plugin>

<plugin entity_name="<%= $worldName %>"
entity_type="world"
filename="libignition-gazebo-air-pressure-system.so"
name="ignition::gazebo::systems::AirPressure">
</plugin>
</plugin>

<%if !$headless %>
<executable_wrapper>
<plugin name="ignition::launch::GazeboGui"
filename="libignition-launch-gazebogui.so">
<world_name><%= $worldName %></world_name>
<window_title>SubT Simulator</window_title>
<window_icon><%= ENV['SUBT_IMAGES_PATH'] %>/SubT_logo.svg</window_icon>
<plugin filename="GzScene3D" name="3D View">
<ignition-gui>
<title>3D View</title>
<property type="bool" key="showTitleBar">false</property>
<property type="string" key="state">docked</property>
</ignition-gui>

<engine>ogre2</engine>
<scene>scene</scene>
<ambient_light>0.2 0.2 0.1</ambient_light>
<background_color>0.8 0.8 0.8</background_color>
<camera_pose>-6.3 -4.2 3.6 0 0.268 0.304</camera_pose>
<service>/world/<%= $worldName %>/scene/info</service>
<pose_topic>/world/<%= $worldName %>/pose/info</pose_topic>
<scene_topic>/world/<%= $worldName %>/scene/info</scene_topic>
<deletion_topic>/world/<%= $worldName %>/scene/deletion</deletion_topic>
</plugin>
<plugin filename="WorldControl" name="World control">
<ignition-gui>
<title>World control</title>
<property type="bool" key="showTitleBar">false</property>
<property type="bool" key="resizable">false</property>
<property type="double" key="height">72</property>
<property type="double" key="width">121</property>
<property type="double" key="z">1</property>

<property type="string" key="state">floating</property>
<anchors target="3D View">
<line own="left" target="left"/>
<line own="bottom" target="bottom"/>
</anchors>
</ignition-gui>

<play_pause>true</play_pause>
<step>true</step>
<start_paused>true</start_paused>
<service>/world/<%= $worldName %>/control</service>
<stats_topic>/world/<%= $worldName %>/stats</stats_topic>

</plugin>

<plugin filename="WorldStats" name="World stats">
<ignition-gui>
<title>World stats</title>
<property type="bool" key="showTitleBar">false</property>
<property type="bool" key="resizable">false</property>
<property type="double" key="height">110</property>
<property type="double" key="width">290</property>
<property type="double" key="z">1</property>

<property type="string" key="state">floating</property>
<anchors target="3D View">
<line own="right" target="right"/>
<line own="bottom" target="bottom"/>
</anchors>
</ignition-gui>

<sim_time>true</sim_time>
<real_time>true</real_time>
<real_time_factor>true</real_time_factor>
<iterations>true</iterations>
<topic>/world/<%= $worldName %>/stats</topic>
</plugin>
</plugin>
</executable_wrapper>
<%end%>

<%= spawner(robotName, modelURI, $worldName, 0, 0, 0, 0, 0, 0) %>
<%= rosExecutables(robotName, $worldName) %>

</ignition>

Loading