Skip to content
This repository was archived by the owner on Dec 1, 2020. It is now read-only.

Commit 5986270

Browse files
authored
Merge pull request #166 from project-march/fix/PM-58-reorganize-repo
Fix march dependency
2 parents f7f3ee7 + e8b73ee commit 5986270

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

.rosinstall

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
- git:
2+
local-name: march
3+
uri: https://github.com/project-march/march
4+
version: develop

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ env:
2828
- CCACHE_DIR=$HOME/.ccache # enables C/C++ caching in industrial_ci
2929
- BUILDER=colcon
3030
- CATKIN_LINT=pedantic
31-
- UPSTREAM_WORKSPACE='dependencies.rosinstall -march-iv/march_gait_scheduler -march-iv/march_gait_selection -march-iv/march_launch -march-iv/march_rqt_gait_selection -march-iv/march_rqt_input_device -march-iv/march_rqt_training_log -march-iv/march_safety -march-iv/march_sound_scheduler'
31+
- UPSTREAM_WORKSPACE='.rosinstall -march/march_gait_scheduler -march/march_gait_selection -march/march_launch -march/march_rqt_launch_menu -march/march_safety -march/march_sound_scheduler -march/march_state_machine'
3232
- AFTER_SCRIPT='builder_run_build "$target_ws/install" "$target_ws" --cmake-target-skip-unavailable --cmake-target roslint'
3333
matrix:
3434
- ROS_DISTRO=kinetic

README.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1-
# hardware-interface
2-
The hardware interface of the MARCH IV. This includes EtherCAT master and uses the SOEM library.
1+
# Hardware Interface
2+
The hardware interface of the MARCH exoskeleton. This includes EtherCAT master and uses the SOEM library.
3+
4+
| Branch | Build Status |
5+
| ------ |:------------:|
6+
| Master | [![Build Status](https://api.travis-ci.com/project-march/hardware-interface.svg?branch=master)](https://travis-ci.com/project-march/hardware-interface) |
7+
| Develop | [![Build Status](https://api.travis-ci.com/project-march/hardware-interface.svg?branch=develop)](https://travis-ci.com/project-march/hardware-interface) |
38

dependencies.rosinstall

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)