Skip to content

Commit 916da9e

Browse files
luu176luu176
authored
Merge pull request #49 from ry4000/main
2 parents 68e753f + 05cb352 commit 916da9e

File tree

4 files changed

+40
-40
lines changed

4 files changed

+40
-40
lines changed

‎README.md‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -67,38 +67,38 @@ This is a list of metro cards and transit systems that need support or have part
6767

6868
## ✅ Supported Cards
6969

70-
| **Card / Agency** | **Country / City** | **Card Type** |
71-
|--------------------|---------------------------------------------|-------------------|
72-
| **Bip!** | 🇨🇱 Santiago de Chile, Chile | Mifare Classic |
73-
| **Charliecard** | 🇺🇸 Boston, MA, USA | Mifare Classic |
74-
| **Clipper** | 🇺🇸 San Francisco, CA, USA | Mifare DESFire |
75-
| **ITSO** | 🇬🇧 United Kingdom | Mifare DESFire |
76-
| **Metromoney** | 🇬🇪 Tbilisi, Georgia | Mifare Classic |
77-
| **myki** | 🇦🇺 Melbourne (and surrounds), VIC, Australia | Mifare DESFire |
78-
| **Navigo** | 🇫🇷 Paris, France | Calypso |
79-
| **Opal** | 🇦🇺 Sydney (and surrounds), NSW, Australia | Mifare DESFire |
80-
| **Opus** | 🇨🇦 Montreal, QC, Canada | Calypso |
81-
| **Rav-Kav** | 🇮🇱 Israel | Calypso |
82-
| **SmartRider** | :australia: Western Australia, Australia | Mifare Classic |
83-
| **Troika** | 🇷🇺 Moscow, Russia | Mifare Classic |
70+
| **Card / Agency** | **City / Country** | **Card Type** |
71+
|--------------------|----------------------------------------------|-------------------|
72+
| **Bip!** | 🇨🇱 Santiago de Chile, Chile | MIFARE Classic |
73+
| **Charliecard** | 🇺🇸 Boston, MA, USA | MIFARE Classic |
74+
| **Clipper** | 🇺🇸 San Francisco, CA, USA | MIFARE DESFire |
75+
| **ITSO** | 🇬🇧 United Kingdom | MIFARE DESFire |
76+
| **Metromoney** | 🇬🇪 Tbilisi, Georgia | MIFARE Classic |
77+
| **myki** | 🇦🇺 Melbourne (and surrounds), VIC, Australia | MIFARE DESFire |
78+
| **Navigo** | 🇫🇷 Paris, France | Calypso |
79+
| **Opal** | 🇦🇺 Sydney (and surrounds), NSW, Australia | MIFARE DESFire |
80+
| **Opus** | 🇨🇦 Montreal, QC, Canada | Calypso |
81+
| **Rav-Kav** | 🇮🇱 Israel | Calypso |
82+
| **SmartRider** | 🇦🇺 Perth, WA, Australia | MIFARE Classic |
83+
| **Troika** | 🇷🇺 Moscow, Russia | MIFARE Classic |
8484

8585

8686
---
8787

8888
# Credits
89-
- **App Author**: [@luu176](https://github.com/luu176)
90-
- **Charliecard Parser**: [@zacharyweiss](https://github.com/zacharyweiss)
91-
- **Rav-Kav Parser**: [@luu176](https://github.com/luu176)
92-
- **Navigo Parser**: [@luu176](https://github.com/luu176), [@DocSystem](https://github.com/DocSystem)
93-
- **Opus Parser**: [@DocSystem](https://github.com/DocSystem)
94-
- **Metromoney Parser**: [@Leptopt1los](https://github.com/Leptopt1los)
95-
- **Bip! Parser**: [@rbasoalto](https://github.com/rbasoalto), [@gornekich](https://github.com/gornekich)
96-
- **Clipper Parser**: [@ke6jjj](https://github.com/ke6jjj)
97-
- **Troika Parser**: [@gornekich](https://github.com/gornekich)
98-
- **Myki Parser**: [@gornekich](https://github.com/gornekich)
99-
- **Opal Parser**: [@gornekich](https://github.com/gornekich)
100-
- **ITSO Parser**: [@gsp8181](https://github.com/gsp8181), [@hedger](https://github.com/hedger), [@gornekich](https://github.com/gornekich)
101-
- **Info Slaves**: [@equipter](https://github.com/equipter), [TheDingo8MyBaby](https://github.com/TheDingo8MyBaby)
89+
- **App Author:** [@luu176](https://github.com/luu176)
90+
- **Info Slaves:** [@equipter](https://github.com/equipter), [TheDingo8MyBaby](https://github.com/TheDingo8MyBaby)
91+
- **Bip! Parser:** [@rbasoalto](https://github.com/rbasoalto), [@gornekich](https://github.com/gornekich)
92+
- **Charliecard Parser:** [@zacharyweiss](https://github.com/zacharyweiss)
93+
- **Clipper Parser:** [@ke6jjj](https://github.com/ke6jjj)
94+
- **ITSO Parser:** [@gsp8181](https://github.com/gsp8181), [@hedger](https://github.com/hedger), [@gornekich](https://github.com/gornekich)
95+
- **Metromoney Parser:** [@Leptopt1los](https://github.com/Leptopt1los)
96+
- **myki Parser:** [@gornekich](https://github.com/gornekich)
97+
- **Navigo Parser:** [@luu176](https://github.com/luu176), [@DocSystem](https://github.com/DocSystem)
98+
- **Opal Parser:** [@gornekich](https://github.com/gornekich)
99+
- **Opus Parser:** [@DocSystem](https://github.com/DocSystem)
100+
- **Rav-Kav Parser:** [@luu176](https://github.com/luu176)
101+
- **Troika Parser:** [@gornekich](https://github.com/gornekich)
102102

103103
---
104104

‎app/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ This is a list of metro cards and transit systems that are supported.
1414
- **Clipper**
1515
- **ITSO**
1616
- **Metromoney**
17-
- **Myki**
17+
- **myki**
1818
- **Navigo**
1919
- **Opal**
2020
- **Opus**
@@ -32,8 +32,8 @@ More coming soon!
3232
- **Info Slaves**: equipter, TheDingo8MyBaby
3333
- **ITSO Parser**: gsp8181, hedger, gornekich
3434
- **Metromoney Parser**: Leptopt1los
35-
- **Myki Parser**: gornekich
35+
- **myki Parser**: gornekich
3636
- **Navigo Parser**: luu176, DocSystem
3737
- **Opal Parser**: gornekich
3838
- **Rav-Kav Parser**: luu176
39-
- **Troika Parser**: gornekich
39+
- **Troika Parser**: gornekich

‎scenes/metroflip_scene_credits.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ void metroflip_scene_credits_on_enter(void* context) {
1717
furi_string_cat_printf(str, "Created by luu176\n");
1818
furi_string_cat_printf(str, "Inspired by Metrodroid\n\n");
1919
furi_string_cat_printf(str, "Special Thanks:\n willyjl\n");
20+
furi_string_cat_printf(str, "Info Slaves:\n Equip, TheDingo8MyBaby\n\n");
2021
furi_string_cat_printf(str, "\e#Parser Credits:\n\n");
2122
furi_string_cat_printf(str, "Bip! Parser:\n rbasoalto, gornekich\n\n");
2223
furi_string_cat_printf(str, "CharlieCard Parser:\n zacharyweiss\n\n");
@@ -29,7 +30,6 @@ void metroflip_scene_credits_on_enter(void* context) {
2930
furi_string_cat_printf(str, "Opus Parser: DocSystem\n\n");
3031
furi_string_cat_printf(str, "Rav-Kav Parser: luu176\n\n");
3132
furi_string_cat_printf(str, "Troika Parser:\n gornekich\n\n");
32-
furi_string_cat_printf(str, "Info Slaves:\n Equip, TheDingo8MyBaby\n\n");
3333

3434
widget_add_text_scroll_element(widget, 0, 0, 128, 64, furi_string_get_cstr(str));
3535

‎scenes/metroflip_scene_supported.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@ void metroflip_scene_supported_on_enter(void* context) {
1515

1616
furi_string_printf(str, "\e#Supported Cards:\n\n");
1717
furi_string_cat_printf(
18-
str, " - Bip!:\nSantiago de Chile, Chile\nProtocol: Mifare Classic\n\n");
19-
furi_string_cat_printf(str, " - Charliecard:\nBoston, MA, USA\nProtocol: Mifare Classic\n\n");
18+
str, " - Bip!:\nSantiago de Chile, Chile\nProtocol: MIFARE Classic\n\n");
19+
furi_string_cat_printf(str, " - Charliecard:\nBoston, MA, USA\nProtocol: MIFARE Classic\n\n");
2020
furi_string_cat_printf(
21-
str, " - Clipper:\nSan Francisco, CA, USA\nProtocol: Mifare DESFire\n\n");
22-
furi_string_cat_printf(str, " - ITSO:\nUnited Kingdom\nProtocol: Mifare DESFire\n\n");
23-
furi_string_cat_printf(str, " - Metromoney:\nTbilisi, Georgia\nProtocol: Mifare Classic\n\n");
21+
str, " - Clipper:\nSan Francisco, CA, USA\nProtocol: MIFARE DESFire\n\n");
22+
furi_string_cat_printf(str, " - ITSO:\nUnited Kingdom\nProtocol: MIFARE DESFire\n\n");
23+
furi_string_cat_printf(str, " - Metromoney:\nTbilisi, Georgia\nProtocol: MIFARE Classic\n\n");
2424
furi_string_cat_printf(
2525
str,
26-
" - myki:\n🇦🇺 Melbourne (and surrounds), VIC, Australia\nProtocol: Mifare DESFire\n\n");
26+
" - myki:\nMelbourne (and surrounds), VIC, Australia\nProtocol: MIFARE DESFire\n\n");
2727
furi_string_cat_printf(str, " - Navigo:\nParis, France\nProtocol: Calypso\n\n");
2828
furi_string_cat_printf(
29-
str, " - Opal:\nSydney (and surrounds), NSW, Australia\nProtocol: Mifare DESFire\n\n");
29+
str, " - Opal:\nSydney (and surrounds), NSW, Australia\nProtocol: MIFARE DESFire\n\n");
3030
furi_string_cat_printf(str, " - Opus:\nMontreal, QC, Canada\nProtocol: Calypso\n\n");
3131
furi_string_cat_printf(str, " - Rav-Kav:\nIsrael\nProtocol: Calypso\n\n");
3232
furi_string_cat_printf(
33-
str, " - SmartRider:\nWestern Australia, Australia\nProtocol: Mifare Classic\n\n");
34-
furi_string_cat_printf(str, " - Troika:\nMoscow, Russia\nProtocol: Mifare Classic\n\n");
33+
str, " - SmartRider:\nPerth, WA, Australia\nProtocol: MIFARE Classic\n\n");
34+
furi_string_cat_printf(str, " - Troika:\nMoscow, Russia\nProtocol: MIFARE Classic\n\n");
3535

3636
widget_add_text_scroll_element(widget, 0, 0, 128, 64, furi_string_get_cstr(str));
3737

0 commit comments

Comments
 (0)