Merge branch 'develop'

project-march · Jun 1, 2020 · 74c5550 · 74c5550
2 parents d67e705 + 29483ec
commit 74c5550
Show file tree

Hide file tree

Showing 110 changed files with 16,897 additions and 475 deletions.
diff --git a/.flake8 b/.flake8
@@ -7,6 +7,7 @@ application-package-names =
     march_rqt_gait_selection,
     march_rqt_input_device,
     march_rqt_note_taker,
+    march_rqt_software_check,
     march_shared_classes,
     march_shared_resources
 import-order-style = appnexus
@@ -33,4 +34,4 @@ ignore =
     W503,
     # C815: Trailing comma in Python 3.5
     C815
-ignore-names = rowCount, columnCount, headerData, setUp
+ignore-names = rowCount, columnCount, headerData, setUp, paintEvent
diff --git a/.travis.yml b/.travis.yml
@@ -27,7 +27,7 @@ env:
     - DOCKER_RUN_OPTS='$CI_ENV -e CATKIN_TEST_COVERAGE=1 -e NOSE_COVER_INCLUSIVE=True -e NOSE_COVER_BRANCHES=True'
     - AFTER_INSTALL_TARGET_DEPENDENCIES='pip install coverage'
     - AFTER_RUN_TARGET_TEST='cd "$target_ws" && ./src/monitor/coverage.sh && bash <(curl -s https://codecov.io/bash) -R src/monitor -F test && bash <(curl -s https://codecov.io/bash) -R src/monitor -F production'
-    - UPSTREAM_WORKSPACE='.rosinstall -march/march_data_collector -march/march_description -march/march_gain_scheduling -march/march_gait_scheduler -march/march_gait_selection -march/march_launch -march/march_safety -march/march_shared_classes -march/march_state_machine'
+    - UPSTREAM_WORKSPACE='.rosinstall -march/march_data_collector -march/march_description -march/march_gain_scheduling -march/march_gait_scheduler -march/march_gait_selection -march/march_launch -march/march_moveit -march/march_safety -march/march_shared_classes -march/march_state_machine'
 
 jobs:
   include:

diff --git a/march_rqt_gait_selection/launch/march_rqt_gait_selection.launch b/march_rqt_gait_selection/launch/march_rqt_gait_selection.launch
@@ -1,3 +1,3 @@
 <launch>
-    <node name="march_rqt_gait_selection" pkg="march_rqt_gait_selection" type="march_rqt_gait_selection" output="screen"/>
+    <node name="$(anon rqt_gait_selection)" pkg="march_rqt_gait_selection" type="march_rqt_gait_selection" output="screen"/>
 </launch>
diff --git a/march_rqt_gait_selection/plugin.xml b/march_rqt_gait_selection/plugin.xml
@@ -1,5 +1,5 @@
 <library path="src">
-    <class name="GaitSelectionPlugin" type="march_rqt_gait_selection.gait_selection.GaitSelectionPlugin" base_class_type="rqt_gui_py::Plugin">
+    <class name="GaitSelectionPlugin" type="march_rqt_gait_selection.gait_selection_plugin.GaitSelectionPlugin" base_class_type="rqt_gui_py::Plugin">
         <description>
             RQT plugin to configure which version of gaits will be performed at runtime.
         </description>