Merge branch 'master' into task-4-test-worlds

uf-mil · Sep 21, 2024 · e7966f1 · e7966f1
2 parents f25feff + 408cf57
commit e7966f1
Show file tree

Hide file tree

Showing 30 changed files with 666 additions and 153 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -50,7 +50,7 @@ jobs:
       - name: Install BlueView Sonar SDK
         run: |
           cd $GITHUB_WORKSPACE/catkin_ws/src/mil
-          ./scripts/hardware_installers/install_bvtsdk --pass ${{ secrets.ZOBELISK_PASSWORD }}
+          ./scripts/hw/install_bvtsdk --pass ${{ secrets.ZOBELISK_PASSWORD }}
           ls mil_common/drivers/mil_blueview_driver
           echo $PWD
       - name: Install system dependencies

diff --git a/NaviGator/mission_control/navigator_launch/launch/hardware/gps.launch b/NaviGator/mission_control/navigator_launch/launch/hardware/gps.launch
@@ -2,7 +2,7 @@
     <node name="sylphase_ros_driver" pkg="navigator_tools" type="sylphase_ros_driver">
         <param name="port" value="1235" />
         <param name="child_frame_id" value="wamv/ins_link" />
-        <param name="force_z_to_zero" value="False" />
+        <param name="force_z_to_zero" value="True" />
         <remap from="/odom" to="/ins_odom" />
     </node>
 </launch>