Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase to Master #2

Open
wants to merge 91 commits into
base: ompl-constrained-planning-v2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
f1fd2c5
Apply new clang-format-10 config (#519)
henningkayser Aug 24, 2020
d50903c
Fix moveit_cpp tutorial (#516)
JafarAbdi Aug 24, 2020
1d64f5b
Update the servo tutorial for new pkg/topic names (#508)
AndyZe Sep 11, 2020
2a7b927
MoveIt deep grasping tutorial (#521)
bostoncleek Sep 28, 2020
7cac2c3
Remove warning about franka_description not being released (#530)
tylerjw Sep 30, 2020
3262e09
Add instruction for Kinematic Solver field to the hand planning group…
tylerjw Oct 2, 2020
f0ac33f
Update planning_scene topic and images in RViz tutorial (#534)
tylerjw Oct 3, 2020
04cd003
Python3 migration (#536)
tylerjw Oct 6, 2020
cfb3e8f
Travis: Enable warnings, clang-tidy, and noetic build
rhaschke Oct 6, 2020
db3d148
Use system includes to silent warnings external to the package
rhaschke Oct 6, 2020
76ad931
Apply clang-tidy-fix
rhaschke Oct 6, 2020
4c661e4
Add not-yet released repos to upstream workspace
rhaschke Oct 6, 2020
3c200b3
Fix catkin_lint errors + warnings
rhaschke Oct 6, 2020
4dc65c9
Fix compiler warnings
rhaschke Oct 6, 2020
4adfb57
Simplify Travis config: Consider doc generation / htmlproofing a sepa…
rhaschke Oct 6, 2020
ccd1019
Travis: Temporarily switch to ros-testing
rhaschke Oct 6, 2020
f907768
Merge PR #538: Switch to Noetic and fix various build warnings
rhaschke Oct 7, 2020
af34473
Whitepsace Cleanup (#539)
DLu Oct 8, 2020
43d7753
Update Branches to Noetic
DLu Oct 8, 2020
28d74cc
apt-get => apt
DLu Oct 8, 2020
a2862e5
Update Conf
DLu Oct 8, 2020
40bd382
Merge pull request #541 from DLu/noetic_updates
Oct 8, 2020
f5407d8
Split Object Sections in MoveGroupInterface tutorial
DLu Oct 8, 2020
7a4c3b3
Apply suggestions from code review
DLu Oct 9, 2020
149fbe4
Changes from PR Feedback
DLu Oct 9, 2020
b9b977e
Add a gif and formatting cleanup
DLu Oct 12, 2020
3c90b71
[fix] the position of the box in the "Move Group Python Interface" (#…
sjahr Oct 13, 2020
d21a745
Update doc/move_group_interface/src/move_group_interface_tutorial.cpp
DLu Oct 14, 2020
4f93172
New Goal Pose for exaggerated change in path
DLu Oct 14, 2020
627982a
Fix typos in trajopt planner (#545)
jesseli2002 Oct 18, 2020
f757545
Update comments based on PR
DLu Oct 20, 2020
3dda4a0
Fix collision bug, add gifs
DLu Oct 20, 2020
66766aa
Misc Tutorial Improvements, some for noetic (#546)
DLu Oct 27, 2020
843c888
Merge pull request #542 from DLu/update_move_group_interface
Oct 27, 2020
52b4920
fix typo in switch_controller call
Villanut0 Nov 2, 2020
340ca28
Merge pull request #552 from Villanut0/fix_servo_doc
Nov 2, 2020
7a547f8
New calibration tutorial (#497)
Nov 3, 2020
ddac28e
Fix "Planning Scene ROS API" tutorial to spawn the object in the grip…
sjahr Nov 12, 2020
8fb9853
update ruby version for travis CI (#556)
auman66 Nov 13, 2020
9a25cf0
Add Pilz Industrial Motion Planner tutorial (#461)
jschleicher Nov 18, 2020
7e6ca05
Using Bullet as a Collision Checker (#337)
j-petit Nov 19, 2020
2dc53dd
Refer to ros-testing repositories in case of issues (#559)
anilzeybek Nov 26, 2020
5d9c8ed
Support for video embedding (#550)
DLu Nov 30, 2020
1716a96
Update README with gif admonition (#561)
DLu Dec 11, 2020
86d30b4
Update move group c++ interface doc (#563)
JM322 Dec 12, 2020
e47dc6f
updates to PlanningSceneMonitor tutorial (#567)
Dec 21, 2020
c0eba93
Fix Bullet tutorial bug (#560) (#568)
j-petit Dec 29, 2020
71ecd2d
Add version buttons and indicator in sidebar header (#557)
Dec 31, 2020
abb9f1a
Add comment about the importance of AsyncSpinner (#565)
samarth-robo Jan 3, 2021
a7ebc0b
Moveitcpp Tutorial Images (#571)
bostoncleek Jan 7, 2021
ea5ab20
Remove unused variable (#576)
ValerioMagnago Jan 19, 2021
623dede
Update move_group_python_interface_tutorial.py (#577)
mqnc Feb 25, 2021
9e9cf38
move version dropdown to seperate file and add Foxy
Mar 9, 2021
8a6e8df
remove indigo from version dropdown
Mar 9, 2021
424cb90
Merge pull request #590 from auman66/moveit2-dropdown
Mar 10, 2021
15f974a
MGI: disambiguate tutorial on plan()+move() (#594)
v4hn Mar 10, 2021
840e121
Fix minor typo (#599)
DLu Mar 10, 2021
2a7014e
Update note on Noetic MoveIt version, noting MoveIt 2
davetcoleman Mar 10, 2021
73e7226
Use tau instead of pi for rotations (#554)
felixvd Mar 10, 2021
2cee639
Document MoveIt 2 tutorials (#598)
davetcoleman Mar 10, 2021
cf8c525
Add MoveIt+Gazebo Integration tutorial for panda arm (#499)
tahsinkose Mar 10, 2021
7215911
Autoinstall rosdoc-lite if needed (#608)
davetcoleman Mar 11, 2021
5b2080d
Merge pull request #600 from ros-planning/pr-noetic-disclaimer
Mar 11, 2021
4dcf79b
Improve chomp_planner_tutorial text and formatting (#609)
davetcoleman Mar 11, 2021
36b2926
Create a tutorial for using moveit_opw_kinematics_plugin (#607)
simonschmeisser Mar 11, 2021
25e4c7e
Explain why tutorials must build moveit from source (#601)
davetcoleman Mar 11, 2021
edb533c
Describe predefined states comboboxes (#610)
davetcoleman Mar 11, 2021
186f9c4
Update MoveItCpp namespace and includes (#549)
henningkayser Mar 17, 2021
bdf2f81
fixed licenses (#595)
v4hn Mar 19, 2021
d2458c1
Clarify name in MoveGroupInterface tutorial (#611)
j-kuehn Mar 19, 2021
493360d
Add Python2 compatibility (#618)
felixvd Apr 6, 2021
d756c93
Remove unnecessary comment (#620)
Praveendwivedi Apr 7, 2021
6391622
add docs for cached ik plugin (#622)
mamoll Apr 7, 2021
7617552
Fix broken links (#628)
Apr 21, 2021
c7572af
fix typo (#629)
lorepieri8 Apr 23, 2021
8fd9264
Set Bullet as the exclusive collision detection algorithm. (#584)
Apr 28, 2021
da2b0e6
correct explanation of padding parameters (#627)
v4hn Apr 28, 2021
74577a8
Update trajopt_example.cpp based on new changes in the trajopt PR (#437)
ommmid May 3, 2021
d3eeaff
Create 'Representation and Evaluation of Constraints' tutorial (#501)
davetcoleman May 3, 2021
22711b2
Fix broken links in constraint tutorial (#637)
davetcoleman May 3, 2021
e1c74b7
Tutorial for debugging a failing test using docker (#489)
tylerjw May 3, 2021
13c4fc1
Mesh Filter tutorial with UR5 and Kinect simulated in Gazebo (#558)
Abishalini May 4, 2021
fa945cb
Clone moveit_task_constructor repo since .rosinstall file was deleted…
JafarAbdi May 21, 2021
37c0701
Migrate to github actions (#634)
Jun 4, 2021
7e88e34
Improve perception tutorial (#633)
v4hn Jun 5, 2021
901ed80
Enable CI on PRs (#647)
Jun 8, 2021
fb4f949
Add note to ignore git clone warnings if path already exists (#645)
AdamPettinger Jun 9, 2021
ccba270
Fix list formating (#649)
mohamedsayed18 Jun 15, 2021
e034800
Merge branch 'master' into ompl-constrained-planning-v2
gautz Jun 24, 2021
a9c9c9b
constrained position collision-avoidance
gautz Jun 24, 2021
b43efa7
pre-commit run
gautz Jun 24, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 43 additions & 34 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -1,66 +1,75 @@
---
BasedOnStyle: Google
ColumnLimit: 120
MaxEmptyLinesToKeep: 1
SortIncludes: false

Standard: Auto
IndentWidth: 2
TabWidth: 2
UseTab: Never
AccessModifierOffset: -2
ConstructorInitializerIndentWidth: 2
NamespaceIndentation: None
ContinuationIndentWidth: 4
IndentCaseLabels: true
IndentFunctionDeclarationAfterType: false

AlignEscapedNewlinesLeft: false
AlignTrailingComments: true

AllowAllParametersOfDeclarationOnNextLine: false
ExperimentalAutoDetectBinPacking: false
ObjCSpaceBeforeProtocolList: true
Cpp11BracedListStyle: false

AllowShortBlocksOnASingleLine: true
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AllowShortFunctionsOnASingleLine: None
AllowShortLoopsOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false

AlwaysBreakTemplateDeclarations: true
AlwaysBreakBeforeMultilineStrings: false
BreakBeforeBinaryOperators: false
BreakBeforeTernaryOperators: false
BreakConstructorInitializersBeforeComma: true

BinPackParameters: true
ColumnLimit: 120
ConstructorInitializerAllOnOneLineOrOnePerLine: true
DerivePointerBinding: false
PointerBindsToType: true
ExperimentalAutoDetectBinPacking: false
IndentCaseLabels: true
MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
ObjCSpaceBeforeProtocolList: true
PenaltyBreakBeforeFirstCallParameter: 19
PenaltyBreakComment: 60
PenaltyBreakString: 1
PenaltyBreakFirstLessLess: 1000
PenaltyExcessCharacter: 1000
PenaltyReturnTypeOnItsOwnLine: 90

PenaltyExcessCharacter: 50
PenaltyBreakBeforeFirstCallParameter: 30
PenaltyBreakComment: 1000
PenaltyBreakFirstLessLess: 10
PenaltyBreakString: 100
PenaltyReturnTypeOnItsOwnLine: 50

SpacesBeforeTrailingComments: 2
Cpp11BracedListStyle: false
Standard: Auto
IndentWidth: 2
TabWidth: 2
UseTab: Never
IndentFunctionDeclarationAfterType: false
SpacesInParentheses: false
SpacesInAngles: false
SpaceInEmptyParentheses: false
SpacesInCStyleCastParentheses: false
SpaceAfterCStyleCast: false
SpaceAfterControlStatementKeyword: true
SpaceBeforeAssignmentOperators: true
ContinuationIndentWidth: 4
SortIncludes: false
SpaceAfterCStyleCast: false

# Configure each individual brace in BraceWrapping
BreakBeforeBraces: Custom

# Control of individual brace wrapping cases
BraceWrapping: {
AfterClass: 'true'
AfterControlStatement: 'true'
AfterEnum : 'true'
AfterFunction : 'true'
AfterNamespace : 'true'
AfterStruct : 'true'
AfterUnion : 'true'
BeforeCatch : 'true'
BeforeElse : 'true'
IndentBraces : 'false'
}
BraceWrapping:
AfterCaseLabel: true
AfterClass: true
AfterControlStatement: true
AfterEnum: true
AfterFunction: true
AfterNamespace: true
AfterStruct: true
AfterUnion: true
BeforeCatch: true
BeforeElse: true
IndentBraces: false
...
36 changes: 36 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
---
Checks: '-*,
performance-*,
llvm-namespace-comment,
modernize-redundant-void-arg,
modernize-use-nullptr,
modernize-use-default,
modernize-use-override,
modernize-loop-convert,
readability-named-parameter,
readability-redundant-smartptr-get,
readability-redundant-string-cstr,
readability-simplify-boolean-expr,
readability-container-size-empty,
readability-identifier-naming,
'
HeaderFilterRegex: ''
AnalyzeTemporaryDtors: false
CheckOptions:
- key: llvm-namespace-comment.ShortNamespaceLines
value: '10'
- key: llvm-namespace-comment.SpacesBeforeComments
value: '2'
- key: readability-braces-around-statements.ShortStatementLines
value: '2'
# type names
- key: readability-identifier-naming.ClassCase
value: CamelCase
- key: readability-identifier-naming.EnumCase
value: CamelCase
- key: readability-identifier-naming.UnionCase
value: CamelCase
# method names
- key: readability-identifier-naming.MethodCase
value: camelBack
...
67 changes: 67 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
# This config uses industrial_ci (https://github.com/ros-industrial/industrial_ci.git).
# For troubleshooting, see readme (https://github.com/ros-industrial/industrial_ci/blob/master/README.rst)

name: CI

on:
workflow_dispatch:
pull_request:
push:

jobs:
default:
strategy:
matrix:
env:
- IMAGE: master-source
- IMAGE: noetic-source
env:
DOCKER_IMAGE: moveit/moveit:${{ matrix.env.IMAGE }}
UNDERLAY: /root/ws_moveit/install
CATKIN_LINT: true
CCACHE_DIR: ${{ github.workspace }}/.ccache
BASEDIR: ${{ github.workspace }}/.work
CLANG_TIDY_BASE_REF: ${{ github.base_ref || github.ref }}

name: ${{ matrix.env.IMAGE }}${{ matrix.env.CATKIN_LINT && ' + catkin_lint' || ''}}${{ matrix.env.CLANG_TIDY && ' + clang-tidy' || '' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
# The target directory cache doesn't include the source directory because
# that comes from the checkout. See "prepare target_ws for cache" task below
- name: cache target_ws
uses: pat-s/always-upload-cache@v2.1.3
with:
path: ${{ env.BASEDIR }}/target_ws
key: ${{ env.CACHE_PREFIX }}-${{ github.run_id }}
restore-keys: ${{ env.CACHE_PREFIX }}
env:
CACHE_PREFIX: target_ws-${{ matrix.env.IMAGE }}-${{ hashFiles('**/CMakeLists.txt', '**/package.xml') }}
- name: cache ccache
uses: pat-s/always-upload-cache@v2.1.3
with:
path: ${{ env.CCACHE_DIR }}
key: ${{ env.CACHE_PREFIX }}-${{ github.sha }}-${{ github.run_id }}
restore-keys: |
${{ env.CACHE_PREFIX }}-${{ github.sha }}
${{ env.CACHE_PREFIX }}
env:
CACHE_PREFIX: ccache-${{ matrix.env.IMAGE }}

- name: industrial_ci
uses: ros-industrial/industrial_ci@master
env: ${{ matrix.env }}

- name: upload test artifacts (on failure)
uses: actions/upload-artifact@v2
if: failure()
with:
name: test-results
path: ${{ env.BASEDIR }}/target_ws/**/test_results/**/*.xml
- name: prepare target_ws for cache
if: ${{ always() }}
run: |
du -sh ${{ env.BASEDIR }}/target_ws
sudo find ${{ env.BASEDIR }}/target_ws -wholename '*/test_results/*' -delete
sudo rm -rf ${{ env.BASEDIR }}/target_ws/src ${{ env.BASEDIR }}/target_ws/logs
du -sh ${{ env.BASEDIR }}/target_ws
30 changes: 30 additions & 0 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Build+Test+Deploy

on:
workflow_dispatch:
pull_request:
push:
branches:
- master

jobs:
default:
name: Build + Test + Deploy Website
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: ros-tooling/setup-ros@v0.2
with:
required-ros-distributions: noetic
- uses: actions/setup-python@v2
- uses: ruby/setup-ruby@v1
with:
ruby-version: '2.7'
- name: "Build+Test: Run htmlproofer.sh"
run: ./htmlproofer.sh
- name: Deploy
if: ${{ success() && github.event_name == 'push'}}
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./build/html
23 changes: 23 additions & 0 deletions .github/workflows/format.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# This is a format job. Pre-commit has a first-party GitHub action, so we use
# that: https://github.com/pre-commit/action

name: Format (pre-commit)

on:
workflow_dispatch:
pull_request:
push:

jobs:
pre-commit:
name: pre-commit
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- name: Install clang-format-10
run: sudo apt-get install clang-format-10
- uses: rhaschke/install-catkin_lint-action@v1.0
with:
distro: noetic
- uses: pre-commit/action@v2.0.0
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ doc/html
build
Gemfile
native_build
*.gdb
*.gdb
55 changes: 55 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# To use:
#
# pre-commit run -a
#
# Or:
#
# pre-commit install # (runs every time you commit in git)
#
# To update this file:
#
# pre-commit autoupdate
#
# See https://github.com/pre-commit/pre-commit

repos:
# Standard hooks
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.4.0
hooks:
- id: check-added-large-files
- id: check-case-conflict
- id: check-json
- id: check-merge-conflict
- id: check-symlinks
- id: check-toml
- id: check-yaml
- id: debug-statements
- id: destroyed-symlinks
- id: detect-private-key
- id: end-of-file-fixer
- id: mixed-line-ending
- id: pretty-format-json
- id: trailing-whitespace

- repo: https://github.com/psf/black
rev: 20.8b1
hooks:
- id: black

- repo: local
hooks:
- id: clang-format
name: clang-format
description: Format files with ClangFormat.
entry: clang-format-10
language: system
files: \.(c|cc|cxx|cpp|frag|glsl|h|hpp|hxx|ih|ispc|ipp|java|js|m|proto|vert)$
args: ['-fallback-style=none', '-i']
- id: catkin_lint
name: catkin_lint
description: Check package.xml and cmake files
entry: catkin_lint .
language: system
always_run: true
pass_filenames: false
Loading