add log for reader; TODO:delay/wtxm config

leommxj · Apr 15, 2024 · cbd68ae · cbd68ae
1 parent de380a6
commit cbd68ae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/as_card_worker.c b/as_card_worker.c
@@ -46,7 +46,10 @@ AsCardWorker* as_card_worker_alloc(NfcRelay* nfc_relay) {
     as_card_worker->dev_data = iso14443_4a_alloc();
     as_card_worker->bitbuffer = bit_buffer_alloc(256);
     as_card_worker->buff_tx = malloc(256);
-    as_card_worker->delayus = 2000;
+    // TODO: Make the following two configurable
+    as_card_worker->delayus = 3500;
+    CMD_14A_WTX[1] = 1;
+    nfca_append_crc16(&CMD_14A_WTX[0], 2);
 
     return as_card_worker;
 }

diff --git a/as_reader_worker.c b/as_reader_worker.c
@@ -81,7 +81,9 @@ static NfcCommand as_reader_worker_poller_trx_callback(NfcGenericEvent event, vo
                     event.instance,
                     as_reader_worker->bitbuffer_tx,
                     as_reader_worker->bitbuffer_rx);
+                trace_bit_buffer_hexdump(TAG, "Emu Reader TX", as_reader_worker->bitbuffer_tx);
                 if(err == Iso14443_4aErrorNone) {
+                    trace_bit_buffer_hexdump(TAG, "Emu Reader RX", as_reader_worker->bitbuffer_rx);
                     FURI_LOG_D(TAG, "Card Found, Recv RX");
                     NfcRelayPacket* packet = packet_alloc_data(
                         NfcRelayPacketApduResp,
@@ -170,7 +172,7 @@ int32_t as_reader_worker_task(void* context) {
             // drop PCB
             bit_buffer_copy_bytes(
                 as_reader_worker->bitbuffer_tx, &recv_packet->buf[1], recv_packet->len - 1);
-            trace_bit_buffer_hexdump(TAG, "Emu Reader TX", as_reader_worker->bitbuffer_tx);
+            trace_bit_buffer_hexdump(TAG, "Reader apdu recv", as_reader_worker->bitbuffer_tx);
             free(recv_packet);
             recv_packet = NULL;
             as_reader_worker->apdu_ready = true;