Merge branch 'dev' into gornek/3637_nfc_rc_fixes

flipperdevices · Oct 28, 2023 · e5f5596 · e5f5596
2 parents 455316c + 844e0f1
commit e5f5596
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/applications/main/nfc/helpers/protocol_support/mf_desfire/mf_desfire_render.c b/applications/main/nfc/helpers/protocol_support/mf_desfire/mf_desfire_render.c
@@ -197,6 +197,7 @@ void nfc_render_mf_desfire_file_settings_data(
         furi_string_cat_printf(str, "size %lu\n", record_size);
         break;
     case MfDesfireFileTypeValue:
+        record_size = MF_DESFIRE_VALUE_SIZE;
         furi_string_cat_printf(
             str, "lo %lu hi %lu\n", settings->value.lo_limit, settings->value.hi_limit);
         furi_string_cat_printf(

diff --git a/lib/nfc/protocols/mf_desfire/mf_desfire.h b/lib/nfc/protocols/mf_desfire/mf_desfire.h
@@ -29,6 +29,7 @@ extern "C" {
 #define MF_DESFIRE_UID_SIZE (7)
 #define MF_DESFIRE_BATCH_SIZE (5)
 #define MF_DESFIRE_APP_ID_SIZE (3)
+#define MF_DESFIRE_VALUE_SIZE (4)
 
 typedef struct {
     uint8_t hw_vendor;

diff --git a/lib/nfc/protocols/mf_desfire/mf_desfire_poller_i.c b/lib/nfc/protocols/mf_desfire/mf_desfire_poller_i.c
@@ -354,7 +354,7 @@ MfDesfireError mf_desfire_poller_async_read_file_records( //-V524
     furi_assert(instance);
 
     bit_buffer_reset(instance->input_buffer);
-    bit_buffer_append_byte(instance->input_buffer, MF_DESFIRE_CMD_READ_DATA);
+    bit_buffer_append_byte(instance->input_buffer, MF_DESFIRE_CMD_READ_RECORDS);
     bit_buffer_append_byte(instance->input_buffer, id);
     bit_buffer_append_bytes(instance->input_buffer, (const uint8_t*)&offset, 3);
     bit_buffer_append_bytes(instance->input_buffer, (const uint8_t*)&size, 3);