Merge remote-tracking branch 'origin/main' into dev

MOV-AI · Jan 9, 2023 · 1c7fcac · 1c7fcac
2 parents 9bbd554 + 99446ce
commit 1c7fcac
Showing 1 changed file with 18 additions and 26 deletions.
diff --git a/files/home/default.rviz b/files/home/default.rviz
@@ -5,10 +5,9 @@ Panels:
     Property Tree Widget:
       Expanded:
         - /Global Options1
-        - /Mapping1
-        - /Localization1/3D1/Slam Odometry1
-      Splitter Ratio: 0.5941042900085449
-    Tree Height: 668
+        - /Cameras1/Camera Front Image1/Status1
+      Splitter Ratio: 0.46526655554771423
+    Tree Height: 654
   - Class: rviz/Selection
     Name: Selection
   - Class: rviz/Tool Properties
@@ -25,7 +24,7 @@ Panels:
     Experimental: false
     Name: Time
     SyncMode: 0
-    SyncSource: Submaps Edges
+    SyncSource: Scan Front
 Preferences:
   PromptSaveOnExit: true
 Toolbars:
@@ -195,7 +194,7 @@ Visualization Manager:
           Size (Pixels): 3
           Size (m): 0.009999999776482582
           Style: Points
-          Topic: /velodyne_points
+          Topic: /lidar/points
           Unreliable: false
           Use Fixed Frame: true
           Use rainbow: true
@@ -206,7 +205,7 @@ Visualization Manager:
       Displays:
         - Class: rviz/Image
           Enabled: true
-          Image Topic: /camera_back/color/image_rect_throttled
+          Image Topic: /camera_back/color/image_rect_raw
           Max Value: 1
           Median window: 5
           Min Value: 0
@@ -218,7 +217,7 @@ Visualization Manager:
           Value: true
         - Class: rviz/Image
           Enabled: true
-          Image Topic: /camera_front/color/image_rect_throttled
+          Image Topic: /camera_front/color/image_rect_raw
           Max Value: 1
           Median window: 5
           Min Value: 0
@@ -606,7 +605,7 @@ Visualization Manager:
                   Scale: 1
                   Value: true
                 Value: true
-              Enabled: true
+              Enabled: false
               Keep: 1
               Name: Slam Odometry
               Position Tolerance: 0.10000000149011612
@@ -623,7 +622,7 @@ Visualization Manager:
                 Value: Axes
               Topic: /tugbot__localization__localization_slam__lidar_slam/slam_odom/out
               Unreliable: false
-              Value: true
+              Value: false
           Enabled: true
           Name: 3D
       Enabled: true
@@ -702,16 +701,8 @@ Visualization Manager:
       Name: Navigation
     - Class: rviz/MarkerArray
       Enabled: true
-      Marker Topic: /tugbot__msu__scan/scan_markers/out
-      Name: Pickup Areas
-      Namespaces:
-        {}
-      Queue Size: 100
-      Value: true
-    - Class: rviz/MarkerArray
-      Enabled: true
-      Marker Topic: visualization_marker_array
-      Name: Drop Areas
+      Marker Topic: /tugbot__msu__scan_server/scan_markers/out
+      Name: Pickup and Drop Areas
       Namespaces:
         {}
       Queue Size: 100
@@ -723,7 +714,7 @@ Visualization Manager:
       History Length: 1
       Name: Imu
       Queue Size: 10
-      Topic: /drivers__imu_filter/imu_filtered/out
+      Topic: /imu/data/filtered
       Unreliable: false
       Value: false
   Enabled: true
@@ -753,8 +744,8 @@ Visualization Manager:
   Value: true
   Views:
     Current:
-      Class: rviz/Orbit
-      Distance: 10.71345329284668
+      Angle: -0.004999999888241291
+      Class: rviz/TopDownOrtho
       Enable Stereo Rendering:
         Stereo Eye Separation: 0.05999999865889549
         Stereo Focal Distance: 1
@@ -770,9 +761,10 @@ Visualization Manager:
       Invert Z Axis: false
       Name: Current View
       Near Clip Distance: 0.009999999776482582
-      Pitch: 0.7597967386245728
+      Scale: 38.08797073364258
       Target Frame: base_link
-      Yaw: 5.013184070587158
+      X: 2.342628240585327
+      Y: -1.4866849184036255
     Saved: ~
 Window Geometry:
   Camera Back Image:
@@ -784,7 +776,7 @@ Window Geometry:
   Height: 1154
   Hide Left Dock: false
   Hide Right Dock: false
-  QMainWindow State: 000000ff00000000fd0000000400000000000001bb000003e8fc020000000cfb0000001200530065006c0065006300740069006f006e00000001e10000009b0000005c00fffffffb000000120056006900650077007300200054006f006f02000001df000002110000018500000122fb000000200054006f006f006c002000500072006f0070006500720074006900650073003203000002880000011d000002210000017afb0000001e0054006f006f006c002000500072006f0070006500720074006900650073010000003b000000bd0000005c00fffffffb000000100044006900730070006c00610079007301000000fe00000325000000c700fffffffb0000002000730065006c0065006300740069006f006e00200062007500660066006500720200000138000000aa0000023a00000294fb00000014005700690064006500530074006500720065006f02000000e6000000d2000003ee0000030bfb0000000c004b0069006e0065006300740200000186000001060000030c00000261fb0000000c00430061006d0065007200610000000253000001200000000000000000fb0000002200430061006d0065007200610020004200610063006b00200049006d00610067006500000002c7000000820000001600fffffffb0000002200430061006d0065007200610020004200610063006b00200049006d00610067006500000002ae000000c50000000000000000fb0000002400430061006d006500720061002000460072006f006e007400200049006d006100670065000000034f000000d40000001600ffffff000000010000010f000003e8fc0200000003fb0000001e0054006f006f006c002000500072006f00700065007200740069006500730100000041000000780000000000000000fb0000000a00560069006500770073010000003b000003e8000000a000fffffffb0000001200530065006c0065006300740069006f006e010000025a000000b200000000000000000000000200000490000000a9fc0100000001fb0000000a00560069006500770073030000004e00000080000002e10000019700000003000006400000003efc0100000002fb0000000800540069006d00650100000000000006400000024400fffffffb0000000800540069006d006501000000000000045000000000000000000000036a000003e800000004000000040000000800000008fc0000000100000002000000010000000a0054006f006f006c00730100000000ffffffff0000000000000000
+  QMainWindow State: 000000ff00000000fd0000000400000000000002b0000003e8fc020000000dfb0000001200530065006c0065006300740069006f006e00000001e10000009b0000005c00fffffffb000000120056006900650077007300200054006f006f02000001df000002110000018500000122fb000000200054006f006f006c002000500072006f0070006500720074006900650073003203000002880000011d000002210000017afb0000001e0054006f006f006c002000500072006f0070006500720074006900650073010000003b000000cb0000005c00fffffffb000000100044006900730070006c006100790073010000010c00000317000000c700fffffffb0000002000730065006c0065006300740069006f006e00200062007500660066006500720200000138000000aa0000023a00000294fb00000014005700690064006500530074006500720065006f02000000e6000000d2000003ee0000030bfb0000000c004b0069006e0065006300740200000186000001060000030c00000261fb0000000c00430061006d0065007200610000000253000001200000000000000000fb0000002200430061006d0065007200610020004200610063006b00200049006d0061006700650000000311000000a50000000000000000fb0000002200430061006d0065007200610020004200610063006b00200049006d00610067006500000002ae000000c50000001600fffffffb0000002400430061006d006500720061002000460072006f006e007400200049006d00610067006500000003bc000000670000000000000000fb0000002400430061006d006500720061002000460072006f006e007400200049006d0061006700650000000000ffffffff0000001600ffffff000000010000010f000003e8fc0200000003fb0000001e0054006f006f006c002000500072006f00700065007200740069006500730100000041000000780000000000000000fb0000000a00560069006500770073000000003b000003e8000000a000fffffffb0000001200530065006c0065006300740069006f006e010000025a000000b200000000000000000000000200000490000000a9fc0100000001fb0000000a00560069006500770073030000004e00000080000002e10000019700000003000006400000003efc0100000002fb0000000800540069006d00650100000000000006400000024400fffffffb0000000800540069006d006501000000000000045000000000000000000000038a000003e800000004000000040000000800000008fc0000000100000002000000010000000a0054006f006f006c00730100000000ffffffff0000000000000000
   Selection:
     collapsed: false
   Time: