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.h

Revision:
29:9c0339e3c593
Parent:
26:bbcc25418ffa
Child:
32:9a4046224b11
--- a/Block.h	Tue Dec 01 20:54:26 2015 +0000
+++ b/Block.h	Tue Dec 01 22:56:08 2015 +0000
@@ -57,8 +57,11 @@
 public:
 // TODO: Switched
 	enum Size {Small = 0, Big = 1};
+	enum BlockColour {Wrong = -1, Red = 0, White = 1, Blue = 2, Green = 3, Orange = 4, Yellow = 5, Black = 6};
+
 	Block();
 	Block(Size size);
+	Block(Size size, BlockColour blockColour);
 	Block(Size size, Colour minColour, Colour maxColour, Colour averageColour);
 	Block(const Block& rhs);
 	virtual ~Block();
@@ -67,6 +70,7 @@
 	Colour minColour;
 	Colour maxColour;
 	Colour averageColour;
+	BlockColour colour;
 
  	void printDescription();
  private: