Skip to content

Commit 83f2320

Browse files
authored
Merge branch 'dev' into datetime-module
2 parents a3b438f + 468cc45 commit 83f2320

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

.vscode/example/settings.json.tmpl

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,13 @@
1919
"--compile-commands-dir=${workspaceFolder}/build/latest",
2020
"--clang-tidy",
2121
"--header-insertion=never"
22-
]
22+
],
23+
"files.watcherExclude": {
24+
"**/.git/objects/**": true,
25+
"**/.git/**/modules/**/objects/**": true,
26+
"**/.git/**/subtree-cache/**": true,
27+
"**/.git/**/rr-cache/**": true,
28+
"build/**": true,
29+
"toolchain/**": true
30+
}
2331
}

applications/main/nfc/cli/commands/mfu/nfc_cli_command_mfu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ const NfcCliKeyDescriptor wrbl_action_keys[] = {
5959
//mfu rdbl --block 0 -- data DEADBEEF
6060
const NfcCliActionDescriptor wrbl_action = {
6161
.name = "wrbl",
62-
.description = "Read block from ultralight card",
62+
.description = "Write block to ultralight card",
6363
.alloc = nfc_cli_mfu_wrbl_alloc_ctx,
6464
.free = nfc_cli_mfu_wrbl_free_ctx,
6565
.execute = nfc_cli_mfu_wrbl_execute,

0 commit comments

Comments
 (0)