From 29ff8cd55a956ceb74db056a0ff4858bb0f34b40 Mon Sep 17 00:00:00 2001 From: Josh Stewart Date: Wed, 3 Aug 2016 11:30:01 +1000 Subject: [PATCH] Fix for Arduino 1.6.10 regression (https://github.com/arduino/Arduino/issues/5186) --- display.ino | 4 ++-- speeduino.ino | 2 +- {libs => src}/Adafruit_SSD1306/Adafruit_GFX.cpp | 0 {libs => src}/Adafruit_SSD1306/Adafruit_GFX.h | 0 {libs => src}/Adafruit_SSD1306/Adafruit_SSD1306.cpp | 0 {libs => src}/Adafruit_SSD1306/Adafruit_SSD1306.h | 0 {libs => src}/Adafruit_SSD1306/README.txt | 0 .../examples/ssd1306_128x32_i2c/ssd1306_128x32_i2c.ino | 0 .../examples/ssd1306_128x32_spi/ssd1306_128x32_spi.ino | 0 .../examples/ssd1306_128x64_i2c/ssd1306_128x64_i2c.ino | 0 .../examples/ssd1306_128x64_spi/ssd1306_128x64_spi.ino | 0 {libs => src}/Adafruit_SSD1306/glcdfont.c | 0 {libs => src}/Adafruit_SSD1306/license.txt | 0 .../Examples/PID_AdaptiveTunings/PID_AdaptiveTunings.ino | 0 {libs => src}/PID_v1/Examples/PID_Basic/PID_Basic.ino | 0 .../PID_v1/Examples/PID_RelayOutput/PID_RelayOutput.ino | 0 {libs => src}/PID_v1/PID_v1.cpp | 0 {libs => src}/PID_v1/PID_v1.h | 0 {libs => src}/PID_v1/keywords.txt | 0 19 files changed, 3 insertions(+), 3 deletions(-) rename {libs => src}/Adafruit_SSD1306/Adafruit_GFX.cpp (100%) rename {libs => src}/Adafruit_SSD1306/Adafruit_GFX.h (100%) rename {libs => src}/Adafruit_SSD1306/Adafruit_SSD1306.cpp (100%) rename {libs => src}/Adafruit_SSD1306/Adafruit_SSD1306.h (100%) rename {libs => src}/Adafruit_SSD1306/README.txt (100%) rename {libs => src}/Adafruit_SSD1306/examples/ssd1306_128x32_i2c/ssd1306_128x32_i2c.ino (100%) rename {libs => src}/Adafruit_SSD1306/examples/ssd1306_128x32_spi/ssd1306_128x32_spi.ino (100%) rename {libs => src}/Adafruit_SSD1306/examples/ssd1306_128x64_i2c/ssd1306_128x64_i2c.ino (100%) rename {libs => src}/Adafruit_SSD1306/examples/ssd1306_128x64_spi/ssd1306_128x64_spi.ino (100%) rename {libs => src}/Adafruit_SSD1306/glcdfont.c (100%) rename {libs => src}/Adafruit_SSD1306/license.txt (100%) rename {libs => src}/PID_v1/Examples/PID_AdaptiveTunings/PID_AdaptiveTunings.ino (100%) rename {libs => src}/PID_v1/Examples/PID_Basic/PID_Basic.ino (100%) rename {libs => src}/PID_v1/Examples/PID_RelayOutput/PID_RelayOutput.ino (100%) rename {libs => src}/PID_v1/PID_v1.cpp (100%) rename {libs => src}/PID_v1/PID_v1.h (100%) rename {libs => src}/PID_v1/keywords.txt (100%) diff --git a/display.ino b/display.ino index 8afd1495..8cca192f 100644 --- a/display.ino +++ b/display.ino @@ -6,8 +6,8 @@ A full copy of the license may be found in the projects root directory #include #include -#include "libs/Adafruit_SSD1306/Adafruit_GFX.h" -#include "libs/Adafruit_SSD1306/Adafruit_SSD1306.h" +#include "src/Adafruit_SSD1306/Adafruit_GFX.h" +#include "src/Adafruit_SSD1306/Adafruit_SSD1306.h" Adafruit_SSD1306 display(pinDisplayReset); diff --git a/speeduino.ino b/speeduino.ino index d28d214b..e6f0c15f 100644 --- a/speeduino.ino +++ b/speeduino.ino @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "auxiliaries.h" #include "fastAnalog.h" #include "sensors.h" -#include "libs/PID_v1/PID_v1.h" +#include "src/PID_v1/PID_v1.h" #include "errors.h" #ifdef __SAM3X8E__ diff --git a/libs/Adafruit_SSD1306/Adafruit_GFX.cpp b/src/Adafruit_SSD1306/Adafruit_GFX.cpp similarity index 100% rename from libs/Adafruit_SSD1306/Adafruit_GFX.cpp rename to src/Adafruit_SSD1306/Adafruit_GFX.cpp diff --git a/libs/Adafruit_SSD1306/Adafruit_GFX.h b/src/Adafruit_SSD1306/Adafruit_GFX.h similarity index 100% rename from libs/Adafruit_SSD1306/Adafruit_GFX.h rename to src/Adafruit_SSD1306/Adafruit_GFX.h diff --git a/libs/Adafruit_SSD1306/Adafruit_SSD1306.cpp b/src/Adafruit_SSD1306/Adafruit_SSD1306.cpp similarity index 100% rename from libs/Adafruit_SSD1306/Adafruit_SSD1306.cpp rename to src/Adafruit_SSD1306/Adafruit_SSD1306.cpp diff --git a/libs/Adafruit_SSD1306/Adafruit_SSD1306.h b/src/Adafruit_SSD1306/Adafruit_SSD1306.h similarity index 100% rename from libs/Adafruit_SSD1306/Adafruit_SSD1306.h rename to src/Adafruit_SSD1306/Adafruit_SSD1306.h diff --git a/libs/Adafruit_SSD1306/README.txt b/src/Adafruit_SSD1306/README.txt similarity index 100% rename from libs/Adafruit_SSD1306/README.txt rename to src/Adafruit_SSD1306/README.txt diff --git a/libs/Adafruit_SSD1306/examples/ssd1306_128x32_i2c/ssd1306_128x32_i2c.ino b/src/Adafruit_SSD1306/examples/ssd1306_128x32_i2c/ssd1306_128x32_i2c.ino similarity index 100% rename from libs/Adafruit_SSD1306/examples/ssd1306_128x32_i2c/ssd1306_128x32_i2c.ino rename to src/Adafruit_SSD1306/examples/ssd1306_128x32_i2c/ssd1306_128x32_i2c.ino diff --git a/libs/Adafruit_SSD1306/examples/ssd1306_128x32_spi/ssd1306_128x32_spi.ino b/src/Adafruit_SSD1306/examples/ssd1306_128x32_spi/ssd1306_128x32_spi.ino similarity index 100% rename from libs/Adafruit_SSD1306/examples/ssd1306_128x32_spi/ssd1306_128x32_spi.ino rename to src/Adafruit_SSD1306/examples/ssd1306_128x32_spi/ssd1306_128x32_spi.ino diff --git a/libs/Adafruit_SSD1306/examples/ssd1306_128x64_i2c/ssd1306_128x64_i2c.ino b/src/Adafruit_SSD1306/examples/ssd1306_128x64_i2c/ssd1306_128x64_i2c.ino similarity index 100% rename from libs/Adafruit_SSD1306/examples/ssd1306_128x64_i2c/ssd1306_128x64_i2c.ino rename to src/Adafruit_SSD1306/examples/ssd1306_128x64_i2c/ssd1306_128x64_i2c.ino diff --git a/libs/Adafruit_SSD1306/examples/ssd1306_128x64_spi/ssd1306_128x64_spi.ino b/src/Adafruit_SSD1306/examples/ssd1306_128x64_spi/ssd1306_128x64_spi.ino similarity index 100% rename from libs/Adafruit_SSD1306/examples/ssd1306_128x64_spi/ssd1306_128x64_spi.ino rename to src/Adafruit_SSD1306/examples/ssd1306_128x64_spi/ssd1306_128x64_spi.ino diff --git a/libs/Adafruit_SSD1306/glcdfont.c b/src/Adafruit_SSD1306/glcdfont.c similarity index 100% rename from libs/Adafruit_SSD1306/glcdfont.c rename to src/Adafruit_SSD1306/glcdfont.c diff --git a/libs/Adafruit_SSD1306/license.txt b/src/Adafruit_SSD1306/license.txt similarity index 100% rename from libs/Adafruit_SSD1306/license.txt rename to src/Adafruit_SSD1306/license.txt diff --git a/libs/PID_v1/Examples/PID_AdaptiveTunings/PID_AdaptiveTunings.ino b/src/PID_v1/Examples/PID_AdaptiveTunings/PID_AdaptiveTunings.ino similarity index 100% rename from libs/PID_v1/Examples/PID_AdaptiveTunings/PID_AdaptiveTunings.ino rename to src/PID_v1/Examples/PID_AdaptiveTunings/PID_AdaptiveTunings.ino diff --git a/libs/PID_v1/Examples/PID_Basic/PID_Basic.ino b/src/PID_v1/Examples/PID_Basic/PID_Basic.ino similarity index 100% rename from libs/PID_v1/Examples/PID_Basic/PID_Basic.ino rename to src/PID_v1/Examples/PID_Basic/PID_Basic.ino diff --git a/libs/PID_v1/Examples/PID_RelayOutput/PID_RelayOutput.ino b/src/PID_v1/Examples/PID_RelayOutput/PID_RelayOutput.ino similarity index 100% rename from libs/PID_v1/Examples/PID_RelayOutput/PID_RelayOutput.ino rename to src/PID_v1/Examples/PID_RelayOutput/PID_RelayOutput.ino diff --git a/libs/PID_v1/PID_v1.cpp b/src/PID_v1/PID_v1.cpp similarity index 100% rename from libs/PID_v1/PID_v1.cpp rename to src/PID_v1/PID_v1.cpp diff --git a/libs/PID_v1/PID_v1.h b/src/PID_v1/PID_v1.h similarity index 100% rename from libs/PID_v1/PID_v1.h rename to src/PID_v1/PID_v1.h diff --git a/libs/PID_v1/keywords.txt b/src/PID_v1/keywords.txt similarity index 100% rename from libs/PID_v1/keywords.txt rename to src/PID_v1/keywords.txt