Skip to content

Commit b7e5072

Browse files
committed
1 parent bd94555 commit b7e5072

File tree

4 files changed

+9
-16
lines changed

4 files changed

+9
-16
lines changed

CHANGELOG.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,4 @@
1414
- Added Troika parser (Moscow, Russia)
1515
- Added Myki parser (Melbourne (and surrounds), VIC, Australia)
1616
- Added Opal parser (Sydney (and surrounds), NSW, Australia)
17-
- Added ITSO parser (United Kingdom)
18-
>>>>>>>>> Temporary merge branch 2
17+
- Added ITSO parser (United Kingdom)

README.md

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,6 @@ This is a list of metro cards and transit systems that need support or have part
2727
- Status: Fully supported.
2828
- [x] **Opal**
2929
- Status: Fully supported.
30-
>>>>>>>>> Temporary merge branch 2
31-
32-
## 📝 To Do (Unimplemented)
33-
- [ ] **Tianjin Railway Transit (TRT)**
34-
- To Do: Add support for reading and analyzing Tianjin Railway Transit cards.
35-
<<<<<<<<< Temporary merge branch 1
36-
- [ ] **Clipper**
37-
- To Do: Add support for reading and analyzing Clipper cards. (v0.3)
38-
=========
39-
40-
>>>>>>>>> Temporary merge branch 2
41-
4230

4331
---
4432

manifest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ sourcecode:
1717
origin: https://github.com/luu176/Metroflip
1818
subdir:
1919
type: git
20-
version: 0.2
20+
version: 0.3

scenes/metroflip_scene_credits.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,16 @@ void metroflip_scene_credits_on_enter(void* context) {
1717
furi_string_cat_printf(str, "Inspired by Metrodroid\n\n");
1818
furi_string_cat_printf(str, "\e#Parser Credits:\n\n");
1919
furi_string_cat_printf(str, "Rav-Kav Parser: luu176\n\n");
20+
furi_string_cat_printf(str, "Navigo Parser: luu176\n\n");
2021
furi_string_cat_printf(str, "Metromoney Parser:\n Leptopt1los\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");
23-
furi_string_cat_printf(str, "Info Slave: equip\n\n");
24+
furi_string_cat_printf(str, "Clipper Parser:\n ke6jjj\n\n");
25+
furi_string_cat_printf(str, "Troika Parser:\n gornekich\n\n");
26+
furi_string_cat_printf(str, "ITSO Parser:\n gsp8181, hedger, gornekich\n\n");
27+
furi_string_cat_printf(str, "Opal Parser:\n gornekich\n\n");
28+
furi_string_cat_printf(str, "Myki Parser:\n gornekich\n\n");
29+
furi_string_cat_printf(str, "Info Slaves:\n Equip, TheDingo8MyBaby\n\n");
2430

2531
widget_add_text_scroll_element(widget, 0, 0, 128, 64, furi_string_get_cstr(str));
2632

0 commit comments

Comments
 (0)