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.

2 files changed, 4 insertions, 3 deletions

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);