Merge branch 'Development' into delta_auto_bed_level

Conflicts: Marlin/Marlin_main.cpp
2015-03-16 08:24:26 +02:00
parent 53abc5e2f1 cbe4496123
commit 8a739b6fba
124 changed files with 43168 additions and 1238 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,8 @@ install:
  - sudo apt-get update -q 
  - sudo apt-get install arduino
 before_script:
+  # copy TMC and L6470 libraries to arduino dir, as conditional includes do not work in .ino files
+  - sudo cp -r ArduinoAddons/Arduino_1.x.x/libraries/ /usr/share/arduino
 # add U8glib, LiquidCrystal_I2C & LiquidTWI2 libraries 
  - sudo unzip u8glib_arduino_v1.17.zip -d /usr/share/arduino/libraries/
  - cd /usr/share/arduino/libraries/