Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FL-3657] Fix NFC unit tests #3192

Merged
merged 2 commits into from
Nov 9, 2023
Merged

[FL-3657] Fix NFC unit tests #3192

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
947e518
nfc data generator: change 4th uid byte setting rule
gornekich Nov 2, 2023
933f0f3
Merge branch 'dev' into gornek/3657_nfc_fix_unit_tests
skotopes Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/nfc/helpers/nfc_data_generator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ static const uint8_t default_config_ntag_i2c[] = {0x01, 0x00, 0xF8, 0x48, 0x08,
static void nfc_generate_mf_ul_uid(uint8_t* uid) {
uid[0] = NXP_MANUFACTURER_ID;
furi_hal_random_fill_buf(&uid[1], 6);
uid[3] |= 0x01; // To avoid forbidden 0x88 value
// I'm not sure how this is generated, but the upper nybble always seems to be 8
uid[6] &= 0x0F;
uid[6] |= 0x80;
Expand Down Expand Up @@ -322,6 +323,7 @@ static void nfc_generate_ntag_i2c_plus_2k(NfcDevice* nfc_device) {
static void nfc_generate_mf_classic_uid(uint8_t* uid, uint8_t length) {
uid[0] = NXP_MANUFACTURER_ID;
furi_hal_random_fill_buf(&uid[1], length - 1);
uid[3] |= 0x01; // To avoid forbidden 0x88 value
}

static void
Expand Down