Eric Betts 9 месяцев назад
Родитель
Сommit
27c143beba
2 измененных файлов с 16 добавлено и 10 удалено
  1. 15 2
      passy_common.h
  2. 1 8
      passy_reader.c

+ 15 - 2
passy_common.h

@@ -6,8 +6,21 @@
 
 typedef enum {
     PassyReadNone = 0,
-    PassyReadDG1,
-    PassyReadDG2,
+    PassyReadDG1 = 0x0101,
+    PassyReadDG2 = 0x0102,
+    PassyReadDG3 = 0x0103,
+    PassyReadDG4 = 0x0104,
+    PassyReadDG5 = 0x0105,
+    PassyReadDG6 = 0x0106,
+    PassyReadDG7 = 0x0107,
+    PassyReadDG8 = 0x0108,
+    PassyReadDG9 = 0x0109,
+    PassyReadDG10 = 0x010A,
+    PassyReadDG11 = 0x010B,
+    PassyReadDG12 = 0x010C,
+    PassyReadDG13 = 0x010D,
+    PassyReadDG14 = 0x010E,
+    PassyReadDG15 = 0x010F,
 } PassyReadType;
 
 void passy_log_bitbuffer(char* tag, char* prefix, BitBuffer* buffer);

+ 1 - 8
passy_reader.c

@@ -364,7 +364,7 @@ NfcCommand passy_reader_state_machine(Passy* passy, PassyReader* passy_reader) {
         view_dispatcher_send_custom_event(
             passy->view_dispatcher, PassyCustomEventReaderAuthenticated);
 
-        ret = passy_reader_select_file(passy_reader, 0x0101);
+        ret = passy_reader_select_file(passy_reader, passy->read_type);
         if(ret != NfcCommandContinue) {
             view_dispatcher_send_custom_event(passy->view_dispatcher, PassyCustomEventReaderError);
             break;
@@ -401,13 +401,6 @@ NfcCommand passy_reader_state_machine(Passy* passy, PassyReader* passy_reader) {
             passy_log_bitbuffer(TAG, "DG1", passy_reader->DG1);
 
         } else if(passy->read_type == PassyReadDG2) {
-            ret = passy_reader_select_file(passy_reader, 0x0102);
-            if(ret != NfcCommandContinue) {
-                view_dispatcher_send_custom_event(
-                    passy->view_dispatcher, PassyCustomEventReaderError);
-                break;
-            }
-
             uint8_t header[100];
             ret = passy_reader_read_binary(passy_reader, 0x00, sizeof(header), header);
             if(ret != NfcCommandContinue) {