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-3801] Mifare Ultralight naming fix #3551

Merged
merged 9 commits into from
Apr 1, 2024
Merged

[FL-3801] Mifare Ultralight naming fix #3551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
378d2ab
Fixed some UI mismatches in plugin and nfc app
RebornedBrain Mar 26, 2024
ad6d487
Fixed nameing mismatches in mosgortrans_util
RebornedBrain Mar 26, 2024
13122a4
Fix ultralight naming display
RebornedBrain Mar 27, 2024
e13f6e8
Merge branch 'dev' into reborned/plugin_ui_fix
gornekich Mar 28, 2024
1acc972
Merge branch 'dev' into reborned/plugin_ui_fix
skotopes Mar 29, 2024
7ab6431
Fix naming for Ultralight on read screen
RebornedBrain Mar 29, 2024
acc4ce1
Merge remote-tracking branch 'origin/dev' into reborned/plugin_ui_fix
skotopes Apr 1, 2024
7ab16da
fbt: fixed regression with pvs-reports autoopen
hedger Apr 1, 2024
3dedcb0
Revert st25tb_render.c
skotopes Apr 1, 2024
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 applications/main/nfc/helpers/protocol_support/mf_ultralight/mf_ultralight.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,8 @@ static void nfc_scene_read_success_on_enter_mf_ultralight(NfcApp* instance) {
furi_string_cat_printf(
temp_str, "\e#%s\n", nfc_device_get_name(device, NfcDeviceNameTypeFull));

furi_string_replace(temp_str, "Mifare", "MIFARE");

nfc_render_mf_ultralight_info(data, NfcProtocolFormatTypeShort, temp_str);
}

Expand Down
2 changes: 1 addition & 1 deletion scripts/fbt_tools/pvsstudio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def atexist_handler():

for bf in GetBuildFailures():
for node in Flatten(bf.node):
if node.exists and "pvs" in node.name and node.name.endswith(".html"):
if node.exists and "pvs" in node.path and node.name.endswith(".html"):
# macOS
if sys.platform == "darwin":
subprocess.run(["open", node.abspath])
Expand Down