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

Docs + simple generic gripper controller interface + minor bug fixes #64

Merged
merged 36 commits into from
Sep 11, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
b2ac9a5
[gripper_controller] Started working on a base implementation for con…
alex-mitrevski Aug 15, 2018
a9b5e2d
[pickup_action] Modified the action so that it uses the newly impleme…
alex-mitrevski Aug 15, 2018
7d4d96d
[pickup_action] Removed an unused import in action_states.py
alex-mitrevski Aug 15, 2018
8f84416
[place_action] Modified the action so that it uses the newly implemen…
alex-mitrevski Aug 15, 2018
709ed30
[2dnav] Fixed a syntax error in 2dnav.launch
alex-mitrevski Aug 15, 2018
939b866
[2dnav] Fixed syntax errors in 2dnav_dwa.launch
alex-mitrevski Aug 15, 2018
4abcdbf
[move_arm_action, dmp] Added the frame names as parameters
alex-mitrevski Aug 15, 2018
7de11cf
[2dnav_dwa.launch] Found a general solution to the nested substitutio…
alex-mitrevski Aug 16, 2018
e03f0fe
[2dnav_eband.launch] Resolved a nested substitution error
alex-mitrevski Aug 16, 2018
051be62
[command_robot] Added a README file for the package
alex-mitrevski Aug 16, 2018
ba0325f
[sound_vocaliser_base.py] Fixed a small typo
alex-mitrevski Aug 18, 2018
85f9152
[sound_vocalisation] Added a README
alex-mitrevski Aug 18, 2018
6a2a9fc
[gripper_controller] Added a README
alex-mitrevski Aug 18, 2018
3c1e1bd
[sound_vocalisation, gripper_controller] Small formatting correction …
alex-mitrevski Aug 18, 2018
1397206
[rosplan_interface] Added a README
alex-mitrevski Aug 19, 2018
6b63063
[pickup_action] Removed an obsolete parameter from 'pickup_client.lau…
alex-mitrevski Aug 19, 2018
5035694
[hri] Added a README
alex-mitrevski Aug 19, 2018
3637e9a
Added a Doxyfile
alex-mitrevski Aug 20, 2018
1f96622
Update dockerfile for travis
argenos Aug 25, 2018
c5d7cd8
Build only travis image in CI
argenos Aug 25, 2018
73bf9e8
Add follow_person from mas_common
argenos Aug 26, 2018
2c0116a
remove mdr_perception_libs and adapt to new ObjectDetector
minhnh Aug 23, 2018
0baafae
add recognition service name as launch args
minhnh Aug 23, 2018
7727270
use correct method sig
minhnh Aug 23, 2018
ae92ece
remove redundant recognition module, update docs and launch
minhnh Aug 23, 2018
e7b8a57
Add mdr_environments package
argenos Aug 27, 2018
462acc5
Add ground floor maps
danningwang Aug 28, 2018
5250d92
Fix environment structure
argenos Aug 28, 2018
068f7e9
Add code owners file
argenos Sep 9, 2018
7f44209
Change kdl to b-it-bots fork in rosinstall
argenos Sep 11, 2018
5cdf631
Change images to bitbots organization
argenos Sep 11, 2018
dfc390f
Update Dockerfile to build from bitbots-common
argenos Sep 11, 2018
8fb0739
Update Dockerfile for travis
argenos Sep 11, 2018
c3f7442
Add dockerignore file
argenos Sep 11, 2018
3617b3c
Update travis config
argenos Sep 11, 2018
58b6605
Update Docker instructions in README
argenos Sep 11, 2018
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
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.git
7 changes: 7 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Default owners for everything in the repo.
# Unless a later match takes precedence, they will be requested for review
# when someone opens a pull request.
* @argenos @alex-mitrevski

mdr_perception @minhnh
mdr_navigation @argenos
19 changes: 16 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,30 @@ services:
language: cpp

env:
- COMPOSE_VERSION: 1.22.0
global:
- COMPOSE_VERSION: 1.22.0
- CONTAINER_RELEASE_IMAGE: bitbots/bitbots-domestic:$TRAVIS_BRANCH

before_install:
- sudo rm /usr/local/bin/docker-compose
- sudo curl -L https://github.com/docker/compose/releases/download/1.22.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
- sudo chmod +x /usr/local/bin/docker-compose
- docker-compose -v
- docker-compose build

script:
- docker-compose run travis
- docker-compose build travis

deploy:
provider: script
skip_cleanup: true
script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker build -t $CONTAINER_RELEASE_IMAGE .
- docker images
- docker push $CONTAINER_RELEASE_IMAGE
on:
all_branches: true
condition: $TRAVIS_BRANCH =~ ^kinetic|devel$ OR tag = true

notifications:
slack:
Expand Down
19 changes: 11 additions & 8 deletions .travis/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
FROM argenos/bitbots-base
FROM bitbots/bitbots-domestic:kinetic

RUN rosdep update
WORKDIR /travis
ADD ./ /travis/src/mas_domestic_robotics

ADD ./ /kinetic/src/mas_domestic_robotics
WORKDIR /kinetic

RUN wstool init src && wstool merge -t src src/mas_domestic_robotics/.travis/travis.rosinstall
RUN wstool update -t src
RUN rosdep install --from-paths src --ignore-src --rosdistro=kinetic -y
RUN . /opt/ros/mas_stable/setup.sh && \
catkin config --init && \
catkin config --extend /opt/ros/mas_stable && \
apt-get update -qq && \
rosdep update -qq && \
rosdep install -q --from-paths src --ignore-src --rosdistro=kinetic -y && \
rm -rf /var/lib/apt/lists/* && \
catkin build --no-status
49 changes: 0 additions & 49 deletions .travis/travis.rosinstall

This file was deleted.

30 changes: 25 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,29 @@
FROM argenos/bitbots-base
FROM bitbots/bitbots-common:kinetic

WORKDIR /kinetic
COPY mas-domestic.rosinstall /kinetic

RUN rosdep update
RUN wstool init --shallow src && \
wstool merge -t src mas-domestic.rosinstall && \
cd src && \
wstool remove mas_domestic_robotics mas_common_robotics orocos_kinematics_dynamics kdl_parser && \
cd - && \
wstool update -t src

RUN wstool init src && wstool merge -t src https://raw.githubusercontent.com/b-it-bots/mas_domestic_robotics/kinetic/mas-domestic.rosinstall
RUN wstool update -t src
RUN rosdep install --from-paths src --ignore-src --rosdistro=kinetic -y
ADD . /kinetic/src/mas_domestic_robotics


RUN . /opt/ros/mas_stable/setup.sh && \
apt-get update -qq && \
rosdep update -q && \
rosdep install --from-paths src --ignore-src --rosdistro=kinetic -y && \
rm -rf /var/lib/apt/lists/* && \
catkin config --init && \
catkin config --extend /opt/ros/mas_stable && \
catkin config --install --install-space /opt/ros/mas_stable && \
catkin build && \
rm -rf /kinetic/

WORKDIR /
ENTRYPOINT ["/ros_entrypoint.sh"]
CMD ["bash"]
Loading