Update with Arduino 1.0.5 lib

Arduino.h

@@ -1 +1,214 @@
-#include <WProgram.h>
+#ifndef Arduino_h
+#define Arduino_h
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include <avr/pgmspace.h>
+#include <avr/io.h>
+#include <avr/interrupt.h>
+
+#include "binary.h"
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+#define HIGH 0x1
+#define LOW  0x0
+
+#define INPUT 0x0
+#define OUTPUT 0x1
+#define INPUT_PULLUP 0x2
+
+#define true 0x1
+#define false 0x0
+
+#define PI 3.1415926535897932384626433832795
+#define HALF_PI 1.5707963267948966192313216916398
+#define TWO_PI 6.283185307179586476925286766559
+#define DEG_TO_RAD 0.017453292519943295769236907684886
+#define RAD_TO_DEG 57.295779513082320876798154814105
+
+#define SERIAL  0x0
+#define DISPLAY 0x1
+
+#define LSBFIRST 0
+#define MSBFIRST 1
+
+#define CHANGE 1
+#define FALLING 2
+#define RISING 3
+
+#if defined(__AVR_ATtiny24__) || defined(__AVR_ATtiny44__) || defined(__AVR_ATtiny84__) || defined(__AVR_ATtiny25__) || defined(__AVR_ATtiny45__) || defined(__AVR_ATtiny85__)
+#define DEFAULT 0
+#define EXTERNAL 1
+#define INTERNAL 2
+#else
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega644__) || defined(__AVR_ATmega644A__) || defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644PA__)
+#define INTERNAL1V1 2
+#define INTERNAL2V56 3
+#else
+#define INTERNAL 3
+#endif
+#define DEFAULT 1
+#define EXTERNAL 0
+#endif
+
+// undefine stdlib's abs if encountered
+#ifdef abs
+#undef abs
+#endif
+
+#define min(a,b) ((a)<(b)?(a):(b))
+#define max(a,b) ((a)>(b)?(a):(b))
+#define abs(x) ((x)>0?(x):-(x))
+#define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt)))
+#define round(x)     ((x)>=0?(long)((x)+0.5):(long)((x)-0.5))
+#define radians(deg) ((deg)*DEG_TO_RAD)
+#define degrees(rad) ((rad)*RAD_TO_DEG)
+#define sq(x) ((x)*(x))
+
+#define interrupts() sei()
+#define noInterrupts() cli()
+
+#define clockCyclesPerMicrosecond() ( F_CPU / 1000000L )
+#define clockCyclesToMicroseconds(a) ( (a) / clockCyclesPerMicrosecond() )
+#define microsecondsToClockCycles(a) ( (a) * clockCyclesPerMicrosecond() )
+
+#define lowByte(w) ((uint8_t) ((w) & 0xff))
+#define highByte(w) ((uint8_t) ((w) >> 8))
+
+#define bitRead(value, bit) (((value) >> (bit)) & 0x01)
+#define bitSet(value, bit) ((value) |= (1UL << (bit)))
+#define bitClear(value, bit) ((value) &= ~(1UL << (bit)))
+#define bitWrite(value, bit, bitvalue) (bitvalue ? bitSet(value, bit) : bitClear(value, bit))
+
+
+typedef unsigned int word;
+
+#define bit(b) (1UL << (b))
+
+typedef uint8_t boolean;
+typedef uint8_t byte;
+
+void init(void);
+
+void pinMode(uint8_t, uint8_t);
+void digitalWrite(uint8_t, uint8_t);
+int digitalRead(uint8_t);
+int analogRead(uint8_t);
+void analogReference(uint8_t mode);
+void analogWrite(uint8_t, int);
+
+unsigned long millis(void);
+unsigned long micros(void);
+void delay(unsigned long);
+void delayMicroseconds(unsigned int us);
+unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout);
+
+void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
+uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
+
+void attachInterrupt(uint8_t, void (*)(void), int mode);
+void detachInterrupt(uint8_t);
+
+void setup(void);
+void loop(void);
+
+// Get the bit location within the hardware port of the given virtual pin.
+// This comes from the pins_*.c file for the active board configuration.
+
+#define analogInPinToBit(P) (P)
+
+// On the ATmega1280, the addresses of some of the port registers are
+// greater than 255, so we can't store them in uint8_t's.
+extern const uint16_t PROGMEM port_to_mode_PGM[];
+extern const uint16_t PROGMEM port_to_input_PGM[];
+extern const uint16_t PROGMEM port_to_output_PGM[];
+
+extern const uint8_t PROGMEM digital_pin_to_port_PGM[];
+// extern const uint8_t PROGMEM digital_pin_to_bit_PGM[];
+extern const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[];
+extern const uint8_t PROGMEM digital_pin_to_timer_PGM[];
+
+// Get the bit location within the hardware port of the given virtual pin.
+// This comes from the pins_*.c file for the active board configuration.
+//
+// These perform slightly better as macros compared to inline functions
+//
+#define digitalPinToPort(P) ( pgm_read_byte( digital_pin_to_port_PGM + (P) ) )
+#define digitalPinToBitMask(P) ( pgm_read_byte( digital_pin_to_bit_mask_PGM + (P) ) )
+#define digitalPinToTimer(P) ( pgm_read_byte( digital_pin_to_timer_PGM + (P) ) )
+#define analogInPinToBit(P) (P)
+#define portOutputRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_output_PGM + (P))) )
+#define portInputRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_input_PGM + (P))) )
+#define portModeRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_mode_PGM + (P))) )
+
+#define NOT_A_PIN 0
+#define NOT_A_PORT 0
+
+#ifdef ARDUINO_MAIN
+#define PA 1
+#define PB 2
+#define PC 3
+#define PD 4
+#define PE 5
+#define PF 6
+#define PG 7
+#define PH 8
+#define PJ 10
+#define PK 11
+#define PL 12
+#endif
+
+#define NOT_ON_TIMER 0
+#define TIMER0A 1
+#define TIMER0B 2
+#define TIMER1A 3
+#define TIMER1B 4
+#define TIMER2  5
+#define TIMER2A 6
+#define TIMER2B 7
+
+#define TIMER3A 8
+#define TIMER3B 9
+#define TIMER3C 10
+#define TIMER4A 11
+#define TIMER4B 12
+#define TIMER4C 13
+#define TIMER4D 14
+#define TIMER5A 15
+#define TIMER5B 16
+#define TIMER5C 17
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#ifdef __cplusplus
+#include "WCharacter.h"
+#include "WString.h"
+#include "HardwareSerial.h"
+
+uint16_t makeWord(uint16_t w);
+uint16_t makeWord(byte h, byte l);
+
+#define word(...) makeWord(__VA_ARGS__)
+
+unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout = 1000000L);
+
+void tone(uint8_t _pin, unsigned int frequency, unsigned long duration = 0);
+void noTone(uint8_t _pin);
+
+// WMath prototypes
+long random(long);
+long random(long, long);
+void randomSeed(unsigned int);
+long map(long, long, long, long, long);
+
+#endif
+
+#include "pins_arduino.h"
+
+#endif

EEPROMClass.cpp

@@ -22,7 +22,6 @@
  ******************************************************************************/
 
 #include <avr/eeprom.h>
-#include "WConstants.h"
 #include "EEPROM.h"
 
 /******************************************************************************

HardwareSerial.cpp

@@ -4,7 +4,7 @@
 #include <Logger.h>
 #include <SerialBuffer.h>
 
-#include <WProgram.h>
+#include <Arduino.h>
 #include "HardwareSerial.h"
 
 HardwareSerial Serial;
@@ -44,9 +44,9 @@ void HardwareSerial::flush()
   // theSerialBuffer.flush();
 }
 
-void HardwareSerial::write(uint8_t c)
+size_t HardwareSerial::write(uint8_t c)
 {
-  theSerialBuffer.put(c);
+  return theSerialBuffer.put(c);
 }
 
 // vim:cin:ai:sts=2 sw=2

HardwareSerial.h

@@ -38,7 +38,7 @@ class HardwareSerial : public Stream
     virtual int peek(void);
     virtual int read(void);
     virtual void flush(void);
-    virtual void write(uint8_t);
+    virtual size_t write(uint8_t);
     using Print::write; // pull in write(str) and write(buf, size) from Print
 };
 

Jamfile

@@ -11,8 +11,8 @@ UPLOAD_RATE 	= 57600 ;
 AVRDUDE_PROTOCOL = stk500v1 ;
 COM 		= 33 ;
 
-# Host-specific overrides for locations 
-if $(OS) = MACOSX 
+# Host-specific overrides for locations
+if $(OS) = MACOSX
 {
 ARDUINO_VERSION	= 22 ;
 OLD_DIR 	= /opt/arduino-0021 ;
@@ -41,8 +41,8 @@ AVRDUDE 	= $(AVR_TOOLS_PATH)/avrdude ;
 
 DEFINES  	= F_CPU=$(F_CPU)L ARDUINO=$(ARDUINO_VERSION) VERSION_H HAL=1 ;
 CTUNING  	= -ffunction-sections -fdata-sections ;
-CXXTUNING  	= -fno-exceptions -fno-strict-aliasing ; 
-ASFLAGS  	= -mmcu=$(MCU) ; 
+CXXTUNING  	= -fno-exceptions -fno-strict-aliasing ;
+ASFLAGS  	= -mmcu=$(MCU) ;
 CFLAGS  	= -Os -Wall -Wextra $(ASFLAGS) $(CTUNING) ;
 CXXFLAGS  	= $(CFLAGS) $(CXXTUNING) ;
 LDFLAGS  	= -Os -lm -Wl,--gc-sections -mmcu=atmega328p ;
@@ -95,7 +95,7 @@ rule AvrAsm
 
 actions AvrAsm
 {
-  $(AVR_AS) $(ASFLAGS) -o $(<) $(>) 
+  $(AVR_AS) $(ASFLAGS) -o $(<) $(>)
 }
 
 rule AvrCc
@@ -110,7 +110,7 @@ rule AvrCc
 
 actions AvrCc
 {
-  $(AVR_CC) -c -o $(<) $(CCHDRS) $(CCDEFS) $(CFLAGS) $(>) 
+  $(AVR_CC) -c -o $(<) $(CCHDRS) $(CCDEFS) $(CFLAGS) $(>)
 }
 
 rule AvrC++
@@ -125,7 +125,7 @@ rule AvrC++
 
 actions AvrC++
 {
-  $(AVR_CXX) -c -o $(<) $(CCHDRS) $(CCDEFS) $(CXXFLAGS) $(>) 
+  $(AVR_CXX) -c -o $(<) $(CCHDRS) $(CCDEFS) $(CXXFLAGS) $(>)
 }
 
 rule AvrAsmFromC++
@@ -140,7 +140,7 @@ rule AvrAsmFromC++
 
 actions AvrAsmFromC++
 {
-  $(AVR_CXX) -S -fverbose-asm -o $(<) $(CCHDRS) $(CCDEFS) $(CXXFLAGS) $(>) 
+  $(AVR_CXX) -S -fverbose-asm -o $(<) $(CCHDRS) $(CCDEFS) $(CXXFLAGS) $(>)
 }
 
 rule Pde
@@ -152,9 +152,9 @@ rule Pde
 
 actions Pde
 {
-  echo "#include <WProgram.h>" > $(<) 
+  echo "#include <Arduino.h>" > $(<)
   echo "#line 1 \"$(>)\"" >> $(<)
-  cat $(>) >> $(<) 
+  cat $(>) >> $(<)
 }
 
 rule AvrPde
@@ -177,7 +177,7 @@ rule AvrObject
 
 rule AvrObjects
 {
-  for _I in $(<) 
+  for _I in $(<)
   {
     AvrObject $(OUT_DIR)/$(_I:B).o : $(_I) ;
   }
@@ -194,7 +194,7 @@ rule AvrMainFromObjects
 
 actions AvrMainFromObjects
 {
-  $(AVR_LD) $(LDFLAGS) -o $(<) $(>) 
+  $(AVR_LD) $(LDFLAGS) -o $(<) $(>)
 }
 
 rule AvrMain
@@ -247,7 +247,7 @@ OUT_NATIVE      = $(OUT_DIR_NATIVE)/$(PROJECT_NAME) ;
 NATIVE_CORE    = $(SKETCH_DIR)/hardware/native ;
 HDRS = $(NATIVE_CORE) $(HDRS) ;
 NATIVE_CORE_MODULES = [ GLOB $(NATIVE_CORE) : *.c *.cpp ] ;
-NATIVE_MODULES  = ; 
+NATIVE_MODULES  = ;
 DEFINES += NATIVE ;
 
 rule NativePde
@@ -263,11 +263,11 @@ rule UserObject
   {
   case *.pde : NativePde $(<) : $(>) ;
   }
-} 
+}
 
 rule Objects
 {
-  for _I in $(<) 
+  for _I in $(<)
   {
     local _O = $(OUT_DIR_NATIVE)/$(_I:B).o ;
     Object $(_O) : $(_I) ;
@@ -282,12 +282,12 @@ rule Main
 
 actions C++
 {
-  c++ -c -o $(<) $(CCHDRS) $(CCDEFS) $(>) 
+  c++ -c -o $(<) $(CCHDRS) $(CCDEFS) $(>)
 }
 
-actions Link 
+actions Link
 {
-  c++  -o $(<) $(>) 
+  c++  -o $(<) $(>)
 }