Merge pull request #10 from luu176/dev

v0.3

Author: luu176

CHANGELOG.md

@@ -1,8 +1,17 @@
 ## v0.1
 
 - Initial release by luu176
+
 ## v0.2
 
 - Update Rav-Kav parsing to show more data such as transaction logs
-- Add Navigo parser!
+- Add Navigo parser! (Paris, France)
 - Bug fixes
+
+## v0.3
+
+- Added Clipper parser (San Francisco, CA, USA)
+- Added Troika parser (Moscow, Russia)
+- Added Myki parser (Melbourne (and surrounds), VIC, Australia)
+- Added Opal parser (Sydney (and surrounds), NSW, Australia)
+- Added ITSO parser (United Kingdom)

README.md

@@ -10,27 +10,29 @@ This is a list of metro cards and transit systems that need support or have part
 
 ## ✅ Supported Cards
 - [x] **Rav-Kav**  
-  - Status: Needs more functionality (currently only able to read balance).
+  - Status: Partially Supported
 - [x] **Charliecard**  
   - Status: Fully supported.
 - [x] **Metromoney**  
   - Status: Fully supported.
 - [x] **Bip!**  
   - Status: Fully supported.
 - [x] **Navigo**  
-  - Status: Fully supported. (v0.2)
-
-## 🚧 In Progress / Needs More Functionality
-- [ ] **Rav-Kav**  
-  - Current functionality: Reads balance only.  (v0.1)
-  - To Do: Parse more data from the card (e.g., transaction history, expiration date, etc.). (v0.2)
+  - Status: Fully supported.
+- [x] **Troika**
+  - Status: Fully supported.
+- [x] **Clipper**
+  - Status: Fully supported.
+- [x] **Myki**
+  - Status: Fully supported.
+- [x] **Opal**
+  - Status: Fully supported.
+- [x] **ITSO**
+  - Status: Fully supported.
 
 ## 📝 To Do (Unimplemented)
 - [ ] **Tianjin Railway Transit (TRT)**  
   - To Do: Add support for reading and analyzing Tianjin Railway Transit cards.
-- [ ] **Clipper**  
-  - To Do: Add support for reading and analyzing Clipper cards. (v0.3)
-
 
 ---
 
@@ -41,5 +43,9 @@ This is a list of metro cards and transit systems that need support or have part
 - **Navigo Parser**: [@luu176](https://github.com/luu176)
 - **Metromoney Parser**: [@Leptopt1los](https://github.com/Leptopt1los)
 - **Bip! Parser**: [@rbasoalto](https://github.com/rbasoalto) [@gornekich](https://github.com/gornekich)
-- **Info Slave**: [@equipter](https://github.com/equipter)
-
+- **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)

api/mosgortrans/mosgortrans_util.c

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <bit_lib.h>
+#include <datetime.h>
+#include <furi/core/string.h>
+#include <nfc/protocols/mf_classic/mf_classic.h>
+#include <furi_hal_rtc.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void render_section_header(
+    FuriString* str,
+    const char* name,
+    uint8_t prefix_separator_cnt,
+    uint8_t suffix_separator_cnt);
+bool mosgortrans_parse_transport_block(const MfClassicBlock* block, FuriString* result);
+
+#ifdef __cplusplus
+}
+#endif

api/mosgortrans/mosgortrans_util.h

@@ -12,21 +12,36 @@ This is a list of metro cards and transit systems that are supported.
 - **Rav-Kav**  
   - Status: Partially supported
 - **Navigo**  
-  - Status: Fully supported
+  - Status: Fully supported.
 - **Charliecard**  
-  - Status: Fully supported
+  - Status: Fully supported.
 - **Metromoney**  
-  - Status: Fully supported
+  - Status: Fully supported.
 - **Bip!**  
-  - Status: Fully supported
+  - Status: Fully supported.
+- **Clipper**  
+  - Status: Fully supported.
+- **Troika**  
+  - Status: Fully supported.
+- **Myki**  
+  - Status: Fully supported.
+- **Opal**  
+  - Status: Fully supported.
+- **ITSO**
+  - Status: Fully supported.
 
-More coming soon!
+More coming soon! 
 
-## Credits
-- App Author: luu176
-- Charliecard Parser: zacharyweiss
-- Rav-Kav Parser: luu176
-- Navigo Parser: luu176
-- Metromoney Parser: Leptopt1los
-- Bip! Parser: rbasoalto, gornekich
-- Info Slave: equipter
+## Credits:
+- **App Author**: luu176
+- **Charliecard Parser**: zacharyweiss
+- **Rav-Kav Parser**: luu176
+- **Navigo Parser**: luu176
+- **Metromoney Parser**: Leptopt1los
+- **Bip! Parser**: rbasoaltor & gornekich
+- **Clipper Parser**: ke6jjj
+- **Troika Parser**: gornekich
+- **Myki Parser**: gornekich
+- **Opal parser**: gornekich
+- **ITSO parser**: gsp8181, hedger, gornekich
+- **Info Slaves**: Equip, TheDingo8MyBaby

app/README.md

@@ -126,6 +126,15 @@ void metroflip_app_blink_stop(Metroflip* metroflip) {
     notification_message(metroflip->notifications, &metroflip_app_sequence_blink_stop);
 }
 
+void metroflip_exit_widget_callback(GuiButtonType result, InputType type, void* context) {
+    Metroflip* app = context;
+    UNUSED(result);
+
+    if(type == InputTypeShort) {
+        scene_manager_search_and_switch_to_previous_scene(app->scene_manager, MetroflipSceneStart);
+    }
+}
+
 // Calypso
 
 void byte_to_binary(uint8_t byte, char* bits) {

metroflip.c

@@ -122,6 +122,8 @@ void metroflip_app_blink_stop(Metroflip* metroflip);
     if(!(locked)) submenu_add_item(submenu, label, index, callback, callback_context)
 #endif
 
+void metroflip_exit_widget_callback(GuiButtonType result, InputType type, void* context);
+
 ///////////////////////////////// Calypso /////////////////////////////////
 
 #define Metroflip_POLLER_MAX_BUFFER_SIZE 1024

metroflip_i.h

@@ -3,15 +3,6 @@
 
 #define TAG "Metroflip:Scene:About"
 
-void metroflip_about_widget_callback(GuiButtonType result, InputType type, void* context) {
-    Metroflip* app = context;
-    UNUSED(result);
-
-    if(type == InputTypeShort) {
-        scene_manager_search_and_switch_to_previous_scene(app->scene_manager, MetroflipSceneStart);
-    }
-}
-
 void metroflip_scene_about_on_enter(void* context) {
     Metroflip* app = context;
     Widget* widget = app->widget;
@@ -29,7 +20,7 @@ void metroflip_scene_about_on_enter(void* context) {
     widget_add_text_scroll_element(widget, 0, 0, 128, 64, furi_string_get_cstr(str));
 
     widget_add_button_element(
-        widget, GuiButtonTypeRight, "Exit", metroflip_about_widget_callback, app);
+        widget, GuiButtonTypeRight, "Exit", metroflip_exit_widget_callback, app);
 
     furi_string_free(str);
     view_dispatcher_switch_to_view(app->view_dispatcher, MetroflipViewWidget);

scenes/metroflip_scene_about.c

@@ -272,15 +272,6 @@ static bool
     return parsed;
 }
 
-void metroflip_bip_widget_callback(GuiButtonType result, InputType type, void* context) {
-    Metroflip* app = context;
-    UNUSED(result);
-
-    if(type == InputTypeShort) {
-        scene_manager_search_and_switch_to_previous_scene(app->scene_manager, MetroflipSceneStart);
-    }
-}
-
 static NfcCommand metroflip_scene_bip_poller_callback(NfcGenericEvent event, void* context) {
     furi_assert(context);
     furi_assert(event.event_data);
@@ -332,7 +323,7 @@ static NfcCommand metroflip_scene_bip_poller_callback(NfcGenericEvent event, voi
         widget_add_text_scroll_element(widget, 0, 0, 128, 64, furi_string_get_cstr(parsed_data));
 
         widget_add_button_element(
-            widget, GuiButtonTypeRight, "Exit", metroflip_bip_widget_callback, app);
+            widget, GuiButtonTypeRight, "Exit", metroflip_exit_widget_callback, app);
 
         furi_string_free(parsed_data);
         view_dispatcher_switch_to_view(app->view_dispatcher, MetroflipViewWidget);

scenes/metroflip_scene_bip.c

@@ -1183,15 +1183,6 @@ static bool charliecard_parse(FuriString* parsed_data, const MfClassicData* data
     return parsed;
 }
 
-void metroflip_charliecard_widget_callback(GuiButtonType result, InputType type, void* context) {
-    Metroflip* app = context;
-    UNUSED(result);
-
-    if(type == InputTypeShort) {
-        scene_manager_search_and_switch_to_previous_scene(app->scene_manager, MetroflipSceneStart);
-    }
-}
-
 static NfcCommand
     metroflip_scene_charlicard_poller_callback(NfcGenericEvent event, void* context) {
     furi_assert(context);
@@ -1243,7 +1234,7 @@ static NfcCommand
         widget_add_text_scroll_element(widget, 0, 0, 128, 64, furi_string_get_cstr(parsed_data));
 
         widget_add_button_element(
-            widget, GuiButtonTypeRight, "Exit", metroflip_charliecard_widget_callback, app);
+            widget, GuiButtonTypeRight, "Exit", metroflip_exit_widget_callback, app);
 
         furi_string_free(parsed_data);
         view_dispatcher_switch_to_view(app->view_dispatcher, MetroflipViewWidget);