Chandan Siyag / Mbed 2 deprecated AlooMBED

3rd year group project. Electronic and Electrical Engineering. Heriot-Watt University. This is the code for the mbed for the Automatic Little Object Organiser (ALOO).

Dependencies:   MCP23017 TCS3472_I2C WattBob_TextLCD mbed

Diff: Block.cpp

Revision:
29:9c0339e3c593
Parent:
26:bbcc25418ffa
Child:
30:c0bc92d009fe
diff -r 7e4d29977d72 -r 9c0339e3c593 Block.cpp
--- a/Block.cpp	Tue Dec 01 20:54:26 2015 +0000
+++ b/Block.cpp	Tue Dec 01 22:56:08 2015 +0000
@@ -40,9 +40,17 @@
 	this->minColour = Colour();
 	this->averageColour = Colour();
 	this->maxColour = Colour();
+	this->colour = Block::Red;
 //		this->minError = {0, 0, 0, 0};
 //	this->maxError = {0, 0, 0, 0};
 }
+
+Block::Block(Size size, BlockColour blockColour){
+	this = Block();
+	this->colour = blockColour;
+	this->size = size;
+}
+
 Block::Block(Size size) {
 	// TODO Auto-generated constructor stub
 	this->size = size;