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:
7:b6e31bfdb2af
Parent:
6:98fe30430194
Child:
20:4e0f0944f28f
--- a/Block.cpp	Mon Nov 16 05:10:17 2015 +0000
+++ b/Block.cpp	Mon Nov 16 18:46:31 2015 +0000
@@ -7,24 +7,6 @@
 
 #include "Block.h"
 
-Block::Block(){
-	size = Size::Small;
-}
-Block::Block(Size size) {
-	// TODO Auto-generated constructor stub
-	this->size = size;
-}
-
-Block::Block(const Block& rhs){
-	minColour = Colour(rhs.minColour);
-	maxColour = Colour(rhs.maxColour);
-	size = rhs.size;
-}
-
-Block::~Block() {
-	// TODO Auto-generated destructor stub
-}
-
 Colour::Colour(){
 	setRed(0);
 	setBlue(0);
@@ -42,3 +24,26 @@
 	setGreen(rhs.getGreen());
 	setAlpha(rhs.getAlpha());
 }
+
+Block::Block(){
+	this->size = Small;
+	this->minColour = Colour();
+	this->maxColour = Colour();
+}
+Block::Block(Size size) {
+	// TODO Auto-generated constructor stub
+	this->size = size;
+	this->minColour = Colour();
+	this->maxColour = Colour();
+}
+
+Block::Block(const Block& rhs){
+	minColour = Colour(rhs.minColour);
+	maxColour = Colour(rhs.maxColour);
+	size = rhs.size;
+}
+
+Block::~Block() {
+	// TODO Auto-generated destructor stub
+}
+