liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 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>
This commit is contained in:
Sergey Gavrilov
2022-10-06 01:15:23 +10:00
committed by GitHub
parent 0f9ea925d3
commit 4bf29827f8
370 changed files with 5597 additions and 3963 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
applications/services/bt/bt_cli.c
View File

@@ -7,18 +7,18 @@
#include "bt_settings.h"
#include "bt_service/bt.h"
static void bt_cli_command_hci_info(Cli* cli, string_t args, void* context) {
static void bt_cli_command_hci_info(Cli* cli, FuriString* args, void* context) {
UNUSED(cli);
UNUSED(args);
UNUSED(context);
string_t buffer;
string_init(buffer);
FuriString* buffer;
buffer = furi_string_alloc();
furi_hal_bt_dump_state(buffer);
printf("%s", string_get_cstr(buffer));
string_clear(buffer);
printf("%s", furi_string_get_cstr(buffer));
furi_string_free(buffer);
}
static void bt_cli_command_carrier_tx(Cli* cli, string_t args, void* context) {
static void bt_cli_command_carrier_tx(Cli* cli, FuriString* args, void* context) {
UNUSED(context);
int channel = 0;
int power = 0;
@@ -50,7 +50,7 @@ static void bt_cli_command_carrier_tx(Cli* cli, string_t args, void* context) {
} while(false);
}
static void bt_cli_command_carrier_rx(Cli* cli, string_t args, void* context) {
static void bt_cli_command_carrier_rx(Cli* cli, FuriString* args, void* context) {
UNUSED(context);
int channel = 0;
@@ -81,7 +81,7 @@ static void bt_cli_command_carrier_rx(Cli* cli, string_t args, void* context) {
} while(false);
}
static void bt_cli_command_packet_tx(Cli* cli, string_t args, void* context) {
static void bt_cli_command_packet_tx(Cli* cli, FuriString* args, void* context) {
UNUSED(context);
int channel = 0;
int pattern = 0;
@@ -129,7 +129,7 @@ static void bt_cli_command_packet_tx(Cli* cli, string_t args, void* context) {
} while(false);
}
static void bt_cli_command_packet_rx(Cli* cli, string_t args, void* context) {
static void bt_cli_command_packet_rx(Cli* cli, FuriString* args, void* context) {
UNUSED(context);
int channel = 0;
int datarate = 1;
@@ -178,12 +178,12 @@ static void bt_cli_print_usage() {
}
}
static void bt_cli(Cli* cli, string_t args, void* context) {
static void bt_cli(Cli* cli, FuriString* args, void* context) {
UNUSED(context);
furi_record_open(RECORD_BT);
string_t cmd;
string_init(cmd);
FuriString* cmd;
cmd = furi_string_alloc();
BtSettings bt_settings;
bt_settings_load(&bt_settings);
@@ -192,24 +192,24 @@ static void bt_cli(Cli* cli, string_t args, void* context) {
bt_cli_print_usage();
break;
}
if(string_cmp_str(cmd, "hci_info") == 0) {
if(furi_string_cmp_str(cmd, "hci_info") == 0) {
bt_cli_command_hci_info(cli, args, NULL);
break;
}
if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug) && furi_hal_bt_is_testing_supported()) {
if(string_cmp_str(cmd, "tx_carrier") == 0) {
if(furi_string_cmp_str(cmd, "tx_carrier") == 0) {
bt_cli_command_carrier_tx(cli, args, NULL);
break;
}
if(string_cmp_str(cmd, "rx_carrier") == 0) {
if(furi_string_cmp_str(cmd, "rx_carrier") == 0) {
bt_cli_command_carrier_rx(cli, args, NULL);
break;
}
if(string_cmp_str(cmd, "tx_packet") == 0) {
if(furi_string_cmp_str(cmd, "tx_packet") == 0) {
bt_cli_command_packet_tx(cli, args, NULL);
break;
}
if(string_cmp_str(cmd, "rx_packet") == 0) {
if(furi_string_cmp_str(cmd, "rx_packet") == 0) {
bt_cli_command_packet_rx(cli, args, NULL);
break;
}
@@ -222,7 +222,7 @@ static void bt_cli(Cli* cli, string_t args, void* context) {
furi_hal_bt_start_advertising();
}
string_clear(cmd);
furi_string_free(cmd);
furi_record_close(RECORD_BT);
}

8
applications/services/bt/bt_service/bt.c
View File

@@ -75,14 +75,14 @@ static void bt_pin_code_hide(Bt* bt) {
static bool bt_pin_code_verify_event_handler(Bt* bt, uint32_t pin) {
furi_assert(bt);
notification_message(bt->notification, &sequence_display_backlight_on);
string_t pin_str;
FuriString* pin_str;
dialog_message_set_icon(bt->dialog_message, &I_BLE_Pairing_128x64, 0, 0);
string_init_printf(pin_str, "Verify code\n%06d", pin);
pin_str = furi_string_alloc_printf("Verify code\n%06d", pin);
dialog_message_set_text(
bt->dialog_message, string_get_cstr(pin_str), 64, 4, AlignCenter, AlignTop);
bt->dialog_message, furi_string_get_cstr(pin_str), 64, 4, AlignCenter, AlignTop);
dialog_message_set_buttons(bt->dialog_message, "Cancel", "OK", NULL);
DialogMessageButton button = dialog_message_show(bt->dialogs, bt->dialog_message);
string_clear(pin_str);
furi_string_free(pin_str);
return button == DialogMessageButtonCenter;
}