Merge branch 'flipperdevices:dev' into dev

applications/nfc/nfc_types.c

@@ -35,6 +35,14 @@ const char* nfc_mf_ul_type(MfUltralightType type, bool full_name) {
         return "NTAG215";
     } else if(type == MfUltralightTypeNTAG216) {
         return "NTAG216";
+    } else if(type == MfUltralightTypeNTAGI2C1K) {
+        return "NTAG I2C 1K";
+    } else if(type == MfUltralightTypeNTAGI2C2K) {
+        return "NTAG I2C 2K";
+    } else if(type == MfUltralightTypeNTAGI2CPlus1K) {
+        return "NTAG I2C Plus 1K";
+    } else if(type == MfUltralightTypeNTAGI2CPlus2K) {
+        return "NTAG I2C Plus 2K";
     } else if(type == MfUltralightTypeUL11 && full_name) {
         return "Mifare Ultralight 11";
     } else if(type == MfUltralightTypeUL21 && full_name) {

applications/nfc/nfc_worker.c

@@ -315,6 +315,11 @@ void nfc_worker_emulate_mifare_ul(NfcWorker* nfc_worker) {
     MfUltralightEmulator emulator = {};
     mf_ul_prepare_emulation(&emulator, &nfc_worker->dev_data->mf_ul_data);
     while(nfc_worker->state == NfcWorkerStateEmulateMifareUltralight) {
+        emulator.auth_success = false;
+        if(emulator.data.type >= MfUltralightTypeNTAGI2C1K) {
+            // Sector index needs to be reset
+            emulator.curr_sector = 0;
+        }
         furi_hal_nfc_emulate_nfca(
             nfc_data->uid,
             nfc_data->uid_len,

firmware/targets/f7/furi_hal/furi_hal_nfc.c

@@ -1,3 +1,4 @@
+#include <limits.h>
 #include "furi_hal_nfc.h"
 #include <st25r3916.h>
 #include <st25r3916_irq.h>
@@ -60,6 +61,7 @@ bool furi_hal_nfc_detect(FuriHalNfcDevData* nfc_data, uint32_t timeout) {
 
     rfalLowPowerModeStop();
     rfalNfcState state = rfalNfcGetState();
+    rfalNfcState state_old = 0;
     if(state == RFAL_NFC_STATE_NOTINIT) {
         rfalNfcInitialize();
     }
@@ -82,11 +84,14 @@ bool furi_hal_nfc_detect(FuriHalNfcDevData* nfc_data, uint32_t timeout) {
     while(true) {
         rfalNfcWorker();
         state = rfalNfcGetState();
+        if(state != state_old) {
+            FURI_LOG_T(TAG, "State change %d -> %d", state_old, state);
+        }
+        state_old = state;
         if(state == RFAL_NFC_STATE_ACTIVATED) {
             detected = true;
             break;
         }
-        FURI_LOG_T(TAG, "Current state %d", state);
         if(state == RFAL_NFC_STATE_POLL_ACTIVATION) {
             start = DWT->CYCCNT;
             continue;
@@ -337,6 +342,8 @@ bool furi_hal_nfc_emulate_nfca(
                     break;
                 }
                 if(buff_tx_len) {
+                    if(buff_tx_len == UINT16_MAX) buff_tx_len = 0;
+
                     ReturnCode ret = rfalTransceiveBitsBlockingTx(
                         buff_tx,
                         buff_tx_len,

firmware/targets/furi_hal_include/furi_hal_nfc.h

@@ -36,6 +36,10 @@ extern "C" {
     ((uint32_t)RFAL_TXRX_FLAGS_CRC_TX_MANUAL | (uint32_t)RFAL_TXRX_FLAGS_CRC_RX_KEEP | \
      (uint32_t)RFAL_TXRX_FLAGS_PAR_RX_KEEP | (uint32_t)RFAL_TXRX_FLAGS_PAR_TX_NONE)
 
+#define FURI_HAL_NFC_TX_RAW_RX_DEFAULT                                                 \
+    ((uint32_t)RFAL_TXRX_FLAGS_CRC_TX_MANUAL | (uint32_t)RFAL_TXRX_FLAGS_CRC_RX_REMV | \
+     (uint32_t)RFAL_TXRX_FLAGS_PAR_RX_REMV | (uint32_t)RFAL_TXRX_FLAGS_PAR_TX_NONE)
+
 typedef enum {
     FuriHalNfcTxRxTypeDefault,
     FuriHalNfcTxRxTypeRxNoCrc,

lib/nfc_protocols/mifare_ultralight.h

@@ -2,7 +2,8 @@
 
 #include <furi_hal_nfc.h>
 
-#define MF_UL_MAX_DUMP_SIZE 1024
+// Largest tag is NTAG I2C Plus 2K, both data sectors plus SRAM
+#define MF_UL_MAX_DUMP_SIZE ((238 + 256 + 16) * 4)
 
 #define MF_UL_TEARING_FLAG_DEFAULT (0xBD)
 
@@ -11,6 +12,7 @@
 #define MF_UL_READ_CMD (0x30)
 #define MF_UL_FAST_READ_CMD (0x3A)
 #define MF_UL_WRITE (0xA2)
+#define MF_UL_FAST_WRITE (0xA6)
 #define MF_UL_COMP_WRITE (0xA0)
 #define MF_UL_READ_CNT (0x39)
 #define MF_UL_INC_CNT (0xA5)
@@ -18,6 +20,7 @@
 #define MF_UL_READ_SIG (0x3C)
 #define MF_UL_CHECK_TEARING (0x3E)
 #define MF_UL_READ_VCSL (0x4B)
+#define MF_UL_SECTOR_SELECT (0xC2)
 
 typedef enum {
     MfUltralightTypeUnknown,
@@ -26,6 +29,10 @@ typedef enum {
     MfUltralightTypeNTAG213,
     MfUltralightTypeNTAG215,
     MfUltralightTypeNTAG216,
+    MfUltralightTypeNTAGI2C1K,
+    MfUltralightTypeNTAGI2C2K,
+    MfUltralightTypeNTAGI2CPlus1K,
+    MfUltralightTypeNTAGI2CPlus2K,
 
     // Keep last for number of types calculation
     MfUltralightTypeNum,
@@ -71,11 +78,12 @@ typedef struct {
 } MfUltralightAuth;
 
 typedef struct {
-    uint8_t pages_to_read;
-    uint8_t pages_read;
+    uint16_t pages_to_read;
+    int16_t pages_read;
     bool support_fast_read;
     bool support_tearing_flags;
     bool support_counters;
+    bool support_signature;
 } MfUltralightReader;
 
 typedef struct {
@@ -85,6 +93,10 @@ typedef struct {
     bool comp_write_cmd_started;
     uint8_t comp_write_page_addr;
     MfUltralightAuth* auth_data;
+    bool auth_success;
+    uint8_t curr_sector;
+    bool sector_select_cmd_started;
+    bool ntag_i2c_plus_sector3_lockout;
 } MfUltralightEmulator;
 
 bool mf_ul_check_card_type(uint8_t ATQA0, uint8_t ATQA1, uint8_t SAK);