Skip to content

Commit

Permalink
Merge branch 'foxy'
Browse files Browse the repository at this point in the history
  • Loading branch information
rbonghi committed Sep 6, 2022
2 parents 017b416 + a4a668d commit 5b79a3e
Show file tree
Hide file tree
Showing 14 changed files with 491 additions and 334 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ If you are looking for an NVIDIA Jetson Nano alternative, you can user for nanos
| 🐳 Docker | latest* | foxy | galactic | Pulls |
|:-------------:|:-------:|:----:|:--------:|:-----:|
| 🧠 [core](https://github.com/rnanosaur/nanosaur.git) | [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/nanosaur/nanosaur/latest)](https://hub.docker.com/r/nanosaur/nanosaur) | [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/nanosaur/nanosaur/foxy)](https://hub.docker.com/r/nanosaur/nanosaur) | [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/nanosaur/nanosaur/galactic)](https://hub.docker.com/r/nanosaur/nanosaur) | [![Docker Pulls](https://img.shields.io/docker/pulls/nanosaur/nanosaur)](https://hub.docker.com/r/nanosaur/nanosaur) |
| 🖼️ [perception](https://github.com/rnanosaur/nanosaur_perception.git) | [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/nanosaur/perception/latest)](https://hub.docker.com/r/nanosaur/perception) | [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/nanosaur/perception/foxy)](https://hub.docker.com/r/nanosaur/perception) | [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/nanosaur/perception/galactic)](https://hub.docker.com/r/nanosaur/perception) | [![Docker Pulls](https://img.shields.io/docker/pulls/nanosaur/perception)](https://hub.docker.com/r/nanosaur/perception) |
| 🖼️ [perception](https://github.com/rnanosaur/nanosaur_perception.git) | [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/nanosaur/perception/latest)](https://hub.docker.com/r/nanosaur/perception) <br/> zed <br/> [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/nanosaur/perception/latest-zed)](https://hub.docker.com/r/nanosaur/perception) <br/> realsense <br/> [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/nanosaur/perception/latest-realsense)](https://hub.docker.com/r/nanosaur/perception) | [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/nanosaur/perception/foxy)](https://hub.docker.com/r/nanosaur/perception) <br/> zed <br/> [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/nanosaur/perception/foxy-zed)](https://hub.docker.com/r/nanosaur/perception) <br/> realsense <br/> [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/nanosaur/perception/foxy-realsense)](https://hub.docker.com/r/nanosaur/perception) | [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/nanosaur/perception/galactic)](https://hub.docker.com/r/nanosaur/perception) | [![Docker Pulls](https://img.shields.io/docker/pulls/nanosaur/perception)](https://hub.docker.com/r/nanosaur/perception) |

# License

Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ services:
- "/dev/input" # Joystick robot
environment:
- ROS_DOMAIN_ID=${ROS_DOMAIN_ID:-0}
- NANOSAUR_COVER_TYPE=${NANOSAUR_COVER_TYPE}
- NANOSAUR_COVER_TYPE=${NANOSAUR_COVER_TYPE:-fisheye}
- RMW_IMPLEMENTATION=${RMW_IMPLEMENTATION:-rmw_cyclonedds_cpp}
labels:
- "com.centurylinklabs.watchtower.scope=nanosaur"
Expand All @@ -54,7 +54,7 @@ services:
- "core"
environment:
- ROS_DOMAIN_ID=${ROS_DOMAIN_ID:-0}
- NANOSAUR_COVER_TYPE=${NANOSAUR_COVER_TYPE}
- NANOSAUR_COVER_TYPE=${NANOSAUR_COVER_TYPE:-fisheye}
- RMW_IMPLEMENTATION=${NANOSAUR_RMW:-rmw_cyclonedds_cpp}
labels:
- "com.centurylinklabs.watchtower.scope=nanosaur"
Expand Down
2 changes: 1 addition & 1 deletion nanosaur/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>nanosaur</name>
<version>2.0.2</version>
<version>2.1.0</version>
<description>nanosaur support meta package</description>

<maintainer email="raffaello@rnext.it">Raffaello Bonghi</maintainer>
Expand Down
10 changes: 9 additions & 1 deletion nanosaur/rosinstall/simulations.rosinstall
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,12 @@
- git:
local-name: nanosaur_simulations
version: main
uri: https://github.com/rnanosaur/nanosaur_simulations.git
uri: https://github.com/rnanosaur/nanosaur_simulations.git
- git:
local-name: nanosaur_perception
version: foxy
uri: https://github.com/rnanosaur/nanosaur_perception.git
- git:
local-name: ign_ros2_control
version: foxy
uri: https://github.com/ros-controls/gz_ros2_control.git
14 changes: 11 additions & 3 deletions nanosaur/scripts/completition.bash
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,14 @@ _dothis_completions()
fi
return 0
;;
simulation)
COMPREPLY=( $(compgen -W "run set --help" -- ${cur}) )
return 0
;;
build)
COMPREPLY=( $(compgen -W "clean --help --verbose" -- ${cur}) )
return 0
;;
clean)
if [[ $PLATFORM = "robot" ]]; then
COMPREPLY=($(compgen -W "-f" -- ${cur}))
Expand All @@ -76,14 +84,14 @@ _dothis_completions()
;;
esac

COMPREPLY=($(compgen -W "help info cover config domain install update" "${COMP_WORDS[1]}"))
COMPREPLY=($(compgen -W "help info cover config dds domain install update" "${COMP_WORDS[1]}"))
# Add extra configurations
if [[ $PLATFORM = "robot" ]]; then
COMPREPLY+=($(compgen -W "distro network wakeup down" "${COMP_WORDS[1]}"))
COMPREPLY+=($(compgen -W "distro network wakeup down clean" "${COMP_WORDS[1]}"))
# Docker
COMPREPLY+=($(compgen -W "start restart stop up logs top rm exec" "${COMP_WORDS[1]}"))
else
COMPREPLY+=($(compgen -W "build branch" "${cur}"))
COMPREPLY+=($(compgen -W "build branch perception simulation teleop" "${cur}"))
fi
return 0
}
Expand Down
Loading

0 comments on commit 5b79a3e

Please sign in to comment.