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

diff --git a/libraries/Robot_Control/RobotSdCard.cpp b/libraries/Robot_Control/RobotSdCard.cpp
deleted file mode 100644
index df833d2..0000000
--- a/libraries/Robot_Control/RobotSdCard.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <ArduinoRobot.h>
-
-void RobotControl::beginSD(){
-  card.init();
-  file.init(&card);
-  melody.init(&card);
-}
-
-void RobotControl::_enableSD(){
-  DDRB = DDRB & 0xDF; //pinMode(CS_LCD,INPUT);
-  DDRB = DDRB | 0x10; //pinMode(CS_SD,OUTPUT);
-}
-
-/*
-void RobotControl::sdTest(){
-  file.open("Infor.txt",O_READ);
-  uint8_t buf[7];
-  char n;
-  while ((n = file.read(buf, sizeof(buf))) > 0) {
-    for (uint8_t i = 0; i < n; i++) Serial.write(buf[i]);
-  }
-}*/
\ No newline at end of file