Browse Source

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.
Richard Wackerbarth 9 years ago
parent
commit
06ae832276
5 changed files with 3 additions and 73 deletions
  1. 0
    2
      .travis.yml
  2. 1
    5
      Marlin/Conditionals.h
  3. 1
    5
      Marlin/Marlin.h
  4. 0
    56
      Marlin/Marlin.pde
  5. 1
    5
      Marlin/blinkm.h

+ 0
- 2
.travis.yml View File

@@ -30,8 +30,6 @@ before_script:
30 30
   - cd $TRAVIS_BUILD_DIR
31 31
   # ino needs files in src directory
32 32
   - ln -s Marlin src
33
-  # remove Marlin.pde as it confuses ino after it finds Marlin.ino
34
-  - rm Marlin/Marlin.pde
35 33
   - generate_version_header_for_marlin . Marlin/_Version.h
36 34
   - cat Marlin/_Version.h
37 35
 script:

+ 1
- 5
Marlin/Conditionals.h View File

@@ -219,11 +219,7 @@
219 219
     #define HardwareSerial_h // trick to disable the standard HWserial
220 220
   #endif
221 221
 
222
-  #if (ARDUINO >= 100)
223
-    #include "Arduino.h"
224
-  #else
225
-    #include "WProgram.h"
226
-  #endif
222
+  #include "Arduino.h"
227 223
 
228 224
   /**
229 225
    * ENDSTOPPULLUPS

+ 1
- 5
Marlin/Marlin.h View File

@@ -26,11 +26,7 @@
26 26
   #error Your Configuration.h and Configuration_adv.h files are outdated!
27 27
 #endif
28 28
 
29
-#if (ARDUINO >= 100)
30
-  #include "Arduino.h"
31
-#else
32
-  #include "WProgram.h"
33
-#endif
29
+#include "Arduino.h"
34 30
 
35 31
 #define BIT(b) (1<<(b))
36 32
 #define TEST(n,b) (((n)&BIT(b))!=0)

+ 0
- 56
Marlin/Marlin.pde View File

@@ -1,56 +0,0 @@
1
-/* -*- c++ -*- */
2
-
3
-/*
4
-    Reprap firmware based on Sprinter and grbl.
5
- Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
6
-
7
- This program is free software: you can redistribute it and/or modify
8
- it under the terms of the GNU General Public License as published by
9
- the Free Software Foundation, either version 3 of the License, or
10
- (at your option) any later version.
11
-
12
- This program is distributed in the hope that it will be useful,
13
- but WITHOUT ANY WARRANTY; without even the implied warranty of
14
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
- GNU General Public License for more details.
16
-
17
- You should have received a copy of the GNU General Public License
18
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
19
- */
20
-
21
-/*
22
- This firmware is a mashup between Sprinter and grbl.
23
-  (https://github.com/kliment/Sprinter)
24
-  (https://github.com/simen/grbl/tree)
25
-
26
- It has preliminary support for Matthew Roberts advance algorithm
27
-    http://reprap.org/pipermail/reprap-dev/2011-May/003323.html
28
- */
29
-
30
-/* All the implementation is done in *.cpp files to get better compatibility with avr-gcc without the Arduino IDE */
31
-/* Use this file to help the Arduino IDE find which Arduino libraries are needed and to keep documentation on GCode */
32
-
33
-#include "Configuration.h"
34
-#include "pins.h"
35
-
36
-#ifdef ULTRA_LCD
37
-  #if defined(LCD_I2C_TYPE_PCF8575)
38
-    #include <Wire.h>
39
-    #include <LiquidCrystal_I2C.h>
40
-  #elif defined(LCD_I2C_TYPE_MCP23017) || defined(LCD_I2C_TYPE_MCP23008)
41
-    #include <Wire.h>
42
-    #include <LiquidTWI2.h>
43
-  #elif defined(DOGLCD)
44
-    #include <U8glib.h> // library for graphics LCD by Oli Kraus (https://code.google.com/p/u8glib/)
45
-  #else
46
-    #include <LiquidCrystal.h> // library for character LCD
47
-  #endif
48
-#endif
49
-
50
-#if HAS_DIGIPOTSS
51
-  #include <SPI.h>
52
-#endif
53
-
54
-#if defined(DIGIPOT_I2C)
55
-  #include <Wire.h>
56
-#endif

+ 1
- 5
Marlin/blinkm.h View File

@@ -2,12 +2,8 @@
2 2
   blinkm.h
3 3
   Library header file for BlinkM library
4 4
  */
5
-#if ARDUINO >= 100
6
-  #include "Arduino.h"
7
-#else
8
-  #include "WProgram.h"
9
-#endif
10 5
 
6
+#include "Arduino.h"
11 7
 #include "Wire.h"
12 8
 
13 9
 void SendColors(byte red, byte grn, byte blu);

Loading…
Cancel
Save