Revision 3:c1fb0b6871ef, committed 2017-11-01

Comitter:

vkaminsk

Date:

Wed Nov 01 08:46:58 2017 +0000

Parent:

2:a0c7513fb634

Commit message:

test

Changed in this revision

diff -r a0c7513fb634 -r c1fb0b6871ef Arducam_OV5642.lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Arducam_OV5642.lib	Wed Nov 01 08:46:58 2017 +0000
@@ -0,0 +1,1 @@
+http://mbed.org/users/justinkim/code/Arducam_OV5642/#ee782b77485e

diff -r a0c7513fb634 -r c1fb0b6871ef main.cpp
--- a/main.cpp	Fri Jun 06 03:04:48 2014 +0000
+++ b/main.cpp	Wed Nov 01 08:46:58 2017 +0000
@@ -17,7 +17,7 @@
 #include "MFRC522.h"
 
 // Nucleo Pin for MFRC522 reset (pick another D pin if you need D8)
-#define MF_RESET    D8
+#define MF_RESET    PC_7
 
 DigitalOut LedGreen(LED1);
 
@@ -32,6 +32,14 @@
   // Init. RC522 Chip
   RfChip.PCD_Init();
 
+  //Ініціалізація для зчитування
+  uint8_t status;    
+  MFRC522::MIFARE_Key key;
+  uint8_t buffer[18];
+  uint8_t num_buffer = 1; //номер буфера (0-63)
+  uint8_t size = sizeof(buffer);
+  //Кінець ініціалізації
+
   while (true) {
     LedGreen = 1;
 
@@ -50,18 +58,45 @@
     }
 
     LedGreen = 0;
-
-    // Print Card UID
-    pc.printf("Card UID: ");
-    for (uint8_t i = 0; i < RfChip.uid.size; i++)
-    {
-      pc.printf(" %X02", RfChip.uid.uidByte[i]);
-    }
-    pc.printf("\n\r");
+//
+//    // Print Card UID
+//    pc.printf("Card UID: ");
+//    for (uint8_t i = 0; i < RfChip.uid.size; i++)
+//    {
+//      pc.printf(" %X02", RfChip.uid.uidByte[i]);
+//    }
+//    pc.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));
+//    uint8_t piccType = RfChip.PICC_GetType(RfChip.uid.sak);
+//    pc.printf("PICC Type: %s \n\r", RfChip.PICC_GetTypeName(piccType));
+    
+    
+    //Ключ, він завжди FFFFFFFFFF
+    for (uint8_t i = 0; i < MFRC522::MF_KEY_SIZE; ++i) {
+        key.keyByte[i] = 0xFF;
+    }
+    //Аутентифікація для доступу до даних (без неї не працює)
+    status = RfChip.PCD_Authenticate(MFRC522::PICC_CMD_MF_AUTH_KEY_A, num_buffer, &key, &(RfChip.uid));
+    
+    if (status == MFRC522::STATUS_OK) {
+        status = RfChip.MIFARE_Read(num_buffer, buffer, &size); //Зчитування
+        //**Для запису в буффер
+        //buffer[1] = 1;
+        //buffer[2] = 2;
+        
+        //status = RfChip.MIFARE_Write(num_buffer, buffer, 16);
+        //**
+       if (status == MFRC522::STATUS_OK) {
+            pc.printf("Data (block = %i): ", num_buffer);
+            for (uint8_t i = 0; i < 16; i++)
+           {
+                pc.printf("%X ", buffer[i]);
+            }
+            pc.printf("\n\r");
+        }
+    }
+    RfChip.PCD_StopCrypto1(); //Закриття аутентифікації(для повторного використання)
     wait_ms(1000);
   }
 }
\ No newline at end of file

diff -r a0c7513fb634 -r c1fb0b6871ef mbed.bld
--- a/mbed.bld	Fri Jun 06 03:04:48 2014 +0000
+++ b/mbed.bld	Wed Nov 01 08:46:58 2017 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/mbed_official/code/mbed/builds/0b3ab51c8877
\ No newline at end of file
+http://mbed.org/users/mbed_official/code/mbed/builds/b484a57bc302
\ No newline at end of file