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

diff --git a/libraries/Robot_Control/Multiplexer.cpp b/libraries/Robot_Control/Multiplexer.cpp
deleted file mode 100644
index 8f7d30e..0000000
--- a/libraries/Robot_Control/Multiplexer.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "Multiplexer.h"
-
-void Multiplexer::begin(uint8_t* selectors, uint8_t Z, uint8_t length){
-	for(uint8_t i=0;i<length;i++){
-		this->selectors[i]=selectors[i];
-		pinMode(selectors[i],OUTPUT);
-	}
-	this->length=length;
-	this->pin_Z=Z;
-	pinMode(pin_Z,INPUT);
-}
-
-void Multiplexer::selectPin(uint8_t num){
-	for(uint8_t i=0;i<length;i++){
-		//Serial.print(bitRead(num,i));
-		digitalWrite(selectors[i],bitRead(num,i));
-	}
-	//Serial.println("");
-}
-
-int Multiplexer::getAnalogValue(){
-	return analogRead(pin_Z);
-}
-
-bool Multiplexer::getDigitalValue(){
-	return digitalRead(pin_Z);
-}
-
-int Multiplexer::getAnalogValueAt(uint8_t num){
-	selectPin(num);
-	return getAnalogValue();
-}
-
-bool Multiplexer::getDigitalValueAt(uint8_t num){
-	selectPin(num);
-	return getDigitalValue();
-}