Ion Systems / Mbed 2 deprecated Chipin_Main

The MBED firmware used on the Chipin sorter, developed over 12 weeks for a 3rd year university systems project. Chipin is a token sorter, it sorts tokens by colours and dispenses them to order through an online booking system and card reader. This program interfaces with an FPGA, PC and LCD screen to control the sorter. The sorter has an operation mode where it can process orders when a card is entered into the machine. There is also a maintenance mode where the device responds to maintenance instructions such as 'dispense all'. More information at http://www.ionsystems.uk/

Dependencies:   MCP23017 TCS3472_I2C WattBob_TextLCD mbed-rtos mbed

Diff: cardReader.h

Revision:
23:f9e7e64784be
Parent:
13:0661d658d9d1
Child:
24:8868101d01d0
--- a/cardReader.h	Tue Nov 25 22:32:26 2014 +0000
+++ b/cardReader.h	Sat Nov 29 16:32:57 2014 +0000
@@ -1,5 +1,4 @@
 #include "mbed.h"
-
 DigitalIn cardBit1(p21);
 DigitalIn cardBit2(p22);
 DigitalIn cardBit3(p23);
@@ -8,41 +7,25 @@
 DigitalIn cardBit6(p26);
 DigitalIn cardDetect(p29);
 
-
-int cardValues[6] = {0,0,0,0,0,0};
+bool cardValues[6] = {0,0,0,0,0,0};
 
 bool cardDataAcquired = false;
 
-void cardAcquisition(){
-        lcd->reset();
-        lcd->locate(0,0);   //Going to new line
-        if(cardBit1) lcd->printf("p1=1,");
-        else lcd->printf("p1=0,");
-        cardValues[0] = cardBit1;
+int cardAcquisition(){
+        //Work out the number of the card
+        int cardNumber = 0;
+        //Bit 1
+        if(cardBit1) cardNumber += 1;
+        if(cardBit2) cardNumber += 2;
+        if(cardBit3) cardNumber += 4;
+        if(cardBit4) cardNumber += 8;
+        if(cardBit5) cardNumber += 16;
+        if(cardBit6) cardNumber += 32;
         
-        if(cardBit2) lcd->printf("p2=1,");
-        else lcd->printf("p2=0,");
-        cardValues[1] = cardBit2;
-        
-        if(cardBit3) lcd->printf("p3=1");
-        else lcd->printf("p3=0");
-        cardValues[2] = cardBit3;
-        
-        lcd->locate(1,0);   //Going to new line
-        
-        if(cardBit4) lcd->printf("p4=1");
-        else lcd->printf("p4=0,");
-        cardValues[3] = cardBit4;
+        return cardNumber;
         
         
-        if(cardBit5) lcd->printf("p5=1,");
-        else lcd->printf("p5=0,");
-        cardValues[4] = cardBit5;
         
-        if(cardBit6) lcd->printf("p6=1");
-        else lcd->printf("p6=0");
-        cardValues[5] = cardBit6;
         
-        //cardDataAcquired = true;
         
     }
\ No newline at end of file