Explorar o código

NfcMaker: Refactor, support different NTAG types

Willy-JL hai 1 ano
pai
achega
9cf9eaaa68

+ 33 - 0
nfc_maker/nfc_maker.c

@@ -1,5 +1,30 @@
 #include "nfc_maker.h"
 
+const NfcDataGeneratorType ntag_generators[NtagMAX] = {
+    [Ntag203] = NfcDataGeneratorTypeNTAG203,
+    [Ntag213] = NfcDataGeneratorTypeNTAG213,
+    [Ntag215] = NfcDataGeneratorTypeNTAG215,
+    [Ntag216] = NfcDataGeneratorTypeNTAG216,
+    [NtagI2C1K] = NfcDataGeneratorTypeNTAGI2C1k,
+    [NtagI2C2K] = NfcDataGeneratorTypeNTAGI2C2k,
+};
+const char* ntag_names[NtagMAX] = {
+    [Ntag203] = "NTAG203",
+    [Ntag213] = "NTAG213",
+    [Ntag215] = "NTAG215",
+    [Ntag216] = "NTAG216",
+    [NtagI2C1K] = "NTAG I2C 1K",
+    [NtagI2C2K] = "NTAG I2C 2K",
+};
+const size_t ntag_sizes[NtagMAX] = {
+    [Ntag203] = 0x12 * NTAG_DATA_AREA_UNIT_SIZE,
+    [Ntag213] = 0x12 * NTAG_DATA_AREA_UNIT_SIZE,
+    [Ntag215] = 0x3E * NTAG_DATA_AREA_UNIT_SIZE,
+    [Ntag216] = 0x6D * NTAG_DATA_AREA_UNIT_SIZE,
+    [NtagI2C1K] = 0x6D * NTAG_DATA_AREA_UNIT_SIZE,
+    [NtagI2C2K] = 0xEA * NTAG_DATA_AREA_UNIT_SIZE,
+};
+
 static bool nfc_maker_custom_event_callback(void* context, uint32_t event) {
     furi_assert(context);
     NfcMaker* app = context;
@@ -46,12 +71,20 @@ NfcMaker* nfc_maker_alloc() {
     app->popup = popup_alloc();
     view_dispatcher_add_view(app->view_dispatcher, NfcMakerViewPopup, popup_get_view(app->popup));
 
+    // Nfc Device
+    app->nfc_device = nfc_device_alloc();
+    app->ndef_buffer = malloc(MAX_NDEF_LEN);
+
     return app;
 }
 
 void nfc_maker_free(NfcMaker* app) {
     furi_assert(app);
 
+    // Nfc Device
+    nfc_device_free(app->nfc_device);
+    free(app->ndef_buffer);
+
     // Gui modules
     view_dispatcher_remove_view(app->view_dispatcher, NfcMakerViewSubmenu);
     submenu_free(app->submenu);

+ 18 - 0
nfc_maker/nfc_maker.h

@@ -24,6 +24,21 @@
 #define BIG_INPUT_LEN 248
 #define SMALL_INPUT_LEN 90
 
+#define NTAG_DATA_AREA_UNIT_SIZE 2 * MF_ULTRALIGHT_PAGE_SIZE
+typedef enum {
+    Ntag203,
+    Ntag213,
+    Ntag215,
+    Ntag216,
+    NtagI2C1K,
+    NtagI2C2K,
+    NtagMAX,
+} Ntag;
+extern const NfcDataGeneratorType ntag_generators[NtagMAX];
+extern const char* ntag_names[NtagMAX];
+extern const size_t ntag_sizes[NtagMAX];
+#define MAX_NDEF_LEN ntag_sizes[NtagI2C2K]
+
 typedef enum {
     WifiAuthenticationOpen = 0x01,
     WifiAuthenticationWpa2Personal = 0x20,
@@ -49,6 +64,9 @@ typedef struct {
     ByteInput* byte_input;
     Popup* popup;
 
+    NfcDevice* nfc_device;
+    uint8_t* ndef_buffer;
+
     uint8_t mac_buf[MAC_INPUT_LEN];
     char mail_buf[MAIL_INPUT_LEN];
     char phone_buf[PHONE_INPUT_LEN];

+ 1 - 1
nfc_maker/scenes/nfc_maker_scene_bluetooth.c

@@ -40,7 +40,7 @@ bool nfc_maker_scene_bluetooth_on_event(void* context, SceneManagerEvent event)
         switch(event.event) {
         case ByteInputResultOk:
             furi_hal_bt_reverse_mac_addr(app->mac_buf);
-            scene_manager_next_scene(app->scene_manager, NfcMakerSceneSave);
+            scene_manager_next_scene(app->scene_manager, NfcMakerSceneSaveGenerate);
             break;
         default:
             break;

+ 3 - 2
nfc_maker/scenes/nfc_maker_scene_config.h

@@ -14,5 +14,6 @@ ADD_SCENE(nfc_maker, wifi, Wifi)
 ADD_SCENE(nfc_maker, wifi_auth, WifiAuth)
 ADD_SCENE(nfc_maker, wifi_encr, WifiEncr)
 ADD_SCENE(nfc_maker, wifi_pass, WifiPass)
-ADD_SCENE(nfc_maker, save, Save)
-ADD_SCENE(nfc_maker, result, Result)
+ADD_SCENE(nfc_maker, save_generate, SaveGenerate)
+ADD_SCENE(nfc_maker, save_name, SaveName)
+ADD_SCENE(nfc_maker, save_result, SaveResult)

+ 1 - 1
nfc_maker/scenes/nfc_maker_scene_contact_url.c

@@ -41,7 +41,7 @@ bool nfc_maker_scene_contact_url_on_event(void* context, SceneManagerEvent event
         consumed = true;
         switch(event.event) {
         case TextInputResultOk:
-            scene_manager_next_scene(app->scene_manager, NfcMakerSceneSave);
+            scene_manager_next_scene(app->scene_manager, NfcMakerSceneSaveGenerate);
             break;
         default:
             break;

+ 1 - 1
nfc_maker/scenes/nfc_maker_scene_https.c

@@ -39,7 +39,7 @@ bool nfc_maker_scene_https_on_event(void* context, SceneManagerEvent event) {
         consumed = true;
         switch(event.event) {
         case TextInputResultOk:
-            scene_manager_next_scene(app->scene_manager, NfcMakerSceneSave);
+            scene_manager_next_scene(app->scene_manager, NfcMakerSceneSaveGenerate);
             break;
         default:
             break;

+ 1 - 1
nfc_maker/scenes/nfc_maker_scene_mail.c

@@ -37,7 +37,7 @@ bool nfc_maker_scene_mail_on_event(void* context, SceneManagerEvent event) {
         consumed = true;
         switch(event.event) {
         case TextInputResultOk:
-            scene_manager_next_scene(app->scene_manager, NfcMakerSceneSave);
+            scene_manager_next_scene(app->scene_manager, NfcMakerSceneSaveGenerate);
             break;
         default:
             break;

+ 1 - 1
nfc_maker/scenes/nfc_maker_scene_phone.c

@@ -37,7 +37,7 @@ bool nfc_maker_scene_phone_on_event(void* context, SceneManagerEvent event) {
         consumed = true;
         switch(event.event) {
         case TextInputResultOk:
-            scene_manager_next_scene(app->scene_manager, NfcMakerSceneSave);
+            scene_manager_next_scene(app->scene_manager, NfcMakerSceneSaveGenerate);
             break;
         default:
             break;

+ 0 - 405
nfc_maker/scenes/nfc_maker_scene_result.c

@@ -1,405 +0,0 @@
-#include "../nfc_maker.h"
-
-enum PopupEvent {
-    PopupEventExit,
-};
-
-static void nfc_maker_scene_result_popup_callback(void* context) {
-    NfcMaker* app = context;
-
-    view_dispatcher_send_custom_event(app->view_dispatcher, PopupEventExit);
-}
-
-void nfc_maker_scene_result_on_enter(void* context) {
-    NfcMaker* app = context;
-    Popup* popup = app->popup;
-    bool success = false;
-
-    FlipperFormat* file = flipper_format_file_alloc(furi_record_open(RECORD_STORAGE));
-    FuriString* path = furi_string_alloc();
-    furi_string_printf(path, NFC_APP_FOLDER "/%s" NFC_APP_EXTENSION, app->save_buf);
-
-    uint32_t pages = 135;
-    size_t size = pages * 4;
-    uint8_t* buf = malloc(size);
-    do {
-        if(!flipper_format_file_open_new(file, furi_string_get_cstr(path))) break;
-
-        if(!flipper_format_write_header_cstr(file, "Flipper NFC device", 4)) break;
-        if(!flipper_format_write_string_cstr(file, "Device type", "NTAG/Ultralight")) break;
-
-        // Serial number
-        size_t i = 0;
-        buf[i++] = 0x04;
-        furi_hal_random_fill_buf(&buf[i], 8);
-        i += 8;
-        uint8_t uid[7];
-        memcpy(&uid[0], &buf[0], 3);
-        memcpy(&uid[3], &buf[4], 4);
-
-        if(!flipper_format_write_hex(file, "UID", uid, sizeof(uid))) break;
-        if(!flipper_format_write_string_cstr(file, "ATQA", "00 44")) break;
-        if(!flipper_format_write_string_cstr(file, "SAK", "00")) break;
-        if(!flipper_format_write_string_cstr(file, "Data format version", "2")) break;
-        if(!flipper_format_write_string_cstr(file, "NTAG/Ultralight type", "NTAG215")) break;
-        // TODO: Maybe randomize?
-        if(!flipper_format_write_string_cstr(
-               file,
-               "Signature",
-               "00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00"))
-            break;
-        if(!flipper_format_write_string_cstr(file, "Mifare version", "00 04 04 02 01 00 11 03"))
-            break;
-
-        if(!flipper_format_write_string_cstr(file, "Counter 0", "0")) break;
-        if(!flipper_format_write_string_cstr(file, "Tearing 0", "00")) break;
-        if(!flipper_format_write_string_cstr(file, "Counter 1", "0")) break;
-        if(!flipper_format_write_string_cstr(file, "Tearing 1", "00")) break;
-        if(!flipper_format_write_string_cstr(file, "Counter 2", "0")) break;
-        if(!flipper_format_write_string_cstr(file, "Tearing 2", "00")) break;
-        if(!flipper_format_write_uint32(file, "Pages total", &pages, 1)) break;
-        if(!flipper_format_write_uint32(file, "Pages read", &pages, 1)) break;
-
-        // Static data
-        buf[i++] = 0x48; // Internal
-        buf[i++] = 0x00; // Lock bytes
-        buf[i++] = 0x00; // ...
-
-        buf[i++] = 0xE1; // Capability container
-        buf[i++] = 0x10; // ...
-        buf[i++] = 0x3E; // ...
-        buf[i++] = 0x00; // ...
-
-        buf[i++] = 0x03; // NDEF TLV block
-
-        // NDEF Docs: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/protocols/nfc/index.html#nfc-data-exchange-format-ndef
-        uint8_t tnf = 0x00;
-        const char* type = "";
-        uint8_t* payload = NULL;
-        size_t payload_len = 0;
-
-        size_t data_len = 0;
-        size_t j = 0;
-        switch(scene_manager_get_scene_state(app->scene_manager, NfcMakerSceneStart)) {
-        case NfcMakerSceneBluetooth: {
-            tnf = 0x02; // Media-type [RFC 2046]
-            type = "application/vnd.bluetooth.ep.oob";
-
-            data_len = MAC_INPUT_LEN;
-            payload_len = data_len + 2;
-            payload = malloc(payload_len);
-
-            payload[j++] = 0x08;
-            payload[j++] = 0x00;
-            memcpy(&payload[j], app->mac_buf, data_len);
-            j += data_len;
-            break;
-        }
-        case NfcMakerSceneContact: {
-            tnf = 0x02; // Media-type [RFC 2046]
-            type = "text/vcard";
-
-            FuriString* vcard = furi_string_alloc_set("BEGIN:VCARD\r\nVERSION:3.0\r\n");
-            furi_string_cat_printf(
-                vcard, "PRODID:-//Flipper Xtreme//%s//EN\r\n", version_get_version(NULL));
-            furi_string_cat_printf(vcard, "N:%s;%s;;;\r\n", app->small_buf2, app->small_buf1);
-            furi_string_cat_printf(
-                vcard,
-                "FN:%s%s%s\r\n",
-                app->small_buf1,
-                strnlen(app->small_buf2, SMALL_INPUT_LEN) ? " " : "",
-                app->small_buf2);
-            if(strnlen(app->mail_buf, MAIL_INPUT_LEN)) {
-                furi_string_cat_printf(vcard, "EMAIL:%s\r\n", app->mail_buf);
-            }
-            if(strnlen(app->phone_buf, PHONE_INPUT_LEN)) {
-                furi_string_cat_printf(vcard, "TEL:%s\r\n", app->phone_buf);
-            }
-            if(strnlen(app->big_buf, BIG_INPUT_LEN)) {
-                furi_string_cat_printf(vcard, "URL:%s\r\n", app->big_buf);
-            }
-            furi_string_cat_printf(vcard, "END:VCARD\r\n");
-
-            payload_len = furi_string_size(vcard);
-            payload = malloc(payload_len);
-            memcpy(payload, furi_string_get_cstr(vcard), payload_len);
-            furi_string_free(vcard);
-            break;
-        }
-        case NfcMakerSceneHttps: {
-            tnf = 0x01; // NFC Forum well-known type [NFC RTD]
-            type = "U";
-
-            data_len = strnlen(app->big_buf, BIG_INPUT_LEN);
-            payload_len = data_len + 1;
-            payload = malloc(payload_len);
-
-            payload[j++] = 0x04; // Prepend "https://"
-            memcpy(&payload[j], app->big_buf, data_len);
-            j += data_len;
-            break;
-        }
-        case NfcMakerSceneMail: {
-            tnf = 0x01; // NFC Forum well-known type [NFC RTD]
-            type = "U";
-
-            data_len = strnlen(app->mail_buf, MAIL_INPUT_LEN);
-            payload_len = data_len + 1;
-            payload = malloc(payload_len);
-
-            payload[j++] = 0x06; // Prepend "mailto:"
-            memcpy(&payload[j], app->mail_buf, data_len);
-            j += data_len;
-            break;
-        }
-        case NfcMakerScenePhone: {
-            tnf = 0x01; // NFC Forum well-known type [NFC RTD]
-            type = "U";
-
-            data_len = strnlen(app->phone_buf, PHONE_INPUT_LEN);
-            payload_len = data_len + 1;
-            payload = malloc(payload_len);
-
-            payload[j++] = 0x05; // Prepend "tel:"
-            memcpy(&payload[j], app->phone_buf, data_len);
-            j += data_len;
-            break;
-        }
-        case NfcMakerSceneText: {
-            tnf = 0x01; // NFC Forum well-known type [NFC RTD]
-            type = "T";
-
-            data_len = strnlen(app->big_buf, BIG_INPUT_LEN);
-            payload_len = data_len + 3;
-            payload = malloc(payload_len);
-
-            payload[j++] = 0x02;
-            payload[j++] = 'e';
-            payload[j++] = 'n';
-            memcpy(&payload[j], app->big_buf, data_len);
-            j += data_len;
-            break;
-        }
-        case NfcMakerSceneUrl: {
-            tnf = 0x01; // NFC Forum well-known type [NFC RTD]
-            type = "U";
-
-            data_len = strnlen(app->big_buf, BIG_INPUT_LEN);
-            payload_len = data_len + 1;
-            payload = malloc(payload_len);
-
-            payload[j++] = 0x00; // No prepend
-            memcpy(&payload[j], app->big_buf, data_len);
-            j += data_len;
-            break;
-        }
-        case NfcMakerSceneWifi: {
-            tnf = 0x02; // Media-type [RFC 2046]
-            type = "application/vnd.wfa.wsc";
-
-            uint8_t ssid_len = strnlen(app->small_buf1, SMALL_INPUT_LEN);
-            uint8_t pass_len = strnlen(app->small_buf2, SMALL_INPUT_LEN);
-            uint8_t data_len = ssid_len + pass_len;
-            payload_len = data_len + 39;
-            payload = malloc(payload_len);
-
-            payload[j++] = 0x10;
-            payload[j++] = 0x0E;
-            payload[j++] = 0x00;
-
-            payload[j++] = data_len + 43;
-            payload[j++] = 0x10;
-            payload[j++] = 0x26;
-            payload[j++] = 0x00;
-
-            payload[j++] = 0x01;
-            payload[j++] = 0x01;
-            payload[j++] = 0x10;
-            payload[j++] = 0x45;
-
-            payload[j++] = 0x00;
-            payload[j++] = ssid_len;
-            memcpy(&payload[j], app->small_buf1, ssid_len);
-            j += ssid_len;
-            payload[j++] = 0x10;
-            payload[j++] = 0x03;
-
-            payload[j++] = 0x00;
-            payload[j++] = 0x02;
-            payload[j++] = 0x00;
-            payload[j++] =
-                scene_manager_get_scene_state(app->scene_manager, NfcMakerSceneWifiAuth);
-
-            payload[j++] = 0x10;
-            payload[j++] = 0x0F;
-            payload[j++] = 0x00;
-            payload[j++] = 0x02;
-
-            payload[j++] = 0x00;
-            payload[j++] =
-                scene_manager_get_scene_state(app->scene_manager, NfcMakerSceneWifiEncr);
-            payload[j++] = 0x10;
-            payload[j++] = 0x27;
-
-            payload[j++] = 0x00;
-            payload[j++] = pass_len;
-            memcpy(&payload[j], app->small_buf2, pass_len);
-            j += pass_len;
-            payload[j++] = 0x10;
-            payload[j++] = 0x20;
-
-            payload[j++] = 0x00;
-            payload[j++] = 0x06;
-            payload[j++] = 0xFF;
-            payload[j++] = 0xFF;
-
-            payload[j++] = 0xFF;
-            payload[j++] = 0xFF;
-            payload[j++] = 0xFF;
-            payload[j++] = 0xFF;
-
-            break;
-        }
-        default:
-            break;
-        }
-
-        // Record header
-        uint8_t flags = 0;
-        flags |= 1 << 7; // MB (Message Begin)
-        flags |= 1 << 6; // ME (Message End)
-        flags |= tnf; // TNF (Type Name Format)
-        size_t type_len = strlen(type);
-
-        size_t header_len = 0;
-        header_len += 1; // Flags and TNF
-        header_len += 1; // Type length
-        if(payload_len < 0xFF) {
-            flags |= 1 << 4; // SR (Short Record)
-            header_len += 1; // Payload length
-        } else {
-            header_len += 4; // Payload length
-        }
-        header_len += type_len; // Payload type
-
-        size_t record_len = header_len + payload_len;
-        if(record_len < 0xFF) {
-            buf[i++] = record_len; // TLV length
-        } else {
-            buf[i++] = 0xFF; // TLV length
-            buf[i++] = record_len >> 8; // ...
-            buf[i++] = record_len & 0xFF; // ...
-        }
-        buf[i++] = flags; // Flags and TNF
-        buf[i++] = type_len; // Type length
-        if(flags & (1 << 4)) { // SR (Short Record)
-            buf[i++] = payload_len; // Payload length
-        } else {
-            buf[i++] = 0x00; // Payload length
-            buf[i++] = 0x00; // ...
-            buf[i++] = payload_len >> 8; // ...
-            buf[i++] = payload_len & 0xFF; // ...
-        }
-        memcpy(&buf[i], type, type_len); // Payload type
-        i += type_len;
-
-        // Record payload
-        memcpy(&buf[i], payload, payload_len);
-        i += payload_len;
-        free(payload);
-
-        // Record terminator
-        buf[i++] = 0xFE;
-
-        // Padding until last 5 pages
-        for(; i < size - 20; i++) {
-            buf[i] = 0x00;
-        }
-
-        // Last 5 static pages
-        buf[i++] = 0x00;
-        buf[i++] = 0x00;
-        buf[i++] = 0x00;
-        buf[i++] = 0xBD;
-
-        buf[i++] = 0x04;
-        buf[i++] = 0x00;
-        buf[i++] = 0x00;
-        buf[i++] = 0xFF;
-
-        buf[i++] = 0x00;
-        buf[i++] = 0x05;
-        buf[i++] = 0x00;
-        buf[i++] = 0x00;
-
-        buf[i++] = 0xFF;
-        buf[i++] = 0xFF;
-        buf[i++] = 0xFF;
-        buf[i++] = 0xFF;
-
-        buf[i++] = 0x00;
-        buf[i++] = 0x00;
-        buf[i++] = 0x00;
-        buf[i++] = 0x00;
-
-        // Write pages
-        char str[16];
-        bool ok = true;
-        for(size_t page = 0; page < pages; page++) {
-            snprintf(str, sizeof(str), "Page %u", page);
-            if(!flipper_format_write_hex(file, str, &buf[page * 4], 4)) {
-                ok = false;
-                break;
-            }
-        }
-        if(!ok) break;
-
-        if(!flipper_format_write_string_cstr(file, "Failed authentication attempts", "0")) break;
-
-        success = true;
-
-    } while(false);
-    free(buf);
-
-    furi_string_free(path);
-    flipper_format_free(file);
-    furi_record_close(RECORD_STORAGE);
-
-    if(success) {
-        popup_set_icon(popup, 36, 5, &I_DolphinDone_80x58);
-        popup_set_header(popup, "Saved!", 13, 22, AlignLeft, AlignBottom);
-    } else {
-        popup_set_icon(popup, 69, 15, &I_WarningDolphinFlip_45x42);
-        popup_set_header(popup, "Error!", 13, 22, AlignLeft, AlignBottom);
-    }
-    popup_set_timeout(popup, 1500);
-    popup_set_context(popup, app);
-    popup_set_callback(popup, nfc_maker_scene_result_popup_callback);
-    popup_enable_timeout(popup);
-
-    view_dispatcher_switch_to_view(app->view_dispatcher, NfcMakerViewPopup);
-}
-
-bool nfc_maker_scene_result_on_event(void* context, SceneManagerEvent event) {
-    NfcMaker* app = context;
-    bool consumed = false;
-
-    if(event.type == SceneManagerEventTypeCustom) {
-        consumed = true;
-        switch(event.event) {
-        case PopupEventExit:
-            scene_manager_search_and_switch_to_previous_scene(
-                app->scene_manager, NfcMakerSceneStart);
-            break;
-        default:
-            break;
-        }
-    }
-
-    return consumed;
-}
-
-void nfc_maker_scene_result_on_exit(void* context) {
-    NfcMaker* app = context;
-    popup_reset(app->popup);
-}

+ 312 - 0
nfc_maker/scenes/nfc_maker_scene_save_generate.c

@@ -0,0 +1,312 @@
+#include "../nfc_maker.h"
+
+size_t nfc_maker_scene_save_generate_populate_ndef_buffer(NfcMaker* app) {
+    // NDEF Docs: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/protocols/nfc/index.html#nfc-data-exchange-format-ndef
+    uint8_t tnf = 0x00;
+    const char* type = "";
+    uint8_t* payload = NULL;
+    uint8_t* payload_it = NULL;
+    size_t payload_len = 0;
+
+    size_t data_len = 0;
+    switch(scene_manager_get_scene_state(app->scene_manager, NfcMakerSceneStart)) {
+    case NfcMakerSceneBluetooth: {
+        tnf = 0x02; // Media-type [RFC 2046]
+        type = "application/vnd.bluetooth.ep.oob";
+
+        data_len = MAC_INPUT_LEN;
+        payload_len = data_len + 2;
+        payload = payload_it = malloc(payload_len);
+
+        *payload_it++ = 0x08;
+        *payload_it++ = 0x00;
+        memcpy(payload_it, app->mac_buf, data_len);
+        payload_it += data_len;
+        break;
+    }
+    case NfcMakerSceneContact: {
+        tnf = 0x02; // Media-type [RFC 2046]
+        type = "text/vcard";
+
+        FuriString* vcard = furi_string_alloc_set("BEGIN:VCARD\r\nVERSION:3.0\r\n");
+        furi_string_cat_printf(
+            vcard, "PRODID:-//Flipper Xtreme//%s//EN\r\n", version_get_version(NULL));
+        furi_string_cat_printf(vcard, "N:%s;%s;;;\r\n", app->small_buf2, app->small_buf1);
+        furi_string_cat_printf(
+            vcard,
+            "FN:%s%s%s\r\n",
+            app->small_buf1,
+            strnlen(app->small_buf2, SMALL_INPUT_LEN) ? " " : "",
+            app->small_buf2);
+        if(strnlen(app->mail_buf, MAIL_INPUT_LEN)) {
+            furi_string_cat_printf(vcard, "EMAIL:%s\r\n", app->mail_buf);
+        }
+        if(strnlen(app->phone_buf, PHONE_INPUT_LEN)) {
+            furi_string_cat_printf(vcard, "TEL:%s\r\n", app->phone_buf);
+        }
+        if(strnlen(app->big_buf, BIG_INPUT_LEN)) {
+            furi_string_cat_printf(vcard, "URL:%s\r\n", app->big_buf);
+        }
+        furi_string_cat_printf(vcard, "END:VCARD\r\n");
+
+        payload_len = furi_string_size(vcard);
+        payload = payload_it = malloc(payload_len);
+        memcpy(payload_it, furi_string_get_cstr(vcard), payload_len);
+        payload_it += payload_len;
+        furi_string_free(vcard);
+        break;
+    }
+    case NfcMakerSceneHttps: {
+        tnf = 0x01; // NFC Forum well-known type [NFC RTD]
+        type = "U";
+
+        data_len = strnlen(app->big_buf, BIG_INPUT_LEN);
+        payload_len = data_len + 1;
+        payload = payload_it = malloc(payload_len);
+
+        *payload_it++ = 0x04; // Prepend "https://"
+        memcpy(payload_it, app->big_buf, data_len);
+        payload_it += data_len;
+        break;
+    }
+    case NfcMakerSceneMail: {
+        tnf = 0x01; // NFC Forum well-known type [NFC RTD]
+        type = "U";
+
+        data_len = strnlen(app->mail_buf, MAIL_INPUT_LEN);
+        payload_len = data_len + 1;
+        payload = payload_it = malloc(payload_len);
+
+        *payload_it++ = 0x06; // Prepend "mailto:"
+        memcpy(payload_it, app->mail_buf, data_len);
+        payload_it += data_len;
+        break;
+    }
+    case NfcMakerScenePhone: {
+        tnf = 0x01; // NFC Forum well-known type [NFC RTD]
+        type = "U";
+
+        data_len = strnlen(app->phone_buf, PHONE_INPUT_LEN);
+        payload_len = data_len + 1;
+        payload = payload_it = malloc(payload_len);
+
+        *payload_it++ = 0x05; // Prepend "tel:"
+        memcpy(payload_it, app->phone_buf, data_len);
+        payload_it += data_len;
+        break;
+    }
+    case NfcMakerSceneText: {
+        tnf = 0x01; // NFC Forum well-known type [NFC RTD]
+        type = "T";
+
+        data_len = strnlen(app->big_buf, BIG_INPUT_LEN);
+        payload_len = data_len + 3;
+        payload = payload_it = malloc(payload_len);
+
+        *payload_it++ = 0x02;
+        *payload_it++ = 'e';
+        *payload_it++ = 'n';
+        memcpy(payload_it, app->big_buf, data_len);
+        payload_it += data_len;
+        break;
+    }
+    case NfcMakerSceneUrl: {
+        tnf = 0x01; // NFC Forum well-known type [NFC RTD]
+        type = "U";
+
+        data_len = strnlen(app->big_buf, BIG_INPUT_LEN);
+        payload_len = data_len + 1;
+        payload = payload_it = malloc(payload_len);
+
+        *payload_it++ = 0x00; // No prepend
+        memcpy(payload_it, app->big_buf, data_len);
+        payload_it += data_len;
+        break;
+    }
+    case NfcMakerSceneWifi: {
+        tnf = 0x02; // Media-type [RFC 2046]
+        type = "application/vnd.wfa.wsc";
+
+        uint8_t ssid_len = strnlen(app->small_buf1, SMALL_INPUT_LEN);
+        uint8_t pass_len = strnlen(app->small_buf2, SMALL_INPUT_LEN);
+        uint8_t data_len = ssid_len + pass_len;
+        payload_len = data_len + 39;
+        payload = payload_it = malloc(payload_len);
+
+        *payload_it++ = 0x10;
+        *payload_it++ = 0x0E;
+        *payload_it++ = 0x00;
+
+        *payload_it++ = data_len + 43;
+        *payload_it++ = 0x10;
+        *payload_it++ = 0x26;
+        *payload_it++ = 0x00;
+
+        *payload_it++ = 0x01;
+        *payload_it++ = 0x01;
+        *payload_it++ = 0x10;
+        *payload_it++ = 0x45;
+
+        *payload_it++ = 0x00;
+        *payload_it++ = ssid_len;
+        memcpy(payload_it, app->small_buf1, ssid_len);
+        payload_it += ssid_len;
+        *payload_it++ = 0x10;
+        *payload_it++ = 0x03;
+
+        *payload_it++ = 0x00;
+        *payload_it++ = 0x02;
+        *payload_it++ = 0x00;
+        *payload_it++ = scene_manager_get_scene_state(app->scene_manager, NfcMakerSceneWifiAuth);
+
+        *payload_it++ = 0x10;
+        *payload_it++ = 0x0F;
+        *payload_it++ = 0x00;
+        *payload_it++ = 0x02;
+
+        *payload_it++ = 0x00;
+        *payload_it++ = scene_manager_get_scene_state(app->scene_manager, NfcMakerSceneWifiEncr);
+        *payload_it++ = 0x10;
+        *payload_it++ = 0x27;
+
+        *payload_it++ = 0x00;
+        *payload_it++ = pass_len;
+        memcpy(payload_it, app->small_buf2, pass_len);
+        payload_it += pass_len;
+        *payload_it++ = 0x10;
+        *payload_it++ = 0x20;
+
+        *payload_it++ = 0x00;
+        *payload_it++ = 0x06;
+        *payload_it++ = 0xFF;
+        *payload_it++ = 0xFF;
+
+        *payload_it++ = 0xFF;
+        *payload_it++ = 0xFF;
+        *payload_it++ = 0xFF;
+        *payload_it++ = 0xFF;
+
+        break;
+    }
+    default:
+        break;
+    }
+
+    // Setup header
+    uint8_t flags = 0;
+    flags |= 1 << 7; // MB (Message Begin)
+    flags |= 1 << 6; // ME (Message End)
+    flags |= tnf; // TNF (Type Name Format)
+    size_t type_len = strlen(type);
+
+    size_t header_len = 0;
+    header_len += 1; // Flags and TNF
+    header_len += 1; // Type length
+    if(payload_len < 0xFF) {
+        flags |= 1 << 4; // SR (Short Record)
+        header_len += 1; // Payload length
+    } else {
+        header_len += 4; // Payload length
+    }
+    header_len += type_len; // Payload type
+
+    // Start consolidating into NDEF buffer
+    memset(app->ndef_buffer, 0, MAX_NDEF_LEN);
+    uint8_t* buf = app->ndef_buffer;
+
+    // NDEF TLV block
+    *buf++ = 0x03; // TLV type
+    size_t record_len = header_len + payload_len;
+    if(record_len < 0xFF) {
+        *buf++ = record_len; // TLV length
+    } else {
+        *buf++ = 0xFF; // TLV length
+        *buf++ = record_len >> 8; // ...
+        *buf++ = record_len & 0xFF; // ...
+    }
+
+    // Record header
+    *buf++ = flags; // Flags and TNF
+    *buf++ = type_len; // Type length
+    if(flags & (1 << 4)) { // SR (Short Record)
+        *buf++ = payload_len; // Payload length
+    } else {
+        *buf++ = payload_len >> 24 & 0xFF; // Payload length
+        *buf++ = payload_len >> 16 & 0xFF; // ...
+        *buf++ = payload_len >> 8 & 0xFF; // ...
+        *buf++ = payload_len & 0xFF; // ...
+    }
+    memcpy(buf, type, type_len); // Payload type
+    buf += type_len;
+
+    // Record payload
+    memcpy(buf, payload, payload_len);
+    buf += payload_len;
+    free(payload);
+
+    // Record terminator
+    *buf++ = 0xFE;
+
+    return buf - app->ndef_buffer; // Size of NDEF data
+}
+
+void nfc_maker_scene_save_generate_submenu_callback(void* context, uint32_t index) {
+    NfcMaker* app = context;
+    view_dispatcher_send_custom_event(app->view_dispatcher, index);
+}
+
+void nfc_maker_scene_save_generate_on_enter(void* context) {
+    NfcMaker* app = context;
+    Submenu* submenu = app->submenu;
+    size_t ndef_size = nfc_maker_scene_save_generate_populate_ndef_buffer(app);
+
+    submenu_set_header(submenu, "NTAG Type:");
+
+    for(Ntag ntag = 0; ntag < NtagMAX; ntag++) {
+        submenu_add_lockable_item(
+            submenu,
+            ntag_names[ntag],
+            ntag,
+            nfc_maker_scene_save_generate_submenu_callback,
+            app,
+            ndef_size > ntag_sizes[ntag],
+            "Data is\ntoo large!");
+    }
+
+    submenu_set_selected_item(
+        submenu, scene_manager_get_scene_state(app->scene_manager, NfcMakerSceneSaveGenerate));
+
+    view_dispatcher_switch_to_view(app->view_dispatcher, NfcMakerViewSubmenu);
+}
+
+bool nfc_maker_scene_save_generate_on_event(void* context, SceneManagerEvent event) {
+    NfcMaker* app = context;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        scene_manager_set_scene_state(app->scene_manager, NfcMakerSceneSaveGenerate, event.event);
+        if(event.event >= NtagMAX) return consumed;
+        consumed = true;
+
+        nfc_data_generator_fill_data(ntag_generators[event.event], app->nfc_device);
+        MfUltralightData* data = mf_ultralight_alloc();
+        nfc_device_copy_data(app->nfc_device, NfcProtocolMfUltralight, data);
+
+        size_t size =
+            MIN(ntag_sizes[event.event], // Known size
+                data->page[3].data[2] * NTAG_DATA_AREA_UNIT_SIZE // Capability Container
+            );
+        memcpy(&data->page[4].data[0], app->ndef_buffer, size);
+        nfc_device_set_data(app->nfc_device, NfcProtocolMfUltralight, data);
+        mf_ultralight_free(data);
+
+        scene_manager_next_scene(app->scene_manager, NfcMakerSceneSaveName);
+    }
+
+    return consumed;
+}
+
+void nfc_maker_scene_save_generate_on_exit(void* context) {
+    NfcMaker* app = context;
+    submenu_reset(app->submenu);
+}

+ 11 - 7
nfc_maker/scenes/nfc_maker_scene_save.c → nfc_maker/scenes/nfc_maker_scene_save_name.c

@@ -4,23 +4,27 @@ enum TextInputResult {
     TextInputResultOk,
 };
 
-static void nfc_maker_scene_save_text_input_callback(void* context) {
+static void nfc_maker_scene_save_name_text_input_callback(void* context) {
     NfcMaker* app = context;
 
     view_dispatcher_send_custom_event(app->view_dispatcher, TextInputResultOk);
 }
 
-void nfc_maker_scene_save_on_enter(void* context) {
+void nfc_maker_scene_save_name_on_enter(void* context) {
     NfcMaker* app = context;
     TextInput* text_input = app->text_input;
 
     text_input_set_header_text(text_input, "Save the NFC tag:");
 
-    name_generator_make_auto(app->save_buf, BIG_INPUT_LEN, "NFC");
+    FuriString* prefix = furi_string_alloc();
+    nfc_device_get_abbreviated_name(app->nfc_device, prefix);
+    furi_string_replace_all(prefix, " ", "_");
+    name_generator_make_auto(app->save_buf, BIG_INPUT_LEN, furi_string_get_cstr(prefix));
+    furi_string_free(prefix);
 
     text_input_set_result_callback(
         text_input,
-        nfc_maker_scene_save_text_input_callback,
+        nfc_maker_scene_save_name_text_input_callback,
         app,
         app->save_buf,
         BIG_INPUT_LEN,
@@ -33,7 +37,7 @@ void nfc_maker_scene_save_on_enter(void* context) {
     view_dispatcher_switch_to_view(app->view_dispatcher, NfcMakerViewTextInput);
 }
 
-bool nfc_maker_scene_save_on_event(void* context, SceneManagerEvent event) {
+bool nfc_maker_scene_save_name_on_event(void* context, SceneManagerEvent event) {
     NfcMaker* app = context;
     bool consumed = false;
 
@@ -41,7 +45,7 @@ bool nfc_maker_scene_save_on_event(void* context, SceneManagerEvent event) {
         consumed = true;
         switch(event.event) {
         case TextInputResultOk:
-            scene_manager_next_scene(app->scene_manager, NfcMakerSceneResult);
+            scene_manager_next_scene(app->scene_manager, NfcMakerSceneSaveResult);
             break;
         default:
             break;
@@ -51,7 +55,7 @@ bool nfc_maker_scene_save_on_event(void* context, SceneManagerEvent event) {
     return consumed;
 }
 
-void nfc_maker_scene_save_on_exit(void* context) {
+void nfc_maker_scene_save_name_on_exit(void* context) {
     NfcMaker* app = context;
     text_input_reset(app->text_input);
 }

+ 59 - 0
nfc_maker/scenes/nfc_maker_scene_save_result.c

@@ -0,0 +1,59 @@
+#include "../nfc_maker.h"
+
+enum PopupEvent {
+    PopupEventExit,
+};
+
+static void nfc_maker_scene_save_result_popup_callback(void* context) {
+    NfcMaker* app = context;
+
+    view_dispatcher_send_custom_event(app->view_dispatcher, PopupEventExit);
+}
+
+void nfc_maker_scene_save_result_on_enter(void* context) {
+    NfcMaker* app = context;
+    Popup* popup = app->popup;
+
+    FuriString* path =
+        furi_string_alloc_printf(NFC_APP_FOLDER "/%s" NFC_APP_EXTENSION, app->save_buf);
+    bool success = nfc_device_save(app->nfc_device, furi_string_get_cstr(path));
+    furi_string_free(path);
+
+    if(success) {
+        popup_set_icon(popup, 36, 5, &I_DolphinDone_80x58);
+        popup_set_header(popup, "Saved!", 13, 22, AlignLeft, AlignBottom);
+    } else {
+        popup_set_icon(popup, 69, 15, &I_WarningDolphinFlip_45x42);
+        popup_set_header(popup, "Error!", 13, 22, AlignLeft, AlignBottom);
+    }
+    popup_set_timeout(popup, 1500);
+    popup_set_context(popup, app);
+    popup_set_callback(popup, nfc_maker_scene_save_result_popup_callback);
+    popup_enable_timeout(popup);
+
+    view_dispatcher_switch_to_view(app->view_dispatcher, NfcMakerViewPopup);
+}
+
+bool nfc_maker_scene_save_result_on_event(void* context, SceneManagerEvent event) {
+    NfcMaker* app = context;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        consumed = true;
+        switch(event.event) {
+        case PopupEventExit:
+            scene_manager_search_and_switch_to_previous_scene(
+                app->scene_manager, NfcMakerSceneStart);
+            break;
+        default:
+            break;
+        }
+    }
+
+    return consumed;
+}
+
+void nfc_maker_scene_save_result_on_exit(void* context) {
+    NfcMaker* app = context;
+    popup_reset(app->popup);
+}

+ 1 - 1
nfc_maker/scenes/nfc_maker_scene_text.c

@@ -39,7 +39,7 @@ bool nfc_maker_scene_text_on_event(void* context, SceneManagerEvent event) {
         consumed = true;
         switch(event.event) {
         case TextInputResultOk:
-            scene_manager_next_scene(app->scene_manager, NfcMakerSceneSave);
+            scene_manager_next_scene(app->scene_manager, NfcMakerSceneSaveGenerate);
             break;
         default:
             break;

+ 1 - 1
nfc_maker/scenes/nfc_maker_scene_url.c

@@ -39,7 +39,7 @@ bool nfc_maker_scene_url_on_event(void* context, SceneManagerEvent event) {
         consumed = true;
         switch(event.event) {
         case TextInputResultOk:
-            scene_manager_next_scene(app->scene_manager, NfcMakerSceneSave);
+            scene_manager_next_scene(app->scene_manager, NfcMakerSceneSaveGenerate);
             break;
         default:
             break;

+ 1 - 1
nfc_maker/scenes/nfc_maker_scene_wifi_auth.c

@@ -66,7 +66,7 @@ bool nfc_maker_scene_wifi_auth_on_event(void* context, SceneManagerEvent event)
             scene_manager_set_scene_state(
                 app->scene_manager, NfcMakerSceneWifiEncr, WifiEncryptionNone);
             strcpy(app->small_buf2, "");
-            scene_manager_next_scene(app->scene_manager, NfcMakerSceneSave);
+            scene_manager_next_scene(app->scene_manager, NfcMakerSceneSaveGenerate);
         } else {
             scene_manager_set_scene_state(
                 app->scene_manager, NfcMakerSceneWifiEncr, WifiEncryptionAes);

+ 1 - 1
nfc_maker/scenes/nfc_maker_scene_wifi_pass.c

@@ -37,7 +37,7 @@ bool nfc_maker_scene_wifi_pass_on_event(void* context, SceneManagerEvent event)
         consumed = true;
         switch(event.event) {
         case TextInputResultOk:
-            scene_manager_next_scene(app->scene_manager, NfcMakerSceneSave);
+            scene_manager_next_scene(app->scene_manager, NfcMakerSceneSaveGenerate);
             break;
         default:
             break;