Skip to content

Installer Improvements #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cvml11 wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Installer Improvements #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6aa9b82
Add missing ROS2 resource files preventing colcon build success
cvml11 Jan 3, 2026
29c6725
Remove . from setup.py file causing navigation_launch.py to not copy.
cvml11 Jan 3, 2026
2196f6d
Source the venv before running colcon build
cvml11 Jan 3, 2026
7eb6cc3
Fill in missing setup.cfg files
cvml11 Jan 3, 2026
99d56f6
Add in the neato.urdf descriptor to the install.
cvml11 Jan 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added firmware/ros2_ws/src/openneato_driver/resource/openneato_driver
View file
Open in desktop
Empty file.
4 changes: 4 additions & 0 deletions firmware/ros2_ws/src/openneato_driver/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[develop]
script_dir=$base/lib/openneato_driver
[install]
install_scripts=$base/lib/openneato_driver
Empty file added firmware/ros2_ws/src/openneato_nav/resource/openneato_nav
View file
Open in desktop
Empty file.
4 changes: 4 additions & 0 deletions firmware/ros2_ws/src/openneato_nav/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[develop]
script_dir=$base/lib/openneato_nav
[install]
install_scripts=$base/lib/openneato_nav
6 changes: 4 additions & 2 deletions firmware/ros2_ws/src/openneato_nav/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@
['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')),
# Install the urdf descriptor of Neato
(os.path.join('share', package_name, 'urdf'), glob('urdf/*')),
],
install_requires=['setuptools'],
zip_safe=True,
Expand All @@ -27,4 +29,4 @@
entry_points={
'console_scripts': [],
},
)
)
10 changes: 10 additions & 0 deletions firmware/ros2_ws/src/openneato_nav/urdf/neato.urdf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<robot name="ryans_neato">
<link name="base_link">
<visual>
<geometry>
<cylinder radius="0.18" length="0.2"/>
</geometry>
<material name="blue"/>
</visual>
</link>
</robot>
10 changes: 9 additions & 1 deletion installer/install.sh
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -139,4 +147,4 @@ do_uninstall() {
case $CHOICE in
"1") do_install ;;
"2") do_uninstall ;;
esac
esac