refactor

main.ino

@@ -3,7 +3,7 @@
 #include <SoftwareSerial.h>
 #include <SCLib.h>
 
-#define ledPin 13
+#define STATUS_LED 13
 
 #define READER_VCC
 #define READER_RST 4
@@ -20,9 +20,9 @@
 #define CARD_IO    10
 #define CARD_PRE   12
 
-SmartCardReader cardReader(CARD_IO, CARD_RST, CARD_VCC, CARD_PRE, CARD_CLK, true);
-uint8_t atr[MAX_ATR_BYTES];
-int atr_size;
+SmartCardReader cardReader(CARD_IO, CARD_RST, CARD_VCC, CARD_PRE, CARD_CLK, false);
+uint8_t readerAtr[MAX_ATR_BYTES];
+int readerAtrSize = 0;
 
 bool readerReset = false;
 int baudRate = -1;
@@ -43,18 +43,13 @@ int digitalPinToInterrupt(int pin)
 
 #endif
 
-void onReaderReset()
-{
-    readerReset = true;
-}
-
-void computeEtu()
+void emulatorComputeEtu()
 {
     baudRate = 9600;
     etu = 1000000 / baudRate;
 }
 
-void sendAtrByte(char byte)
+void emulatorSendAtrByte(char byte)
 {
     unsigned long nextBitTime = micros() + (2 * etu);
     digitalWrite(READER_IO, HIGH);
@@ -89,16 +84,25 @@ void sendAtrByte(char byte)
     }
 }
 
-void sendAtr(const uint8_t* atr, size_t size)
+void emulatorSendAtr(const uint8_t* atr, size_t size)
 {
     pinMode(READER_IO, OUTPUT);
     for (int i = 0; i < size; ++i)
     {
-        sendAtrByte(atr[i]);
+        emulatorSendAtrByte(atr[i]);
         delayMicroseconds(4*etu);
     }
 }
 
+void readerResetAtr()
+{
+    for (size_t i = 0; i < sizeof(readerAtr); ++i)
+    {
+        readerAtr[i] = 0;
+    }
+    readerAtrSize = 0;
+}
+
 void setup() {
     Serial.begin(9600);
     Serial.println("Initializing...");
@@ -108,37 +112,47 @@ void setup() {
     pinMode(READER_IO, OUTPUT);
     digitalWrite(READER_IO, HIGH);
 
-    pinMode(ledPin, OUTPUT);
-    digitalWrite (ledPin, LOW);
+    pinMode(STATUS_LED, OUTPUT);
+    digitalWrite(STATUS_LED, LOW);
     Serial.println("Initialized");
 
-
-    atr_size = cardReader.activate(atr, sizeof(atr));
-    cardReader.deactivate();
+    readerResetAtr();
 }
 
 void loop() {
 
-    if (digitalRead(READER_RST))
+    if (readerAtrSize == 0)
     {
-        if (!readerReset)
+        if (cardReader.cardInserted())
         {
-//            atr_size = cardReader.activate(atr, sizeof(atr));
-
-//            uint8_t atr[] = {0x3B, 0x65, 0x00, 0x00, 0x20, 0x63, 0xCB, 0x6C, 0x80};
-//            int atr_size = sizeof(atr);
-            computeEtu();
-            sendAtr(atr, atr_size);
-            readerReset = true;
-            digitalWrite(ledPin, !digitalRead(ledPin));
-
-//            cardReader.deactivate();
+            readerAtrSize = cardReader.activate(readerAtr, sizeof(readerAtr));
+            cardReader.dumpHEX(readerAtr, readerAtrSize);
+            cardReader.deactivate();
+            digitalWrite(STATUS_LED, HIGH);
         }
     }
     else
     {
-        if (readerReset) {
-            readerReset = false;
+        if (!cardReader.cardInserted())
+        {
+            readerResetAtr();
+            digitalWrite(STATUS_LED, LOW);
+        }
+        else if (digitalRead(READER_RST))
+        {
+            if (!readerReset)
+            {
+                emulatorComputeEtu();
+                emulatorSendAtr(readerAtr, readerAtrSize);
+                readerReset = true;
+            }
+        }
+        else
+        {
+            if (readerReset)
+            {
+                readerReset = false;
+            }
         }
     }
 }