From 79a0425b052f5d2156fb92c962c7a0aada6b0d9f Mon Sep 17 00:00:00 2001
From: fherrero <fherrero@iri.upc.edu>
Date: Wed, 10 Jul 2019 16:50:33 +0200
Subject: [PATCH] Do not make firmware automatically. Add make firmware in CI
yml. Add firmware dependency in README
---
.gitlab-ci.yml | 3 ++-
README.md | 4 ++++
src/CMakeLists.txt | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2f3007c..aad0e96 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,6 +14,7 @@
- cd build
- cmake -D CMAKE_BUILD_TYPE=RELEASE -DCPACK_PACKAGE_VERSION=$CI_COMMIT_TAG ..
- make package -j $(nproc)
+ - make firmware -j $(nproc)
artifacts:
paths:
- build/*.deb
@@ -26,6 +27,6 @@
script:
- cd build
- "scp -i /root/.ssh/iriLabKeyNopwd -r *battery-monitor*.deb irilabo@147.83.76.226:packages/"
- - "ssh irilabo@147.83.76.226 -i /root/.ssh/iriLabKeyNopwd -tt /home/irilabo/repo_scripts/update_repo.sh name-with-dashes"
+ - "ssh irilabo@147.83.76.226 -i /root/.ssh/iriLabKeyNopwd -tt /home/irilabo/repo_scripts/update_repo.sh battery-monitor"
only:
- tags
diff --git a/README.md b/README.md
index ffd3959..804d979 100644
--- a/README.md
+++ b/README.md
@@ -63,6 +63,10 @@ This package also requires of the following IRI libraries:
* [iriutils](https://gitlab.iri.upc.edu/labrobotica/algorithms/iriutils "iriutils gitlab page"), a set of basic tools.
* [comm](https://gitlab.iri.upc.edu/labrobotica/drivers/comm "comm gitlab page"), a set of drivers for standard communication devices.
* [dynamixel](https://gitlab.iri.upc.edu/labrobotica/drivers/dynamixel "dynamixel gitlab page"), a driver for dynamixel communication protocol.
+
+This package also contains the following packages as Git Submodules:
+
+ * [avr8_smbus_battery_monitor](https://gitlab.iri.upc.edu/labrobotica/firmware/avr8_smbus_battery_monitor), a firmware to read battery information through SMBUS
## Compilation and installation
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 062bcfd..6a720e0 100755
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -57,7 +57,7 @@ if(NOT EXISTS "${PROJECT_SOURCE_DIR}/${firmware_dir}/Makefile")
message(FATAL_ERROR "The submodules were not downloaded! GIT_SUBMODULE was turned off or failed. Please update submodules and try again.")
endif()
-add_custom_target(firmware ALL COMMAND make
+add_custom_target(firmware COMMAND make
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../${firmware_dir}
)
--
GitLab