Release 0.3. Includes support for Arduino 1.0. Added setSerial method to use alternate serial ports (e.g. Mega). Some bug fixes

git-svn-id: https://xbee-arduino.googlecode.com/svn/trunk@41 42c8444e-1c8e-11de-a108-cd2f117ce590

Author: andrew.rapp

XBee.cpp

@@ -18,9 +18,14 @@
  */
 
 #include "XBee.h"
-#include "WProgram.h"
+
+#if defined(ARDUINO) && ARDUINO >= 100
+	#include "Arduino.h"
+#else
+	#include "WProgram.h"
+#endif
+
 #include "HardwareSerial.h"
-#include "NewSoftSerial.h"
 
 XBeeResponse::XBeeResponse() {
 
@@ -760,10 +765,8 @@ XBee::XBee(): _response(XBeeResponse()) {
 
 	_response.init();
 	_response.setFrameData(_responseFrameData);
-
-	_useNss = false;	
-	_serial = NULL;
-	_nssSerial = NULL;
+	// default
+	_serial = &Serial;
 }
 
 uint8_t XBee::getNextFrameId() {
@@ -779,53 +782,27 @@ uint8_t XBee::getNextFrameId() {
 }
 
 void XBee::begin(long baud) {
-	if (_useNss) {
-		_nssSerial->begin(baud);
-	} else {
-		_serial->begin(baud);
-	}
+	_serial->begin(baud);
+}
+
+void XBee::setSerial(HardwareSerial &serial) {
+	_serial = &serial;
 }
 
 bool XBee::available() {
-	if (_useNss) {
-		return _nssSerial->available();
-	} else {
-		return _serial->available();
-	}
+	return _serial->available();
 }
 
 uint8_t XBee::read() {
-	if (_useNss) {
-		return _nssSerial->read();
-	} else {
-		return _serial->read();
-	}
+	return _serial->read();
 } 
 
 void XBee::flush() {
-	if (_useNss) {
-		_nssSerial->flush();
-	} else {
-		_serial->flush();
-	}
+	_serial->flush();
 } 
 
-void XBee::print(uint8_t val) {
-	if (_useNss) {
-		_nssSerial->print(val, BYTE);
-	} else {
-		_serial->print(val, BYTE);
-	}
-}
-
-void XBee::setSerial(HardwareSerial &serial) {
-	_serial = &serial;
-	_useNss = false;
-}
-
-void XBee::setNss(NewSoftSerial &nssSerial) {
-	_nssSerial = &nssSerial;
-	_useNss = true;
+void XBee::write(uint8_t val) {
+	_serial->write(val);
 }
 
 XBeeResponse& XBee::getResponse() {
@@ -1473,18 +1450,18 @@ void XBee::send(XBeeRequest &request) {
 	// send checksum
 	sendByte(checksum, true);
 
-	// send packet
-	// flush does not flush the output buffer, but instead input buffer, which would be awful!
-	//flush();
+	// send packet (Note: prior to Arduino 1.0 this flushed the incoming buffer, which of course was not so great)
+	flush();
 }
 
 void XBee::sendByte(uint8_t b, bool escape) {
 
 	if (escape && (b == START_BYTE || b == ESCAPE || b == XON || b == XOFF)) {
 //		std::cout << "escaping byte [" << toHexString(b) << "] " << std::endl;
-		print(ESCAPE);
-		print(b ^ 0x20);
+		write(ESCAPE);
+		write(b ^ 0x20);
 	} else {
-		print(b);
+		write(b);
 	}
-}
+}
+

XBee.h

@@ -20,14 +20,13 @@
 #ifndef XBee_h
 #define XBee_h
 
-#include <WProgram.h>
-#include <inttypes.h>
-
-#include <NewSoftSerial.h>
-#include <HardwareSerial.h>
+#if defined(ARDUINO) && ARDUINO >= 100
+	#include "Arduino.h"
+#else
+	#include "WProgram.h"
+#endif
 
-// TODO
-#define USE_NSS 0
+#include <inttypes.h>
 
 #define SERIES_1
 #define SERIES_2
@@ -718,21 +717,15 @@ class XBee {
 	 * Returns a sequential frame id between 1 and 255
 	 */
 	uint8_t getNextFrameId();
-	
 	/**
-	 * Sets the Serial port for communication.
+	 * Specify the serial port.  Only relevant for Arduinos that support multiple serial ports (e.g. Mega)
 	 */
 	void setSerial(HardwareSerial &serial);
-	/**
-	 * Tells the library to use NSS for communication, with the specified TX and RX pins
-	 */
-	//void setNss(uint8_t tx, uint8_t rx);
-	void setNss(NewSoftSerial &nssSerial);
 private:
 	bool available();
 	uint8_t read();
 	void flush();
-	void print(uint8_t val);
+	void write(uint8_t val);
 	void sendByte(uint8_t b, bool escape);
 	void resetResponse();
 	XBeeResponse _response;
@@ -746,10 +739,6 @@ class XBee {
 	// buffer for incoming RX packets.  holds only the api specific frame data, starting after the api id byte and prior to checksum
 	uint8_t _responseFrameData[MAX_FRAME_DATA_SIZE];
 	HardwareSerial* _serial;
-	NewSoftSerial* _nssSerial;
-	bool _useNss;
-	//uint8_t nssTx;
-	//uint8_t nssRx;
 };
 
 /**