Deprecate xacro macros (PX4#623)

xacro macros have been replaced by jinja templates in PX4/PX4-Autopilot#15831, therefore no longer used in the PX4 toolchain. This commit removes rotors_description to deprecate xacro templates completely Remove xacro.py
RyosukeMatsushima · Oct 7, 2020 · d780bd6 · d780bd6
1 parent b8b187c
commit d780bd6
Show file tree

Hide file tree

Showing 16 changed files with 10 additions and 3,564 deletions.
diff --git a/models/if750a/if750a.sdf b/models/if750a/if750a.sdf
@@ -121,7 +121,7 @@
         <geometry>
           <mesh>
             <scale>1 1 1</scale>
-            <uri>model://rotors_description/meshes/iris_prop_ccw.dae</uri>
+            <uri>model://iris/meshes/iris_prop_ccw.dae</uri>
           </mesh>
         </geometry>
         <material>
@@ -187,7 +187,7 @@
         <geometry>
           <mesh>
             <scale>1 1 1</scale>
-            <uri>model://rotors_description/meshes/iris_prop_ccw.dae</uri>
+            <uri>model://iris/meshes/iris_prop_ccw.dae</uri>
           </mesh>
         </geometry>
         <material>
@@ -253,7 +253,7 @@
         <geometry>
           <mesh>
             <scale>1 1 1</scale>
-            <uri>model://rotors_description/meshes/iris_prop_cw.dae</uri>
+            <uri>model://iris/meshes/iris_prop_cw.dae</uri>
           </mesh>
         </geometry>
         <material>
@@ -319,7 +319,7 @@
         <geometry>
           <mesh>
             <scale>1 1 1</scale>
-            <uri>model://rotors_description/meshes/iris_prop_cw.dae</uri>
+            <uri>model://iris/meshes/iris_prop_cw.dae</uri>
           </mesh>
         </geometry>
         <material>

diff --git a/models/iris_hitl/iris_hitl.sdf b/models/iris_hitl/iris_hitl.sdf
@@ -37,7 +37,7 @@
         <geometry>
           <mesh>
             <scale>1 1 1</scale>
-            <uri>model://rotors_description/meshes/iris.stl</uri>
+            <uri>model://iris/meshes/iris.stl</uri>
           </mesh>
         </geometry>
         <material>
@@ -200,7 +200,7 @@
         <geometry>
           <mesh>
             <scale>1 1 1</scale>
-            <uri>model://rotors_description/meshes/iris_prop_ccw.dae</uri>
+            <uri>model://iris/meshes/iris_prop_ccw.dae</uri>
           </mesh>
         </geometry>
         <material>

diff --git a/models/px4vision/px4vision.sdf b/models/px4vision/px4vision.sdf
@@ -120,7 +120,7 @@
         <geometry>
           <mesh>
             <scale>0.6 0.6 0.6</scale>
-            <uri>model://rotors_description/meshes/iris_prop_ccw.dae</uri>
+            <uri>model://iris/meshes/iris_prop_ccw.dae</uri>
           </mesh>
         </geometry>
         <material>
@@ -185,7 +185,7 @@
         <geometry>
           <mesh>
             <scale>0.6 0.6 0.6</scale>
-            <uri>model://rotors_description/meshes/iris_prop_ccw.dae</uri>
+            <uri>model://iris/meshes/iris_prop_ccw.dae</uri>
           </mesh>
         </geometry>
         <material>
@@ -250,7 +250,7 @@
         <geometry>
           <mesh>
             <scale>0.6 0.6 0.6</scale>
-            <uri>model://rotors_description/meshes/iris_prop_cw.dae</uri>
+            <uri>model://iris/meshes/iris_prop_cw.dae</uri>
           </mesh>
         </geometry>
         <material>
@@ -315,7 +315,7 @@
         <geometry>
           <mesh>
             <scale>0.6 0.6 0.6</scale>
-            <uri>model://rotors_description/meshes/iris_prop_cw.dae</uri>
+            <uri>model://iris/meshes/iris_prop_cw.dae</uri>
           </mesh>
         </geometry>
         <material>

diff --git a/models/rotors_description/model.config b/models/rotors_description/model.config