Merge remote-tracking branch 'upstream/master' into em4x70_support

2020-12-09 10:00:42 -05:00
parent 97a27c0156 3329e363e0
commit 011b585b0d
27 changed files with 2584 additions and 1482 deletions
--- a/doc/cliparser_todo.txt
+++ b/doc/cliparser_todo.txt
@@ -141,13 +141,6 @@ hf mfu otptear
 hf mfdes enum
 hf mfdes getuid
 hf mfdes info
-hf thinfilm info
-hf thinfilm sim
-hf topaz info
-hf topaz reader
-hf topaz sim
-hf topaz sniff
-hf topaz raw
 hw connect
 hw dbg
 hw detectreader
@@ -174,11 +167,14 @@ lf simfsk
 lf simpsk
 lf simbidir
 lf sniff
+lf tune
 lf em 410x
 lf em 4x05
 lf em 4x50
+lf hitag info
 lf hitag reader
 lf hitag sim
+lf hitag sniff
 lf hitag writer
 lf hitag dump
 lf hitag cc