diff --git a/.gitignore b/.gitignore index 42b07155c1..32e5a2ff47 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,5 @@ models/standard_vtol_drop/standard_vtol_drop.sdf models/tailsitter/tailsitter.sdf models/advanced_plane/advanced_plane.sdf models/quadtailsitter/quadtailsitter.sdf +models/NDT_tilting/NDT_tilting.sdf +models/tilting_quadrotor/tilting_quadrotor.sdf diff --git a/models/NDT_tilting/NDT_tilting.sdf.jinja b/models/NDT_tilting/NDT_tilting.sdf.jinja new file mode 100644 index 0000000000..61b1a8a1a7 --- /dev/null +++ b/models/NDT_tilting/NDT_tilting.sdf.jinja @@ -0,0 +1,1236 @@ + + + + + + 0 0 0 0 0 0 + + + 0 0 0 0 0 0 + 2.5 + + 0.15 + 0.00 + 0.00 + 0.15 + 0.0 + 0.05 + + + + 0 0 0 0 0 0 + + + 1e-3 1e-3 1e-3 + model://NDT_tilting/meshes/body.stl + + + + + + 0.001 + 0 + + + + + + + + + 0 0 0 0 0 0 + + + 1e-3 1e-3 1e-3 + model://NDT_tilting/meshes/body.stl + + + + + + + 1 + + 0 + + + 0 0 0.05 0 0 0 + + 0 0 0 0 0 0 + 0.015 + + 1e-05 + 0 + 0 + 1e-05 + 0 + 1e-05 + + + + + /imu_link + base_link + + 1 0 0 + + 0 + 0 + 0 + 0 + + + 0 + 0 + + 1 + + + + + + 0 0 0 0 0 0 + + 0.0 0.0 0.0 0 0 0 + 0.4031180930624021 + + 0.001829 + 0 + 0 + 0.000448 + 0 + 0.001461 + + + + + + 1e-3 1e-3 1e-3 + model://NDT_tilting/meshes/arm.stl + + + + + + + + + + + + + + + 1e-3 1e-3 1e-3 + model://NDT_tilting/meshes/arm.stl + + + + + + + 1 + + 0 + + + + 0.14 0.15 0.05 0 0 0.785 + tilt_arm_2 + base_link + + 0.5 0.5 0 + + -2 + 2 + + + 1.0 + 0 + 0 + + 1 + + + + + 0 0 0 0 0 1.5 + + 0.0 0.0 0.0 0 0 0 + 0.4031180930624021 + + 0.001829 + 0 + 0 + 0.000448 + 0 + 0.001461 + + + + + + 1e-3 1e-3 1e-3 + model://NDT_tilting/meshes/arm.stl + + + + + + + + + + + + + + + 1e-3 1e-3 1e-3 + model://NDT_tilting/meshes/arm.stl + + + + + + + 1 + + 0 + + + + 0.14 0.15 0.05 0 0 0.785 + tilt_arm_3 + base_link + + -0.47 0.53 0 + + -2 + 2 + + + 1.0 + 0 + 0 + + 1 + + + + + 0 0 0 0 0 3.1415 + + 0.0 0.0 0.0 0 0 0 + 0.4031180930624021 + + 0.001829 + 0 + 0 + 0.000448 + 0 + 0.001461 + + + + + + 1e-3 1e-3 1e-3 + model://NDT_tilting/meshes/arm.stl + + + + + + + + + + + + + + + 1e-3 1e-3 1e-3 + model://NDT_tilting/meshes/arm.stl + + + + + + + 1 + + 0 + + + + 0.14 0.15 0.05 0 0 0.785 + tilt_arm_4 + base_link + + -0.5 -0.5 0 + + -2 + 2 + + + 1.0 + 0 + 0 + + 1 + + + + + 0 0 0 0 0 4.64 + + 0.0 0.0 0.0 0 0 0 + 0.4031180930624021 + + 0.001829 + 0 + 0 + 0.000448 + 0 + 0.001461 + + + + + + 1e-3 1e-3 1e-3 + model://NDT_tilting/meshes/arm.stl + + + + + + + + + + + + + + + 1e-3 1e-3 1e-3 + model://NDT_tilting/meshes/arm.stl + + + + + + + 1 + + 0 + + + + 0.14 0.15 0.05 0 0 0.785 + tilt_arm_1 + base_link + + 0.47 -0.53 0 + + -2 + 2 + + + 1.0 + 0 + 0 + + 1 + + + + + + 0.32 -0.36 0.11 0 0 0 + + 0 0 0 0 0 0 + 0.005 + + 9.75e-07 + 0 + 0 + 0.000273104 + 0 + 0.000274004 + + + + 0 0 0 0 0 0 + + + 0.005 + 0.128 + + + + + + + + + + + + + 0 0 0 0 0 0 + + + 1 1 1 + model://iris/meshes/iris_prop_ccw.dae + + + + + + + 1 + + + + rotor_1 + tilt_arm_1 + + 0 0 1 + + -1e+16 + 1e+16 + + + 0 + 0 + + 1 + + + + 0.32 -0.36 -0.035 0 0 0 + + 0 0 0 0 0 0 + 0.005 + + 9.75e-07 + 0 + 0 + 0.000273104 + 0 + 0.000274004 + + + + 0 0 0 0 0 0 + + + 0.005 + 0.128 + + + + + + + + + + + + + 0 0 0 0 0 0 + + + 1 1 1 + model://iris/meshes/iris_prop_cw.dae + + + + + + + 1 + + + + rotor_6 + tilt_arm_1 + + 0 0 1 + + -1e+16 + 1e+16 + + + 0 + 0 + + 1 + + + + + 0.327 0.35 0.115 0 0 0 + + 0 0 0 0 0 0 + 0.005 + + 9.75e-07 + 0 + 0 + 0.000273104 + 0 + 0.000274004 + + + + 0 0 0 0 0 0 + + + 0.005 + 0.128 + + + + + + + + + + + + + 0 0 0 0 0 0 + + + 1 1 1 + model://iris/meshes/iris_prop_cw.dae + + + + + + + 1 + + + + rotor_2 + tilt_arm_2 + + 0 0 1 + + -1e+16 + 1e+16 + + + 0 + 0 + + 1 + + + + 0.327 0.35 -0.035 0 0 0 + + 0 0 0 0 0 0 + 0.005 + + 9.75e-07 + 0 + 0 + 0.000273104 + 0 + 0.000274004 + + + + 0 0 0 0 0 0 + + + 0.005 + 0.128 + + + + + + + + + + + + + 0 0 0 0 0 0 + + + 1 1 1 + model://iris/meshes/iris_prop_ccw.dae + + + + + + + 1 + + + + rotor_5 + tilt_arm_2 + + 0 0 1 + + -1e+16 + 1e+16 + + + 0 + 0 + + 1 + + + + + -0.32 0.357 0.115 0 0 0 + + 0 0 0 0 0 0 + 0.005 + + 9.75e-07 + 0 + 0 + 0.000273104 + 0 + 0.000274004 + + + + 0 0 0 0 0 0 + + + 0.005 + 0.128 + + + + + + + + + + + + + 0 0 0 0 0 0 + + + 1 1 1 + model://iris/meshes/iris_prop_ccw.dae + + + + + + + 1 + + + + rotor_3 + tilt_arm_3 + + 0 0 1 + + -1e+16 + 1e+16 + + + 0 + 0 + + 1 + + + + -0.32 0.357 -0.035 0 0 0 + + 0 0 0 0 0 0 + 0.005 + + 9.75e-07 + 0 + 0 + 0.000273104 + 0 + 0.000274004 + + + + 0 0 0 0 0 0 + + + 0.005 + 0.128 + + + + + + + + + + + + + 0 0 0 0 0 0 + + + 1 1 1 + model://iris/meshes/iris_prop_cw.dae + + + + + + + 1 + + + + rotor_8 + tilt_arm_3 + + 0 0 1 + + -1e+16 + 1e+16 + + + 0 + 0 + + 1 + + + + + -0.328 -0.350 0.115 0 0 0 0 0 0 + + 0 0 0 0 0 0 + 0.005 + + 9.75e-07 + 0 + 0 + 0.000273104 + 0 + 0.000274004 + + + + 0 0 0 0 0 0 + + + 0.005 + 0.128 + + + + + + + + + + + + + 0 0 0 0 0 0 + + + 1 1 1 + model://iris/meshes/iris_prop_cw.dae + + + + + + + 1 + + + + rotor_4 + tilt_arm_4 + + 0 0 1 + + -1e+16 + 1e+16 + + + 0 + 0 + + 1 + + + + -0.328 -0.350 -0.035 0 0 0 0 0 0 + + 0 0 0 0 0 0 + 0.005 + + 9.75e-07 + 0 + 0 + 0.000273104 + 0 + 0.000274004 + + + + 0 0 0 0 0 0 + + + 0.005 + 0.128 + + + + + + + + + + + + + 0 0 0 0 0 0 + + + 1 1 1 + model://iris/meshes/iris_prop_ccw.dae + + + + + + + 1 + + + + rotor_7 + tilt_arm_4 + + 0 0 1 + + -1e+16 + 1e+16 + + + 0 + 0 + + 1 + + + + + + + base_link + 10 + + + + rotor_1_joint + rotor_1 + ccw + 0.0125 + 0.025 + 1100 + 9.84e-06 + 0.09 + /gazebo/command/motor_speed + 0 + 0.000175 + 1e-06 + /motor_speed/0 + 10 + + + + rotor_6_joint + rotor_6 + cw + 0.0125 + 0.025 + 1100 + 9.84e-06 + 0.09 + /gazebo/command/motor_speed + 5 + 0.000175 + 1e-06 + /motor_speed/5 + 10 + + + + rotor_2_joint + rotor_2 + cw + 0.0125 + 0.025 + 1100 + 9.84e-06 + 0.09 + /gazebo/command/motor_speed + 1 + 0.000175 + 1e-06 + /motor_speed/1 + 10 + + + + rotor_5_joint + rotor_5 + ccw + 0.0125 + 0.025 + 1100 + 9.84e-06 + 0.09 + /gazebo/command/motor_speed + 4 + 0.000175 + 1e-06 + /motor_speed/4 + 10 + + + + rotor_3_joint + rotor_3 + ccw + 0.0125 + 0.025 + 1100 + 9.84e-06 + 0.09 + /gazebo/command/motor_speed + 2 + 0.000175 + 1e-06 + /motor_speed/2 + 10 + + + + rotor_8_joint + rotor_8 + cw + 0.0125 + 0.025 + 1100 + 9.84e-06 + 0.09 + /gazebo/command/motor_speed + 7 + 0.000175 + 1e-06 + /motor_speed/7 + 10 + + + + rotor_4_joint + rotor_4 + cw + 0.0125 + 0.025 + 1100 + 9.84e-06 + 0.09 + /gazebo/command/motor_speed + 3 + 0.000175 + 1e-06 + /motor_speed/3 + 10 + + + + rotor_7_joint + rotor_7 + ccw + 0.0125 + 0.025 + 1100 + 9.84e-06 + 0.09 + /gazebo/command/motor_speed + 6 + 0.000175 + 1e-06 + /motor_speed/6 + 10 + + + model://gps + 0.05 0 0.04 0 0 0 + gps0 + + + gps0::link + base_link + + + + + + + 100 + 0.0004 + 6.4e-06 + 600 + /mag + + + + 50 + /baro + 0 + + + + /imu + /mag + /baro + INADDR_ANY + {{ mavlink_tcp_port }} + {{ mavlink_udp_port }} + {{ serial_enabled }} + {{ serial_device }} + {{ serial_baudrate }} + INADDR_ANY + 14550 + INADDR_ANY + 14540 + {{ hil_mode }} + 0 + 0 + 1 + 1 + 1 + /gazebo/command/motor_speed + + + 0 + 0 + 1000 + 0 + 100 + velocity + + + 1 + 0 + 1000 + 0 + 100 + velocity + + + 2 + 0 + 1000 + 0 + 100 + velocity + + + 3 + 0 + 1000 + 0 + 100 + velocity + + + 4 + 0 + 1000 + 0 + 100 + velocity + + + 5 + 0 + 1000 + 0 + 100 + velocity + + + 6 + 0 + 1000 + 0 + 100 + velocity + + + 7 + 0 + 1000 + 0 + 100 + velocity + + + + 8 + 0.0 + 1.57 + 0 + 0 + position + tilt_arm_1_joint + +

20

+ 0.0 + 0.5 + 0.0 + 0.0 + 2 + -2 + + + + 9 + 0.0 + 1.57 + 0 + 0 + position + tilt_arm_2_joint + +

20

+ 0.0 + 0.5 + 0 + 0 + 2 + -2 + + + + 10 + 0.0 + 1.57 + 0 + 0 + position + tilt_arm_3_joint + +

20

+ 0.0 + 0.5 + 0 + 0 + 2 + -2 + + + + 11 + 0.0 + 1.57 + 0 + 0 + position + tilt_arm_4_joint + +

20

+ 0.0 + 0.5 + 0 + 0 + 2 + -2 + + + + + 0 + + + /imu_link + /imu + 0.00018665 + 3.8785e-05 + 1000.0 + 0.0087 + 0.00186 + 0.006 + 300.0 + 0.196 + + + diff --git a/models/NDT_tilting/meshes/arm.stl b/models/NDT_tilting/meshes/arm.stl new file mode 100755 index 0000000000..943fde0e30 Binary files /dev/null and b/models/NDT_tilting/meshes/arm.stl differ diff --git a/models/NDT_tilting/meshes/body.stl b/models/NDT_tilting/meshes/body.stl new file mode 100755 index 0000000000..81aa14b6c4 Binary files /dev/null and b/models/NDT_tilting/meshes/body.stl differ diff --git a/models/NDT_tilting/model.config b/models/NDT_tilting/model.config new file mode 100644 index 0000000000..fd5ed49bbc --- /dev/null +++ b/models/NDT_tilting/model.config @@ -0,0 +1,11 @@ + + + + NDT tilting + 1.0 + NDT_tilting.sdf + + NDT tilting coaxial octorotor + + + diff --git a/models/tilting_quadrotor/meshes/arm.stl b/models/tilting_quadrotor/meshes/arm.stl new file mode 100755 index 0000000000..943fde0e30 Binary files /dev/null and b/models/tilting_quadrotor/meshes/arm.stl differ diff --git a/models/tilting_quadrotor/meshes/body.stl b/models/tilting_quadrotor/meshes/body.stl new file mode 100755 index 0000000000..81aa14b6c4 Binary files /dev/null and b/models/tilting_quadrotor/meshes/body.stl differ diff --git a/models/tilting_quadrotor/model.config b/models/tilting_quadrotor/model.config new file mode 100644 index 0000000000..0951587078 --- /dev/null +++ b/models/tilting_quadrotor/model.config @@ -0,0 +1,11 @@ + + + + Tilting quadrotor + 1.0 + tilting_quadrotor.sdf + + Generic tilting quadrotor + + + diff --git a/models/tilting_quadrotor/tilting_quadrotor.sdf.jinja b/models/tilting_quadrotor/tilting_quadrotor.sdf.jinja new file mode 100644 index 0000000000..cf7caefa87 --- /dev/null +++ b/models/tilting_quadrotor/tilting_quadrotor.sdf.jinja @@ -0,0 +1,876 @@ + + + + + + 0 0 0 0 0 0 + + + 0 0 0 0 0 0 + 2.0 + + 0.008 + 0.00 + 0.00 + 0.008 + 0.0 + 0.008 + + + + 0 0 0 0 0 0 + + + 0.5e-3 0.5e-3 0.5e-3 + model://tilting_quadrotor/meshes/body.stl + + + + + + 0.001 + 0 + + + + + + + + + 0 0 0 0 0 0 + + + 0.5e-3 0.5e-3 0.5e-3 + model://tilting_quadrotor/meshes/body.stl + + + + + + + 1 + + 0 + + + 0 0 0.025 0 0 0 + + 0 0 0 0 0 0 + 0.015 + + 1e-05 + 0 + 0 + 1e-05 + 0 + 1e-05 + + + + + /imu_link + base_link + + 1 0 0 + + 0 + 0 + 0 + 0 + + + 0 + 0 + + 1 + + + + + + 0 0 0 0 0 0 + + 0.0 0.0 0.0 0 0 0 + 0.20 + + 0.0001 + 0 + 0 + 0.0001 + 0 + 0.0005 + + + + + + 0.5e-3 0.5e-3 0.5e-3 + model://tilting_quadrotor/meshes/arm.stl + + + + + + + + + + + + + + + 0.5e-3 0.5e-3 0.5e-3 + model://tilting_quadrotor/meshes/arm.stl + + + + + + + 1 + + 0 + + + + 0.07 0.075 0.025 0 0 0.785 + tilt_arm_2 + base_link + + 0.25 0.25 0 + + -2 + 2 + + + 1.0 + 0 + 0 + + 1 + + + + + 0 0 0 0 0 1.5 + + 0.0 0.0 0.0 0 0 0 + 0.20 + + 0.0001 + 0 + 0 + 0.0001 + 0 + 0.0001 + + + + + + 0.5e-3 0.5e-3 0.5e-3 + model://tilting_quadrotor/meshes/arm.stl + + + + + + + + + + + + + + + 0.5e-3 0.5e-3 0.5e-3 + model://tilting_quadrotor/meshes/arm.stl + + + + + + + 1 + + 0 + + + + 0.07 0.075 0.025 0 0 0.785 + tilt_arm_3 + base_link + + -0.235 0.265 0 + + -2 + 2 + + + 1.0 + 0 + 0 + + 1 + + + + + 0 0 0 0 0 3.1415 + + 0.0 0.0 0.0 0 0 0 + 0.20 + + 0.0001 + 0 + 0 + 0.0001 + 0 + 0.0001 + + + + + + 0.5e-3 0.5e-3 0.5e-3 + model://tilting_quadrotor/meshes/arm.stl + + + + + + + + + + + + + + + 0.5e-3 0.5e-3 0.5e-3 + model://tilting_quadrotor/meshes/arm.stl + + + + + + + 1 + + 0 + + + + 0.07 0.075 0.025 0 0 0.785 + tilt_arm_4 + base_link + + -0.25 -0.25 0 + + -2 + 2 + + + 1.0 + 0 + 0 + + 1 + + + + + 0 0 0 0 0 4.64 + + 0.0 0.0 0.0 0 0 0 + 0.20 + + 0.0001 + 0 + 0 + 0.0001 + 0 + 0.0001 + + + + + + 0.5e-3 0.5e-3 0.5e-3 + model://tilting_quadrotor/meshes/arm.stl + + + + + + + + + + + + + + + 0.5e-3 0.5e-3 0.5e-3 + model://tilting_quadrotor/meshes/arm.stl + + + + + + + 1 + + 0 + + + + 0.07 0.075 0.025 0 0 0.785 + tilt_arm_1 + base_link + + 0.235 -0.265 0 + + -2 + 2 + + + 1.0 + 0 + 0 + + 1 + + + + + + 0.16 -0.18 0.055 0 0 0 + + 0 0 0 0 0 0 + 0.005 + + 4.85e-07 + 0 + 0 + 0.0001857 + 0 + 0.000274004 + + + + 0 0 0 0 0 0 + + + 0.005 + 0.128 + + + + + + + + + + + + + 0 0 0 0 0 0 + + + 1 1 1 + model://iris/meshes/iris_prop_ccw.dae + + + + + + + 1 + + + + rotor_1 + tilt_arm_1 + + 0 0 1 + + -1e+16 + 1e+16 + + + 0 + 0 + + 1 + + + + + 0.1635 0.175 0.05525 0 0 0 + + 0 0 0 0 0 0 + 0.005 + + 4.85e-07 + 0 + 0 + 0.0001857 + 0 + 0.000274004 + + + + 0 0 0 0 0 0 + + + 0.005 + 0.128 + + + + + + + + + + + + + 0 0 0 0 0 0 + + + 1 1 1 + model://iris/meshes/iris_prop_cw.dae + + + + + + + 1 + + + + rotor_2 + tilt_arm_2 + + 0 0 1 + + -1e+16 + 1e+16 + + + 0 + 0 + + 1 + + + + + -0.16 0.17535 0.05525 0 0 0 + + 0 0 0 0 0 0 + 0.005 + + 4.85e-07 + 0 + 0 + 0.0001857 + 0 + 0.000274004 + + + + 0 0 0 0 0 0 + + + 0.005 + 0.128 + + + + + + + + + + + + + 0 0 0 0 0 0 + + + 1 1 1 + model://iris/meshes/iris_prop_ccw.dae + + + + + + + 1 + + + + rotor_3 + tilt_arm_3 + + 0 0 1 + + -1e+16 + 1e+16 + + + 0 + 0 + + 1 + + + + + -0.164 -0.175 0.05525 0 0 0 0 0 0 + + 0 0 0 0 0 0 + 0.005 + + 4.85e-07 + 0 + 0 + 0.0001857 + 0 + 0.000274004 + + + + 0 0 0 0 0 0 + + + 0.005 + 0.128 + + + + + + + + + + + + + 0 0 0 0 0 0 + + + 1 1 1 + model://iris/meshes/iris_prop_cw.dae + + + + + + + 1 + + + + rotor_4 + tilt_arm_4 + + 0 0 1 + + -1e+16 + 1e+16 + + + 0 + 0 + + 1 + + + + + + + base_link + 10 + + + + rotor_1_joint + rotor_1 + ccw + 0.0125 + 0.025 + 1100 + 9.84e-06 + 0.09 + /gazebo/command/motor_speed + 0 + 0.000175 + 1e-06 + /motor_speed/0 + 10 + + + + rotor_2_joint + rotor_2 + cw + 0.0125 + 0.025 + 1100 + 9.84e-06 + 0.09 + /gazebo/command/motor_speed + 1 + 0.000175 + 1e-06 + /motor_speed/1 + 10 + + + + rotor_3_joint + rotor_3 + ccw + 0.0125 + 0.025 + 1100 + 9.84e-06 + 0.09 + /gazebo/command/motor_speed + 2 + 0.000175 + 1e-06 + /motor_speed/2 + 10 + + + + rotor_4_joint + rotor_4 + cw + 0.0125 + 0.025 + 1100 + 9.84e-06 + 0.09 + /gazebo/command/motor_speed + 3 + 0.000175 + 1e-06 + /motor_speed/3 + 10 + + + model://gps + 0.05 0 0.04 0 0 0 + gps0 + + + gps0::link + base_link + + + + + + + 100 + 0.0004 + 6.4e-06 + 600 + /mag + + + + 50 + /baro + 0 + + + + /imu + /mag + /baro + INADDR_ANY + {{ mavlink_tcp_port }} + {{ mavlink_udp_port }} + {{ serial_enabled }} + {{ serial_device }} + {{ serial_baudrate }} + INADDR_ANY + 14550 + INADDR_ANY + 14540 + {{ hil_mode }} + 0 + 0 + 1 + 1 + 1 + /gazebo/command/motor_speed + + + 0 + 0 + 1000 + 0 + 100 + velocity + + + 1 + 0 + 1000 + 0 + 100 + velocity + + + 2 + 0 + 1000 + 0 + 100 + velocity + + + 3 + 0 + 1000 + 0 + 100 + velocity + + + + 8 + 0.0 + 1.57 + 0 + 0 + position + tilt_arm_1_joint + +

20

+ 0.0 + 0.5 + 0.0 + 0.0 + 2 + -2 + + + + 9 + 0.0 + 1.57 + 0 + 0 + position + tilt_arm_2_joint + +

20

+ 0.0 + 0.5 + 0 + 0 + 2 + -2 + + + + 10 + 0.0 + 1.57 + 0 + 0 + position + tilt_arm_3_joint + +

20

+ 0.0 + 0.5 + 0 + 0 + 2 + -2 + + + + 11 + 0.0 + 1.57 + 0 + 0 + position + tilt_arm_4_joint + +

20

+ 0.0 + 0.5 + 0 + 0 + 2 + -2 + + + + + 0 + + + /imu_link + /imu + 0.00018665 + 3.8785e-05 + 1000.0 + 0.0087 + 0.00186 + 0.006 + 300.0 + 0.196 + + + diff --git a/worlds/empty.world b/worlds/empty.world index 08922a0c1f..ad4cf6c311 100644 --- a/worlds/empty.world +++ b/worlds/empty.world @@ -1,6 +1,11 @@ + + 0.95 0.95 0.95 1 + 0.98 0.98 0.98 1 + true + model://sun @@ -33,5 +38,15 @@ 250 6.0e-6 2.3e-5 -4.2e-5 + + + + true + true + -2 -2 1.5 + true + + +