From 8d845e4563dc1d6f3f5f4e34c8c1e3b887478e58 Mon Sep 17 00:00:00 2001 From: SkorP Date: Tue, 11 Jun 2024 15:46:44 +0400 Subject: [PATCH 1/2] SubGhz: fix navigation GUI --- lib/subghz/types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/subghz/types.h b/lib/subghz/types.h index 93f94cc74..8c7f50d5d 100644 --- a/lib/subghz/types.h +++ b/lib/subghz/types.h @@ -11,7 +11,7 @@ #include #include -#define SUBGHZ_APP_FOLDER ANY_PATH("subghz") +#define SUBGHZ_APP_FOLDER EXT_PATH("subghz") #define SUBGHZ_RAW_FOLDER EXT_PATH("subghz") #define SUBGHZ_APP_FILENAME_PREFIX "SubGHz" #define SUBGHZ_APP_FILENAME_EXTENSION ".sub" From d4d5b1b55a6a7bf619a1cc36737a38dfdc8ad1b0 Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Tue, 11 Jun 2024 16:15:18 +0300 Subject: [PATCH 2/2] fix typo --- .../main/nfc/plugins/supported_cards/microel.c | 8 ++++---- .../main/nfc/plugins/supported_cards/mizip.c | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/applications/main/nfc/plugins/supported_cards/microel.c b/applications/main/nfc/plugins/supported_cards/microel.c index 2dc8cd3eb..93f564f35 100644 --- a/applications/main/nfc/plugins/supported_cards/microel.c +++ b/applications/main/nfc/plugins/supported_cards/microel.c @@ -189,7 +189,7 @@ static bool microel_parse(const NfcDevice* device, FuriString* parsed_data) { //Get credit in block number 8 const uint8_t* temp_ptr = data->block[4].data; uint16_t balance = (temp_ptr[6] << 8) | (temp_ptr[5]); - uint16_t previus_balance = (data->block[5].data[6] << 8) | (data->block[5].data[5]); + uint16_t previous_balance = (data->block[5].data[6] << 8) | (data->block[5].data[5]); furi_string_cat_printf(parsed_data, "\e#Microel Card\n"); furi_string_cat_printf(parsed_data, "UID:"); for(size_t i = 0; i < UID_LENGTH; i++) { @@ -199,9 +199,9 @@ static bool microel_parse(const NfcDevice* device, FuriString* parsed_data) { parsed_data, "\nCurrent Credit: %d.%02d E \n", balance / 100, balance % 100); furi_string_cat_printf( parsed_data, - "Previus Credit: %d.%02d E \n", - previus_balance / 100, - previus_balance % 100); + "Previous Credit: %d.%02d E \n", + previous_balance / 100, + previous_balance % 100); parsed = true; } while(false); diff --git a/applications/main/nfc/plugins/supported_cards/mizip.c b/applications/main/nfc/plugins/supported_cards/mizip.c index d29901d2e..8b8d7ee4b 100644 --- a/applications/main/nfc/plugins/supported_cards/mizip.c +++ b/applications/main/nfc/plugins/supported_cards/mizip.c @@ -206,15 +206,15 @@ static bool mizip_parse(const NfcDevice* device, FuriString* parsed_data) { //Get credit uint8_t credit_pointer = 0x08; - uint8_t previus_credit_pointer = 0x09; + uint8_t previous_credit_pointer = 0x09; if(data->block[10].data[0] == 0x55) { credit_pointer = 0x09; - previus_credit_pointer = 0x08; + previous_credit_pointer = 0x08; } uint16_t balance = (data->block[credit_pointer].data[2] << 8) | (data->block[credit_pointer].data[1]); - uint16_t previus_balance = (data->block[previus_credit_pointer].data[2] << 8) | - (data->block[previus_credit_pointer].data[1]); + uint16_t previous_balance = (data->block[previous_credit_pointer].data[2] << 8) | + (data->block[previous_credit_pointer].data[1]); //parse data furi_string_cat_printf(parsed_data, "\e#MiZIP Card\n"); @@ -226,9 +226,9 @@ static bool mizip_parse(const NfcDevice* device, FuriString* parsed_data) { parsed_data, "\nCurrent Credit: %d.%02d E \n", balance / 100, balance % 100); furi_string_cat_printf( parsed_data, - "Previus Credit: %d.%02d E \n", - previus_balance / 100, - previus_balance % 100); + "Previous Credit: %d.%02d E \n", + previous_balance / 100, + previous_balance % 100); parsed = true; } while(false);