From cab4aac95983e555dbbc9964a8869d2ae96a8b4d Mon Sep 17 00:00:00 2001 From: ry4000 <154689120+ry4000@users.noreply.github.com> Date: Mon, 1 Dec 2025 20:15:58 +1100 Subject: [PATCH 1/2] R&Y: `TransitCardInfo` in `desfire.c` Removed `(` and `)` that indicates the card's respective IATA code; this was done to shorten the character count of some lengthy card names. --- scenes/desfire.c | 134 +++++++++++++++++++++++------------------------ 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/scenes/desfire.c b/scenes/desfire.c index d78b9de..00cf44c 100644 --- a/scenes/desfire.c +++ b/scenes/desfire.c @@ -20,94 +20,94 @@ typedef struct { } TransitCardInfo; TransitCardInfo cards[88] = { - {0x000001, "TTP (MAD) / beep (MNL)", "CRTM / AFPI", true}, - {0x000002, "beep (MNL)", "AFPI", true}, - {0x000003, "beep (MNL)", "AFPI", true}, - {0x000004, "beep (MNL)", "AFPI", true}, + {0x000001, "MAD TTP / MNL beep", "CRTM / AFPI", true}, + {0x000002, "MNL beep", "AFPI", true}, + {0x000003, "MNL beep", "AFPI", true}, + {0x000004, "MNL beep", "AFPI", true}, {0x0011F2, "myki", "TV", false}, - {0x002000, "Presto (YYZ)", "Metrolinx", true}, - {0x004048, "Mi Movilidad (GDL)", "SITEUR", true}, - {0x004055, "AT HOP (AKL)", "Auckland Transport", true}, - {0x004063, "Travel Pass (DOH)", "Qatar Rail", true}, + {0x002000, "YYZ Presto", "Metrolinx", true}, + {0x004048, "GDL Mi Movilidad", "SITEUR", true}, + {0x004055, "AUK AT HOP", "Auckland Transport", true}, + {0x004063, "DOH Travel Pass", "Qatar Rail", true}, {0x004078, "nol", "RTA", false}, {0x008057, "NORTIC", "NRPA", true}, {0x010000, "Breeze / Compass / EASY / FREEDOM / Urbana", "MARTA / TransLink / MIA County / PATCO / LPP", true}, - {0x012340, "motion (ECN)", "MoTCW", true}, - {0x012350, "motion (ECN)", "MoTCW", true}, - {0x012360, "motion (ECN)", "MoTCW", true}, + {0x012340, "ECN motion", "MoTCW", true}, + {0x012350, "ECN motion", "MoTCW", true}, + {0x012360, "ECN motion", "MoTCW", true}, {0x018057, "NORTIC", "NRPA", true}, {0x0112F2, "Tap-N-Go / peggo", "GBMT / YWG Transit", true}, - {0x014D44, "DMTC (DEL)", "DMRCL", true}, - {0x020000, "Urbana (LJU)", "LPP", true}, - {0x0212F2, "Tap-N-Go (GRB)", "GBM Transit", true}, - {0x024D44, "DMTC (DEL)", "DMRCL", true}, - {0x034D44, "DMTC (DEL)", "DMRCL", true}, - {0x044D44, "DMTC (DEL)", "DMRCL", true}, - {0x050000, "T-mobilitat (BCN) / Urbana (LJU)", "TMB / LPP", true}, - {0x054D44, "DMTC (DEL)", "DMRCL", true}, - {0x064D44, "DMTC (DEL)", "DMRCL", true}, - {0x074D44, "DMTC (DEL)", "DMRCL", true}, + {0x014D44, "DEL DMTC", "DMRCL", true}, + {0x020000, "LJU Urbana", "LPP", true}, + {0x0212F2, "GRB Tap-N-Go", "GBM Transit", true}, + {0x024D44, "DEL DMTC", "DMRCL", true}, + {0x034D44, "DEL DMTC", "DMRCL", true}, + {0x044D44, "DEL DMTC", "DMRCL", true}, + {0x050000, "BCN T-mobilitat / LJU Urbana", "TMB / LPP", true}, + {0x054D44, "DEL DMTC", "DMRCL", true}, + {0x064D44, "DEL DMTC", "DMRCL", true}, + {0x074D44, "DEL DMTC", "DMRCL", true}, {0x1101F4, "itso", "ITSO (UK)", false}, - {0x1120EF, "HSL (HEL)", "HRT", true}, + {0x1120EF, "HEL HSL", "HRT", true}, {0x1201F4, "itso", "ITSO (UK)", false}, {0x1301F4, "itso", "ITSO (UK)", false}, {0x1401F4, "itso", "ITSO (UK)", false}, {0x1602A0, "itso", "ITSO (UK)", false}, - {0x171108, "TRIPKO (MNL)", "JourneyTech", true}, + {0x171108, "MNL TRIPKO", "JourneyTech", true}, {0x227508, "Umo", "Cubic", true}, - {0x3010F2, "ORCA (SEA)", "ORCA", true}, + {0x3010F2, "SEA ORCA", "ORCA", true}, {0x314553, "opal", "Opal", false}, - {0x315441, "ATH.ENA (ATH)", "OASA", true}, - {0x31594F, "Oyster (LHR)", "TfL", true}, + {0x315441, "ATH ATH.ENA", "OASA", true}, + {0x31594F, "LHR Oyster", "TfL", true}, {0x4012F2, "Connect (SMF)", "SACOG", true}, - {0x422201, "Istanbulkart (IST)", "BELBIM", true}, - {0x422202, "Istanbulkart (IST)", "BELBIM", true}, - {0x422206, "Istanbulkart (IST)", "BELBIM", true}, - {0x425301, "MRT SVC (BKK) / Rabbit (BKK)", "BEM / BTS", true}, - {0x425302, "MRT SVC (BKK) / Rabbit (BKK)", "BEM / BTS", true}, - {0x425303, "MRT SVC (BKK) / Rabbit (BKK)", "BEM / BTS", true}, - {0x425304, "MRT SVC (BKK) / Rabbit (BKK)", "BEM / BTS", true}, - {0x425305, "MRT SVC (BKK) / Rabbit (BKK)", "BEM / BTS", true}, - {0x425306, "MRT SVC (BKK) / Rabbit (BKK)", "BEM / BTS", true}, - {0x425307, "MRT SVC (BKK) / Rabbit (BKK)", "BEM / BTS", true}, - {0x425308, "MRT SVC (BKK) / Rabbit (BKK)", "BEM / BTS", true}, - {0x425309, "MRT SVC (BKK) / Rabbit (BKK)", "BEM / BTS", true}, - {0x42530A, "MRT SVC (BKK)", "BEM", true}, - {0x42530B, "MRT SVC (BKK)", "BEM", true}, - {0x42530C, "MRT SVC (BKK)", "BEM", true}, - {0x42530D, "MRT SVC (BKK)", "BEM", true}, - {0x42530E, "MRT SVC (BKK)", "BEM", true}, - {0x42530F, "MRT SVC (BKK)", "BEM", true}, - {0x425310, "MRT SVC (BKK)", "BEM", true}, - {0x425311, "MRT SVC (BKK)", "BEM", true}, - {0x5010F2, "Metrocard (CHC)", "ECan", true}, - {0x5011F2, "Litacka Opencard", "Haguess", true}, - {0x6013F2, "HOLO", "Honolulu County", true}, - {0x7A007A, "TAP & GO (LAS)", "RTC", true}, + {0x422201, "IST Istanbulkart", "BELBIM", true}, + {0x422202, "IST Istanbulkart", "BELBIM", true}, + {0x422206, "IST Istanbulkart", "BELBIM", true}, + {0x425301, "BKK MRT SVC / BKK Rabbit", "BEM / BTS", true}, + {0x425302, "BKK MRT SVC / BKK Rabbit", "BEM / BTS", true}, + {0x425303, "BKK MRT SVC / BKK Rabbit", "BEM / BTS", true}, + {0x425304, "BKK MRT SVC / BKK Rabbit", "BEM / BTS", true}, + {0x425305, "BKK MRT SVC / BKK Rabbit", "BEM / BTS", true}, + {0x425306, "BKK MRT SVC / BKK Rabbit", "BEM / BTS", true}, + {0x425307, "BKK MRT SVC / BKK Rabbit", "BEM / BTS", true}, + {0x425308, "BKK MRT SVC / BKK Rabbit", "BEM / BTS", true}, + {0x425309, "BKK MRT SVC / BKK Rabbit", "BEM / BTS", true}, + {0x42530A, "BKK MRT SVC", "BEM", true}, + {0x42530B, "BKK MRT SVC", "BEM", true}, + {0x42530C, "BKK MRT SVC", "BEM", true}, + {0x42530D, "BKK MRT SVC", "BEM", true}, + {0x42530E, "BKK MRT SVC", "BEM", true}, + {0x42530F, "BKK MRT SVC", "BEM", true}, + {0x425310, "BKK MRT SVC", "BEM", true}, + {0x425311, "BKK MRT SVC", "BEM", true}, + {0x5010F2, "CHC Metrocard", "ECan", true}, + {0x5011F2, "PRG Litacka", "Haguess", true}, + {0x6013F2, "HNL HOLO", "Honolulu County", true}, + {0x7A007A, "LAS TAP & GO", "RTC", true}, {0x7D23A4, "Umo", "Cubic", true}, {0x805BC6, "Umo", "Cubic", true}, {0x8E7F67, "Umo", "Cubic", true}, - {0x8113F2, "Ventra (ORD)", "CTA", true}, + {0x8113F2, "ORD Ventra", "CTA", true}, {0x9011F2, "clipper", "Clipper", false}, - {0x9013F2, "Bee (DUD)", "Otago RC", true}, + {0x9013F2, "DUD Bee", "Otago RC", true}, {0x9111F2, "clipper", "Clipper", false}, - {0xA012F2, "Go CT", "CTtransit", true}, - {0xA013F2, "Wave (PVD)", "RIPTA", true}, - {0xAF1122, "Leap (DUB)", "TFI", true}, - {0xB006F2, "metroCARD (ADL)", "Adelaide Metro", true}, + {0xA012F2, "BDL Go CT", "CTtransit", true}, + {0xA013F2, "PVD Wave", "RIPTA", true}, + {0xAF1122, "DUB Leap (DUB)", "TFI", true}, + {0xB006F2, "ADL metroCARD", "Adelaide Metro", true}, {0xB52C99, "Umo", "Cubic", true}, - {0xCA3490, "City Card (SOF)", "UMC", true}, - {0xCC00CC, "Smartcard (CMH)", "COTA", true}, - {0xD000D0, "Tapp Pay (DAY)", "RTA", true}, - {0xDD00DD, "MyRide (DEN)", "RTD", true}, - {0xD001F0, "BAT (VIT)", "Euskotren", true}, - {0xE010F2, "Hop Fastpass (PDX)", "TriMet", true}, - {0xF00000, "OMNY (JFK)", "MTA", true}, + {0xCA3490, "SOF City Card", "UMC", true}, + {0xCC00CC, "CMH Smartcard", "COTA", true}, + {0xD000D0, "DAY Tapp Pay", "RTA", true}, + {0xDD00DD, "DEN MyRide", "RTD", true}, + {0xD001F0, "VIT BAT", "Euskotren", true}, + {0xE010F2, "PDX Hop Fastpass", "TriMet", true}, + {0xF00000, "JFK OMNY", "MTA", true}, {0xF010F2, "myki", "myki", false}, - {0xF18301, "URBANCARD (WRO)", "UTS", true}, - {0xF18302, "URBANCARD (WRO)", "UTS", true}, - {0xF18303, "URBANCARD (WRO)", "UTS", true}, - {0xFF30FF, "Presto (YYZ)", "Metrolinx", true}, + {0xF18301, "WRO URBANCARD", "UTS", true}, + {0xF18302, "WRO URBANCARD", "UTS", true}, + {0xF18303, "WRO URBANCARD", "UTS", true}, + {0xFF30FF, "YYZ Presto", "Metrolinx", true}, }; int num_cards = sizeof(cards) / sizeof(cards[0]); From b678f7bdb113a1618ec2376e445807408fe10b97 Mon Sep 17 00:00:00 2001 From: ry4000 <154689120+ry4000@users.noreply.github.com> Date: Mon, 1 Dec 2025 22:17:45 +1100 Subject: [PATCH 2/2] R&Y: Updated `IST` AIDs in `desfire.c` --- scenes/desfire.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scenes/desfire.c b/scenes/desfire.c index 00cf44c..232bef7 100644 --- a/scenes/desfire.c +++ b/scenes/desfire.c @@ -19,7 +19,7 @@ typedef struct { bool locked; } TransitCardInfo; -TransitCardInfo cards[88] = { +TransitCardInfo cards[89] = { {0x000001, "MAD TTP / MNL beep", "CRTM / AFPI", true}, {0x000002, "MNL beep", "AFPI", true}, {0x000003, "MNL beep", "AFPI", true}, @@ -61,7 +61,8 @@ TransitCardInfo cards[88] = { {0x31594F, "LHR Oyster", "TfL", true}, {0x4012F2, "Connect (SMF)", "SACOG", true}, {0x422201, "IST Istanbulkart", "BELBIM", true}, - {0x422202, "IST Istanbulkart", "BELBIM", true}, + {0x422204, "IST Istanbulkart", "BELBIM", true}, + {0x422205, "IST Istanbulkart", "BELBIM", true}, {0x422206, "IST Istanbulkart", "BELBIM", true}, {0x425301, "BKK MRT SVC / BKK Rabbit", "BEM / BTS", true}, {0x425302, "BKK MRT SVC / BKK Rabbit", "BEM / BTS", true},