Merge pull request #49 from ry4000/main

README.md

@@ -67,38 +67,38 @@ This is a list of metro cards and transit systems that need support or have part
 
 ## ✅ Supported Cards
 
-| **Card / Agency**  | **Country / City**                          | **Card Type**     |
-|--------------------|---------------------------------------------|-------------------|
-| **Bip!**           | 🇨🇱 Santiago de Chile, Chile                | Mifare Classic    |
-| **Charliecard**    | 🇺🇸 Boston, MA, USA                        | Mifare Classic    |
-| **Clipper**        | 🇺🇸 San Francisco, CA, USA                  | Mifare DESFire    |
-| **ITSO**           | 🇬🇧 United Kingdom                          | Mifare DESFire    |
-| **Metromoney**     | 🇬🇪 Tbilisi, Georgia                        | Mifare Classic    |
-| **myki**           | 🇦🇺 Melbourne (and surrounds), VIC, Australia | Mifare DESFire    |
-| **Navigo**         | 🇫🇷 Paris, France                           | Calypso           |
-| **Opal**           | 🇦🇺 Sydney (and surrounds), NSW, Australia  | Mifare DESFire    |
-| **Opus**           | 🇨🇦 Montreal, QC, Canada                    | Calypso           |
-| **Rav-Kav**        | 🇮🇱 Israel                                  | Calypso           |
-| **SmartRider**     | :australia: Western Australia, Australia   | Mifare Classic    |
-| **Troika**         | 🇷🇺 Moscow, Russia                          | Mifare Classic    |
+| **Card / Agency**  | **City / Country**                           | **Card Type**     |
+|--------------------|----------------------------------------------|-------------------|
+| **Bip!**           | 🇨🇱 Santiago de Chile, Chile                  | MIFARE Classic    |
+| **Charliecard**    | 🇺🇸 Boston, MA, USA                           | MIFARE Classic    |
+| **Clipper**        | 🇺🇸 San Francisco, CA, USA                    | MIFARE DESFire    |
+| **ITSO**           | 🇬🇧 United Kingdom                            | MIFARE DESFire    |
+| **Metromoney**     | 🇬🇪 Tbilisi, Georgia                          | MIFARE Classic    |
+| **myki**           | 🇦🇺 Melbourne (and surrounds), VIC, Australia | MIFARE DESFire    |
+| **Navigo**         | 🇫🇷 Paris, France                             | Calypso           |
+| **Opal**           | 🇦🇺 Sydney (and surrounds), NSW, Australia    | MIFARE DESFire    |
+| **Opus**           | 🇨🇦 Montreal, QC, Canada                      | Calypso           |
+| **Rav-Kav**        | 🇮🇱 Israel                                    | Calypso           |
+| **SmartRider**     | 🇦🇺 Perth, WA, Australia                      | MIFARE Classic    |
+| **Troika**         | 🇷🇺 Moscow, Russia                            | MIFARE Classic    |
 
 
 ---
 
 # Credits
-- **App Author**: [@luu176](https://github.com/luu176)
-- **Charliecard Parser**: [@zacharyweiss](https://github.com/zacharyweiss)
-- **Rav-Kav Parser**: [@luu176](https://github.com/luu176)
-- **Navigo Parser**: [@luu176](https://github.com/luu176), [@DocSystem](https://github.com/DocSystem)
-- **Opus Parser**: [@DocSystem](https://github.com/DocSystem)
-- **Metromoney Parser**: [@Leptopt1los](https://github.com/Leptopt1los)
-- **Bip! Parser**: [@rbasoalto](https://github.com/rbasoalto), [@gornekich](https://github.com/gornekich)
-- **Clipper Parser**: [@ke6jjj](https://github.com/ke6jjj)
-- **Troika Parser**: [@gornekich](https://github.com/gornekich)
-- **Myki Parser**: [@gornekich](https://github.com/gornekich)
-- **Opal Parser**: [@gornekich](https://github.com/gornekich)
-- **ITSO Parser**: [@gsp8181](https://github.com/gsp8181), [@hedger](https://github.com/hedger), [@gornekich](https://github.com/gornekich)
-- **Info Slaves**: [@equipter](https://github.com/equipter), [TheDingo8MyBaby](https://github.com/TheDingo8MyBaby)
+- **App Author:** [@luu176](https://github.com/luu176)
+- **Info Slaves:** [@equipter](https://github.com/equipter), [TheDingo8MyBaby](https://github.com/TheDingo8MyBaby)
+- **Bip! Parser:** [@rbasoalto](https://github.com/rbasoalto), [@gornekich](https://github.com/gornekich)
+- **Charliecard Parser:** [@zacharyweiss](https://github.com/zacharyweiss)
+- **Clipper Parser:** [@ke6jjj](https://github.com/ke6jjj)
+- **ITSO Parser:** [@gsp8181](https://github.com/gsp8181), [@hedger](https://github.com/hedger), [@gornekich](https://github.com/gornekich)
+- **Metromoney Parser:** [@Leptopt1los](https://github.com/Leptopt1los)
+- **myki Parser:** [@gornekich](https://github.com/gornekich)
+- **Navigo Parser:** [@luu176](https://github.com/luu176), [@DocSystem](https://github.com/DocSystem)
+- **Opal Parser:** [@gornekich](https://github.com/gornekich)
+- **Opus Parser:** [@DocSystem](https://github.com/DocSystem)
+- **Rav-Kav Parser:** [@luu176](https://github.com/luu176)
+- **Troika Parser:** [@gornekich](https://github.com/gornekich)
 
 ---
 

app/README.md

@@ -14,7 +14,7 @@ This is a list of metro cards and transit systems that are supported.
 - **Clipper**  
 - **ITSO**  
 - **Metromoney**  
-- **Myki**  
+- **myki**  
 - **Navigo**  
 - **Opal**  
 - **Opus**  
@@ -32,8 +32,8 @@ More coming soon!
 - **Info Slaves**: equipter, TheDingo8MyBaby  
 - **ITSO Parser**: gsp8181, hedger, gornekich  
 - **Metromoney Parser**: Leptopt1los  
-- **Myki Parser**: gornekich  
+- **myki Parser**: gornekich  
 - **Navigo Parser**: luu176, DocSystem  
 - **Opal Parser**: gornekich  
 - **Rav-Kav Parser**: luu176  
-- **Troika Parser**: gornekich  
+- **Troika Parser**: gornekich  

scenes/metroflip_scene_credits.c

@@ -17,6 +17,7 @@ void metroflip_scene_credits_on_enter(void* context) {
     furi_string_cat_printf(str, "Created by luu176\n");
     furi_string_cat_printf(str, "Inspired by Metrodroid\n\n");
     furi_string_cat_printf(str, "Special Thanks:\n willyjl\n");
+    furi_string_cat_printf(str, "Info Slaves:\n Equip, TheDingo8MyBaby\n\n");
     furi_string_cat_printf(str, "\e#Parser Credits:\n\n");
     furi_string_cat_printf(str, "Bip! Parser:\n rbasoalto, gornekich\n\n");
     furi_string_cat_printf(str, "CharlieCard Parser:\n zacharyweiss\n\n");
@@ -29,7 +30,6 @@ void metroflip_scene_credits_on_enter(void* context) {
     furi_string_cat_printf(str, "Opus Parser: DocSystem\n\n");
     furi_string_cat_printf(str, "Rav-Kav Parser: luu176\n\n");
     furi_string_cat_printf(str, "Troika Parser:\n gornekich\n\n");
-    furi_string_cat_printf(str, "Info Slaves:\n Equip, TheDingo8MyBaby\n\n");
 
     widget_add_text_scroll_element(widget, 0, 0, 128, 64, furi_string_get_cstr(str));
 

scenes/metroflip_scene_supported.c

@@ -15,23 +15,23 @@ void metroflip_scene_supported_on_enter(void* context) {
 
     furi_string_printf(str, "\e#Supported Cards:\n\n");
     furi_string_cat_printf(
-        str, " - Bip!:\nSantiago de Chile, Chile\nProtocol: Mifare Classic\n\n");
-    furi_string_cat_printf(str, " - Charliecard:\nBoston, MA, USA\nProtocol: Mifare Classic\n\n");
+        str, " - Bip!:\nSantiago de Chile, Chile\nProtocol: MIFARE Classic\n\n");
+    furi_string_cat_printf(str, " - Charliecard:\nBoston, MA, USA\nProtocol: MIFARE Classic\n\n");
     furi_string_cat_printf(
-        str, " - Clipper:\nSan Francisco, CA, USA\nProtocol: Mifare DESFire\n\n");
-    furi_string_cat_printf(str, " - ITSO:\nUnited Kingdom\nProtocol: Mifare DESFire\n\n");
-    furi_string_cat_printf(str, " - Metromoney:\nTbilisi, Georgia\nProtocol: Mifare Classic\n\n");
+        str, " - Clipper:\nSan Francisco, CA, USA\nProtocol: MIFARE DESFire\n\n");
+    furi_string_cat_printf(str, " - ITSO:\nUnited Kingdom\nProtocol: MIFARE DESFire\n\n");
+    furi_string_cat_printf(str, " - Metromoney:\nTbilisi, Georgia\nProtocol: MIFARE Classic\n\n");
     furi_string_cat_printf(
         str,
-        " - myki:\n🇦🇺 Melbourne (and surrounds), VIC, Australia\nProtocol: Mifare DESFire\n\n");
+        " - myki:\nMelbourne (and surrounds), VIC, Australia\nProtocol: MIFARE DESFire\n\n");
     furi_string_cat_printf(str, " - Navigo:\nParis, France\nProtocol: Calypso\n\n");
     furi_string_cat_printf(
-        str, " - Opal:\nSydney (and surrounds), NSW, Australia\nProtocol: Mifare DESFire\n\n");
+        str, " - Opal:\nSydney (and surrounds), NSW, Australia\nProtocol: MIFARE DESFire\n\n");
     furi_string_cat_printf(str, " - Opus:\nMontreal, QC, Canada\nProtocol: Calypso\n\n");
     furi_string_cat_printf(str, " - Rav-Kav:\nIsrael\nProtocol: Calypso\n\n");
     furi_string_cat_printf(
-        str, " - SmartRider:\nWestern Australia, Australia\nProtocol: Mifare Classic\n\n");
-    furi_string_cat_printf(str, " - Troika:\nMoscow, Russia\nProtocol: Mifare Classic\n\n");
+        str, " - SmartRider:\nPerth, WA, Australia\nProtocol: MIFARE Classic\n\n");
+    furi_string_cat_printf(str, " - Troika:\nMoscow, Russia\nProtocol: MIFARE Classic\n\n");
 
     widget_add_text_scroll_element(widget, 0, 0, 128, 64, furi_string_get_cstr(str));