Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-24 01:28:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge: ensure upstream files are properly integrated

Browse Source
This commit is contained in:
noproto
2025-12-01 02:21:52 -05:00
parent 9f890b693d
commit 41afa8b9a7
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/services/gui/modules/byte_input.c
-4
View File
@@ -861,10 +861,6 @@ void byte_input_set_result_callback(
model->callback_context = callback_context;
model->bytes = bytes;
model->bytes_count = bytes_count;
// Zero out the bytes
for(uint8_t i = 0; i < bytes_count; i++) {
model->bytes[i] = 0;
}
},
true);
}
lib/nfc/protocols/mf_ultralight/mf_ultralight_poller.c
+5 -9
View File
@@ -566,16 +566,12 @@ static NfcCommand mf_ultralight_poller_handler_read_pages(MfUltralightPoller* in
instance->error = mf_ultralight_poller_read_page(instance, start_page, &data);
}
// Regression review
const uint8_t read_cnt = instance->data->type == MfUltralightTypeMfulC ? 1 : 4;
if(instance->error == MfUltralightErrorNone) {
for(size_t i = 0; i < read_cnt; i++) {
if(start_page + i < instance->pages_total) {
FURI_LOG_D(TAG, "Read page %d success", start_page + i);
instance->data->page[start_page + i] = data.page[i];
instance->pages_read++;
instance->data->pages_read = instance->pages_read;
}
if(start_page < instance->pages_total) {
FURI_LOG_D(TAG, "Read page %d success", start_page);
instance->data->page[start_page] = data.page[0];
instance->pages_read++;
instance->data->pages_read = instance->pages_read;
}
if(instance->pages_read == instance->pages_total) {