liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FL-2220, FL-2221, FL-1883] RFID and iButton GUI update (#1107)

Browse Source 
* RFID and iButton gui update
* Grammar nazi: readed -> read
* Grammar nazi pt.2: writed -> written

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
Nikolay Minaylov
2022-04-14 15:03:47 +03:00
committed by GitHub
parent 72a6bbb8ad
commit 779d319069
44 changed files with 419 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/nfc_protocols/mifare_ultralight.c
View File

@@ -56,12 +56,12 @@ uint16_t mf_ul_prepare_read(uint8_t* dest, uint8_t start_page) {
void mf_ul_parse_read_response(uint8_t* buff, uint16_t page_addr, MifareUlDevice* mf_ul_read) {
uint8_t pages_read = 4;
uint8_t page_read_count = mf_ul_read->pages_readed + pages_read;
uint8_t page_read_count = mf_ul_read->pages_read + pages_read;
if(page_read_count > mf_ul_read->pages_to_read) {
pages_read -= page_read_count - mf_ul_read->pages_to_read;
}
mf_ul_read->pages_readed += pages_read;
mf_ul_read->data.data_size = mf_ul_read->pages_readed * 4;
mf_ul_read->pages_read += pages_read;
mf_ul_read->data.data_size = mf_ul_read->pages_read * 4;
memcpy(&mf_ul_read->data.data[page_addr * 4], buff, pages_read * 4);
}
@@ -77,8 +77,8 @@ void mf_ul_parse_fast_read_response(
uint8_t start_page,
uint8_t end_page,
MifareUlDevice* mf_ul_read) {
mf_ul_read->pages_readed = end_page - start_page + 1;
mf_ul_read->data.data_size = mf_ul_read->pages_readed * 4;
mf_ul_read->pages_read = end_page - start_page + 1;
mf_ul_read->data.data_size = mf_ul_read->pages_read * 4;
memcpy(mf_ul_read->data.data, buff, mf_ul_read->data.data_size);
}

2
lib/nfc_protocols/mifare_ultralight.h
View File

@@ -74,7 +74,7 @@ typedef struct {
typedef struct {
uint8_t pages_to_read;
uint8_t pages_readed;
uint8_t pages_read;
bool support_fast_read;
bool data_changed;
MifareUlData data;