save changes for merge

USC-ACTLab · Jun 25, 2024 · 854b1f5 · 854b1f5
1 parent b7a35b9
commit 854b1f5
Show file tree

Hide file tree

Showing 32 changed files with 3,237 additions and 294 deletions.
diff --git a/crazyflie/config/config.rviz b/crazyflie/config/config.rviz
@@ -6,6 +6,9 @@ Panels:
       Expanded:
         - /Global Options1
         - /Status1
+        - /Grid1
+        - /TF1
+        - /TF1/Frames1
       Splitter Ratio: 0.5
     Tree Height: 549
   - Class: rviz_common/Selection
@@ -51,8 +54,10 @@ Visualization Manager:
       Enabled: true
       Frame Timeout: 15
       Frames:
-        All Enabled: true
-        wand:
+        All Enabled: false
+        cf33:
+          Value: true
+        pete:
           Value: true
         world:
           Value: true
@@ -63,7 +68,9 @@ Visualization Manager:
       Show Names: false
       Tree:
         world:
-          wand:
+          cf33:
+            {}
+          pete:
             {}
       Update Interval: 0
       Value: true
@@ -113,7 +120,7 @@ Visualization Manager:
   Views:
     Current:
       Class: rviz_default_plugins/Orbit
-      Distance: 4.256967067718506
+      Distance: 11.772972106933594
       Enable Stereo Rendering:
         Stereo Eye Separation: 0.05999999865889549
         Stereo Focal Distance: 1
@@ -128,10 +135,10 @@ Visualization Manager:
       Invert Z Axis: false
       Name: Current View
       Near Clip Distance: 0.009999999776482582
-      Pitch: 0.6353980898857117
+      Pitch: 0.770397961139679
       Target Frame: <Fixed Frame>
       Value: Orbit (rviz)
-      Yaw: 1.9485704898834229
+      Yaw: 4.333576202392578
     Saved: ~
 Window Geometry:
   Displays:
@@ -149,5 +156,5 @@ Window Geometry:
   Views:
     collapsed: false
   Width: 1200
-  X: 89
-  Y: 197
+  X: 160
+  Y: 105
diff --git a/crazyflie/config/crazyflies.yaml b/crazyflie/config/crazyflies.yaml
@@ -128,15 +128,15 @@ robots:
     initial_position: [-0.5, 0, 0.0]
     type: cf21_single_marker
   cf22:
-    enabled: false
+    enabled: true
     uri: radio://*/100/2M/E7E7E7E716
     initial_position: [1.0, 1.0, 0.0]
     type: cf21_single_marker
   cf23:
     enabled: false
     uri: radio://*/80/2M/E7E7E7E717
-    initial_position: [0.25, 0, 0.0]
-    type: cf21
+    initial_position: [0.5, 0, 0.0]
+    type: cf21_m3
   cf24:
     enabled: false
     uri: radio://*/80/2M/E7E7E7E718
@@ -151,7 +151,7 @@ robots:
   cf27:
     enabled: false
     uri: radio://*/80/2M/E7E7E7E71B
-    initial_position: [-0.5, 0, 0.0]
+    initial_position: [-0.0, 0, 0.0]
     type: cf21_single_marker # see robot_types
   cf28:
     enabled: false
@@ -213,7 +213,7 @@ robots:
     enabled: false
     uri: radio://*/80/2M/E7E7E7E72C
     initial_position: [0, 0, 0]
-    type: cf21 # see robot_types
+    type: cf21_m2 # see robot_types
   cf45:
     enabled: false
     uri: radio://*/80/2M/E7E7E7E72D
@@ -245,7 +245,7 @@ robots:
   #   initial_position: [0, 0, 0]
   #   type:      # see robot_types
   cf60:
-    enabled: true
+    enabled: false
     uri: radio://*/80/2M/E7E7E7E73C
     initial_position: [1.5, 0, 0.]
     type: cf21_single_marker # see robot_types