Merge branch 'master' into dev_4x50_standalone

solved merge conflicts
2021-01-30 00:29:18 +01:00
parent 8edbe86b5d bd285908ab
commit b57a457254
67 changed files with 943 additions and 683 deletions
--- a/include/pm3_cmd.h
+++ b/include/pm3_cmd.h
@@ -593,7 +593,6 @@ typedef struct {
 #define CMD_HF_ICLASS_READBL                                              0x0396
 #define CMD_HF_ICLASS_WRITEBL                                             0x0397
 #define CMD_HF_ICLASS_EML_MEMSET                                          0x0398
-#define CMD_HF_ICLASS_AUTH                                                0x0399
 #define CMD_HF_ICLASS_CHKKEYS                                             0x039A
 #define CMD_HF_ICLASS_RESTORE                                             0x039B