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, 190 deletions

diff --git a/libraries/Robot_Control/Adafruit_GFX.h b/libraries/Robot_Control/Adafruit_GFX.h
deleted file mode 100644
index 1f6b8d8..0000000
--- a/libraries/Robot_Control/Adafruit_GFX.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/******************************************************************
- This is the core graphics library for all our displays, providing
- basic graphics primitives (points, lines, circles, etc.). It needs
- to be paired with a hardware-specific library for each display
- device we carry (handling the lower-level functions).
- 
- Adafruit invests time and resources providing this open
- source code, please support Adafruit and open-source hardware
- by purchasing products from Adafruit!
- 
- Written by Limor Fried/Ladyada for Adafruit Industries.
- BSD license, check license.txt for more information.
- All text above must be included in any redistribution.
- ******************************************************************/
-
-#ifndef _ADAFRUIT_GFX_H
-#define _ADAFRUIT_GFX_H
-
-#if ARDUINO >= 100
- #include "Arduino.h"
- #include "Print.h"
-#else
- #include "WProgram.h"
-#endif
-
-//#include "PImage.h"
-
-#define swap(a, b) { int16_t t = a; a = b; b = t; }
-
-/* TODO
-enum RectMode {
-  CORNER,
-  CORNERS,
-  RADIUS,
-  CENTER
-};
-*/
-
-typedef uint16_t color;
-
-class Adafruit_GFX : public Print {
- public:
-
-  //Adafruit_GFX();
-  // i have no idea why we have to formally call the constructor. kinda sux
-  void constructor(int16_t w, int16_t h);
-
-  // this must be defined by the subclass
-  virtual void drawPixel(int16_t x, int16_t y, uint16_t color);
-  virtual void invertDisplay(boolean i);
-
-  // these are 'generic' drawing functions, so we can share them!
-  virtual void drawLine(int16_t x0, int16_t y0, int16_t x1, int16_t y1, 
-		uint16_t color);
-  virtual void drawFastVLine(int16_t x, int16_t y, int16_t h, uint16_t color);
-  virtual void drawFastHLine(int16_t x, int16_t y, int16_t w, uint16_t color);
-  virtual void drawRect(int16_t x, int16_t y, int16_t w, int16_t h, 
-		uint16_t color);
-  virtual void fillRect(int16_t x, int16_t y, int16_t w, int16_t h, 
-		uint16_t color);
-  virtual void fillScreen(uint16_t color);
-
-  void drawCircle(int16_t x0, int16_t y0, int16_t r, uint16_t color);
-  void drawCircleHelper(int16_t x0, int16_t y0,
-			int16_t r, uint8_t cornername, uint16_t color);
-  void fillCircle(int16_t x0, int16_t y0, int16_t r, uint16_t color);
-  void fillCircleHelper(int16_t x0, int16_t y0, int16_t r,
-		      uint8_t cornername, int16_t delta, uint16_t color);
-
-  void drawTriangle(int16_t x0, int16_t y0, int16_t x1, int16_t y1,
-		    int16_t x2, int16_t y2, uint16_t color);
-  void fillTriangle(int16_t x0, int16_t y0, int16_t x1, int16_t y1,
-		    int16_t x2, int16_t y2, uint16_t color);
-  void drawRoundRect(int16_t x0, int16_t y0, int16_t w, int16_t h,
-		     int16_t radius, uint16_t color);
-  void fillRoundRect(int16_t x0, int16_t y0, int16_t w, int16_t h,
-		     int16_t radius, uint16_t color);
-
-  void drawBitmap(int16_t x, int16_t y, 
-		  const uint8_t *bitmap, int16_t w, int16_t h,
-		  uint16_t color);
-  void drawChar(int16_t x, int16_t y, unsigned char c,
-		uint16_t color, uint16_t bg, uint8_t size);
-#if ARDUINO >= 100
-  virtual size_t write(uint8_t);
-#else
-  virtual void   write(uint8_t);
-#endif
-  void setCursor(int16_t x, int16_t y);
-  void setTextColor(uint16_t c);
-  void setTextColor(uint16_t c, uint16_t bg);
-  void setTextSize(uint8_t s);
-  void setTextWrap(boolean w);
-
-  int16_t height(void);
-  int16_t width(void);
-
-  void setRotation(uint8_t r);
-  uint8_t getRotation(void);
-
-  
-  /*
-   * Processing-like graphics primitives
-   */
-  
-  /// transforms a color in 16-bit form given the RGB components.
-  /// The default implementation makes a 5-bit red, a 6-bit
-  /// green and a 5-bit blue (MSB to LSB). Devices that use
-  /// different scheme should override this. 
-  virtual uint16_t newColor(uint8_t red, uint8_t green, uint8_t blue);
-  
-  
-  // http://processing.org/reference/background_.html
-  void background(uint8_t red, uint8_t green, uint8_t blue);
-  void background(color c);
-
-  // http://processing.org/reference/fill_.html
-  void fill(uint8_t red, uint8_t green, uint8_t blue);
-  void fill(color c);
-
-  // http://processing.org/reference/noFill_.html
-  void noFill();
-
-  // http://processing.org/reference/stroke_.html
-  void stroke(uint8_t red, uint8_t green, uint8_t blue);
-  void stroke(color c);
-
-  // http://processing.org/reference/noStroke_.html
-  void noStroke();
-  
-  void text(const char * text, int16_t x, int16_t y);
-  void text(int value, uint8_t posX, uint8_t posY);
-  void text(long value, uint8_t posX, uint8_t posY);
-  void text(char value, uint8_t posX, uint8_t posY);
-  
-  void textWrap(const char * text, int16_t x, int16_t y);
-
-  void textSize(uint8_t size);
-  
-  // similar to ellipse() in Processing, but with
-  // a single radius.
-  // http://processing.org/reference/ellipse_.html
-  void circle(int16_t x, int16_t y, int16_t r);
-  
-  void point(int16_t x, int16_t y);
-  
-  void line(int16_t x1, int16_t y1, int16_t x2, int16_t y2);
-  
-  void quad(int16_t x1, int16_t y1, int16_t x2, int16_t y2, int16_t x3, int16_t y3, int16_t x4, int16_t y4);
-  
-  void rect(int16_t x, int16_t y, int16_t width, int16_t height);
-
-  void rect(int16_t x, int16_t y, int16_t width, int16_t height, int16_t radius);
-  
-  void triangle(int16_t x1, int16_t y1, int16_t x2, int16_t y2, int16_t x3, int16_t y3);
-  
-  /* TODO
-  void rectMode(RectMode mode);
-  
-  void pushStyle();
-  void popStyle();
-  */
-
-//  PImage loadImage(const char * fileName) { return PImage::loadImage(fileName); }
-  
-//  void image(PImage & img, uint16_t x, uint16_t y);
-  
- protected:
-  int16_t  WIDTH, HEIGHT;   // this is the 'raw' display w/h - never changes
-  int16_t  _width, _height; // dependent on rotation
-  int16_t  cursor_x, cursor_y;
-  uint16_t textcolor, textbgcolor;
-  uint8_t  textsize;
-  uint8_t  rotation;
-  boolean  wrap; // If set, 'wrap' text at right edge of display
-  
-  /*
-   * Processing-style graphics state
-   */
-  
-  color strokeColor;
-  bool useStroke;
-  color fillColor;
-  bool useFill;
-};
-
-
-
-
-#endif