diff --git a/app/src/processing/app/preproc/PdePreprocessor.java b/app/src/processing/app/preproc/PdePreprocessor.java index 2deaa15aa..2b4f03e85 100644 --- a/app/src/processing/app/preproc/PdePreprocessor.java +++ b/app/src/processing/app/preproc/PdePreprocessor.java @@ -46,7 +46,7 @@ public class PdePreprocessor { public int prototypeCount = 0; // stores number of included library headers written - // we always write one header: WProgram.h + // we always write one header: Arduino.h public int headerCount = 1; // the prototypes that are generated by the preprocessor @@ -199,7 +199,7 @@ public class PdePreprocessor { int prototypeInsertionPoint = firstStatement(program); out.print(program.substring(0, prototypeInsertionPoint)); - out.print("#include \"WProgram.h\"\n"); + out.print("#include \"Arduino.h\"\n"); // print user defined prototypes for (int i = 0; i < prototypes.size(); i++) { diff --git a/hardware/arduino/cores/arduino/WProgram.h b/hardware/arduino/cores/arduino/Arduino.h similarity index 97% rename from hardware/arduino/cores/arduino/WProgram.h rename to hardware/arduino/cores/arduino/Arduino.h index f73e760bb..ceaa560fe 100755 --- a/hardware/arduino/cores/arduino/WProgram.h +++ b/hardware/arduino/cores/arduino/Arduino.h @@ -1,5 +1,5 @@ -#ifndef WProgram_h -#define WProgram_h +#ifndef Arduino_h +#define Arduino_h #include #include diff --git a/hardware/arduino/cores/arduino/WString.cpp b/hardware/arduino/cores/arduino/WString.cpp index db5a441dc..589979865 100644 --- a/hardware/arduino/cores/arduino/WString.cpp +++ b/hardware/arduino/cores/arduino/WString.cpp @@ -18,7 +18,7 @@ */ #include -#include "WProgram.h" +#include "Arduino.h" #include "WString.h" diff --git a/hardware/arduino/cores/arduino/WString.h b/hardware/arduino/cores/arduino/WString.h index cadddb947..ff671d8d4 100644 --- a/hardware/arduino/cores/arduino/WString.h +++ b/hardware/arduino/cores/arduino/WString.h @@ -20,7 +20,7 @@ #ifndef String_h #define String_h -//#include "WProgram.h" +//#include "Arduino.h" #include #include #include diff --git a/hardware/arduino/cores/arduino/main.cpp b/hardware/arduino/cores/arduino/main.cpp index cc6e81d90..a806ebc05 100755 --- a/hardware/arduino/cores/arduino/main.cpp +++ b/hardware/arduino/cores/arduino/main.cpp @@ -1,4 +1,4 @@ -#include +#include int main(void) { diff --git a/libraries/ArduinoTestSuite/ArduinoTestSuite.cpp b/libraries/ArduinoTestSuite/ArduinoTestSuite.cpp index 845e2efef..86a275ab7 100644 --- a/libraries/ArduinoTestSuite/ArduinoTestSuite.cpp +++ b/libraries/ArduinoTestSuite/ArduinoTestSuite.cpp @@ -26,7 +26,7 @@ #include "ArduinoTestSuite.h" -#include "WProgram.h" +#include "Arduino.h" #include "HardwareSerial.h" #include "pins_arduino.h" diff --git a/libraries/ArduinoTestSuite/ArduinoTestSuite.h b/libraries/ArduinoTestSuite/ArduinoTestSuite.h index 9501d67a2..af810e1eb 100644 --- a/libraries/ArduinoTestSuite/ArduinoTestSuite.h +++ b/libraries/ArduinoTestSuite/ArduinoTestSuite.h @@ -7,8 +7,8 @@ #include #endif -#ifndef WProgram_h - #include "WProgram.h" +#ifndef Arduino_h + #include "Arduino.h" #endif #ifndef HardwareSerial_h #include "HardwareSerial.h" diff --git a/libraries/ArduinoTestSuite/examples/ATS_Constants/ATS_Constants.pde b/libraries/ArduinoTestSuite/examples/ATS_Constants/ATS_Constants.pde index d58e8bac6..3196923f5 100644 --- a/libraries/ArduinoTestSuite/examples/ATS_Constants/ATS_Constants.pde +++ b/libraries/ArduinoTestSuite/examples/ATS_Constants/ATS_Constants.pde @@ -7,7 +7,6 @@ //* Oct 16, 2010 Test of Arduino Constants //************************************************************************ -#include "WProgram.h" #include "HardwareSerial.h" #include diff --git a/libraries/ArduinoTestSuite/examples/ATS_Delay/ATS_Delay.pde b/libraries/ArduinoTestSuite/examples/ATS_Delay/ATS_Delay.pde index 8ac9fd202..c3235d273 100644 --- a/libraries/ArduinoTestSuite/examples/ATS_Delay/ATS_Delay.pde +++ b/libraries/ArduinoTestSuite/examples/ATS_Delay/ATS_Delay.pde @@ -1 +1 @@ -//************************************************************************ //* Arduino Test Suite //* ATS_ToneTest //* //* Copyright (c) 2010 Mark Sproul All right reserved. //* //* This library is free software; you can redistribute it and/or //* modify it under the terms of the GNU Lesser General Public //* License as published by the Free Software Foundation; either //* version 2.1 of the License, or (at your option) any later version. //* //* This library 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 //* Lesser General Public License for more details. //* //* You should have received a copy of the GNU Lesser General Public //* License along with this library; if not, write to the Free Software //* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA //************************************************************************ //* Aug 31, 2010 Started on TestArduino //* Oct 28, 2010 Started on Delay //************************************************************************ #include "WProgram.h" #include "HardwareSerial.h" #include //************************************************************************ void setup() { short ii; short testNum; int startMemoryUsage; unsigned long startMillis; unsigned long endMillis; unsigned long deltaMillis; unsigned long errMillis; boolean passed; char testNameString[80]; startMemoryUsage = ATS_GetFreeMemory(); ATS_begin("Arduino", "DelayTest"); testNum = 1; //* we start at 2 because 0/1 are RXD/TXD for (ii=0; ii<1000; ii+= 15) { startMillis = millis(); delay(ii); endMillis = millis(); deltaMillis = endMillis - startMillis; if (deltaMillis >= ii) { errMillis = deltaMillis - ii; } else { errMillis = ii - deltaMillis; } if (errMillis <= 1) { passed = true; } else { passed = false; } sprintf(testNameString, "DelayTest.%02d (delay= %4d actual delay=%ld err=%ld)", testNum, ii, deltaMillis, errMillis); ATS_PrintTestStatus(testNameString, passed); testNum++; } ATS_ReportMemoryUsage(startMemoryUsage); ATS_end(); } //************************************************************************ void loop() { } \ No newline at end of file +//************************************************************************ //* Arduino Test Suite //* ATS_ToneTest //* //* Copyright (c) 2010 Mark Sproul All right reserved. //* //* This library is free software; you can redistribute it and/or //* modify it under the terms of the GNU Lesser General Public //* License as published by the Free Software Foundation; either //* version 2.1 of the License, or (at your option) any later version. //* //* This library 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 //* Lesser General Public License for more details. //* //* You should have received a copy of the GNU Lesser General Public //* License along with this library; if not, write to the Free Software //* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA //************************************************************************ //* Aug 31, 2010 Started on TestArduino //* Oct 28, 2010 Started on Delay //************************************************************************ #include "HardwareSerial.h" #include //************************************************************************ void setup() { short ii; short testNum; int startMemoryUsage; unsigned long startMillis; unsigned long endMillis; unsigned long deltaMillis; unsigned long errMillis; boolean passed; char testNameString[80]; startMemoryUsage = ATS_GetFreeMemory(); ATS_begin("Arduino", "DelayTest"); testNum = 1; //* we start at 2 because 0/1 are RXD/TXD for (ii=0; ii<1000; ii+= 15) { startMillis = millis(); delay(ii); endMillis = millis(); deltaMillis = endMillis - startMillis; if (deltaMillis >= ii) { errMillis = deltaMillis - ii; } else { errMillis = ii - deltaMillis; } if (errMillis <= 1) { passed = true; } else { passed = false; } sprintf(testNameString, "DelayTest.%02d (delay= %4d actual delay=%ld err=%ld)", testNum, ii, deltaMillis, errMillis); ATS_PrintTestStatus(testNameString, passed); testNum++; } ATS_ReportMemoryUsage(startMemoryUsage); ATS_end(); } //************************************************************************ void loop() { } \ No newline at end of file diff --git a/libraries/ArduinoTestSuite/examples/ATS_General/ATS_General.pde b/libraries/ArduinoTestSuite/examples/ATS_General/ATS_General.pde index 502248a23..3c219bc13 100644 --- a/libraries/ArduinoTestSuite/examples/ATS_General/ATS_General.pde +++ b/libraries/ArduinoTestSuite/examples/ATS_General/ATS_General.pde @@ -8,7 +8,6 @@ //* Oct 18, 2010 Added memory testing //************************************************************************ -#include "WProgram.h" #include "HardwareSerial.h" #include "pins_arduino.h" #include diff --git a/libraries/ArduinoTestSuite/examples/ATS_Skeleton/ATS_Skeleton.pde b/libraries/ArduinoTestSuite/examples/ATS_Skeleton/ATS_Skeleton.pde index 33fc81680..e7fc4fa08 100644 --- a/libraries/ArduinoTestSuite/examples/ATS_Skeleton/ATS_Skeleton.pde +++ b/libraries/ArduinoTestSuite/examples/ATS_Skeleton/ATS_Skeleton.pde @@ -7,7 +7,6 @@ //* Oct 16, 2010 Started on String Test //************************************************************************ -#include "WProgram.h" #include "HardwareSerial.h" #include diff --git a/libraries/ArduinoTestSuite/examples/ATS_StringIndexOfMemory/ATS_StringIndexOfMemory.pde b/libraries/ArduinoTestSuite/examples/ATS_StringIndexOfMemory/ATS_StringIndexOfMemory.pde index 71a6bea19..000976104 100644 --- a/libraries/ArduinoTestSuite/examples/ATS_StringIndexOfMemory/ATS_StringIndexOfMemory.pde +++ b/libraries/ArduinoTestSuite/examples/ATS_StringIndexOfMemory/ATS_StringIndexOfMemory.pde @@ -7,7 +7,6 @@ //* Oct 16, 2010 Started on String Test //************************************************************************ -#include "WProgram.h" #include "HardwareSerial.h" #include diff --git a/libraries/ArduinoTestSuite/examples/ATS_StringTest/ATS_StringTest.pde b/libraries/ArduinoTestSuite/examples/ATS_StringTest/ATS_StringTest.pde index 27a9d26c7..a1c2944df 100644 --- a/libraries/ArduinoTestSuite/examples/ATS_StringTest/ATS_StringTest.pde +++ b/libraries/ArduinoTestSuite/examples/ATS_StringTest/ATS_StringTest.pde @@ -7,7 +7,6 @@ //* Oct 16, 2010 Started on String Test //************************************************************************ -#include "WProgram.h" #include "HardwareSerial.h" #include diff --git a/libraries/ArduinoTestSuite/examples/ATS_ToneTest/ATS_ToneTest.pde b/libraries/ArduinoTestSuite/examples/ATS_ToneTest/ATS_ToneTest.pde index 8bec6be2a..b244081e5 100644 --- a/libraries/ArduinoTestSuite/examples/ATS_ToneTest/ATS_ToneTest.pde +++ b/libraries/ArduinoTestSuite/examples/ATS_ToneTest/ATS_ToneTest.pde @@ -26,7 +26,6 @@ -#include "WProgram.h" #include "HardwareSerial.h" #if defined(__AVR_ATmega168__) || defined(__AVR_ATmega328P__) diff --git a/libraries/Ethernet/Client.cpp b/libraries/Ethernet/Client.cpp index 96d5c7eed..4781bcad9 100644 --- a/libraries/Ethernet/Client.cpp +++ b/libraries/Ethernet/Client.cpp @@ -5,7 +5,7 @@ extern "C" { #include "string.h" } -#include "WProgram.h" +#include "Arduino.h" #include "Ethernet.h" #include "Client.h" diff --git a/libraries/Ethernet/Client.h b/libraries/Ethernet/Client.h index 8725f158a..d7f4e7f5c 100644 --- a/libraries/Ethernet/Client.h +++ b/libraries/Ethernet/Client.h @@ -1,6 +1,6 @@ #ifndef client_h #define client_h -#include "WProgram.h" +#include "Arduino.h" #include "Print.h" class Client : public Stream { diff --git a/libraries/Firmata/Boards.h b/libraries/Firmata/Boards.h index 203645447..f71632095 100644 --- a/libraries/Firmata/Boards.h +++ b/libraries/Firmata/Boards.h @@ -3,7 +3,7 @@ #ifndef Firmata_Boards_h #define Firmata_Boards_h -#include // for digitalRead, digitalWrite, etc +#include // for digitalRead, digitalWrite, etc // Normally Servo.h must be included before Firmata.h (which then includes // this file). If Servo.h wasn't included, this allows the code to still diff --git a/libraries/Firmata/Firmata.cpp b/libraries/Firmata/Firmata.cpp index ffaff4d75..e30deae6c 100644 --- a/libraries/Firmata/Firmata.cpp +++ b/libraries/Firmata/Firmata.cpp @@ -14,7 +14,7 @@ //* Includes //****************************************************************************** -#include "WProgram.h" +#include "Arduino.h" #include "HardwareSerial.h" #include "Firmata.h" diff --git a/libraries/Firmata/Firmata.h b/libraries/Firmata/Firmata.h index 9e8dda075..871591373 100644 --- a/libraries/Firmata/Firmata.h +++ b/libraries/Firmata/Firmata.h @@ -13,7 +13,7 @@ #ifndef Firmata_h #define Firmata_h -#include +#include #include diff --git a/libraries/LiquidCrystal/LiquidCrystal.cpp b/libraries/LiquidCrystal/LiquidCrystal.cpp index 23713f47b..04d0f50e7 100644 --- a/libraries/LiquidCrystal/LiquidCrystal.cpp +++ b/libraries/LiquidCrystal/LiquidCrystal.cpp @@ -3,7 +3,7 @@ #include #include #include -#include "WProgram.h" +#include "Arduino.h" // When the display powers up, it is configured as follows: // diff --git a/libraries/SD/SD.h b/libraries/SD/SD.h index 2c5c323a8..609104b10 100644 --- a/libraries/SD/SD.h +++ b/libraries/SD/SD.h @@ -15,7 +15,7 @@ #ifndef __SD_H__ #define __SD_H__ -#include +#include #include #include diff --git a/libraries/SD/utility/Sd2Card.cpp b/libraries/SD/utility/Sd2Card.cpp index 26c4236ac..361cd0a06 100644 --- a/libraries/SD/utility/Sd2Card.cpp +++ b/libraries/SD/utility/Sd2Card.cpp @@ -17,7 +17,7 @@ * along with the Arduino Sd2Card Library. If not, see * . */ -#include +#include #include "Sd2Card.h" //------------------------------------------------------------------------------ #ifndef SOFTWARE_SPI diff --git a/libraries/SD/utility/SdFatUtil.h b/libraries/SD/utility/SdFatUtil.h index 8bf90483d..c626bfeb9 100644 --- a/libraries/SD/utility/SdFatUtil.h +++ b/libraries/SD/utility/SdFatUtil.h @@ -23,7 +23,7 @@ * \file * Useful utility functions. */ -#include +#include #include /** Store and print a string in flash memory.*/ #define PgmPrint(x) SerialPrint_P(PSTR(x)) diff --git a/libraries/SD/utility/SdFile.cpp b/libraries/SD/utility/SdFile.cpp index 3eb58f48a..40444a721 100644 --- a/libraries/SD/utility/SdFile.cpp +++ b/libraries/SD/utility/SdFile.cpp @@ -19,7 +19,7 @@ */ #include #include -#include +#include //------------------------------------------------------------------------------ // callback function for date/time void (*SdFile::dateTime_)(uint16_t* date, uint16_t* time) = NULL; diff --git a/libraries/SPI/SPI.h b/libraries/SPI/SPI.h index 9d7c3c709..79c89d4d6 100644 --- a/libraries/SPI/SPI.h +++ b/libraries/SPI/SPI.h @@ -12,7 +12,7 @@ #define _SPI_H_INCLUDED #include -#include +#include #include #define SPI_CLOCK_DIV4 0x00 diff --git a/libraries/Servo/Servo.cpp b/libraries/Servo/Servo.cpp index 44e5aa5aa..acac29a86 100755 --- a/libraries/Servo/Servo.cpp +++ b/libraries/Servo/Servo.cpp @@ -43,7 +43,7 @@ */ #include -#include +#include #include "Servo.h" diff --git a/libraries/Stepper/Stepper.cpp b/libraries/Stepper/Stepper.cpp index d5c16a3b4..5d6b5e536 100644 --- a/libraries/Stepper/Stepper.cpp +++ b/libraries/Stepper/Stepper.cpp @@ -45,7 +45,7 @@ http://www.arduino.cc/en/Tutorial/Stepper */ -#include "WProgram.h" +#include "Arduino.h" #include "Stepper.h" /*