diff --git a/INSTALL.md b/INSTALL.md index 20d594e996..fed41de0f5 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -62,3 +62,25 @@ The native installation instructions below walk you through manually running the - If you are an external developer, see: \subpage install-nonNASA - If you have NASA internal access and need to cross-compile for the robot hardware, see: \subpage install-NASA + +### Important Notice: OpenCV 4 Upgrade + +Starting from version 0.18.0, our project uses exclusively OpenCV 4. If you have an earlier version of Astrobee natively build, please follow the steps below to uninstall the previous debians: + + dpkg -r astrobee0 + dpkg -r libalvar2 + dpkg -r libopenmvg1 + dpkg -r libdbow21 + dpkg -r libdbowdlib1 + dpkg -r libopencv3.3.1 + + +once this is done, please follow the external developer install instructions \ref install-nonNASA: + + pushd $ASTROBEE_WS + cd src/scripts/setup/debians + sudo apt-get update + ./build_install_debians.sh + cd ../ + ./install_desktop_packages.sh + popd diff --git a/RELEASE.md b/RELEASE.md index fab3e92e4b..c9cf7509e1 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,5 +1,9 @@ # Releases +## Release 0.18.0 + + * Astrobee now using OpenCV 4! Please see install updates in INSTALL.md + # Release 0.17.3 * Comms bridge added rate feature diff --git a/astrobee.doxyfile b/astrobee.doxyfile index d7f71e82f3..ef7fbd776f 100644 --- a/astrobee.doxyfile +++ b/astrobee.doxyfile @@ -39,7 +39,7 @@ PROJECT_NAME = "NASA Astrobee Robot Software" # control system is used. -PROJECT_NUMBER = 0.17.3 +PROJECT_NUMBER = 0.18.0 # 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 diff --git a/astrobee/CMakeLists.txt b/astrobee/CMakeLists.txt index dfb9b085fb..8e3ab4fdd2 100644 --- a/astrobee/CMakeLists.txt +++ b/astrobee/CMakeLists.txt @@ -18,7 +18,7 @@ cmake_minimum_required(VERSION 3.0) project(astrobee) -set(ASTROBEE_VERSION 0.17.3) +set(ASTROBEE_VERSION 0.18.0) ## Compile as C++14, supported in ROS Kinetic and newer add_compile_options(-std=c++14) diff --git a/debian/changelog b/debian/changelog index e514f8a194..19fd8ccbb2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +astrobee (0.18.0) testing; urgency=medium + + * Astrobee now using OpenCV 4! Please see install updates in INSTALL.md + + -- Astrobee Flight Software Thu, 06 Jun 2024 16:22:41 -0700 + astrobee (0.17.3) testing; urgency=medium * Comms bridge added rate feature diff --git a/scripts/configure.sh b/scripts/configure.sh index 51c3f29b5e..a1dff58c45 100755 --- a/scripts/configure.sh +++ b/scripts/configure.sh @@ -354,7 +354,7 @@ if [ $armhf_build == 1 ] ; then --devel-space ${workspace_path:-armhf/}devel \ --log-space ${workspace_path:-armhf/}logs \ --install \ - --blacklist astrobee_handrail_8_5 astrobee_handrail_21_5 astrobee_handrail_30 astrobee_handrail_41_5 astrobee_iss astrobee_granite \ + --skiplist astrobee_handrail_8_5 astrobee_handrail_21_5 astrobee_handrail_30 astrobee_handrail_41_5 astrobee_iss astrobee_granite \ astrobee_dock astrobee_freeflyer astrobee_gazebo localization_rviz_plugins ground_dds_ros_bridge \ --cmake-args -DARMHF_CHROOT_DIR=$ARMHF_CHROOT_DIR ${armhf_opts} ${use_ctc} ${enable_gazebo} ${build_loc_rviz_plugins} ${extra_opts} \ -DCMAKE_BUILD_TYPE=Release