Skip to content

Commit

Permalink
Add iClass dump detection (2k, as well as default AA1 only dump size)
Browse files Browse the repository at this point in the history
Don't assume all other sizes are MF_CLASSIC_1K -> leave currently selected option
  • Loading branch information
nvx committed May 29, 2022
1 parent 2718239 commit 38af56d
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions ChameleonMiniGUI/FrmMain.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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;
}
}

Expand Down

0 comments on commit 38af56d

Please sign in to comment.