arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-17 22:23:10 +03:00
Code Activity

Renamed WProgram.h to Arduino.h.

Browse Source
This commit is contained in:
David A. Mellis
2011-03-01 19:52:13 -05:00
parent 97abbd7a31
commit d05e4021d0
27 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/processing/app/preproc/PdePreprocessor.java
View File

@ -46,7 +46,7 @@ public class PdePreprocessor {
public int prototypeCount = 0; public int prototypeCount = 0;
// stores number of included library headers written // 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; public int headerCount = 1;
// the prototypes that are generated by the preprocessor // the prototypes that are generated by the preprocessor
@ -199,7 +199,7 @@ public class PdePreprocessor {
int prototypeInsertionPoint = firstStatement(program); int prototypeInsertionPoint = firstStatement(program);
out.print(program.substring(0, prototypeInsertionPoint)); out.print(program.substring(0, prototypeInsertionPoint));
out.print("#include \"WProgram.h\"\n"); out.print("#include \"Arduino.h\"\n");
// print user defined prototypes // print user defined prototypes
for (int i = 0; i < prototypes.size(); i++) { for (int i = 0; i < prototypes.size(); i++) {

4
hardware/arduino/cores/arduino/WProgram.h → hardware/arduino/cores/arduino/Arduino.h
View File

@ -1,5 +1,5 @@
#ifndef WProgram_h #ifndef Arduino_h
#define WProgram_h #define Arduino_h
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

2
hardware/arduino/cores/arduino/WString.cpp
View File

@ -18,7 +18,7 @@
*/ */
#include <stdlib.h> #include <stdlib.h>
#include "WProgram.h" #include "Arduino.h"
#include "WString.h" #include "WString.h"

2
hardware/arduino/cores/arduino/WString.h
View File

@ -20,7 +20,7 @@
#ifndef String_h #ifndef String_h
#define String_h #define String_h
//#include "WProgram.h" //#include "Arduino.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>

2
hardware/arduino/cores/arduino/main.cpp
View File

@ -1,4 +1,4 @@
#include <WProgram.h> #include <Arduino.h>
int main(void) int main(void)
{ {

2
libraries/ArduinoTestSuite/ArduinoTestSuite.cpp
View File

@ -26,7 +26,7 @@
#include "ArduinoTestSuite.h" #include "ArduinoTestSuite.h"
#include "WProgram.h" #include "Arduino.h"
#include "HardwareSerial.h" #include "HardwareSerial.h"
#include "pins_arduino.h" #include "pins_arduino.h"

4
libraries/ArduinoTestSuite/ArduinoTestSuite.h
View File

@ -7,8 +7,8 @@
#include <avr/io.h> #include <avr/io.h>
#endif #endif
#ifndef WProgram_h #ifndef Arduino_h
#include "WProgram.h" #include "Arduino.h"
#endif #endif
#ifndef HardwareSerial_h #ifndef HardwareSerial_h
#include "HardwareSerial.h" #include "HardwareSerial.h"

1
libraries/ArduinoTestSuite/examples/ATS_Constants/ATS_Constants.pde
View File

@ -7,7 +7,6 @@
//* Oct 16, 2010 <ROA> Test of Arduino Constants //* Oct 16, 2010 <ROA> Test of Arduino Constants
//************************************************************************ //************************************************************************
#include "WProgram.h"
#include "HardwareSerial.h" #include "HardwareSerial.h"
#include <ArduinoTestSuite.h> #include <ArduinoTestSuite.h>

2
libraries/ArduinoTestSuite/examples/ATS_Delay/ATS_Delay.pde
View File

@ -1 +1 @@
//************************************************************************ //************************************************************************

1
libraries/ArduinoTestSuite/examples/ATS_General/ATS_General.pde
View File

@ -8,7 +8,6 @@
//* Oct 18, 2010 <MLS> Added memory testing //* Oct 18, 2010 <MLS> Added memory testing
//************************************************************************ //************************************************************************
#include "WProgram.h"
#include "HardwareSerial.h" #include "HardwareSerial.h"
#include "pins_arduino.h" #include "pins_arduino.h"
#include <ArduinoTestSuite.h> #include <ArduinoTestSuite.h>

1
libraries/ArduinoTestSuite/examples/ATS_Skeleton/ATS_Skeleton.pde
View File

@ -7,7 +7,6 @@
//* Oct 16, 2010 <ROA> Started on String Test //* Oct 16, 2010 <ROA> Started on String Test
//************************************************************************ //************************************************************************
#include "WProgram.h"
#include "HardwareSerial.h" #include "HardwareSerial.h"
#include <ArduinoTestSuite.h> #include <ArduinoTestSuite.h>

1
libraries/ArduinoTestSuite/examples/ATS_StringIndexOfMemory/ATS_StringIndexOfMemory.pde
View File

@ -7,7 +7,6 @@
//* Oct 16, 2010 <ROA> Started on String Test //* Oct 16, 2010 <ROA> Started on String Test
//************************************************************************ //************************************************************************
#include "WProgram.h"
#include "HardwareSerial.h" #include "HardwareSerial.h"
#include <ArduinoTestSuite.h> #include <ArduinoTestSuite.h>

1
libraries/ArduinoTestSuite/examples/ATS_StringTest/ATS_StringTest.pde
View File

@ -7,7 +7,6 @@
//* Oct 16, 2010 <ROA> Started on String Test //* Oct 16, 2010 <ROA> Started on String Test
//************************************************************************ //************************************************************************
#include "WProgram.h"
#include "HardwareSerial.h" #include "HardwareSerial.h"
#include <ArduinoTestSuite.h> #include <ArduinoTestSuite.h>

1
libraries/ArduinoTestSuite/examples/ATS_ToneTest/ATS_ToneTest.pde
View File

@ -26,7 +26,6 @@
#include "WProgram.h"
#include "HardwareSerial.h" #include "HardwareSerial.h"
#if defined(__AVR_ATmega168__) || defined(__AVR_ATmega328P__) #if defined(__AVR_ATmega168__) || defined(__AVR_ATmega328P__)

2
libraries/Ethernet/Client.cpp
View File

@ -5,7 +5,7 @@ extern "C" {
#include "string.h" #include "string.h"
} }
#include "WProgram.h" #include "Arduino.h"
#include "Ethernet.h" #include "Ethernet.h"
#include "Client.h" #include "Client.h"

2
libraries/Ethernet/Client.h
View File

@ -1,6 +1,6 @@
#ifndef client_h #ifndef client_h
#define client_h #define client_h
#include "WProgram.h" #include "Arduino.h"
#include "Print.h" #include "Print.h"
class Client : public Stream { class Client : public Stream {

2
libraries/Firmata/Boards.h
View File

@ -3,7 +3,7 @@
#ifndef Firmata_Boards_h #ifndef Firmata_Boards_h
#define Firmata_Boards_h #define Firmata_Boards_h
#include <WProgram.h> // for digitalRead, digitalWrite, etc #include <Arduino.h> // for digitalRead, digitalWrite, etc
// Normally Servo.h must be included before Firmata.h (which then includes // 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 // this file). If Servo.h wasn't included, this allows the code to still

2
libraries/Firmata/Firmata.cpp
View File

@ -14,7 +14,7 @@
//* Includes //* Includes
//****************************************************************************** //******************************************************************************
#include "WProgram.h" #include "Arduino.h"
#include "HardwareSerial.h" #include "HardwareSerial.h"
#include "Firmata.h" #include "Firmata.h"

2
libraries/Firmata/Firmata.h
View File

@ -13,7 +13,7 @@
#ifndef Firmata_h #ifndef Firmata_h
#define Firmata_h #define Firmata_h
#include <WProgram.h> #include <Arduino.h>
#include <inttypes.h> #include <inttypes.h>

2
libraries/LiquidCrystal/LiquidCrystal.cpp
View File

@ -3,7 +3,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <inttypes.h> #include <inttypes.h>
#include "WProgram.h" #include "Arduino.h"
// When the display powers up, it is configured as follows: // When the display powers up, it is configured as follows:
// //

2
libraries/SD/SD.h
View File

@ -15,7 +15,7 @@
#ifndef __SD_H__ #ifndef __SD_H__
#define __SD_H__ #define __SD_H__
#include <WProgram.h> #include <Arduino.h>
#include <utility/SdFat.h> #include <utility/SdFat.h>
#include <utility/SdFatUtil.h> #include <utility/SdFatUtil.h>

2
libraries/SD/utility/Sd2Card.cpp
View File

@ -17,7 +17,7 @@
* along with the Arduino Sd2Card Library. If not, see * along with the Arduino Sd2Card Library. If not, see
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#include <WProgram.h> #include <Arduino.h>
#include "Sd2Card.h" #include "Sd2Card.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#ifndef SOFTWARE_SPI #ifndef SOFTWARE_SPI

2
libraries/SD/utility/SdFatUtil.h
View File

@ -23,7 +23,7 @@
* \file * \file
* Useful utility functions. * Useful utility functions.
*/ */
#include <WProgram.h> #include <Arduino.h>
#include <avr/pgmspace.h> #include <avr/pgmspace.h>
/** Store and print a string in flash memory.*/ /** Store and print a string in flash memory.*/
#define PgmPrint(x) SerialPrint_P(PSTR(x)) #define PgmPrint(x) SerialPrint_P(PSTR(x))

2
libraries/SD/utility/SdFile.cpp
View File

@ -19,7 +19,7 @@
*/ */
#include <SdFat.h> #include <SdFat.h>
#include <avr/pgmspace.h> #include <avr/pgmspace.h>
#include <WProgram.h> #include <Arduino.h>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// callback function for date/time // callback function for date/time
void (*SdFile::dateTime_)(uint16_t* date, uint16_t* time) = NULL; void (*SdFile::dateTime_)(uint16_t* date, uint16_t* time) = NULL;

2
libraries/SPI/SPI.h
View File

@ -12,7 +12,7 @@
#define _SPI_H_INCLUDED #define _SPI_H_INCLUDED
#include <stdio.h> #include <stdio.h>
#include <WProgram.h> #include <Arduino.h>
#include <avr/pgmspace.h> #include <avr/pgmspace.h>
#define SPI_CLOCK_DIV4 0x00 #define SPI_CLOCK_DIV4 0x00

2
libraries/Servo/Servo.cpp
View File

@ -43,7 +43,7 @@
*/ */
#include <avr/interrupt.h> #include <avr/interrupt.h>
#include <WProgram.h> #include <Arduino.h>
#include "Servo.h" #include "Servo.h"

2
libraries/Stepper/Stepper.cpp
View File

@ -45,7 +45,7 @@ http://www.arduino.cc/en/Tutorial/Stepper
*/ */
#include "WProgram.h" #include "Arduino.h"
#include "Stepper.h" #include "Stepper.h"
/* /*