From d3248a7059bbb313e6548c79b5420cb1059cad7f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 20 Oct 2022 17:35:24 +0200
Subject: [PATCH] make style

---
 client/src/pm3line_vocabulory.h |  1 +
 doc/commands.json               | 65 +++++++++++++++------------------
 doc/commands.md                 |  3 +-
 3 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/client/src/pm3line_vocabulory.h b/client/src/pm3line_vocabulory.h
index cbf89bde8..9dc5c84a7 100644
--- a/client/src/pm3line_vocabulory.h
+++ b/client/src/pm3line_vocabulory.h
@@ -347,6 +347,7 @@ const static vocabulory_t vocabulory[] = {
     { 0, "hf mf gview" }, 
     { 0, "hf mf ndefformat" }, 
     { 0, "hf mf ndefread" }, 
+    { 0, "hf mf ndefwrite" }, 
     { 1, "hf mfp help" }, 
     { 0, "hf mfp info" }, 
     { 0, "hf mfp wrp" }, 
diff --git a/doc/commands.json b/doc/commands.json
index 27eb64235..0bc8ae626 100644
--- a/doc/commands.json
+++ b/doc/commands.json
@@ -4364,24 +4364,11 @@
         },
         "hf mf ndefformat": {
             "command": "hf mf ndefformat",
-            "description": "format MIFARE Classic Tag as a NFC tag with Data Exchange Format (NDEF) If no <name> given, UID will be used as filename",
-            "notes": [
-                "hf mf ndefformat --mini -> MIFARE Mini",
-                "hf mf ndefformat --1k -> MIFARE Classic 1k",
-                "hf mf ndefformat --2k -> MIFARE 2k",
-                "hf mf ndefformat --4k -> MIFARE 4k",
-                "hf mf ndefformat --keys hf-mf-066C8B78-key.bin -> MIFARE 1k with keys from specified file"
-            ],
+            "description": "format MIFARE Classic Tag as a NFC tag with Data Exchange Format (NDEF) If no <name> given, UID will be used as filename. It will try default keys and MAD keys to detect if tag is already formatted in order to write.",
+            "notes": [],
             "offline": false,
-            "options": [
-                "-h, --help This help",
-                "-k, --keys <fn> filename of keys",
-                "--mini MIFARE Classic Mini / S20",
-                "--1k MIFARE Classic 1k / S50 (def)",
-                "--2k MIFARE Classic/Plus 2k",
-                "--4k MIFARE Classic 4k / S70"
-            ],
-            "usage": "hf mf ndefformat [-h] [-k <fn>] [--mini] [--1k] [--2k] [--4k]"
+            "options": [],
+            "usage": ""
         },
         "hf mf ndefread": {
             "command": "hf mf ndefread",
@@ -4403,6 +4390,25 @@
             ],
             "usage": "hf mf ndefread [-hvb] [--aid <aid>] [-k <key>] [-f <fn>]"
         },
+        "hf mf ndefwrite": {
+            "command": "hf mf ndefwrite",
+            "description": "Write raw NDEF hex bytes to tag. This commands assumes tag already been NFC/NDEF formatted.",
+            "notes": [
+                "hf mf ndefread -d 0300FE -> write empty record to tag",
+                "hf mf ndefread -f myfilename"
+            ],
+            "offline": false,
+            "options": [
+                "-h, --help This help",
+                "-d <hex> raw NDEF hex bytes",
+                "-f, --file <fn> write raw NDEF file to tag",
+                "--mini MIFARE Classic Mini / S20",
+                "--1k MIFARE Classic 1k / S50 (def)",
+                "--2k MIFARE Classic/Plus 2k",
+                "--4k MIFARE Classic 4k / S70"
+            ],
+            "usage": "hf mf ndefwrite [-h] [-d <hex>] [-f <fn>] [--mini] [--1k] [--2k] [--4k]"
+        },
         "hf mf nested": {
             "command": "hf mf nested",
             "description": "Execute Nested attack against MIFARE Classic card for key recovery",
@@ -10529,24 +10535,11 @@
         },
         "nfc mf cformat": {
             "command": "nfc mf cformat",
-            "description": "format MIFARE Classic Tag as a NFC tag with Data Exchange Format (NDEF) If no <name> given, UID will be used as filename",
-            "notes": [
-                "hf mf ndefformat --mini -> MIFARE Mini",
-                "hf mf ndefformat --1k -> MIFARE Classic 1k",
-                "hf mf ndefformat --2k -> MIFARE 2k",
-                "hf mf ndefformat --4k -> MIFARE 4k",
-                "hf mf ndefformat --keys hf-mf-066C8B78-key.bin -> MIFARE 1k with keys from specified file"
-            ],
+            "description": "format MIFARE Classic Tag as a NFC tag with Data Exchange Format (NDEF) If no <name> given, UID will be used as filename. It will try default keys and MAD keys to detect if tag is already formatted in order to write.",
+            "notes": [],
             "offline": false,
-            "options": [
-                "-h, --help This help",
-                "-k, --keys <fn> filename of keys",
-                "--mini MIFARE Classic Mini / S20",
-                "--1k MIFARE Classic 1k / S50 (def)",
-                "--2k MIFARE Classic/Plus 2k",
-                "--4k MIFARE Classic 4k / S70"
-            ],
-            "usage": "hf mf ndefformat [-h] [-k <fn>] [--mini] [--1k] [--2k] [--4k]"
+            "options": [],
+            "usage": ""
         },
         "nfc mf cread": {
             "command": "nfc mf cread",
@@ -11394,8 +11387,8 @@
         }
     },
     "metadata": {
-        "commands_extracted": 720,
+        "commands_extracted": 721,
         "extracted_by": "PM3Help2JSON v1.00",
-        "extracted_on": "2022-10-16T15:53:13"
+        "extracted_on": "2022-10-20T15:33:35"
     }
 }
\ No newline at end of file
diff --git a/doc/commands.md b/doc/commands.md
index ab64b022f..bbf1aa317 100644
--- a/doc/commands.md
+++ b/doc/commands.md
@@ -509,7 +509,8 @@ Check column "offline" for their availability.
 |`hf mf gen3freeze       `|N       |`Perma lock UID changes. irreversible`
 |`hf mf gview            `|N       |`View card`
 |`hf mf ndefformat       `|N       |`Format MIFARE Classic Tag as NFC Tag`
-|`hf mf ndefread         `|N       |`Prints NDEF records from card`
+|`hf mf ndefread         `|N       |`Read and print NDEF records from card`
+|`hf mf ndefwrite        `|N       |`Write NDEF records to card`
 
 
 ### hf mfp