From 06ae8322761541ad68495189d0776b72c4affd6c Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth Date: Sun, 7 Jun 2015 04:40:52 -0500 Subject: [PATCH] Deprecate Support for Arduino IDE < 1.0.5 Note that newer versions of the IDE can still be made to support compilation for the older boards. --- .travis.yml | 2 -- Marlin/Conditionals.h | 6 +---- Marlin/Marlin.h | 6 +---- Marlin/Marlin.pde | 56 ------------------------------------------- Marlin/blinkm.h | 6 +---- 5 files changed, 3 insertions(+), 73 deletions(-) delete mode 100644 Marlin/Marlin.pde diff --git a/.travis.yml b/.travis.yml index 72060eed7..b6d99abb5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,8 +30,6 @@ before_script: - cd $TRAVIS_BUILD_DIR # ino needs files in src directory - ln -s Marlin src - # remove Marlin.pde as it confuses ino after it finds Marlin.ino - - rm Marlin/Marlin.pde - generate_version_header_for_marlin . Marlin/_Version.h - cat Marlin/_Version.h script: diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h index dab2f2376..1164a0e1b 100644 --- a/Marlin/Conditionals.h +++ b/Marlin/Conditionals.h @@ -219,11 +219,7 @@ #define HardwareSerial_h // trick to disable the standard HWserial #endif - #if (ARDUINO >= 100) - #include "Arduino.h" - #else - #include "WProgram.h" - #endif + #include "Arduino.h" /** * ENDSTOPPULLUPS diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h index 0c3a3ac6d..f4e353a5d 100644 --- a/Marlin/Marlin.h +++ b/Marlin/Marlin.h @@ -26,11 +26,7 @@ #error Your Configuration.h and Configuration_adv.h files are outdated! #endif -#if (ARDUINO >= 100) - #include "Arduino.h" -#else - #include "WProgram.h" -#endif +#include "Arduino.h" #define BIT(b) (1<<(b)) #define TEST(n,b) (((n)&BIT(b))!=0) diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde deleted file mode 100644 index 9eae6d440..000000000 --- a/Marlin/Marlin.pde +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- c++ -*- */ - -/* - Reprap firmware based on Sprinter and grbl. - Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - */ - -/* - This firmware is a mashup between Sprinter and grbl. - (https://github.com/kliment/Sprinter) - (https://github.com/simen/grbl/tree) - - It has preliminary support for Matthew Roberts advance algorithm - http://reprap.org/pipermail/reprap-dev/2011-May/003323.html - */ - -/* All the implementation is done in *.cpp files to get better compatibility with avr-gcc without the Arduino IDE */ -/* Use this file to help the Arduino IDE find which Arduino libraries are needed and to keep documentation on GCode */ - -#include "Configuration.h" -#include "pins.h" - -#ifdef ULTRA_LCD - #if defined(LCD_I2C_TYPE_PCF8575) - #include - #include - #elif defined(LCD_I2C_TYPE_MCP23017) || defined(LCD_I2C_TYPE_MCP23008) - #include - #include - #elif defined(DOGLCD) - #include // library for graphics LCD by Oli Kraus (https://code.google.com/p/u8glib/) - #else - #include // library for character LCD - #endif -#endif - -#if HAS_DIGIPOTSS - #include -#endif - -#if defined(DIGIPOT_I2C) - #include -#endif diff --git a/Marlin/blinkm.h b/Marlin/blinkm.h index 08169e589..df11c9931 100644 --- a/Marlin/blinkm.h +++ b/Marlin/blinkm.h @@ -2,12 +2,8 @@ blinkm.h Library header file for BlinkM library */ -#if ARDUINO >= 100 - #include "Arduino.h" -#else - #include "WProgram.h" -#endif +#include "Arduino.h" #include "Wire.h" void SendColors(byte red, byte grn, byte blu);