Merge branch 'DESFire-AuthISO-Patch' of https://github.com/maxieds/Ch…

…ameleonMini into DESFire-AuthISO-Patch
gcammisa · Jun 29, 2022 · cda26ee · cda26ee
2 parents c3e1dab + b6f4094
commit cda26ee
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Firmware/Chameleon-Mini/Makefile b/Firmware/Chameleon-Mini/Makefile
@@ -215,7 +215,8 @@ SRC         +=  Codec/Codec.c \
 		Codec/Reader14443-2A.c \
 		Codec/SniffISO14443-2A.c \
 		Codec/Reader14443-ISR.S \
-		Codec/ISO15693.c
+		Codec/ISO15693.c \
+		Codec/SniffISO15693.c
 SRC         +=  Application/MifareUltralight.c \
 		Application/MifareClassic.c \
 		Application/ISO14443-3A.c \
@@ -232,7 +233,8 @@ SRC         +=  Application/Vicinity.c \
 		Application/TITagitstandard.c \
 		Application/TITagitplus.c \
 		Application/ISO15693-A.c \
-		Application/EM4233.c
+		Application/EM4233.c \
+		Application/Sniff15693.c
 SRC	    +=  Application/DESFire/../MifareDESFire.c \
                 Application/DESFire/DESFireApplicationDirectory.c \
                 Application/DESFire/DESFireChameleonTerminal.c \

diff --git a/Software/ChamTool/Chameleon/Log.py b/Software/ChamTool/Chameleon/Log.py
@@ -88,8 +88,8 @@ def binaryParityDecoder(data):
     0x91: { 'name': 'APP HALT',       'decoder': binaryDecoder },
     0x92: { 'name': 'APP UNKNOWN',    'decoder': binaryDecoder },
     0x93: { 'name': 'APP REQA',       'decoder': binaryDecoder },
-    0x94: { 'name': 'APP WUPA',       'decoder': binaryDecoser },
-    0x95: { 'name': 'APP DESELECT',   'decoder': binaryDecoser },
+    0x94: { 'name': 'APP WUPA',       'decoder': binaryDecoder },
+    0x95: { 'name': 'APP DESELECT',   'decoder': binaryDecoder },
 
     0xA0: { 'name': 'APP AUTHING' ,    'decoder': binaryDecoder },
     0xA1: { 'name': 'APP AUTHED',      'decoder': binaryDecoder },