Diff: main.cpp

Revision:

4:9ab0d84bbd07

Parent:

3:eaae5433ab45

Child:

5:93c612f43ec2

--- a/main.cpp	Thu Mar 12 15:05:36 2015 +0000
+++ b/main.cpp	Fri Mar 20 19:51:01 2015 +0000
@@ -27,7 +27,7 @@
 DigitalOut  debug2LED(LED2);    // "Debug2" LED
 DigitalOut  ISO15693LED(LED3);  // "Detected ISO15693 tag" LED
 DigitalOut  debug1LED(LED1);    // "Debug1" LED
-DigitalInOut  ook_ask(p6);        // Control ASK/OOK pin on TRF7970
+DigitalInOut  ook_ask(p6);      // Control ASK/OOK pin on TRF7970
 DigitalOut  mod(p5);            // Control MOD pin on TRF7970
 DigitalOut  enable(p4);         // Control EN pin on TRF7970
 DigitalOut  enable2(p3);        // Control EN2 pin on TRF7970
@@ -47,6 +47,9 @@
 uint8_t     tagFlag;
 uint8_t     irqCount = 0;
 
+uint8_t     debugBuffer[1000];  // Capture data for analysis
+uint8_t     bufIdx=0;
+
 void blinkHeartbeatLED(void)
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 //  blinkHeartbeatLED()
@@ -116,11 +119,12 @@
 //    printf("OOK, ");
     
     //  Apply initial settings to the TRF7970
-    initialSettings();
+    trf797xInitialSettings();
 //    printf("Initialized, ");
 
     //  Tri-state OOK pin
-    ook_ask.input();    // Maybe add pullup *****
+    ook_ask.input();
+    ook_ask.mode(PullUp);
     
     readerMode = 0x00;
     
@@ -137,8 +141,10 @@
 //    printf("\r\n");
     */
     
+    printf("\r\nFinished Init\r\n");
+    
     //  Setup interrupt from TRF7970
-    setupIrq();
+    trf797xSetupIrq();
 //    printf("IRQ setup, ");
     
 //    printf("finished init.\r\n\r\n");