Merge pull request #21 from DocSystem/dev

Add card number parsing + some UI/parsing tweaks

scenes/metroflip_scene_navigo.c

@@ -10,12 +10,14 @@
 #define TAG "Metroflip:Scene:Navigo"
 
 int select_new_app(
+    int new_app_directory,
     int new_app,
     BitBuffer* tx_buffer,
     BitBuffer* rx_buffer,
     Iso14443_4bPoller* iso14443_4b_poller,
     Metroflip* app,
     MetroflipPollerEventType* stage) {
+    select_app[5] = new_app_directory;
     select_app[6] = new_app;
 
     bit_buffer_reset(tx_buffer);
@@ -225,6 +227,61 @@ const char* get_pay_method(int pay_method) {
     }
 }
 
+const char* get_zones(int* zones) {
+    if(zones[0] && zones[4]) {
+        return "All Zones (1-5)";
+    } else if(zones[0] && zones[3]) {
+        return "Zones 1-4";
+    } else if(zones[0] && zones[2]) {
+        return "Zones 1-3";
+    } else if(zones[0] && zones[1]) {
+        return "Zones 1-2";
+    } else if(zones[0]) {
+        return "Zone 1";
+    } else if(zones[1] && zones[4]) {
+        return "Zones 2-5";
+    } else if(zones[1] && zones[3]) {
+        return "Zones 2-4";
+    } else if(zones[1] && zones[2]) {
+        return "Zones 2-3";
+    } else if(zones[1]) {
+        return "Zone 2";
+    } else if(zones[2] && zones[4]) {
+        return "Zones 3-5";
+    } else if(zones[2] && zones[3]) {
+        return "Zones 3-4";
+    } else if(zones[2]) {
+        return "Zone 3";
+    } else if(zones[3] && zones[4]) {
+        return "Zones 4-5";
+    } else if(zones[3]) {
+        return "Zone 4";
+    } else if(zones[4]) {
+        return "Zone 5";
+    } else {
+        return "Unknown";
+    }
+}
+
+const char* get_intercode_version(int version) {
+    // version is a 6 bits int
+    // if the first 3 bits are 000, it's a 1.x version
+    // if the first 3 bits are 001, it's a 2.x version
+    // else, it's unknown
+    int major = (version >> 3) & 0x07;
+    if(major == 0) {
+        return "Intercode I";
+    } else if(major == 1) {
+        return "Intercode II";
+    }
+    return "Unknown";
+}
+
+int get_intercode_subversion(int version) {
+    // subversion is a 3 bits int
+    return version & 0x07;
+}
+
 const char* get_metro_station(int station_group_id, int station_id) {
     // Use NAVIGO_H constants
     if(station_group_id < 32 && station_id < 16) {
@@ -259,7 +316,10 @@ const char* get_train_station(int station_group_id, int station_id) {
     return station;
 }
 
-void show_event_info(NavigoCardEvent* event, FuriString* parsed_data) {
+void show_event_info(
+    NavigoCardEvent* event,
+    NavigoCardContract* contracts,
+    FuriString* parsed_data) {
     if(event->transport_type == BUS_URBAIN || event->transport_type == BUS_INTERURBAIN ||
        event->transport_type == METRO || event->transport_type == TRAM) {
         if(event->route_number_available) {
@@ -314,7 +374,11 @@ void show_event_info(NavigoCardEvent* event, FuriString* parsed_data) {
             furi_string_cat_printf(parsed_data, "Vehicle: %d\n", event->vehicle_id);
         }
         if(event->used_contract_available) {
-            furi_string_cat_printf(parsed_data, "Contract: %d\n", event->used_contract);
+            furi_string_cat_printf(
+                parsed_data,
+                "Contract: %d - %s\n",
+                event->used_contract,
+                get_tariff(contracts[event->used_contract].tariff));
         }
         locale_format_datetime_cat(parsed_data, &event->date, true);
         furi_string_cat_printf(parsed_data, "\n");
@@ -355,7 +419,11 @@ void show_event_info(NavigoCardEvent* event, FuriString* parsed_data) {
             furi_string_cat_printf(parsed_data, "Vehicle: %d\n", event->vehicle_id);
         }
         if(event->used_contract_available) {
-            furi_string_cat_printf(parsed_data, "Contract: %d\n", event->used_contract);
+            furi_string_cat_printf(
+                parsed_data,
+                "Contract: %d - %s\n",
+                event->used_contract,
+                get_tariff(contracts[event->used_contract].tariff));
         }
         locale_format_datetime_cat(parsed_data, &event->date, true);
         furi_string_cat_printf(parsed_data, "\n");
@@ -382,7 +450,11 @@ void show_event_info(NavigoCardEvent* event, FuriString* parsed_data) {
             furi_string_cat_printf(parsed_data, "Vehicle: %d\n", event->vehicle_id);
         }
         if(event->used_contract_available) {
-            furi_string_cat_printf(parsed_data, "Contract: %d\n", event->used_contract);
+            furi_string_cat_printf(
+                parsed_data,
+                "Contract: %d - %s\n",
+                event->used_contract,
+                get_tariff(contracts[event->used_contract].tariff));
         }
         locale_format_datetime_cat(parsed_data, &event->date, true);
         furi_string_cat_printf(parsed_data, "\n");
@@ -416,32 +488,24 @@ void show_contract_info(NavigoCardContract* contract, int ticket_count, FuriStri
         furi_string_cat_printf(parsed_data, "\n");
     }
     if(contract->zones_available) {
-        furi_string_cat_printf(parsed_data, "Zones ");
-        for(int i = 0; i < 5; i++) {
-            if(contract->zones[i] != 0) {
-                furi_string_cat_printf(parsed_data, "%d", i + 1);
-                if(i < 4) {
-                    furi_string_cat_printf(parsed_data, ", ");
-                }
-            }
-        }
-        furi_string_cat_printf(parsed_data, "\n");
+        furi_string_cat_printf(parsed_data, "%s\n", get_zones(contract->zones));
     }
     furi_string_cat_printf(parsed_data, "Sold on: ");
     locale_format_datetime_cat(parsed_data, &contract->sale_date, false);
     furi_string_cat_printf(parsed_data, "\n");
     furi_string_cat_printf(
-        parsed_data,
-        "Sales Agent: %s (%d)\n",
-        get_service_provider(contract->sale_agent),
-        contract->sale_agent);
+        parsed_data, "Sales Agent: %s\n", get_service_provider(contract->sale_agent));
     furi_string_cat_printf(parsed_data, "Sales Terminal: %d\n", contract->sale_device);
     furi_string_cat_printf(parsed_data, "Status: %d\n", contract->status);
     furi_string_cat_printf(parsed_data, "Authenticity Code: %d\n", contract->authenticator);
 }
 
 void show_environment_info(NavigoCardEnv* environment, FuriString* parsed_data) {
-    furi_string_cat_printf(parsed_data, "App Version: %d\n", environment->app_version);
+    furi_string_cat_printf(
+        parsed_data,
+        "App Version: %s - v%d\n",
+        get_intercode_version(environment->app_version),
+        get_intercode_subversion(environment->app_version));
     if(environment->country_num == 250) {
         furi_string_cat_printf(parsed_data, "Country: France\n");
     } else {
@@ -462,12 +526,18 @@ void update_page_info(void* context, FuriString* parsed_data) {
     NavigoContext* ctx = app->navigo_context;
     if(ctx->page_id == 0) {
         furi_string_cat_printf(
-            parsed_data, "\e#%s :\n", get_navigo_type(ctx->card->holder.card_status));
+            parsed_data,
+            "\e#%s %u:\n",
+            get_navigo_type(ctx->card->holder.card_status),
+            ctx->card->card_number);
         furi_string_cat_printf(parsed_data, "\e#Contract 1:\n");
         show_contract_info(&ctx->card->contracts[0], ctx->card->ticket_counts[0], parsed_data);
     } else if(ctx->page_id == 1) {
         furi_string_cat_printf(
-            parsed_data, "\e#%s :\n", get_navigo_type(ctx->card->holder.card_status));
+            parsed_data,
+            "\e#%s %u:\n",
+            get_navigo_type(ctx->card->holder.card_status),
+            ctx->card->card_number);
         furi_string_cat_printf(parsed_data, "\e#Contract 2:\n");
         show_contract_info(&ctx->card->contracts[1], ctx->card->ticket_counts[1], parsed_data);
     } else if(ctx->page_id == 2) {
@@ -475,13 +545,13 @@ void update_page_info(void* context, FuriString* parsed_data) {
         show_environment_info(&ctx->card->environment, parsed_data);
     } else if(ctx->page_id == 3) {
         furi_string_cat_printf(parsed_data, "\e#Event 1:\n");
-        show_event_info(&ctx->card->events[0], parsed_data);
+        show_event_info(&ctx->card->events[0], ctx->card->contracts, parsed_data);
     } else if(ctx->page_id == 4) {
         furi_string_cat_printf(parsed_data, "\e#Event 2:\n");
-        show_event_info(&ctx->card->events[1], parsed_data);
+        show_event_info(&ctx->card->events[1], ctx->card->contracts, parsed_data);
     } else if(ctx->page_id == 5) {
         furi_string_cat_printf(parsed_data, "\e#Event 3:\n");
-        show_event_info(&ctx->card->events[2], parsed_data);
+        show_event_info(&ctx->card->events[2], ctx->card->contracts, parsed_data);
     }
 }
 
@@ -620,9 +690,47 @@ static NfcCommand metroflip_scene_navigo_poller_callback(NfcGenericEvent event,
                 // Initialize the card data
                 NavigoCardData* card = malloc(sizeof(NavigoCardData));
 
+                // Select app ICC
+                error = select_new_app(
+                    0x00, 0x02, tx_buffer, rx_buffer, iso14443_4b_poller, app, &stage);
+                if(error != 0) {
+                    break;
+                }
+
+                // Check the response after selecting app
+                if(check_response(rx_buffer, app, &stage, &response_length) != 0) {
+                    break;
+                }
+
+                // Now send the read command for ICC
+                error = read_new_file(0x01, tx_buffer, rx_buffer, iso14443_4b_poller, app, &stage);
+                if(error != 0) {
+                    break;
+                }
+
+                // Check the response after reading the file
+                if(check_response(rx_buffer, app, &stage, &response_length) != 0) {
+                    break;
+                }
+
+                char icc_bit_representation[response_length * 8 + 1];
+                icc_bit_representation[0] = '\0';
+                for(size_t i = 0; i < response_length; i++) {
+                    char bits[9];
+                    uint8_t byte = bit_buffer_get_byte(rx_buffer, i);
+                    byte_to_binary(byte, bits);
+                    strlcat(icc_bit_representation, bits, sizeof(icc_bit_representation));
+                }
+                icc_bit_representation[response_length * 8] = '\0';
+
+                FURI_LOG_I(TAG, "ICC bit representation: %s", icc_bit_representation);
+
+                int start = 128, end = 159;
+                card->card_number = bit_slice_to_dec(icc_bit_representation, start, end);
+
                 // Select app for contracts
-                error =
-                    select_new_app(0x20, tx_buffer, rx_buffer, iso14443_4b_poller, app, &stage);
+                error = select_new_app(
+                    0x20, 0x20, tx_buffer, rx_buffer, iso14443_4b_poller, app, &stage);
                 if(error != 0) {
                     break;
                 }
@@ -809,20 +917,18 @@ static NfcCommand metroflip_scene_navigo_poller_callback(NfcGenericEvent event,
                             sale_timestamp, &card->contracts[i - 1].sale_date);
                     }
 
-                    // 15.2. ContractValiditySaleAgent
+                    // 15.2. ContractValiditySaleAgent - FIX NEEDED
                     contract_key = "ContractValiditySaleAgent";
-                    if(is_calypso_node_present(
-                           bit_representation, contract_key, NavigoContractStructure)) {
-                        int positionOffset = get_calypso_node_offset(
-                            bit_representation, contract_key, NavigoContractStructure);
-                        int start = positionOffset,
-                            end = positionOffset +
-                                  get_calypso_node_size(contract_key, NavigoContractStructure) - 1;
-                        card->contracts[i - 1].sale_agent =
-                            bit_slice_to_dec(bit_representation, start, end);
-                    } else {
-                        card->contracts[i - 1].sale_agent = -1;
-                    }
+                    /* if(is_calypso_node_present(
+                           bit_representation, contract_key, NavigoContractStructure)) { */
+                    int positionOffset = get_calypso_node_offset(
+                        bit_representation, contract_key, NavigoContractStructure);
+                    int start = positionOffset,
+                        end = positionOffset +
+                              get_calypso_node_size(contract_key, NavigoContractStructure) - 1;
+                    card->contracts[i - 1].sale_agent =
+                        bit_slice_to_dec(bit_representation, start, end);
+                    // }
 
                     // 15.3. ContractValiditySaleDevice
                     contract_key = "ContractValiditySaleDevice";
@@ -868,7 +974,8 @@ static NfcCommand metroflip_scene_navigo_poller_callback(NfcGenericEvent event,
                 free_calypso_structure(NavigoContractStructure);
 
                 // Select app for environment
-                error = select_new_app(0x1, tx_buffer, rx_buffer, iso14443_4b_poller, app, &stage);
+                error = select_new_app(
+                    0x20, 0x1, tx_buffer, rx_buffer, iso14443_4b_poller, app, &stage);
                 if(error != 0) {
                     break;
                 }
@@ -900,10 +1007,10 @@ static NfcCommand metroflip_scene_navigo_poller_callback(NfcGenericEvent event,
                         bits,
                         sizeof(environment_bit_representation));
                 }
-                FURI_LOG_I(
-                    TAG, "Environment bit_representation: %s", environment_bit_representation);
-                int start = 0;
-                int end = 5;
+                // FURI_LOG_I(
+                //     TAG, "Environment bit_representation: %s", environment_bit_representation);
+                start = 0;
+                end = 5;
                 card->environment.app_version =
                     bit_slice_to_dec(environment_bit_representation, start, end);
                 start = 13;
@@ -936,8 +1043,8 @@ static NfcCommand metroflip_scene_navigo_poller_callback(NfcGenericEvent event,
                     bit_slice_to_dec(environment_bit_representation, start, end);
 
                 // Select app for counters (remaining tickets on Navigo Easy)
-                error =
-                    select_new_app(0x69, tx_buffer, rx_buffer, iso14443_4b_poller, app, &stage);
+                error = select_new_app(
+                    0x20, 0x69, tx_buffer, rx_buffer, iso14443_4b_poller, app, &stage);
                 if(error != 0) {
                     break;
                 }
@@ -966,7 +1073,7 @@ static NfcCommand metroflip_scene_navigo_poller_callback(NfcGenericEvent event,
                     byte_to_binary(byte, bits);
                     strlcat(counter_bit_representation, bits, sizeof(counter_bit_representation));
                 }
-                FURI_LOG_I(TAG, "Counter bit_representation: %s", counter_bit_representation);
+                // FURI_LOG_I(TAG, "Counter bit_representation: %s", counter_bit_representation);
 
                 // Ticket count (contract 1)
                 start = 0;
@@ -978,12 +1085,12 @@ static NfcCommand metroflip_scene_navigo_poller_callback(NfcGenericEvent event,
                 end = 29;
                 card->ticket_counts[1] = bit_slice_to_dec(counter_bit_representation, start, end);
 
-                FURI_LOG_I(TAG, "Ticket count 1: %d", card->ticket_counts[0]);
-                FURI_LOG_I(TAG, "Ticket count 2: %d", card->ticket_counts[1]);
+                // FURI_LOG_I(TAG, "Ticket count 1: %d", card->ticket_counts[0]);
+                // FURI_LOG_I(TAG, "Ticket count 2: %d", card->ticket_counts[1]);
 
                 // Select app for events
-                error =
-                    select_new_app(0x10, tx_buffer, rx_buffer, iso14443_4b_poller, app, &stage);
+                error = select_new_app(
+                    0x20, 0x10, tx_buffer, rx_buffer, iso14443_4b_poller, app, &stage);
                 if(error != 0) {
                     break;
                 }

scenes/navigo_structs.h

@@ -63,6 +63,7 @@ typedef struct {
     NavigoCardContract contracts[2];
     NavigoCardEvent events[3];
     int ticket_counts[2];
+    unsigned int card_number;
 } NavigoCardData;
 
 typedef struct {