Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/nasa/astrobee into remot…
Browse files Browse the repository at this point in the history
…e_docker
  • Loading branch information
marinagmoreira committed Apr 10, 2024
2 parents e4986a6 + dfacf7b commit 81c94ff
Show file tree
Hide file tree
Showing 150 changed files with 5,156 additions and 540 deletions.
32 changes: 0 additions & 32 deletions .github/workflows/ci_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,38 +7,6 @@ on:

jobs:

build-xenial:

runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Checkout submodule
run: git submodule update --init --depth 1 description/media

- name: Build, test
run: ./scripts/docker/build.sh --xenial --remote
astrobee test_astrobee

build-bionic:

runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Checkout submodule
run: git submodule update --init --depth 1 description/media

- name: Build, test
run: ./scripts/docker/build.sh --bionic --remote
astrobee test_astrobee

build-focal:

runs-on: ubuntu-20.04
Expand Down
72 changes: 0 additions & 72 deletions .github/workflows/ci_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,78 +8,6 @@ on:

jobs:

build-xenial:

runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3

- name: Checkout submodule
run: git submodule update --init --depth 1 description/media

- name: Log in to registry
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin

- name: Build, test, push docker
run: >
revision="latest";
build_arg="astrobee";
push_arg="";
branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}};
if [ "${{ github.repository_owner }}" == "nasa" ]; then
if [ $branch == "develop" ]; then
push_arg="push_astrobee";
fi;
if [ $branch == "master" ]; then
export VERSION=`grep -w -m 1 "Release" RELEASE.md | awk '{print $3}'`;
revision="v${VERSION}";
build_arg="astrobee_base astrobee";
push_arg="push_astrobee_base push_astrobee";
fi;
fi;
command="./scripts/docker/build.sh --xenial --remote --revision ${revision} \
--owner ${{ github.repository_owner }} \
${build_arg} test_astrobee ${push_arg}";
echo "$command";
eval "$command";
build-bionic:

runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3

- name: Checkout submodule
run: git submodule update --init --depth 1 description/media

- name: Log in to registry
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin

- name: Build, test, push docker
run: >
revision="latest";
build_arg="astrobee";
push_arg="";
branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}};
if [ "${{ github.repository_owner }}" == "nasa" ]; then
if [ $branch == "develop" ]; then
push_arg="push_astrobee";
fi;
if [ $branch == "master" ]; then
export VERSION=`grep -w -m 1 "Release" RELEASE.md | awk '{print $3}'`;
revision="v${VERSION}";
build_arg="astrobee_base astrobee";
push_arg="push_astrobee_base push_astrobee";
fi;
fi;
command="./scripts/docker/build.sh --bionic --remote --revision ${revision} \
--owner ${{ github.repository_owner }} \
${build_arg} test_astrobee ${push_arg}";
echo "$command";
eval "$command";
build-focal:

runs-on: ubuntu-20.04
Expand Down
36 changes: 0 additions & 36 deletions .github/workflows/docker_push_latest_base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,42 +8,6 @@ on: ['workflow_dispatch']

jobs:

build-xenial:

runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3

- name: Checkout submodule
run: git submodule update --init --depth 1 description/media

- name: Log in to registry
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin

- name: Build base, build, test, push base docker
run: ./scripts/docker/build.sh --xenial
--owner ${{ github.repository_owner }}
astrobee_base astrobee test_astrobee push_astrobee_base

build-bionic:

runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3

- name: Checkout submodule
run: git submodule update --init --depth 1 description/media

- name: Log in to registry
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin

- name: Build base, build, test, push base docker
run: ./scripts/docker/build.sh --bionic
--owner ${{ github.repository_owner }}
astrobee_base astrobee test_astrobee push_astrobee_base

build-focal:

runs-on: ubuntu-20.04
Expand Down
13 changes: 3 additions & 10 deletions .github/workflows/msgs_jar.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,12 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Build image astrobee/astrobee:msgs-ubuntu16.04
- name: Build image astrobee/astrobee:msgs-ubuntu20.04
run: docker build . -f ./scripts/docker/astrobee_msgs.Dockerfile
--build-arg UBUNTU_VERSION=16.04
--build-arg ROS_VERSION=kinetic
--build-arg PYTHON=''
-t astrobee/astrobee:msgs-ubuntu16.04
-t astrobee/astrobee:msgs-ubuntu20.04

- name: Build image astrobee/astrobee:latest-msgs-jar-ubuntu16.04
- name: Build image astrobee/astrobee:latest-msgs-jar-ubuntu20.04
run: docker build . -f ./scripts/docker/build_msgs_jar.Dockerfile
--build-arg UBUNTU_VERSION=16.04
--build-arg ROS_VERSION=kinetic
--build-arg PYTHON=''
--build-arg REPO=astrobee
-t ghcr.io/${{ github.repository_owner }}/astrobee:latest-msgs-jar

- name: Copy jar files
Expand Down
14 changes: 8 additions & 6 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@

## System requirements

Ubuntu 20.04 is the preferred host OS for most Astrobee developers to use.
Ubuntu 20.04 is currently the only supported platform.

Here are the available host OS options with development roadmap details (use 64-bit PC (AMD64) desktop image):
- [Ubuntu 20.04](http://releases.ubuntu.com/20.04): This is the preferred host OS for most Astrobee developers to use. The Astrobee Facility team is currently preparing to upgrade the robots on ISS from Ubuntu 16.04 to Ubuntu 20.04, but we aren't yet ready to announce a deployment date for that upgrade.
- [Ubuntu 18.04](http://releases.ubuntu.com/18.04): We are not aware of any current robot users that still need Ubuntu 18.04 support, and expect to discontinue support in the near future. New users should not select this host OS.
- [Ubuntu 16.04](http://releases.ubuntu.com/16.04): The Astrobee robot hardware on ISS currently runs Ubuntu 16.04. Only developers with NASA internal access can cross-compile software to run on the robot, and must use 16.04 for that. Most developers shouldn't need to work with 16.04, especially when just getting started. Support will eventually be discontinued after the robot hardware on ISS is upgraded to Ubuntu 20.04.
(Ubuntu 22.04 not supported)
Here are the currently available host OS options with development roadmap details (use 64-bit PC (AMD64) desktop image):
- [Ubuntu 20.04](http://releases.ubuntu.com/20.04): This is currently the only supported platform. The Astrobee hardware on ISS has been running Ubuntu 20.04 since it was upgraded during the "Crew-Minimal S14" activity on December 19, 2023.

Specifically not supported:
- ~~[Ubuntu 16.04](http://releases.ubuntu.com/16.04)~~: No longer supported. The Astrobee robot hardware ran Ubuntu 16.04 from its launch in 2019 until it was upgraded to run Ubuntu 20.04. Ubuntu 16.04 support was discontinued in February 2024. Ending Ubuntu 16.04 support removed important limitations. For example, going forward, Astrobee's software will no longer need to be backward-compatible with Python 2 and OpenCV 3.
- ~~[Ubuntu 18.04](http://releases.ubuntu.com/18.04)~~: Ubuntu 18.04 support as a software development platform was discontinued as of November 2023. (It was never supported on the robot hardware.)
- ~~[Ubuntu 22.04](http://releases.ubuntu.com/22.04)~~: There is currently no plan for Ubuntu 22.04 support on the Astrobee roadmap. However, note that Astrobee ROS2 support, when it eventually becomes available, is currently expected to use the ROS2 Humble Hawksbill distribution that normally runs on 22.04, but backported to run on 20.04 (the last Ubuntu version supported by ROS1). This will facilitate migrating from ROS1 to ROS2 without requiring a simultaneous Ubuntu distribution upgrade.

Graphical interfaces will perform best if your host OS is running natively (not in a virtual machine).

Expand Down
6 changes: 6 additions & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Releases

# Release 0.17.2

* Adding Generic comms bridge
* Multiple bug fixes
* Ubuntu 20 only supported now

# Release 0.17.1

* Multiple bug fixes
Expand Down
2 changes: 1 addition & 1 deletion astrobee.doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ PROJECT_NAME = "NASA Astrobee Robot Software"
# control system is used.


PROJECT_NUMBER = 0.17.1
PROJECT_NUMBER = 0.17.2

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
2 changes: 1 addition & 1 deletion astrobee/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
cmake_minimum_required(VERSION 3.0)
project(astrobee)

set(ASTROBEE_VERSION 0.17.1)
set(ASTROBEE_VERSION 0.17.2)

## Compile as C++14, supported in ROS Kinetic and newer
add_compile_options(-std=c++14)
Expand Down
105 changes: 105 additions & 0 deletions astrobee/config/communications/comms_bridge.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
-- Copyright (c) 2017, United States Government, as represented by the
-- Administrator of the National Aeronautics and Space Administration.
--
-- All rights reserved.
--
-- The Astrobee platform is licensed under the Apache License, Version 2.0
-- (the "License"); you may not use this file except in compliance with the
-- License. You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-- License for the specific language governing permissions and limitations
-- under the License.

require "context"

-- Enable DDS communications on start --
-- If false, a trigger call will be needed to start communications --
initialize_dds_on_start = false

-- Request an advertisement info message if a content message was received
-- before the advertisement info message in case the advertisement message
-- never comes.
-- DDS has been setup such that this shouldn't be needed and it can cause more
-- information to be sent then needed. By default, it will be set to false
-- but if communications on the ISS are not working as expected, it can be
-- enabled.
enable_advertisement_info_request = false

-- The verbosity is used to control the output of the underlying ros
-- publisher/subscriber. Level 2 is the most verbose and will output all of the
-- output including debug statements. Level 1 will output all output except
-- debug statements and level 0 will only output warnings and errors. Since
-- all output statements go directly to the ros log, it is safest to keep it
-- set to 2.
verbose = 2

-- ad2pub_delay is a time amount in seconds. The bridge publisher must receive
-- the adverttisement info message for a topic before it can publish a content
-- message for that topic. If the bridge publisher receives the content message
-- before the advertisement info, it will save the content message if the
-- ad2pub_delay is greater than 0. If the bridge publisher receives the
-- advertisement info message within the ad2pub_delay time, it will process
-- and publish the content message. If the comms bridge seems to be dropping
-- the first few messages, try increasing this value.
ad2pub_delay = 3.0

links = {
-- Logically, there could be up to three two-way links between the three robots. In practice, we
-- will probably only have one link.
{
-- A single link entry has required fields "from" and "to" that specify the robot roles involved
-- in the link.
-- This link will only work on the ISS since it uses the names of the
-- robots on the ISS. Please add more links if Queen goes back to the ISS.
from = "Bumble", -- manager
to = "Honey", -- actor

-- The link entry has three optional fields: relay_forward (messages to be relayed only in the
-- `from` to `to` direction), relay_backward (to be relayed only in the `to` to `from` direction),
-- and relay_both (to be relayed in both directions). Providing all three fields gives the user
-- full directional control while minimizing repetition and copy/paste errors.

-- Each topic entry can contain an input topic and an output topic. The
-- in topic is the topic being published on the robot sending the data and
-- must be specified. The optional out topic is the name of the topic a
-- user wants the data published on in the receiving robot. If the
-- out topic is not specified, the comms bridge will set it to be the name
-- of the robot sending the data combined with the in topic name. For
-- instance, if the from robot was Bumble and the to robot was Honey and
-- one of the in topics in the relay forward list was "mgt/ack", then it
-- would be published on Honey on topic "bumble/mgt/ack".
-- Please note that only one unique in topic can exist in the relay forward
-- and relay both lists and the relay backward and relay both lists. It is
-- fine to have the same in topic in the relay forward and relay backward
-- lists.

relay_forward = {
},
relay_backward = {
},
relay_both = {
{in_topic = "gnc/ekf"},
{in_topic = "gs/data"},
},
},
{
-- This link will only work in the granite lab since it uses the names of
-- the robots in the granite lab.
from = "Bsharp", -- manager
to = "Wannabee", -- actor

relay_forward = {
},
relay_backward = {
},
relay_both = {
{in_topic = "gnc/ekf"},
{in_topic = "gs/data"},
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
;; NDDS_DISCOVERY_PEERS - Discovery Configuration File
;; This file is used to configure the dds portion of the comms bridge
; EVERY LINE IN THIS FILE MUST END IN A COMMENT. Even blank lines.
;
;; Add the IP addresses of the robots to communicate with
127.0.0.1 ; Local host is added by default
Loading

0 comments on commit 81c94ff

Please sign in to comment.