M*LIB: non-inlined strings, FuriString primitive (#1795)

* Quicksave 1
* Header stage complete
* Source stage complete
* Lint & merge fixes
* Includes
* Documentation step 1
* FBT: output free size considering BT STACK
* Documentation step 2
* py lint
* Fix music player plugin
* unit test stage 1: string allocator, mem, getters, setters, appends, compare, search.
* unit test: string equality
* unit test: string replace
* unit test: string start_with, end_with
* unit test: string trim
* unit test: utf-8
* Rename
* Revert fw_size changes
* Simplify CLI backspace handling
* Simplify CLI character insert
* Merge fixes
* Furi: correct filenaming and spelling
* Bt: remove furi string include

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>

lib/nfc/parsers/all_in_one.c

@@ -107,7 +107,7 @@ bool all_in_one_parser_parse(NfcDeviceData* dev_data) {
         dev_data->mf_ul_data.data[4 * 4 + 5] << 4 | (dev_data->mf_ul_data.data[4 * 4 + 6] >> 4);
 
     // Format string for rides count
-    string_printf(
+    furi_string_printf(
         dev_data->parsed_data, "\e#All-In-One\nNumber: %u\nRides left: %u", serial, ride_count);
     return true;
 }

lib/nfc/parsers/nfc_supported_card.h

@@ -4,8 +4,6 @@
 #include "../nfc_worker.h"
 #include "../nfc_device.h"
 
-#include <m-string.h>
-
 typedef enum {
     NfcSupportedCardTypePlantain,
     NfcSupportedCardTypeTroika,

lib/nfc/parsers/plantain_4k_parser.c

@@ -118,36 +118,36 @@ bool plantain_4k_parser_parse(NfcDeviceData* dev_data) {
         card_number = (card_number << 8) | card_number_arr[i];
     }
     // Convert card number to string
-    string_t card_number_str;
-    string_init(card_number_str);
+    FuriString* card_number_str;
+    card_number_str = furi_string_alloc();
     // Should look like "361301047292848684"
     // %llu doesn't work for some reason in sprintf, so we use string_push_uint64 instead
     string_push_uint64(card_number, card_number_str);
     // Add suffix with luhn checksum (1 digit) to the card number string
-    string_t card_number_suffix;
-    string_init(card_number_suffix);
+    FuriString* card_number_suffix;
+    card_number_suffix = furi_string_alloc();
 
     // The number to calculate the checksum on doesn't fit into uint64_t, idk
     //uint8_t luhn_checksum = plantain_calculate_luhn(card_number);
 
     // // Convert luhn checksum to string
-    // string_t luhn_checksum_str;
-    // string_init(luhn_checksum_str);
+    // FuriString* luhn_checksum_str;
+    // luhn_checksum_str = furi_string_alloc();
     // string_push_uint64(luhn_checksum, luhn_checksum_str);
 
-    string_cat_printf(card_number_suffix, "-");
+    furi_string_cat_printf(card_number_suffix, "-");
     // FURI_LOG_D("plant4k", "Card checksum: %d", luhn_checksum);
-    string_cat_printf(card_number_str, string_get_cstr(card_number_suffix));
+    furi_string_cat_printf(card_number_str, furi_string_get_cstr(card_number_suffix));
     // Free all not needed strings
-    string_clear(card_number_suffix);
-    // string_clear(luhn_checksum_str);
+    furi_string_free(card_number_suffix);
+    // furi_string_free(luhn_checksum_str);
 
-    string_printf(
+    furi_string_printf(
         dev_data->parsed_data,
         "\e#Plantain\nN:%s\nBalance:%d\n",
-        string_get_cstr(card_number_str),
+        furi_string_get_cstr(card_number_str),
         balance);
-    string_clear(card_number_str);
+    furi_string_free(card_number_str);
 
     return true;
 }

lib/nfc/parsers/plantain_parser.c

@@ -55,7 +55,7 @@ bool plantain_parser_read(NfcWorker* nfc_worker, FuriHalNfcTxRxContext* tx_rx) {
     return mf_classic_read_card(tx_rx, &reader, &nfc_worker->dev_data->mf_classic_data) == 16;
 }
 
-void string_push_uint64(uint64_t input, string_t output) {
+void string_push_uint64(uint64_t input, FuriString* output) {
     const uint8_t base = 10;
 
     do {
@@ -66,14 +66,15 @@ void string_push_uint64(uint64_t input, string_t output) {
             c += '0';
         else
             c += 'A' - 10;
-        string_push_back(output, c);
+        furi_string_push_back(output, c);
     } while(input);
 
     // reverse string
-    for(uint8_t i = 0; i < string_size(output) / 2; i++) {
-        char c = string_get_char(output, i);
-        string_set_char(output, i, string_get_char(output, string_size(output) - i - 1));
-        string_set_char(output, string_size(output) - i - 1, c);
+    for(uint8_t i = 0; i < furi_string_size(output) / 2; i++) {
+        char c = furi_string_get_char(output, i);
+        furi_string_set_char(
+            output, i, furi_string_get_char(output, furi_string_size(output) - i - 1));
+        furi_string_set_char(output, furi_string_size(output) - i - 1, c);
     }
 }
 
@@ -112,36 +113,36 @@ bool plantain_parser_parse(NfcDeviceData* dev_data) {
         card_number = (card_number << 8) | card_number_arr[i];
     }
     // Convert card number to string
-    string_t card_number_str;
-    string_init(card_number_str);
+    FuriString* card_number_str;
+    card_number_str = furi_string_alloc();
     // Should look like "361301047292848684"
     // %llu doesn't work for some reason in sprintf, so we use string_push_uint64 instead
     string_push_uint64(card_number, card_number_str);
     // Add suffix with luhn checksum (1 digit) to the card number string
-    string_t card_number_suffix;
-    string_init(card_number_suffix);
+    FuriString* card_number_suffix;
+    card_number_suffix = furi_string_alloc();
 
     // The number to calculate the checksum on doesn't fit into uint64_t, idk
     //uint8_t luhn_checksum = plantain_calculate_luhn(card_number);
 
     // // Convert luhn checksum to string
-    // string_t luhn_checksum_str;
-    // string_init(luhn_checksum_str);
+    // FuriString* luhn_checksum_str;
+    // luhn_checksum_str = furi_string_alloc();
     // string_push_uint64(luhn_checksum, luhn_checksum_str);
 
-    string_cat_printf(card_number_suffix, "-");
+    furi_string_cat_printf(card_number_suffix, "-");
     // FURI_LOG_D("plant4k", "Card checksum: %d", luhn_checksum);
-    string_cat_printf(card_number_str, string_get_cstr(card_number_suffix));
+    furi_string_cat_printf(card_number_str, furi_string_get_cstr(card_number_suffix));
     // Free all not needed strings
-    string_clear(card_number_suffix);
-    // string_clear(luhn_checksum_str);
+    furi_string_free(card_number_suffix);
+    // furi_string_free(luhn_checksum_str);
 
-    string_printf(
+    furi_string_printf(
         dev_data->parsed_data,
         "\e#Plantain\nN:%s\nBalance:%d\n",
-        string_get_cstr(card_number_str),
+        furi_string_get_cstr(card_number_str),
         balance);
-    string_clear(card_number_str);
+    furi_string_free(card_number_str);
 
     return true;
 }

lib/nfc/parsers/plantain_parser.h

@@ -8,6 +8,6 @@ bool plantain_parser_read(NfcWorker* nfc_worker, FuriHalNfcTxRxContext* tx_rx);
 
 bool plantain_parser_parse(NfcDeviceData* dev_data);
 
-void string_push_uint64(uint64_t input, string_t output);
+void string_push_uint64(uint64_t input, FuriString* output);
 
 uint8_t plantain_calculate_luhn(uint64_t number);

lib/nfc/parsers/troika_4k_parser.c

@@ -98,7 +98,8 @@ bool troika_4k_parser_parse(NfcDeviceData* dev_data) {
     }
     number >>= 4;
 
-    string_printf(dev_data->parsed_data, "\e#Troika\nNum: %ld\nBalance: %d rur.", number, balance);
+    furi_string_printf(
+        dev_data->parsed_data, "\e#Troika\nNum: %ld\nBalance: %d rur.", number, balance);
 
     return true;
 }

lib/nfc/parsers/troika_parser.c

@@ -78,7 +78,7 @@ bool troika_parser_parse(NfcDeviceData* dev_data) {
         }
         number >>= 4;
 
-        string_printf(
+        furi_string_printf(
             dev_data->parsed_data, "\e#Troika\nNum: %ld\nBalance: %d rur.", number, balance);
         troika_parsed = true;
     } while(false);

lib/nfc/parsers/two_cities.c

@@ -118,29 +118,29 @@ bool two_cities_parser_parse(NfcDeviceData* dev_data) {
         card_number = (card_number << 8) | card_number_arr[i];
     }
     // Convert card number to string
-    string_t card_number_str;
-    string_init(card_number_str);
+    FuriString* card_number_str;
+    card_number_str = furi_string_alloc();
     // Should look like "361301047292848684"
     // %llu doesn't work for some reason in sprintf, so we use string_push_uint64 instead
     string_push_uint64(card_number, card_number_str);
     // Add suffix with luhn checksum (1 digit) to the card number string
-    string_t card_number_suffix;
-    string_init(card_number_suffix);
+    FuriString* card_number_suffix;
+    card_number_suffix = furi_string_alloc();
 
     // The number to calculate the checksum on doesn't fit into uint64_t, idk
     //uint8_t luhn_checksum = two_cities_calculate_luhn(card_number);
 
     // // Convert luhn checksum to string
-    // string_t luhn_checksum_str;
-    // string_init(luhn_checksum_str);
+    // FuriString* luhn_checksum_str;
+    // luhn_checksum_str = furi_string_alloc();
     // string_push_uint64(luhn_checksum, luhn_checksum_str);
 
-    string_cat_printf(card_number_suffix, "-");
+    furi_string_cat_printf(card_number_suffix, "-");
     // FURI_LOG_D("plant4k", "Card checksum: %d", luhn_checksum);
-    string_cat_printf(card_number_str, string_get_cstr(card_number_suffix));
+    furi_string_cat_printf(card_number_str, furi_string_get_cstr(card_number_suffix));
     // Free all not needed strings
-    string_clear(card_number_suffix);
-    // string_clear(luhn_checksum_str);
+    furi_string_free(card_number_suffix);
+    // furi_string_free(luhn_checksum_str);
 
     // =====
     // --PLANTAIN--
@@ -158,14 +158,14 @@ bool two_cities_parser_parse(NfcDeviceData* dev_data) {
     }
     troika_number >>= 4;
 
-    string_printf(
+    furi_string_printf(
         dev_data->parsed_data,
         "\e#Troika+Plantain\nPN: %s\nPB: %d rur.\nTN: %d\nTB: %d rur.\n",
-        string_get_cstr(card_number_str),
+        furi_string_get_cstr(card_number_str),
         balance,
         troika_number,
         troika_balance);
-    string_clear(card_number_str);
+    furi_string_free(card_number_str);
 
     return true;
 }