From 87a764e6164c667be4b3de86d8f62a8857066c8f Mon Sep 17 00:00:00 2001
From: SHC-ASTRA <90978381+ASTRA-SHC@users.noreply.github.com>
Date: Thu, 5 Feb 2026 21:07:56 -0600
Subject: [PATCH] change astra_msgs to latest main hash

---
 auto_start/auto_start_anchor.sh        | 4 ++--
 auto_start/auto_start_headless_full.sh | 2 +-
 auto_start/start_rosbag.sh             | 2 +-
 src/astra_descriptions                 | 2 +-
 src/astra_msgs                         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/auto_start/auto_start_anchor.sh b/auto_start/auto_start_anchor.sh
index 12419bd..faeb221 100755
--- a/auto_start/auto_start_anchor.sh
+++ b/auto_start/auto_start_anchor.sh
@@ -14,8 +14,8 @@ echo "[INFO] Network interface is up!"
 # Your actual ROS node start command goes here
 echo "[INFO] Starting ROS node..."
 
-# Source ROS 2 Humble setup script
-source /opt/ros/humble/setup.bash
+# Source ROS 2 Humble setup script (if we aren't using nix)
+command -v ros2 || source /opt/ros/humble/setup.bash
 
 # Source your workspace setup script
 source $SCRIPT_DIR/../install/setup.bash
diff --git a/auto_start/auto_start_headless_full.sh b/auto_start/auto_start_headless_full.sh
index 8a014e1..875625f 100755
--- a/auto_start/auto_start_headless_full.sh
+++ b/auto_start/auto_start_headless_full.sh
@@ -15,7 +15,7 @@ echo "[INFO] Network interface is up!"
 echo "[INFO] Starting ROS node..."
 
 # Source ROS 2 Humble setup script
-source /opt/ros/humble/setup.bash
+command -v ros2 || source /opt/ros/humble/setup.bash
 
 # Source your workspace setup script
 source $SCRIPT_DIR/../install/setup.bash
diff --git a/auto_start/start_rosbag.sh b/auto_start/start_rosbag.sh
index dcc07d7..0fa68ef 100755
--- a/auto_start/start_rosbag.sh
+++ b/auto_start/start_rosbag.sh
@@ -17,7 +17,7 @@ done
 echo "[INFO] Network interface is up!"
 
 
-source /opt/ros/humble/setup.bash
+command -v ros2 || source /opt/ros/humble/setup.bash
 source $ANCHOR_WS/install/setup.bash
 [[ -f $AUTONOMY_WS/install/setup.bash ]] && source $AUTONOMY_WS/install/setup.bash
 
diff --git a/src/astra_descriptions b/src/astra_descriptions
index 4ab41e9..29a3eea 160000
--- a/src/astra_descriptions
+++ b/src/astra_descriptions
@@ -1 +1 @@
-Subproject commit 4ab41e9c826b0495aa90d0df7972482a831b255b
+Subproject commit 29a3eea9c53c97d7c01c092f4d727e14788066b3
diff --git a/src/astra_msgs b/src/astra_msgs
index ea0a680..91883d8 160000
--- a/src/astra_msgs
+++ b/src/astra_msgs
@@ -1 +1 @@
-Subproject commit ea0a680d2261a3579704fd2b7d075e831fee010e
+Subproject commit 91883d8cab275897be2ece5fc16d77f1baca34ed