From 97abbd7a31bda59639a653851a01b6b1d77a2d46 Mon Sep 17 00:00:00 2001
From: "David A. Mellis" <d.mellis@arduino.cc>
Date: Sat, 26 Feb 2011 13:58:03 -0500
Subject: [PATCH] Removing BYTE keyword (use Serial.write() instead).

---
 app/src/processing/app/debug/Compiler.java | 8 +++++++-
 build/shared/lib/keywords.txt              | 1 -
 hardware/arduino/cores/arduino/Print.cpp   | 8 ++++----
 hardware/arduino/cores/arduino/Print.h     | 9 ++++-----
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/src/processing/app/debug/Compiler.java b/app/src/processing/app/debug/Compiler.java
index f2fa5e26d..951946200 100644
--- a/app/src/processing/app/debug/Compiler.java
+++ b/app/src/processing/app/debug/Compiler.java
@@ -367,7 +367,13 @@ public class Compiler implements MessageConsumer {
         e = new RunnerException("Please import the SPI library from the Sketch > Import Library menu.");
         s += "\nAs of Arduino 0019, the Ethernet library depends on the SPI library." +
              "\nYou appear to be using it or another library that depends on the SPI library.";
-      }        
+      }
+      
+      if (pieces[3].trim().equals("'BYTE' was not declared in this scope")) {
+        e = new RunnerException("The 'BYTE' keyword is no longer supported.");
+	s += "\nAs of Arduino 1.0, the 'BYTE' keyword is no longer supported." +
+	     "\nPlease use Serial.write() instead.";
+      }
       
       if (exception == null && e != null) {
         exception = e;
diff --git a/build/shared/lib/keywords.txt b/build/shared/lib/keywords.txt
index ad53668b2..8859d3b84 100644
--- a/build/shared/lib/keywords.txt
+++ b/build/shared/lib/keywords.txt
@@ -8,7 +8,6 @@ DEC	LITERAL1	Serial_Print
 BIN	LITERAL1	Serial_Print
 HEX	LITERAL1	Serial_Print
 OCT	LITERAL1	Serial_Print
-BYTE	LITERAL1	Serial_Print
 PI	LITERAL1
 HALF_PI	LITERAL1
 TWO_PI	LITERAL1
diff --git a/hardware/arduino/cores/arduino/Print.cpp b/hardware/arduino/cores/arduino/Print.cpp
index 4ee556dd8..eb1a8de41 100755
--- a/hardware/arduino/cores/arduino/Print.cpp
+++ b/hardware/arduino/cores/arduino/Print.cpp
@@ -55,9 +55,9 @@ void Print::print(const char str[])
   write(str);
 }
 
-void Print::print(char c, int base)
+void Print::print(char c)
 {
-  print((long) c, base);
+  write(c);
 }
 
 void Print::print(unsigned char b, int base)
@@ -119,9 +119,9 @@ void Print::println(const char c[])
   println();
 }
 
-void Print::println(char c, int base)
+void Print::println(char c)
 {
-  print(c, base);
+  print(c);
   println();
 }
 
diff --git a/hardware/arduino/cores/arduino/Print.h b/hardware/arduino/cores/arduino/Print.h
index b092ae51d..c09063660 100755
--- a/hardware/arduino/cores/arduino/Print.h
+++ b/hardware/arduino/cores/arduino/Print.h
@@ -29,7 +29,6 @@
 #define HEX 16
 #define OCT 8
 #define BIN 2
-#define BYTE 0
 
 class Print
 {
@@ -43,8 +42,8 @@ class Print
     
     void print(const String &);
     void print(const char[]);
-    void print(char, int = BYTE);
-    void print(unsigned char, int = BYTE);
+    void print(char);
+    void print(unsigned char, int = DEC);
     void print(int, int = DEC);
     void print(unsigned int, int = DEC);
     void print(long, int = DEC);
@@ -53,8 +52,8 @@ class Print
 
     void println(const String &s);
     void println(const char[]);
-    void println(char, int = BYTE);
-    void println(unsigned char, int = BYTE);
+    void println(char);
+    void println(unsigned char, int = DEC);
     void println(int, int = DEC);
     void println(unsigned int, int = DEC);
     void println(long, int = DEC);