Skip to content

Commit

Permalink
Transfer AMOR-related code to amor-yarp-devices
Browse files Browse the repository at this point in the history
  • Loading branch information
PeterBowman authored Dec 3, 2023
1 parent 1555ccd commit 1d2d320
Show file tree
Hide file tree
Showing 21 changed files with 1 addition and 2,260 deletions.
15 changes: 1 addition & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,21 +75,14 @@ jobs:
- name: Download Peak CAN driver
run: wget -O- -q https://www.peak-system.com/fileadmin/media/linux/files/peak-linux-driver-$PEAK_DRIVER_VER.tar.gz | tar -C .deps -xzf -

- name: Check out amor-api
uses: actions/checkout@v3
with:
repository: roboticslab-uc3m/amor-api
token: ${{secrets.AMOR_API}}
path: .deps/amor-api

- name: Check out jr3pci-linux
uses: actions/checkout@v3
with:
repository: roboticslab-uc3m/jr3pci-linux
path: .deps/jr3pci-linux

- name: Install dependencies via apt
run: sudo apt-get update && sudo apt-get install -qq ccache libboost-thread-dev libeigen3-dev intltool libxml2-dev libglib2.0-dev libusb-1.0-0-dev libspnav-dev libxwiimote-dev libgtest-dev
run: sudo apt-get update && sudo apt-get install -qq ccache intltool libxml2-dev libglib2.0-dev libusb-1.0-0-dev libspnav-dev libxwiimote-dev libgtest-dev

- name: Set up CMake
uses: jwlawson/actions-setup-cmake@v1
Expand Down Expand Up @@ -137,12 +130,6 @@ jobs:
sudo make -C lib install
sudo cp -f driver/pcan*.h /usr/include
- name: Build amor-api
run: |
cmake -S .deps/amor-api -B .deps/amor-api/build $CMAKE_CCACHE_LAUNCHER -DENABLE_udev_rules=OFF
cmake --build .deps/amor-api/build
sudo cmake --install .deps/amor-api/build
- name: Install jr3pci-linux header
run: sudo make -C .deps/jr3pci-linux install-header

Expand Down
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ find_package(YCM 0.11 REQUIRED)
find_package(YARP 3.7 REQUIRED COMPONENTS os dev sig)

# Soft dependencies.
find_package(AMOR_API QUIET)
find_package(ARAVIS 0.4 QUIET)
find_package(Doxygen QUIET)
find_package(GTestSources 1.8 QUIET)
Expand Down
1 change: 0 additions & 1 deletion doc/yarp-devices-install.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ For unit testing, you'll need the googletest source package. Refer to [Install g

### Components with known additional/specific dependencies

- [../libraries/YarpPlugins/AmorControlBoard](../libraries/YarpPlugins/AmorControlBoard#requirements)
- [../libraries/YarpPlugins/AravisGigE](../libraries/YarpPlugins/AravisGigE#requirements)
- [../libraries/YarpPlugins/CanBusHico](../libraries/YarpPlugins/CanBusHico#requirements)
- [../libraries/YarpPlugins/CanBusPeak](../libraries/YarpPlugins/CanBusPeak#requirements)
Expand Down
60 changes: 0 additions & 60 deletions libraries/YarpPlugins/AmorControlBoard/AmorControlBoard.cpp

This file was deleted.

181 changes: 0 additions & 181 deletions libraries/YarpPlugins/AmorControlBoard/AmorControlBoard.hpp

This file was deleted.

41 changes: 0 additions & 41 deletions libraries/YarpPlugins/AmorControlBoard/CMakeLists.txt

This file was deleted.

Loading

0 comments on commit 1d2d320

Please sign in to comment.