From 6aa9b82529c779f3a4fb24acf267d5f395c37425 Mon Sep 17 00:00:00 2001 From: cvml11 Date: Sat, 3 Jan 2026 10:20:15 -0500 Subject: [PATCH 1/5] Add missing ROS2 resource files preventing colcon build success --- firmware/ros2_ws/src/openneato_driver/resource/openneato_driver | 0 firmware/ros2_ws/src/openneato_nav/resource/openneato_nav | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 firmware/ros2_ws/src/openneato_driver/resource/openneato_driver create mode 100644 firmware/ros2_ws/src/openneato_nav/resource/openneato_nav diff --git a/firmware/ros2_ws/src/openneato_driver/resource/openneato_driver b/firmware/ros2_ws/src/openneato_driver/resource/openneato_driver new file mode 100644 index 0000000..e69de29 diff --git a/firmware/ros2_ws/src/openneato_nav/resource/openneato_nav b/firmware/ros2_ws/src/openneato_nav/resource/openneato_nav new file mode 100644 index 0000000..e69de29 From 29c672554089a3acb501caa78923497f5272e8d9 Mon Sep 17 00:00:00 2001 From: cvml11 Date: Sat, 3 Jan 2026 10:33:33 -0500 Subject: [PATCH 2/5] Remove . from setup.py file causing navigation_launch.py to not copy. --- firmware/ros2_ws/src/openneato_nav/setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/firmware/ros2_ws/src/openneato_nav/setup.py b/firmware/ros2_ws/src/openneato_nav/setup.py index a662dc3..15b9d8f 100644 --- a/firmware/ros2_ws/src/openneato_nav/setup.py +++ b/firmware/ros2_ws/src/openneato_nav/setup.py @@ -13,7 +13,7 @@ ['resource/' + package_name]), ('share/' + package_name, ['package.xml']), # Installa tutti i file launch - (os.path.join('share', package_name, 'launch'), glob('launch/*.launch.py')), + (os.path.join('share', package_name, 'launch'), glob('launch/*launch.py')), # Installa tutti i file di configurazione (params) (os.path.join('share', package_name, 'params'), glob('params/*.yaml')), ], @@ -27,4 +27,4 @@ entry_points={ 'console_scripts': [], }, -) \ No newline at end of file +) From 2196f6d26d3b0990ce67c9c2dce842ba3cfc4190 Mon Sep 17 00:00:00 2001 From: cvml11 Date: Sat, 3 Jan 2026 11:51:47 -0500 Subject: [PATCH 3/5] Source the venv before running colcon build --- installer/install.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) mode change 100644 => 100755 installer/install.sh diff --git a/installer/install.sh b/installer/install.sh old mode 100644 new mode 100755 index 50476d1..71fcb07 --- a/installer/install.sh +++ b/installer/install.sh @@ -78,6 +78,14 @@ do_install() { whiptail --title "Building ROS 2 Workspace" --infobox "Compiling OpenNeato firmware (this may take a while)..." 8 78 cd "$INSTALL_DIR/firmware/ros2_ws" + # Source Virtual Python environment just created above + if [ -f "$INSTALL_DIR/venv/bin/activate" ]; then + source $INSTALL_DIR/venv/bin/activate + else + echo "Error: Could not source the python virtual environment $INSTALL_DIR/venv/bin/activate" + exit 1 + fi + # Source ROS 2 Jazzy if [ -f "/opt/ros/jazzy/setup.bash" ]; then source /opt/ros/jazzy/setup.bash @@ -139,4 +147,4 @@ do_uninstall() { case $CHOICE in "1") do_install ;; "2") do_uninstall ;; -esac \ No newline at end of file +esac From 7eb6cc3942e13517d6c1342700059d30f08856d7 Mon Sep 17 00:00:00 2001 From: cvml11 Date: Sat, 3 Jan 2026 16:43:20 -0500 Subject: [PATCH 4/5] Fill in missing setup.cfg files --- firmware/ros2_ws/src/openneato_driver/setup.cfg | 4 ++++ firmware/ros2_ws/src/openneato_nav/setup.cfg | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 firmware/ros2_ws/src/openneato_nav/setup.cfg diff --git a/firmware/ros2_ws/src/openneato_driver/setup.cfg b/firmware/ros2_ws/src/openneato_driver/setup.cfg index e69de29..d19b1b6 100644 --- a/firmware/ros2_ws/src/openneato_driver/setup.cfg +++ b/firmware/ros2_ws/src/openneato_driver/setup.cfg @@ -0,0 +1,4 @@ +[develop] +script_dir=$base/lib/openneato_driver +[install] +install_scripts=$base/lib/openneato_driver diff --git a/firmware/ros2_ws/src/openneato_nav/setup.cfg b/firmware/ros2_ws/src/openneato_nav/setup.cfg new file mode 100644 index 0000000..4bbf7bd --- /dev/null +++ b/firmware/ros2_ws/src/openneato_nav/setup.cfg @@ -0,0 +1,4 @@ +[develop] +script_dir=$base/lib/openneato_nav +[install] +install_scripts=$base/lib/openneato_nav From 99d56f6d7480234c8b872f4a58b4d28a24fc81fa Mon Sep 17 00:00:00 2001 From: cvml11 Date: Sat, 3 Jan 2026 16:45:04 -0500 Subject: [PATCH 5/5] Add in the neato.urdf descriptor to the install. --- firmware/ros2_ws/src/openneato_nav/setup.py | 2 ++ firmware/ros2_ws/src/openneato_nav/urdf/neato.urdf | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 firmware/ros2_ws/src/openneato_nav/urdf/neato.urdf diff --git a/firmware/ros2_ws/src/openneato_nav/setup.py b/firmware/ros2_ws/src/openneato_nav/setup.py index 15b9d8f..57ae4ee 100644 --- a/firmware/ros2_ws/src/openneato_nav/setup.py +++ b/firmware/ros2_ws/src/openneato_nav/setup.py @@ -16,6 +16,8 @@ (os.path.join('share', package_name, 'launch'), glob('launch/*launch.py')), # Installa tutti i file di configurazione (params) (os.path.join('share', package_name, 'params'), glob('params/*.yaml')), + # Install the urdf descriptor of Neato + (os.path.join('share', package_name, 'urdf'), glob('urdf/*')), ], install_requires=['setuptools'], zip_safe=True, diff --git a/firmware/ros2_ws/src/openneato_nav/urdf/neato.urdf b/firmware/ros2_ws/src/openneato_nav/urdf/neato.urdf new file mode 100644 index 0000000..826f062 --- /dev/null +++ b/firmware/ros2_ws/src/openneato_nav/urdf/neato.urdf @@ -0,0 +1,10 @@ + + + + + + + + + +