Getting the box ready for Daniel.

This is a first pass at cleaning up the code and getting the libraries to
build with Arduino 1.0. I've started reworking the code for the new
adventure. Dialog notes are in notes.txt.

I've also added a Makefile to build from the command line.

8 files changed, 14 insertions, 12 deletions

diff --git a/libraries/EEPROM/EEPROM.cpp b/libraries/EEPROM/EEPROM.cpp
index 06cec10..9c5e18a 100644
--- a/libraries/EEPROM/EEPROM.cpp
+++ b/libraries/EEPROM/EEPROM.cpp
@@ -22,7 +22,7 @@
  ******************************************************************************/

 

 #include <avr/eeprom.h>

-#include "WConstants.h"

+#include "Arduino.h"

 #include "EEPROM.h"

 

 /******************************************************************************

diff --git a/libraries/LiquidCrystal/LiquidCrystal.cpp b/libraries/LiquidCrystal/LiquidCrystal.cpp
index 835d398..32765a8 100644
--- a/libraries/LiquidCrystal/LiquidCrystal.cpp
+++ b/libraries/LiquidCrystal/LiquidCrystal.cpp
@@ -3,7 +3,7 @@
 #include <stdio.h>

 #include <string.h>

 #include <inttypes.h>

-#include "WProgram.h"

+#include "Arduino.h"

 

 // When the display powers up, it is configured as follows:

 //

@@ -258,8 +258,9 @@ inline void LiquidCrystal::command(uint8_t value) {
   send(value, LOW);

 }

 

-inline void LiquidCrystal::write(uint8_t value) {

+inline size_t LiquidCrystal::write(uint8_t value) {

   send(value, HIGH);

+  return 1;

 }

 

 /************ low level data pushing commands **********/

diff --git a/libraries/LiquidCrystal/LiquidCrystal.h b/libraries/LiquidCrystal/LiquidCrystal.h
index e6c6bb8..eccce54 100644
--- a/libraries/LiquidCrystal/LiquidCrystal.h
+++ b/libraries/LiquidCrystal/LiquidCrystal.h
@@ -79,7 +79,7 @@ public:
 

   void createChar(uint8_t, uint8_t[]);

   void setCursor(uint8_t, uint8_t); 

-  virtual void write(uint8_t);

+  virtual size_t write(uint8_t);

   void command(uint8_t);

 private:

   void send(uint8_t, uint8_t);

diff --git a/libraries/NewSoftSerial/NewSoftSerial.cpp b/libraries/NewSoftSerial/NewSoftSerial.cpp
index 463ab01..54cb41e 100644
--- a/libraries/NewSoftSerial/NewSoftSerial.cpp
+++ b/libraries/NewSoftSerial/NewSoftSerial.cpp
@@ -36,8 +36,7 @@ http://arduiniana.org.
 // 

 #include <avr/interrupt.h>

 #include <avr/pgmspace.h>

-#include "WConstants.h"

-#include "pins_arduino.h"

+#include "Arduino.h"

 #include "NewSoftSerial.h"

 

 // Abstractions for maximum portability between processors

@@ -458,10 +457,10 @@ uint8_t NewSoftSerial::available(void)
   return (_receive_buffer_tail + _NewSS_MAX_RX_BUFF - _receive_buffer_head) % _NewSS_MAX_RX_BUFF;

 }

 

-void NewSoftSerial::write(uint8_t b)

+size_t NewSoftSerial::write(uint8_t b)

 {

   if (_tx_delay == 0)

-    return;

+    return 0;

 

   activate();

 

@@ -504,6 +503,8 @@ void NewSoftSerial::write(uint8_t b)
 

   SREG = oldSREG; // turn interrupts back on

   tunedDelay(_tx_delay);

+

+  return 1;

 }

 

 #if !defined(cbi)

diff --git a/libraries/NewSoftSerial/NewSoftSerial.h b/libraries/NewSoftSerial/NewSoftSerial.h
index 1e39201..dd80c40 100644
--- a/libraries/NewSoftSerial/NewSoftSerial.h
+++ b/libraries/NewSoftSerial/NewSoftSerial.h
@@ -68,7 +68,7 @@ private:
   // private methods

   void recv();

   bool activate();

-  virtual void write(uint8_t byte);

+  virtual size_t write(uint8_t byte);

   uint8_t rx_pin_read();

   void tx_pin_write(uint8_t pin_state);

   void setTX(uint8_t transmitPin);

diff --git a/libraries/PWMServo/PWMServo.cpp b/libraries/PWMServo/PWMServo.cpp
index f80b0c8..bc3dd7e 100644
--- a/libraries/PWMServo/PWMServo.cpp
+++ b/libraries/PWMServo/PWMServo.cpp
@@ -1,5 +1,5 @@
 #include <avr/interrupt.h>
-#include <wiring.h>
+#include <Arduino.h>
 #include <PWMServo.h>
 
 /*
diff --git a/libraries/TinyGPS/TinyGPS.cpp b/libraries/TinyGPS/TinyGPS.cpp
index 15f1614..d4ee60f 100644
--- a/libraries/TinyGPS/TinyGPS.cpp
+++ b/libraries/TinyGPS/TinyGPS.cpp
@@ -19,7 +19,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */

 

-#include "WProgram.h"

+#include "Arduino.h"

 #include "TinyGPS.h"

 

 #define _GPRMC_TERM   "GPRMC"

diff --git a/libraries/TinyGPS/TinyGPS.h b/libraries/TinyGPS/TinyGPS.h
index 7bcb0a7..9c75ad0 100644
--- a/libraries/TinyGPS/TinyGPS.h
+++ b/libraries/TinyGPS/TinyGPS.h
@@ -22,7 +22,7 @@
 #ifndef TinyGPS_h

 #define TinyGPS_h

 

-#include "WProgram.h"

+#include "Arduino.h"

 

 #define _GPS_VERSION 10 // software version of this library

 #define _GPS_MPH_PER_KNOT 1.15077945