Skip to content

Commit 3548f18

Browse files
luu176luu176
authored
Merge pull request #88 from ry4000/dev
2 parents 3ab101d + b678f7b commit 3548f18

File tree

1 file changed

+69
-68
lines changed

1 file changed

+69
-68
lines changed

‎scenes/desfire.c‎

Lines changed: 69 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -19,95 +19,96 @@ typedef struct {
1919
bool locked;
2020
} TransitCardInfo;
2121

22-
TransitCardInfo cards[88] = {
23-
{0x000001, "TTP (MAD) / beep (MNL)", "CRTM / AFPI", true},
24-
{0x000002, "beep (MNL)", "AFPI", true},
25-
{0x000003, "beep (MNL)", "AFPI", true},
26-
{0x000004, "beep (MNL)", "AFPI", true},
22+
TransitCardInfo cards[89] = {
23+
{0x000001, "MAD TTP / MNL beep", "CRTM / AFPI", true},
24+
{0x000002, "MNL beep", "AFPI", true},
25+
{0x000003, "MNL beep", "AFPI", true},
26+
{0x000004, "MNL beep", "AFPI", true},
2727
{0x0011F2, "myki", "TV", false},
28-
{0x002000, "Presto (YYZ)", "Metrolinx", true},
29-
{0x004048, "Mi Movilidad (GDL)", "SITEUR", true},
30-
{0x004055, "AT HOP (AKL)", "Auckland Transport", true},
31-
{0x004063, "Travel Pass (DOH)", "Qatar Rail", true},
28+
{0x002000, "YYZ Presto", "Metrolinx", true},
29+
{0x004048, "GDL Mi Movilidad", "SITEUR", true},
30+
{0x004055, "AUK AT HOP", "Auckland Transport", true},
31+
{0x004063, "DOH Travel Pass", "Qatar Rail", true},
3232
{0x004078, "nol", "RTA", false},
3333
{0x008057, "NORTIC", "NRPA", true},
3434
{0x010000, "Breeze / Compass / EASY / FREEDOM / Urbana", "MARTA / TransLink / MIA County / PATCO / LPP", true},
35-
{0x012340, "motion (ECN)", "MoTCW", true},
36-
{0x012350, "motion (ECN)", "MoTCW", true},
37-
{0x012360, "motion (ECN)", "MoTCW", true},
35+
{0x012340, "ECN motion", "MoTCW", true},
36+
{0x012350, "ECN motion", "MoTCW", true},
37+
{0x012360, "ECN motion", "MoTCW", true},
3838
{0x018057, "NORTIC", "NRPA", true},
3939
{0x0112F2, "Tap-N-Go / peggo", "GBMT / YWG Transit", true},
40-
{0x014D44, "DMTC (DEL)", "DMRCL", true},
41-
{0x020000, "Urbana (LJU)", "LPP", true},
42-
{0x0212F2, "Tap-N-Go (GRB)", "GBM Transit", true},
43-
{0x024D44, "DMTC (DEL)", "DMRCL", true},
44-
{0x034D44, "DMTC (DEL)", "DMRCL", true},
45-
{0x044D44, "DMTC (DEL)", "DMRCL", true},
46-
{0x050000, "T-mobilitat (BCN) / Urbana (LJU)", "TMB / LPP", true},
47-
{0x054D44, "DMTC (DEL)", "DMRCL", true},
48-
{0x064D44, "DMTC (DEL)", "DMRCL", true},
49-
{0x074D44, "DMTC (DEL)", "DMRCL", true},
40+
{0x014D44, "DEL DMTC", "DMRCL", true},
41+
{0x020000, "LJU Urbana", "LPP", true},
42+
{0x0212F2, "GRB Tap-N-Go", "GBM Transit", true},
43+
{0x024D44, "DEL DMTC", "DMRCL", true},
44+
{0x034D44, "DEL DMTC", "DMRCL", true},
45+
{0x044D44, "DEL DMTC", "DMRCL", true},
46+
{0x050000, "BCN T-mobilitat / LJU Urbana", "TMB / LPP", true},
47+
{0x054D44, "DEL DMTC", "DMRCL", true},
48+
{0x064D44, "DEL DMTC", "DMRCL", true},
49+
{0x074D44, "DEL DMTC", "DMRCL", true},
5050
{0x1101F4, "itso", "ITSO (UK)", false},
51-
{0x1120EF, "HSL (HEL)", "HRT", true},
51+
{0x1120EF, "HEL HSL", "HRT", true},
5252
{0x1201F4, "itso", "ITSO (UK)", false},
5353
{0x1301F4, "itso", "ITSO (UK)", false},
5454
{0x1401F4, "itso", "ITSO (UK)", false},
5555
{0x1602A0, "itso", "ITSO (UK)", false},
56-
{0x171108, "TRIPKO (MNL)", "JourneyTech", true},
56+
{0x171108, "MNL TRIPKO", "JourneyTech", true},
5757
{0x227508, "Umo", "Cubic", true},
58-
{0x3010F2, "ORCA (SEA)", "ORCA", true},
58+
{0x3010F2, "SEA ORCA", "ORCA", true},
5959
{0x314553, "opal", "Opal", false},
60-
{0x315441, "ATH.ENA (ATH)", "OASA", true},
61-
{0x31594F, "Oyster (LHR)", "TfL", true},
60+
{0x315441, "ATH ATH.ENA", "OASA", true},
61+
{0x31594F, "LHR Oyster", "TfL", true},
6262
{0x4012F2, "Connect (SMF)", "SACOG", true},
63-
{0x422201, "Istanbulkart (IST)", "BELBIM", true},
64-
{0x422202, "Istanbulkart (IST)", "BELBIM", true},
65-
{0x422206, "Istanbulkart (IST)", "BELBIM", true},
66-
{0x425301, "MRT SVC (BKK) / Rabbit (BKK)", "BEM / BTS", true},
67-
{0x425302, "MRT SVC (BKK) / Rabbit (BKK)", "BEM / BTS", true},
68-
{0x425303, "MRT SVC (BKK) / Rabbit (BKK)", "BEM / BTS", true},
69-
{0x425304, "MRT SVC (BKK) / Rabbit (BKK)", "BEM / BTS", true},
70-
{0x425305, "MRT SVC (BKK) / Rabbit (BKK)", "BEM / BTS", true},
71-
{0x425306, "MRT SVC (BKK) / Rabbit (BKK)", "BEM / BTS", true},
72-
{0x425307, "MRT SVC (BKK) / Rabbit (BKK)", "BEM / BTS", true},
73-
{0x425308, "MRT SVC (BKK) / Rabbit (BKK)", "BEM / BTS", true},
74-
{0x425309, "MRT SVC (BKK) / Rabbit (BKK)", "BEM / BTS", true},
75-
{0x42530A, "MRT SVC (BKK)", "BEM", true},
76-
{0x42530B, "MRT SVC (BKK)", "BEM", true},
77-
{0x42530C, "MRT SVC (BKK)", "BEM", true},
78-
{0x42530D, "MRT SVC (BKK)", "BEM", true},
79-
{0x42530E, "MRT SVC (BKK)", "BEM", true},
80-
{0x42530F, "MRT SVC (BKK)", "BEM", true},
81-
{0x425310, "MRT SVC (BKK)", "BEM", true},
82-
{0x425311, "MRT SVC (BKK)", "BEM", true},
83-
{0x5010F2, "Metrocard (CHC)", "ECan", true},
84-
{0x5011F2, "Litacka Opencard", "Haguess", true},
85-
{0x6013F2, "HOLO", "Honolulu County", true},
86-
{0x7A007A, "TAP & GO (LAS)", "RTC", true},
63+
{0x422201, "IST Istanbulkart", "BELBIM", true},
64+
{0x422204, "IST Istanbulkart", "BELBIM", true},
65+
{0x422205, "IST Istanbulkart", "BELBIM", true},
66+
{0x422206, "IST Istanbulkart", "BELBIM", true},
67+
{0x425301, "BKK MRT SVC / BKK Rabbit", "BEM / BTS", true},
68+
{0x425302, "BKK MRT SVC / BKK Rabbit", "BEM / BTS", true},
69+
{0x425303, "BKK MRT SVC / BKK Rabbit", "BEM / BTS", true},
70+
{0x425304, "BKK MRT SVC / BKK Rabbit", "BEM / BTS", true},
71+
{0x425305, "BKK MRT SVC / BKK Rabbit", "BEM / BTS", true},
72+
{0x425306, "BKK MRT SVC / BKK Rabbit", "BEM / BTS", true},
73+
{0x425307, "BKK MRT SVC / BKK Rabbit", "BEM / BTS", true},
74+
{0x425308, "BKK MRT SVC / BKK Rabbit", "BEM / BTS", true},
75+
{0x425309, "BKK MRT SVC / BKK Rabbit", "BEM / BTS", true},
76+
{0x42530A, "BKK MRT SVC", "BEM", true},
77+
{0x42530B, "BKK MRT SVC", "BEM", true},
78+
{0x42530C, "BKK MRT SVC", "BEM", true},
79+
{0x42530D, "BKK MRT SVC", "BEM", true},
80+
{0x42530E, "BKK MRT SVC", "BEM", true},
81+
{0x42530F, "BKK MRT SVC", "BEM", true},
82+
{0x425310, "BKK MRT SVC", "BEM", true},
83+
{0x425311, "BKK MRT SVC", "BEM", true},
84+
{0x5010F2, "CHC Metrocard", "ECan", true},
85+
{0x5011F2, "PRG Litacka", "Haguess", true},
86+
{0x6013F2, "HNL HOLO", "Honolulu County", true},
87+
{0x7A007A, "LAS TAP & GO", "RTC", true},
8788
{0x7D23A4, "Umo", "Cubic", true},
8889
{0x805BC6, "Umo", "Cubic", true},
8990
{0x8E7F67, "Umo", "Cubic", true},
90-
{0x8113F2, "Ventra (ORD)", "CTA", true},
91+
{0x8113F2, "ORD Ventra", "CTA", true},
9192
{0x9011F2, "clipper", "Clipper", false},
92-
{0x9013F2, "Bee (DUD)", "Otago RC", true},
93+
{0x9013F2, "DUD Bee", "Otago RC", true},
9394
{0x9111F2, "clipper", "Clipper", false},
94-
{0xA012F2, "Go CT", "CTtransit", true},
95-
{0xA013F2, "Wave (PVD)", "RIPTA", true},
96-
{0xAF1122, "Leap (DUB)", "TFI", true},
97-
{0xB006F2, "metroCARD (ADL)", "Adelaide Metro", true},
95+
{0xA012F2, "BDL Go CT", "CTtransit", true},
96+
{0xA013F2, "PVD Wave", "RIPTA", true},
97+
{0xAF1122, "DUB Leap (DUB)", "TFI", true},
98+
{0xB006F2, "ADL metroCARD", "Adelaide Metro", true},
9899
{0xB52C99, "Umo", "Cubic", true},
99-
{0xCA3490, "City Card (SOF)", "UMC", true},
100-
{0xCC00CC, "Smartcard (CMH)", "COTA", true},
101-
{0xD000D0, "Tapp Pay (DAY)", "RTA", true},
102-
{0xDD00DD, "MyRide (DEN)", "RTD", true},
103-
{0xD001F0, "BAT (VIT)", "Euskotren", true},
104-
{0xE010F2, "Hop Fastpass (PDX)", "TriMet", true},
105-
{0xF00000, "OMNY (JFK)", "MTA", true},
100+
{0xCA3490, "SOF City Card", "UMC", true},
101+
{0xCC00CC, "CMH Smartcard", "COTA", true},
102+
{0xD000D0, "DAY Tapp Pay", "RTA", true},
103+
{0xDD00DD, "DEN MyRide", "RTD", true},
104+
{0xD001F0, "VIT BAT", "Euskotren", true},
105+
{0xE010F2, "PDX Hop Fastpass", "TriMet", true},
106+
{0xF00000, "JFK OMNY", "MTA", true},
106107
{0xF010F2, "myki", "myki", false},
107-
{0xF18301, "URBANCARD (WRO)", "UTS", true},
108-
{0xF18302, "URBANCARD (WRO)", "UTS", true},
109-
{0xF18303, "URBANCARD (WRO)", "UTS", true},
110-
{0xFF30FF, "Presto (YYZ)", "Metrolinx", true},
108+
{0xF18301, "WRO URBANCARD", "UTS", true},
109+
{0xF18302, "WRO URBANCARD", "UTS", true},
110+
{0xF18303, "WRO URBANCARD", "UTS", true},
111+
{0xFF30FF, "YYZ Presto", "Metrolinx", true},
111112
};
112113

113114
int num_cards = sizeof(cards) / sizeof(cards[0]);

0 commit comments

Comments
 (0)