Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery

Conflicts:
	app/src/processing/app/Preferences.java
	app/src/processing/app/debug/Uploader.java

1 files changed, 0 insertions, 76 deletions

diff --git a/libraries/Robot_Control/EasyTransfer2.h b/libraries/Robot_Control/EasyTransfer2.h
deleted file mode 100644
index 3369a51..0000000
--- a/libraries/Robot_Control/EasyTransfer2.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/******************************************************************
-*  EasyTransfer Arduino Library 
-*		details and example sketch: 
-*			http://www.billporter.info/easytransfer-arduino-library/
-*
-*		Brought to you by:
-*              Bill Porter
-*              www.billporter.info
-*
-*		See Readme for other info and version history
-*	
-*  
-*This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-<http://www.gnu.org/licenses/>
-*
-*This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License. 
-*To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/ or
-*send a letter to Creative Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
-******************************************************************/
-#ifndef EasyTransfer2_h
-#define EasyTransfer2_h
-
-
-//make it a little prettier on the front end. 
-#define details(name) (byte*)&name,sizeof(name)
-
-//Not neccessary, but just in case. 
-#if ARDUINO > 22
-#include "Arduino.h"
-#else
-#include "WProgram.h"
-#endif
-#include "HardwareSerial.h"
-//#include <NewSoftSerial.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <avr/io.h>
-
-class EasyTransfer2 {
-public:
-void begin(HardwareSerial *theSerial);
-//void begin(uint8_t *, uint8_t, NewSoftSerial *theSerial);
-void sendData();
-boolean receiveData();
-
-void writeByte(uint8_t dat);
-void writeInt(int dat);
-uint8_t readByte();
-int readInt();
-
-
-private:
-HardwareSerial *_serial;
-
-void resetData();
-
-uint8_t data[20];	//data storage, for both read and send
-uint8_t position;
-uint8_t size; //size of data in bytes. Both for read and send
-//uint8_t * address;  //address of struct
-//uint8_t size;       //size of struct
-//uint8_t * rx_buffer; //address for temporary storage and parsing buffer
-//uint8_t rx_buffer[20];
-uint8_t rx_array_inx;  //index for RX parsing buffer
-uint8_t rx_len;		//RX packet length according to the packet
-uint8_t calc_CS;	   //calculated Chacksum
-};
-
-
-
-#endif
\ No newline at end of file