From 38af56d082cc7eac52eeed77ddaa3e2030048cc5 Mon Sep 17 00:00:00 2001 From: Tiernan Messmer Date: Sun, 29 May 2022 23:46:56 +1000 Subject: [PATCH] Add iClass dump detection (2k, as well as default AA1 only dump size) Don't assume all other sizes are MF_CLASSIC_1K -> leave currently selected option --- ChameleonMiniGUI/FrmMain.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ChameleonMiniGUI/FrmMain.cs b/ChameleonMiniGUI/FrmMain.cs index ddb3f91..59144ec 100644 --- a/ChameleonMiniGUI/FrmMain.cs +++ b/ChameleonMiniGUI/FrmMain.cs @@ -2375,6 +2375,10 @@ private void IndentifyDumpTypeBySize(DumpData dump) case 164: SendCommandWithoutResult($"CONFIG{_cmdExtension}=MF_ULTRALIGHT_EV1_164B"); break; + case 256: + case 152: + SendCommandWithoutResult($"CONFIG{_cmdExtension}=ICLASS"); + break; // case for NTAG21X case 180: SendCommandWithoutResult($"CONFIG{_cmdExtension}=NTAG213"); @@ -2385,10 +2389,12 @@ private void IndentifyDumpTypeBySize(DumpData dump) case 924: SendCommandWithoutResult($"CONFIG{_cmdExtension}=NTAG216"); break; - // default to m1 - default: + case 1024: SendCommandWithoutResult(IdentifyUIDSize(dump.Data) == 7 ? $"CONFIG{_cmdExtension}=MF_CLASSIC_1K_7B" : $"CONFIG{_cmdExtension}=MF_CLASSIC_1K"); break; + default: + //SendCommandWithoutResult(IdentifyUIDSize(dump.Data) == 7 ? $"CONFIG{_cmdExtension}=MF_CLASSIC_1K_7B" : $"CONFIG{_cmdExtension}=MF_CLASSIC_1K"); + break; } }