From: Martin Holst Swende Date: Thu, 19 Feb 2015 09:51:10 +0000 (+0100) Subject: Merge pull request #68 from iceman1001/feature X-Git-Tag: v2.0.0-rc1~5^2 X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/0387cd3393d87edf07cdd37dc942b6e561ce499a?hp=181e6db6a95d4d2a8e09bab5fb2cf62d35333447 Merge pull request #68 from iceman1001/feature ADD: identifications. --- diff --git a/client/cmdhf15.c b/client/cmdhf15.c index b843730f..c3ff7dd6 100644 --- a/client/cmdhf15.c +++ b/client/cmdhf15.c @@ -132,13 +132,23 @@ const productName uidmapping[] = { { 0xE014000000000000LL, 16, "SHARP Corporation Japan" }, { 0xE015000000000000LL, 16, "ATMEL France" }, - { 0xE016000000000000LL, 16, "EM Microelectronic-Marin SA Switzerland (Skidata)" }, - { 0xE016040000000000LL, 24, "EM-Marin SA (Skidata Keycard-eco); EM4034? no 'read', just 'readmulti'" }, - { 0xE0160c0000000000LL, 24, "EM-Marin SA; EM4035?" }, - { 0xE016100000000000LL, 24, "EM-Marin SA (Skidata); EM4135; 36x64bit start page 13" }, - { 0xE016240000000000LL, 24, "EM-Marin SA (Skidata); EM4233;" }, - { 0xE016940000000000LL, 24, "EM-Marin SA (Skidata); 51x64bit" }, - + { 0xE016000000000000LL, 16, "EM Microelectronic-Marin SA Switzerland (Skidata)"}, + { 0xE016040000000000LL, 24, "EM-Marin SA (Skidata Keycard-eco); EM4034 [IC id = 01] (Read/Write - no AFI)"}, + { 0xE0160C0000000000LL, 24, "EM-Marin SA (Skidata); EM4035 [IC id = 03] (Read/Write - replaced by 4233)"}, + { 0xE016100000000000LL, 24, "EM-Marin SA (Skidata); EM4135 [IC id = 04] (Read/Write - replaced by 4233) 36x64bit start page 13"}, + { 0xE016140000000000LL, 24, "EM-Marin SA (Skidata); EM4036 [IC id = 05] 28pF"}, + { 0xE016180000000000LL, 24, "EM-Marin SA (Skidata); EM4006 [IC id = 06] (Read Only)"}, + { 0xE0161C0000000000LL, 24, "EM-Marin SA (Skidata); EM4133 [IC id = 07] 23,5pF (Read/Write)"}, + { 0xE016200000000000LL, 24, "EM-Marin SA (Skidata); EM4033 [IC id = 08] 23,5pF (Read Only - no AFI / no DSFID / no security blocks)"}, + { 0xE016240000000000LL, 24, "EM-Marin SA (Skidata); EM4233 [IC id = 09] 23,5pF CustomerID-102"}, + { 0xE016280000000000LL, 24, "EM-Marin SA (Skidata); EM4233 SLIC [IC id = 10] 23,5pF (1Kb flash memory - not provide High Security mode and QuietStorage feature)" }, + { 0xE0163C0000000000LL, 24, "EM-Marin SA (Skidata); EM4237 [IC id = 15] 23,5pF"}, + { 0xE0167C0000000000LL, 24, "EM-Marin SA (Skidata); EM4233 [IC id = 31] 95pF"}, + { 0xE016940000000000LL, 24, "EM-Marin SA (Skidata); EM4036 [IC id = 37] 95pF 51x64bit "}, + { 0xE0169c0000000000LL, 24, "EM-Marin SA (Skidata); EM4133 [IC id = 39] 95pF (Read/Write)" }, + { 0xE016A80000000000LL, 24, "EM-Marin SA (Skidata); EM4233 SLIC [IC id = 42] 97pF" }, + { 0xE016BC0000000000LL, 24, "EM-Marin SA (Skidata); EM4237 [IC id = 47] 97pF" }, + { 0xE017000000000000LL, 16, "KSW Microtec GmbH Germany" }, { 0xE018000000000000LL, 16, "ZMD AG Germany" }, { 0xE019000000000000LL, 16, "XICOR, Inc. USA" }, diff --git a/client/lualibs/default_toys.lua b/client/lualibs/default_toys.lua index cd839ca1..048a29c9 100644 --- a/client/lualibs/default_toys.lua +++ b/client/lualibs/default_toys.lua @@ -74,6 +74,7 @@ local _names = { ["D200"]="MAGIC TRAP", ["D300"]="WATER TRAP", ["D400"]="AIR TRAP", + ["D500"]="UNDEAD TRAP", ["D600"]="TECH TRAP", ["D700"]="FIRE TRAP", ["D800"]="EARTH TRAP", @@ -94,11 +95,11 @@ local _names = { --[[ EXPANSION --]] - ["012C"]="DRAGON", - ["012D"]="ICE", - ["012E"]="PIRATE", - ["012F"]="UNDEAD", - ["0130"]="PVPUNLOCK", + ["012C"]="DRAGONS PEAK", + ["012D"]="EMPIRE OF ICE", + ["012E"]="PIRATE SEAS", + ["012F"]="DARKLIGHT CRYPT", + ["0130"]="VOLCANIC VAULT", ["0131"]="MIRROR OF MYSTERY", ["0132"]="NIGHTMARE EXPRESS", ["0133"]="SUNSCRAPER SPIRE", @@ -117,39 +118,39 @@ local _names = { --]] ["01C2"]="TRAPTEAM GUSTO", ["01C3"]="TRAPTEAM THUNDERBOLT", - ["01C4"]="TRAPTEAM FLINGKONG", + ["01C4"]="TRAPTEAM FLING KONG", ["01C5"]="TRAPTEAM BLADES", ["01C6"]="TRAPTEAM WALLOP", - ["01C7"]="TRAPTEAM HEADRUSH", - ["01C8"]="TRAPTEAM FISTBUMP", - ["01C9"]="TRAPTEAM ROCKYROLL", + ["01C7"]="TRAPTEAM HEAD RUSH", + ["01C8"]="TRAPTEAM FIST BUMP", + ["01C9"]="TRAPTEAM ROCKY ROLL", ["01CA"]="TRAPTEAM WILDFIRE", - ["01CB"]="TRAPTEAM KABOOM", - ["01CC"]="TRAPTEAM TRAILBLAZER", + ["01CB"]="TRAPTEAM KA BOOM", + ["01CC"]="TRAPTEAM TRAIL BLAZER", ["01CD"]="TRAPTEAM TORCH", - ["01CE"]="TRAPTEAM SNAPSHOT", - ["01CF"]="TRAPTEAM LOBSTAR", - ["01D0"]="TRAPTEAM FLIPWRECK", + ["01CE"]="TRAPTEAM SNAP SHOT", + ["01CF"]="TRAPTEAM LOB STAR", + ["01D0"]="TRAPTEAM FLIP WRECK", ["01D1"]="TRAPTEAM ECHO", ["01D2"]="TRAPTEAM BLASTERMIND", ["01D3"]="TRAPTEAM ENIGMA", - ["01D4"]="TRAPTEAM DEJAVU", + ["01D4"]="TRAPTEAM DEJA VU", ["01D5"]="TRAPTEAM COBRA CADABRA", ["01D6"]="TRAPTEAM JAWBREAKER", ["01D7"]="TRAPTEAM GEARSHIFT", ["01D8"]="TRAPTEAM CHOPPER", - ["01D9"]="TRAPTEAM TREADHEAD", + ["01D9"]="TRAPTEAM TREAD HEAD", ["01DA"]="TRAPTEAM BUSHWHACK", ["01DB"]="TRAPTEAM TUFF LUCK", - ["01DC"]="TRAPTEAM FOODFIGHT", - ["01DD"]="TRAPTEAM HIGHFIVE", - ["01DE"]="TRAPTEAM KRYPTKING", - ["01DF"]="TRAPTEAM SHORTCUT", - ["01E0"]="TRAPTEAM BATSPIN", - ["01E1"]="TRAPTEAM FUNNYBONE", - ["01E2"]="TRAPTEAM KNIGHTLIGHT", + ["01DC"]="TRAPTEAM FOOD FIGHT", + ["01DD"]="TRAPTEAM HIGH FIVE", + ["01DE"]="TRAPTEAM NITRO KRYPT KING", + ["01DF"]="TRAPTEAM SHORT CUT", + ["01E0"]="TRAPTEAM BAT SPIN", + ["01E1"]="TRAPTEAM FUNNY BONE", + ["01E2"]="TRAPTEAM KNIGHT LIGHT", ["01E3"]="TRAPTEAM SPOTLIGHT", - ["01E4"]="TRAPTEAM KNIGHTMARE", + ["01E4"]="TRAPTEAM KNIGHT MARE", ["01E5"]="TRAPTEAM BLACKOUT", --[[ @@ -161,12 +162,12 @@ local _names = { ["01F9"]="PET TERRAFIN", ["01FA"]="PET BREEZE", ["01FB"]="PET WEERUPTOR", - ["01FC"]="PET PETVAC", - ["01FD"]="PET SMALLFRY", + ["01FC"]="PET PET VAC", + ["01FD"]="PET SMALL FRY", ["01FE"]="PET DROBIT", ["0202"]="PET GILL GRUNT", - ["0207"]="PET TRIGGER HAPPY", - ["020E"]="PET STEALTH ELF", + ["0207"]="PET TRIGGER SNAPPY", + ["020E"]="PET WHISPER ELF", ["021C"]="PET BARKLEY", ["021D"]="PET THUMPLING", ["021E"]="PET MINI JINI", @@ -182,14 +183,14 @@ local _names = { ["0BBC"]="SWAPFORCE HOG WILD FRYNO", ["0BBD"]="SWAPFORCE SMOLDER DASH", ["0BBE"]="SWAPFORCE BUMBLE BLAST", - ["0BBF"]="SWAPFORCE ZOOLOU", + ["0BBF"]="SWAPFORCE ZOO LOU", ["0BC0"]="SWAPFORCE DUNE BUG", ["0BC1"]="SWAPFORCE STAR STRIKE", ["0BC2"]="SWAPFORCE COUNTDOWN", - ["0BC3"]="SWAPFORCE WINDUP", + ["0BC3"]="SWAPFORCE WIND UP", ["0BC4"]="SWAPFORCE ROLLER BRAWL", ["0BC5"]="SWAPFORCE GRIM CREEPER", - ["0BC6"]="SWAPFORCE RIPTIDE", - ["0BC7"]="SWAPFORCE PUNKSHOCK", + ["0BC6"]="SWAPFORCE RIP TIDE", + ["0BC7"]="SWAPFORCE PUNK SHOCK", } return _names