No more Navigo, now it's Calypso

api/calypso/cards/navigo.c → api/calypso/cards/intercode.c

@@ -1,7 +1,7 @@
 #include <stdlib.h>
-#include "navigo.h"
+#include "intercode.h"
 
-CalypsoApp* get_navigo_contract_structure() {
+CalypsoApp* get_intercode_contract_structure() {
     CalypsoApp* NavigoContractStructure = malloc(sizeof(CalypsoApp));
     if(!NavigoContractStructure) {
         return NULL;
@@ -246,7 +246,7 @@ CalypsoApp* get_navigo_contract_structure() {
     return NavigoContractStructure;
 }
 
-CalypsoApp* get_navigo_event_structure() {
+CalypsoApp* get_intercode_event_structure() {
     CalypsoApp* NavigoEventStructure = malloc(sizeof(CalypsoApp));
     if(!NavigoEventStructure) {
         return NULL;

api/calypso/cards/intercode.h

@@ -0,0 +1,10 @@
+#include "../calypso_util.h"
+
+#ifndef INTERCODE_STRUCTURES_H
+#define INTERCODE_STRUCTURES_H
+
+CalypsoApp* get_intercode_contract_structure();
+
+CalypsoApp* get_intercode_event_structure();
+
+#endif // NAVIGO_STRUCTURES_H

api/calypso/cards/navigo.h

@@ -1,10 +0,0 @@
-#include "../calypso_util.h"
-
-#ifndef NAVIGO_STRUCTURES_H
-#define NAVIGO_STRUCTURES_H
-
-CalypsoApp* get_navigo_contract_structure();
-
-CalypsoApp* get_navigo_event_structure();
-
-#endif // NAVIGO_STRUCTURES_H

scenes/metroflip_scene_navigo.c → scenes/metroflip_scene_calypso.c

@@ -7,7 +7,7 @@
 
 #include <nfc/protocols/iso14443_4b/iso14443_4b_poller.h>
 
-#define TAG "Metroflip:Scene:Navigo"
+#define TAG "Metroflip:Scene:Calypso"
 
 int select_new_app(
     int new_app_directory,
@@ -896,7 +896,7 @@ static NfcCommand metroflip_scene_navigo_poller_callback(NfcGenericEvent event,
                 }
 
                 // Prepare calypso structure
-                CalypsoApp* NavigoContractStructure = get_navigo_contract_structure();
+                CalypsoApp* NavigoContractStructure = get_intercode_contract_structure();
                 if(!NavigoContractStructure) {
                     FURI_LOG_E(TAG, "Failed to load Navigo Contract structure");
                     break;
@@ -1267,7 +1267,7 @@ static NfcCommand metroflip_scene_navigo_poller_callback(NfcGenericEvent event,
                 }
 
                 // Load the calypso structure for events
-                CalypsoApp* NavigoEventStructure = get_navigo_event_structure();
+                CalypsoApp* NavigoEventStructure = get_intercode_event_structure();
                 if(!NavigoEventStructure) {
                     FURI_LOG_E(TAG, "Failed to load Navigo Event structure");
                     break;

scenes/metroflip_scene_config.h

@@ -1,6 +1,6 @@
 ADD_SCENE(metroflip, start, Start)
 ADD_SCENE(metroflip, ravkav, RavKav)
-ADD_SCENE(metroflip, navigo, Navigo)
+ADD_SCENE(metroflip, navigo, Calypso)
 ADD_SCENE(metroflip, charliecard, CharlieCard)
 ADD_SCENE(metroflip, clipper, Clipper)
 ADD_SCENE(metroflip, metromoney, Metromoney)

scenes/metroflip_scene_start.c

@@ -15,7 +15,7 @@ void metroflip_scene_start_on_enter(void* context) {
         submenu, "Rav-Kav", MetroflipSceneRavKav, metroflip_scene_start_submenu_callback, app);
 
     submenu_add_item(
-        submenu, "Navigo", MetroflipSceneNavigo, metroflip_scene_start_submenu_callback, app);
+        submenu, "Calypso", MetroflipSceneCalypso, metroflip_scene_start_submenu_callback, app);
 
     submenu_add_item(
         submenu,

scenes/navigo.h

@@ -1,7 +1,7 @@
 #include <gui/gui.h>
 #include <gui/modules/widget_elements/widget_element.h>
 #include "../api/calypso/calypso_util.h"
-#include "../api/calypso/cards/navigo.h"
+#include "../api/calypso/cards/intercode.h"
 #include <datetime.h>
 #include <stdbool.h>