Write part of the data

scenes/weebo_scene_write.c

@@ -37,18 +37,28 @@ NfcCommand weebo_scene_write_poller_callback(NfcGenericEvent event, void* contex
 
     const MfUltralightPollerEvent* mf_ultralight_event = event.event_data;
 
-    if(mf_ultralight_event->type == MfUltralightPollerEventTypeReadSuccess) {
+    if(mf_ultralight_event->type == MfUltralightPollerEventTypeRequestMode) {
+        // This is called after the successful read, so we don't need to do anything special
+        mf_ultralight_event->data->poller_mode = MfUltralightPollerModeWrite;
+    } else if(mf_ultralight_event->type == MfUltralightPollerEventTypeAuthRequest) {
+        mf_ultralight_event->data->auth_context.skip_auth = true;
+    } else if(mf_ultralight_event->type == MfUltralightPollerEventTypeReadSuccess) {
         nfc_device_set_data(
             weebo->nfc_device, NfcProtocolMfUltralight, nfc_poller_get_data(weebo->poller));
         const MfUltralightData* data =
             nfc_device_get_data(weebo->nfc_device, NfcProtocolMfUltralight);
 
         if(!mf_ultralight_is_all_data_read(data)) {
+            view_dispatcher_send_custom_event(weebo->view_dispatcher, WeeboCustomEventWrongCard);
             ret = NfcCommandStop;
+            return ret;
         }
         if(data->type != MfUltralightTypeNTAG215) {
+            view_dispatcher_send_custom_event(weebo->view_dispatcher, WeeboCustomEventWrongCard);
             ret = NfcCommandStop;
+            return ret;
         }
+        view_dispatcher_send_custom_event(weebo->view_dispatcher, WeeboCustomEventCardDetected);
 
         FURI_LOG_D(
             TAG,
@@ -69,6 +79,7 @@ NfcCommand weebo_scene_write_poller_callback(NfcGenericEvent event, void* contex
 
         uint8_t modified[NTAG215_SIZE];
         nfc3d_amiibo_pack(&weebo->amiiboKeys, weebo->figure, modified);
+        FURI_LOG_D(TAG, "Re-packed");
 
         /*
         MfUltralightAuth* mf_ul_auth;
@@ -78,39 +89,60 @@ NfcCommand weebo_scene_write_poller_callback(NfcGenericEvent event, void* contex
         */
         uint8_t PWD[4];
         weebo_scene_write_calculate_pwd(data->iso14443_3a_data->uid, PWD);
+        FURI_LOG_D(TAG, "PWD: %02X%02X%02X%02X", PWD[0], PWD[1], PWD[2], PWD[3]);
 
         MfUltralightData* newdata = mf_ultralight_alloc();
         nfc_device_copy_data(weebo->nfc_device, NfcProtocolMfUltralight, newdata);
 
-        do {
-            // user data
-            for(size_t i = userMemoryFirst; i <= userMemoryLast; i++) {
-                newdata->page[i / MF_ULTRALIGHT_PAGE_SIZE].data[i % MF_ULTRALIGHT_PAGE_SIZE] =
-                    modified[i];
-            }
-            // pwd
-            memcpy(newdata->page[pwd].data, PWD, sizeof(PWD));
-            // pack
-            memcpy(newdata->page[pack].data, PACKRFUI, sizeof(PACKRFUI));
-            // capability container
-            memcpy(newdata->page[capabilityContainer].data, CC, sizeof(CC));
-            // cfg0
-            memcpy(newdata->page[cfg0].data, CFG0, sizeof(CFG0));
-            // cfg1
-            memcpy(newdata->page[cfg1].data, CFG1, sizeof(CFG1));
-            // dynamic lock bits
-            memcpy(newdata->page[dynamicLockBits].data, DLB, sizeof(DLB));
-            // static lock bits
-            memcpy(newdata->page[staticLockBits].data, SLB, sizeof(SLB));
-
-            nfc_device_set_data(weebo->nfc_device, NfcProtocolMfUltralight, newdata);
-
-        } while(false);
+        // If I were writing these by hand, I'd order them to do the least damage first so they can be re-run
+
+        // user data
+        for(size_t i = userMemoryFirst; i <= userMemoryLast; i++) {
+            newdata->page[i / MF_ULTRALIGHT_PAGE_SIZE].data[i % MF_ULTRALIGHT_PAGE_SIZE] =
+                modified[i];
+        }
+
+        UNUSED(PWD);
+        UNUSED(PACKRFUI);
+        UNUSED(CC);
+        UNUSED(CFG0);
+        UNUSED(CFG1);
+        UNUSED(DLB);
+        UNUSED(SLB);
+
+        /*
+        // pwd
+        memcpy(newdata->page[pwd].data, PWD, sizeof(PWD));
+        // pack
+        memcpy(newdata->page[pack].data, PACKRFUI, sizeof(PACKRFUI));
+        // capability container
+        memcpy(newdata->page[capabilityContainer].data, CC, sizeof(CC));
+        // cfg0
+        memcpy(newdata->page[cfg0].data, CFG0, sizeof(CFG0));
+        // cfg1
+        memcpy(newdata->page[cfg1].data, CFG1, sizeof(CFG1));
+        // dynamic lock bits
+        memcpy(newdata->page[dynamicLockBits].data, DLB, sizeof(DLB));
+        // static lock bits
+        memcpy(newdata->page[staticLockBits].data, SLB, sizeof(SLB));
+        */
+
+        nfc_device_set_data(weebo->nfc_device, NfcProtocolMfUltralight, newdata);
 
         mf_ultralight_free(newdata);
-        //mf_ultralight_auth_free(instance->mf_ul_auth);
+        //mf_ultralight_auth_free(weebo->mf_ul_auth);
+    } else if(mf_ultralight_event->type == MfUltralightPollerEventTypeRequestWriteData) {
+        // NOTE: Consider saving the first 2 pages of the data (UID + BCC) and then doing all the calculations and setting up the data in this block.
+        mf_ultralight_event->data->write_data =
+            nfc_device_get_data(weebo->nfc_device, NfcProtocolMfUltralight);
 
+    } else if(mf_ultralight_event->type == MfUltralightPollerEventTypeWriteSuccess) {
+        view_dispatcher_send_custom_event(weebo->view_dispatcher, WeeboCustomEventWriteSuccess);
         ret = NfcCommandStop;
+    } else if(mf_ultralight_event->type == MfUltralightPollerEventTypeWriteFail) {
+        ret = NfcCommandStop;
+    } else {
+        FURI_LOG_D(TAG, "Unhandled event type: %d", mf_ultralight_event->type);
     }
     return ret;
 }
@@ -119,7 +151,7 @@ void weebo_scene_write_on_enter(void* context) {
     Weebo* weebo = context;
     Popup* popup = weebo->popup;
 
-    popup_set_header(popup, "Writing", 58, 28, AlignCenter, AlignCenter);
+    popup_set_header(popup, "Present NTAG215", 58, 28, AlignCenter, AlignCenter);
     //popup_set_icon(popup, 0, 3, &I_RFIDDolphinReceive_97x61);
     // popup_set_text(popup, "words", 64, 36, AlignCenter, AlignTop);
 
@@ -137,6 +169,17 @@ bool weebo_scene_write_on_event(void* context, SceneManagerEvent event) {
 
     if(event.type == SceneManagerEventTypeCustom) {
         scene_manager_set_scene_state(weebo->scene_manager, WeeboSceneWrite, event.event);
+        if(event.event == WeeboCustomEventCardDetected) {
+            popup_set_text(weebo->popup, "Card detected", 64, 36, AlignCenter, AlignTop);
+            consumed = true;
+        } else if(event.event == WeeboCustomEventWriteSuccess) {
+            popup_set_text(weebo->popup, "Write success", 64, 36, AlignCenter, AlignTop);
+            consumed = true;
+            // TODO: push to new scene
+        } else if(event.event == WeeboCustomEventWrongCard) {
+            popup_set_text(weebo->popup, "Wrong card", 64, 36, AlignCenter, AlignTop);
+            consumed = true;
+        }
     }
 
     return consumed;

weebo_i.h

@@ -50,6 +50,10 @@ enum WeeboCustomEvent {
     WeeboCustomEventViewExit,
     WeeboCustomEventTextInputDone,
     WeeboCustomEventNumberInputDone,
+    // Card writing
+    WeeboCustomEventCardDetected,
+    WeeboCustomEventWriteSuccess,
+    WeeboCustomEventWrongCard,
 };
 
 typedef void (*WeeboLoadingCallback)(void* context, bool state);