From b7a748112785959219520b4f8e07fa76c640e88d Mon Sep 17 00:00:00 2001 From: philsson Date: Fri, 31 Aug 2018 10:27:38 +0200 Subject: [PATCH 01/11] Update .travis.yml --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 757c895..1aee84e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,9 @@ language: c++ + +addons: + apt: + packages: + - gcc-arm-none-eabi + script: make From 0f8af3c4d7d6b97d28bf057fe5697110617754c4 Mon Sep 17 00:00:00 2001 From: philsson Date: Fri, 31 Aug 2018 13:07:55 +0200 Subject: [PATCH 02/11] Update .travis.yml --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1aee84e..f5ed3d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,13 @@ language: c++ addons: apt: + sources: + - terry.guo/gcc-arm-embedded packages: - gcc-arm-none-eabi + +install: + - pip install -r mbed-os/requirements.txt script: make From e6127e90a4aa2403cfd7cdb2288848b1c280c367 Mon Sep 17 00:00:00 2001 From: philsson Date: Fri, 31 Aug 2018 13:12:57 +0200 Subject: [PATCH 03/11] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f5ed3d6..7aeedde 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +sudo: required language: c++ addons: From 7ef1dcb03b3a4d995908222dfae968ca289f660c Mon Sep 17 00:00:00 2001 From: philsson Date: Fri, 31 Aug 2018 13:24:45 +0200 Subject: [PATCH 04/11] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7aeedde..eb4a791 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ addons: - gcc-arm-none-eabi install: - - pip install -r mbed-os/requirements.txt + - sudo pip install -r mbed-os/requirements.txt script: make From 362b787a45687dec8c2c9ad6911f2ead1bb4105b Mon Sep 17 00:00:00 2001 From: philsson Date: Fri, 31 Aug 2018 13:28:19 +0200 Subject: [PATCH 05/11] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index eb4a791..f9ff4e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: c++ addons: apt: sources: - - terry.guo/gcc-arm-embedded + - ppa:terry.guo/gcc-arm-embedded packages: - gcc-arm-none-eabi From 03aae12c15df48d7e676a4e73f040cd6d7c7313e Mon Sep 17 00:00:00 2001 From: philsson Date: Fri, 31 Aug 2018 13:31:47 +0200 Subject: [PATCH 06/11] Update .travis.yml --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f9ff4e8..093ea24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,14 @@ addons: sources: - ppa:terry.guo/gcc-arm-embedded packages: - - gcc-arm-none-eabi + - lib32bz2-1.0 + - lib32ncurses5 + - lib32z1 install: - sudo pip install -r mbed-os/requirements.txt + - wget https://launchpad.net/gcc-arm-embedded/4.9/4.9-2014-q4-major/+download/gcc-arm-none-eabi-4_9-2014q4-20141203-linux.tar.bz2 + - tar -xf gcc-arm-none-eabi-4_9-2014q4-20141203-linux.tar.bz2 script: make From 5d27a10efff6efd986f9f527595e5288e5be8443 Mon Sep 17 00:00:00 2001 From: philsson Date: Fri, 31 Aug 2018 13:39:52 +0200 Subject: [PATCH 07/11] Update .travis.yml --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 093ea24..f0d543d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,18 @@ sudo: required language: c++ - + addons: apt: sources: - - ppa:terry.guo/gcc-arm-embedded + - ppa:team-gcc-arm-embedded/ppa packages: - lib32bz2-1.0 - lib32ncurses5 - lib32z1 + - gcc-arm-embedded install: - sudo pip install -r mbed-os/requirements.txt - - wget https://launchpad.net/gcc-arm-embedded/4.9/4.9-2014-q4-major/+download/gcc-arm-none-eabi-4_9-2014q4-20141203-linux.tar.bz2 - - tar -xf gcc-arm-none-eabi-4_9-2014q4-20141203-linux.tar.bz2 script: make From 652d924b45469153a1c234411507a46e9417b24a Mon Sep 17 00:00:00 2001 From: philsson Date: Fri, 31 Aug 2018 13:44:01 +0200 Subject: [PATCH 08/11] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f0d543d..133fc01 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: c++ addons: apt: sources: - - ppa:team-gcc-arm-embedded/ppa + - team-gcc-arm-embedded/ppa packages: - lib32bz2-1.0 - lib32ncurses5 From 9cc6db625baf89870a64b62b14fde50342836079 Mon Sep 17 00:00:00 2001 From: philsson Date: Fri, 31 Aug 2018 13:45:27 +0200 Subject: [PATCH 09/11] Update .travis.yml --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 133fc01..df1979b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,19 @@ sudo: required language: c++ +before_install: + - sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa + - sudo apt-get update -qq + - sudo apt-get install -qq gcc-arm-embedded --force-yes + addons: apt: sources: - - team-gcc-arm-embedded/ppa + packages: - lib32bz2-1.0 - lib32ncurses5 - lib32z1 - - gcc-arm-embedded install: - sudo pip install -r mbed-os/requirements.txt From b775ebd883960d22e75346de8bd5b45889e0c523 Mon Sep 17 00:00:00 2001 From: philsson Date: Fri, 31 Aug 2018 13:54:40 +0200 Subject: [PATCH 10/11] Fixed includes for Baro --- src/drivers/MS5611.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/drivers/MS5611.cpp b/src/drivers/MS5611.cpp index 847a65d..660cd24 100644 --- a/src/drivers/MS5611.cpp +++ b/src/drivers/MS5611.cpp @@ -13,8 +13,8 @@ //! //! @todo -#include "mbed.h" -#include "ms5611.h" +#include +#include "MS5611.h" double P; // compensated pressure value (mB) double T; // compensated temperature value (degC) @@ -408,4 +408,4 @@ float ms5611::getSeaLevelBaroM(float known_alt) { S = pow(pow((P * INHG), 0.190284) + 0.00001313 * known_alt * FTMETERS , 5.2553026) * MB; return((float)S); } - \ No newline at end of file + From 2985c0c5cf8aa05bd91d7751fb739d5317450bc1 Mon Sep 17 00:00:00 2001 From: philsson Date: Fri, 31 Aug 2018 14:01:42 +0200 Subject: [PATCH 11/11] Fix Includes in servo --- src/drivers/servo.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/drivers/servo.cpp b/src/drivers/servo.cpp index fe14ca5..f7bd065 100644 --- a/src/drivers/servo.cpp +++ b/src/drivers/servo.cpp @@ -1,4 +1,4 @@ -#include "src/drivers/Servo.h" +#include "src/drivers/servo.h" #include "mbed-os/rtos/Thread.h" @@ -149,4 +149,4 @@ void Servo::stop() } } -} // namespace drivers \ No newline at end of file +} // namespace drivers