Diff: main.cpp

Revision:

3:78eca7f5176a

Parent:

2:a0c7513fb634

--- a/main.cpp	Fri Jun 06 03:04:48 2014 +0000
+++ b/main.cpp	Fri Jul 21 08:48:57 2017 +0000
@@ -1,37 +1,27 @@
-//Test of cheap 13.56 Mhz RFID-RC522 module from eBay
-//This code is based on Martin Olejar's MFRC522 library. Minimal changes
-//Adapted for Nucleo STM32 F401RE. Should work on other Nucleos too
-
-//Connect as follows:
-//RFID pins        ->  Nucleo header CN5 (Arduino-compatible header)
-//----------------------------------------
-//RFID IRQ=pin5    ->   Not used. Leave open
-//RFID MISO=pin4   ->   Nucleo SPI_MISO=PA_6=D12
-//RFID MOSI=pin3   ->   Nucleo SPI_MOSI=PA_7=D11
-//RFID SCK=pin2    ->   Nucleo SPI_SCK =PA_5=D13
-//RFID SDA=pin1    ->   Nucleo SPI_CS  =PB_6=D10
-//RFID RST=pin7    ->   Nucleo         =PA_9=D8
-//3.3V and Gnd to the respective pins                              
+/************************************************/
+/*IRQ=pin5    ->   Not used. Leave open         */
+/*MISO=pin4   ->   WIZwiki-W7500 SPI_MISO=D12   */
+/*MOSI=pin3   ->   WIZwiki-W7500 SPI_MOSI=D11   */
+/*SCK=pin2    ->   WIZwiki-W7500 SPI_SCK =D13   */
+/*SDA=pin1    ->   WIZwiki-W7500 SPI_CS  =D10   */
+/*RST=pin7    ->   WIZwiki-W7500         =D8    */
+/************************************************/
                               
 #include "mbed.h"
 #include "MFRC522.h"
 
-// Nucleo Pin for MFRC522 reset (pick another D pin if you need D8)
-#define MF_RESET    D8
-
 DigitalOut LedGreen(LED1);
 
-//Serial connection to PC for output
-Serial pc(SERIAL_TX, SERIAL_RX);
-
-MFRC522    RfChip   (SPI_MOSI, SPI_MISO, SPI_SCK, SPI_CS, MF_RESET);
+MFRC522    RfChip   (D11, D12, D13, D10, D8);
 
 int main(void) {
-  pc.printf("starting...\n");
+  printf("starting...\n");
 
   // Init. RC522 Chip
   RfChip.PCD_Init();
 
+  printf("initailzed\n");
+  
   while (true) {
     LedGreen = 1;
 
@@ -41,27 +31,26 @@
       wait_ms(500);
       continue;
     }
-
     // Select one of the cards
     if ( ! RfChip.PICC_ReadCardSerial())
     {
       wait_ms(500);
       continue;
     }
-
+    
     LedGreen = 0;
 
     // Print Card UID
-    pc.printf("Card UID: ");
+    printf("Card UID: ");
     for (uint8_t i = 0; i < RfChip.uid.size; i++)
     {
-      pc.printf(" %X02", RfChip.uid.uidByte[i]);
+      printf(" %X02", RfChip.uid.uidByte[i]);
     }
-    pc.printf("\n\r");
+    printf("\n\r");
 
     // Print Card type
     uint8_t piccType = RfChip.PICC_GetType(RfChip.uid.sak);
-    pc.printf("PICC Type: %s \n\r", RfChip.PICC_GetTypeName(piccType));
+    printf("PICC Type: %s \n\r", RfChip.PICC_GetTypeName(piccType));
     wait_ms(1000);
   }
 }
\ No newline at end of file