Merge pull request #717 from nasa/develop

Release 0.17.1

Author: marinagmoreira

.isort.cfg

@@ -0,0 +1,18 @@
+[settings]
+
+# The src_paths setting should be a comma-separated list of all the
+# folders in the astrobee repo that contain *.py files. Python files
+# found in these folders count as "first party" so they should be in a
+# separate group from the "third party" imports. If src_paths is not
+# specified, isort will treat only the files it's asked to check as
+# first party. Therefore, if we specify src_paths broadly in this way,
+# isort behavior should be more repeatable between (1) manually
+# running isort on a single file in your local dev machine, vs. (2)
+# running the git pre-commit hook locally on your dev machine, which
+# historically ran isort only on the files that changed since the last
+# commit, or (3) running the CI workflow, which always runs isort on
+# all files. If src_paths needs to be updated, like if *.py files are
+# added to a new folder, you can auto-update it by running
+# scripts/git/configure_isort_paths.sh.
+
+src_paths = doc/scripts,hardware/eps_driver/tools,hardware/pico_driver/scripts,hardware/pmc_actuator/tools,localization/localization_common,localization/localization_common/scripts/localization_common,localization/marker_tracking/tools/marker_tracking_node,localization/sparse_mapping/scripts,localization/sparse_mapping/tools,scripts/build,scripts/calibrate,scripts/debug,scripts/git,scripts/postprocessing/coverage_analysis,tools/bag_processing/scripts,tools/bag_processing/scripts/utilities,tools/bag_processing/test,tools/calibration/scripts,tools/gds_helper/src,tools/gnc_visualizer/dds,tools/gnc_visualizer/scripts,tools/gnc_visualizer/scripts/communications,tools/localization_analysis/scripts,tools/performance_tester/scripts

RELEASE.md

@@ -1,5 +1,9 @@
 # Releases
 
+# Release 0.17.1
+
+  * Multiple bug fixes
+
 # Release 0.17.0
 
   * Full compatibility and debians built for Ubuntu 20

astrobee.doxyfile

@@ -39,7 +39,7 @@ PROJECT_NAME           = "NASA Astrobee Robot Software"
 # control system is used.
 
 
-PROJECT_NUMBER         = 0.17.0
+PROJECT_NUMBER         = 0.17.1
 
 # 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

astrobee/CMakeLists.txt

@@ -18,7 +18,7 @@
 cmake_minimum_required(VERSION 3.0)
 project(astrobee)
 
-set(ASTROBEE_VERSION 0.17.0)
+set(ASTROBEE_VERSION 0.17.1)
 
 ## Compile as C++14, supported in ROS Kinetic and newer
 add_compile_options(-std=c++14)

astrobee/launch/robot/MLP.launch

@@ -89,7 +89,7 @@
   <include file="$(find ff_util)/launch/ff_nodelet.launch">
     <arg name="class" value="depth_odometry/DepthOdometryNodelet" />
     <arg name="name" value="depth_odometry_nodelet" />
-    <arg name="manager" value="mlp_vision" />
+    <arg name="manager" value="mlp_depth_cam" />
     <arg name="spurn" value="$(arg spurn)" />
     <arg name="nodes" value="$(arg nodes)" />
     <arg name="extra" value="$(arg extra)" />

behaviors/arm/tools/arm_tool.cc

@@ -23,7 +23,7 @@
 // Include RPOS
 #include <ros/ros.h>
 // FSW includes
-#include <ff_util/ff_names.h>
+#include <ff_common/ff_names.h>
 #include <ff_util/ff_action.h>
 #include <ff_util/config_client.h>
 

behaviors/dock/tools/dock_tool.cc

@@ -24,7 +24,7 @@
 #include <ros/ros.h>
 
 // FSW includes
-#include <ff_util/ff_names.h>
+#include <ff_common/ff_names.h>
 #include <ff_util/ff_action.h>
 
 // Action

behaviors/light_flow/include/light_flow.h

@@ -20,7 +20,7 @@
 #define LIGHT_FLOW_H_
 
 #include <ff_hw_msgs/ConfigureLED.h>
-#include <ff_util/ff_names.h>
+#include <ff_common/ff_names.h>
 #include <jsoncpp/json/value.h>
 #include <ros/ros.h>
 #include <stdio.h>

behaviors/light_flow/src/light_flow/light_flow.cc

@@ -20,7 +20,7 @@
 #include <assert.h>
 #include <ff_hw_msgs/ConfigureLED.h>
 #include <ff_hw_msgs/ConfigureLEDGroup.h>
-#include <ff_util/ff_names.h>
+#include <ff_common/ff_names.h>
 #include <jsoncpp/json/allocator.h>
 #include <jsoncpp/json/json.h>
 #include <jsoncpp/json/value.h>

behaviors/light_flow/src/light_flow_nodelet/light_flow_nodelet.cc

@@ -32,7 +32,7 @@
 #include <config_reader/config_reader.h>
 
 // FSW nodelet
-#include <ff_util/ff_names.h>
+#include <ff_common/ff_names.h>
 #include <ff_util/ff_nodelet.h>
 
 // Services