Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into release-candidate
Browse files Browse the repository at this point in the history
  • Loading branch information
skotopes committed Feb 24, 2022
2 parents 57689a1 + 966b400 commit afa46b0
Show file tree
Hide file tree
Showing 299 changed files with 5,183 additions and 2,965 deletions.
2 changes: 1 addition & 1 deletion applications/archive/archive.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ bool archive_back_event_callback(void* context) {
}

ArchiveApp* archive_alloc() {
ArchiveApp* archive = furi_alloc(sizeof(ArchiveApp));
ArchiveApp* archive = malloc(sizeof(ArchiveApp));

archive->gui = furi_record_open("gui");
archive->text_input = text_input_alloc();
Expand Down
2 changes: 1 addition & 1 deletion applications/archive/views/archive_browser_view.c
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ bool archive_view_input(InputEvent* event, void* context) {
}

ArchiveBrowserView* browser_alloc() {
ArchiveBrowserView* browser = furi_alloc(sizeof(ArchiveBrowserView));
ArchiveBrowserView* browser = malloc(sizeof(ArchiveBrowserView));
browser->view = view_alloc();
view_allocate_model(browser->view, ViewModelTypeLocking, sizeof(ArchiveBrowserViewModel));
view_set_context(browser->view, browser);
Expand Down
2 changes: 1 addition & 1 deletion applications/bad_usb/bad_usb_app.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ static bool bad_usb_check_assets() {
}

BadUsbApp* bad_usb_app_alloc(char* arg) {
BadUsbApp* app = furi_alloc(sizeof(BadUsbApp));
BadUsbApp* app = malloc(sizeof(BadUsbApp));

if(arg != NULL) {
string_t filename;
Expand Down
2 changes: 1 addition & 1 deletion applications/bad_usb/bad_usb_script.c
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ static int32_t bad_usb_worker(void* context) {
BadUsbScript* bad_usb_script_open(string_t file_path) {
furi_assert(file_path);

BadUsbScript* bad_usb = furi_alloc(sizeof(BadUsbScript));
BadUsbScript* bad_usb = malloc(sizeof(BadUsbScript));
string_init(bad_usb->file_path);
string_set(bad_usb->file_path, file_path);

Expand Down
2 changes: 1 addition & 1 deletion applications/bad_usb/views/bad_usb_view.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ static bool bad_usb_input_callback(InputEvent* event, void* context) {
}

BadUsb* bad_usb_alloc() {
BadUsb* bad_usb = furi_alloc(sizeof(BadUsb));
BadUsb* bad_usb = malloc(sizeof(BadUsb));

bad_usb->view = view_alloc();
view_allocate_model(bad_usb->view, ViewModelTypeLocking, sizeof(BadUsbModel));
Expand Down
2 changes: 1 addition & 1 deletion applications/bt/bt_debug_app/bt_debug_app.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ uint32_t bt_debug_start_view(void* context) {
}

BtDebugApp* bt_debug_app_alloc() {
BtDebugApp* app = furi_alloc(sizeof(BtDebugApp));
BtDebugApp* app = malloc(sizeof(BtDebugApp));

// Load settings
bt_settings_load(&app->settings);
Expand Down
2 changes: 1 addition & 1 deletion applications/bt/bt_debug_app/views/bt_carrier_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ static void bt_test_carrier_timer_callback(void* context) {
}

BtCarrierTest* bt_carrier_test_alloc() {
BtCarrierTest* bt_carrier_test = furi_alloc(sizeof(BtCarrierTest));
BtCarrierTest* bt_carrier_test = malloc(sizeof(BtCarrierTest));
bt_carrier_test->bt_test = bt_test_alloc();
bt_test_set_context(bt_carrier_test->bt_test, bt_carrier_test);
bt_test_set_change_state_callback(
Expand Down
2 changes: 1 addition & 1 deletion applications/bt/bt_debug_app/views/bt_packet_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ static void bt_test_packet_timer_callback(void* context) {
}

BtPacketTest* bt_packet_test_alloc() {
BtPacketTest* bt_packet_test = furi_alloc(sizeof(BtPacketTest));
BtPacketTest* bt_packet_test = malloc(sizeof(BtPacketTest));
bt_packet_test->bt_test = bt_test_alloc();
bt_test_set_context(bt_packet_test->bt_test, bt_packet_test);
bt_test_set_change_state_callback(
Expand Down
2 changes: 1 addition & 1 deletion applications/bt/bt_debug_app/views/bt_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ void bt_test_process_back(BtTest* bt_test) {
}

BtTest* bt_test_alloc() {
BtTest* bt_test = furi_alloc(sizeof(BtTest));
BtTest* bt_test = malloc(sizeof(BtTest));
bt_test->view = view_alloc();
view_set_context(bt_test->view, bt_test);
view_allocate_model(bt_test->view, ViewModelTypeLocking, sizeof(BtTestModel));
Expand Down
2 changes: 1 addition & 1 deletion applications/bt/bt_hid_app/bt_hid.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ void bt_hid_connection_status_changed_callback(BtStatus status, void* context) {
}

BtHid* bt_hid_app_alloc() {
BtHid* app = furi_alloc(sizeof(BtHid));
BtHid* app = malloc(sizeof(BtHid));

// Gui
app->gui = furi_record_open("gui");
Expand Down
2 changes: 1 addition & 1 deletion applications/bt/bt_hid_app/views/bt_hid_keynote.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ static bool bt_hid_keynote_input_callback(InputEvent* event, void* context) {
}

BtHidKeynote* bt_hid_keynote_alloc() {
BtHidKeynote* bt_hid_keynote = furi_alloc(sizeof(BtHidKeynote));
BtHidKeynote* bt_hid_keynote = malloc(sizeof(BtHidKeynote));
bt_hid_keynote->view = view_alloc();
view_set_context(bt_hid_keynote->view, bt_hid_keynote);
view_allocate_model(bt_hid_keynote->view, ViewModelTypeLocking, sizeof(BtHidKeynoteModel));
Expand Down
2 changes: 1 addition & 1 deletion applications/bt/bt_hid_app/views/bt_hid_media.c
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ static bool bt_hid_media_input_callback(InputEvent* event, void* context) {
}

BtHidMedia* bt_hid_media_alloc() {
BtHidMedia* bt_hid_media = furi_alloc(sizeof(BtHidMedia));
BtHidMedia* bt_hid_media = malloc(sizeof(BtHidMedia));
bt_hid_media->view = view_alloc();
view_set_context(bt_hid_media->view, bt_hid_media);
view_allocate_model(bt_hid_media->view, ViewModelTypeLocking, sizeof(BtHidMediaModel));
Expand Down
2 changes: 1 addition & 1 deletion applications/bt/bt_service/bt.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ static void bt_battery_level_changed_callback(const void* _event, void* context)
}

Bt* bt_alloc() {
Bt* bt = furi_alloc(sizeof(Bt));
Bt* bt = malloc(sizeof(Bt));
// Init default maximum packet size
bt->max_packet_size = FURI_HAL_BT_SERIAL_PACKET_SIZE_MAX;
bt->profile = BtProfileSerial;
Expand Down
2 changes: 1 addition & 1 deletion applications/bt/bt_settings_app/bt_settings_app.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ static bool bt_settings_back_event_callback(void* context) {
}

BtSettingsApp* bt_settings_app_alloc() {
BtSettingsApp* app = furi_alloc(sizeof(BtSettingsApp));
BtSettingsApp* app = malloc(sizeof(BtSettingsApp));

// Load settings
bt_settings_load(&app->settings);
Expand Down
2 changes: 1 addition & 1 deletion applications/cli/cli.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <loader/loader.h>

Cli* cli_alloc() {
Cli* cli = furi_alloc(sizeof(Cli));
Cli* cli = malloc(sizeof(Cli));

CliCommandTree_init(cli->commands);

Expand Down
6 changes: 3 additions & 3 deletions applications/crypto/crypto_cli.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ void crypto_cli_encrypt(Cli* cli, string_t args) {
size = size - remain + 16;
}
string_reserve(input, size);
uint8_t* output = furi_alloc(size);
uint8_t* output = malloc(size);
if(!furi_hal_crypto_encrypt((const uint8_t*)string_get_cstr(input), output, size)) {
printf("Failed to encrypt input");
} else {
Expand Down Expand Up @@ -135,8 +135,8 @@ void crypto_cli_decrypt(Cli* cli, string_t args) {
size_t hex_size = string_size(hex_input);
if(hex_size > 0 && hex_size % 2 == 0) {
size_t size = hex_size / 2;
uint8_t* input = furi_alloc(size);
uint8_t* output = furi_alloc(size);
uint8_t* input = malloc(size);
uint8_t* output = malloc(size);

if(args_read_hex_bytes(hex_input, input, size)) {
if(furi_hal_crypto_decrypt(input, output, size)) {
Expand Down
2 changes: 1 addition & 1 deletion applications/debug_tools/display_test/display_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ static void display_config_set_contrast(VariableItem* item) {
}

DisplayTest* display_test_alloc() {
DisplayTest* instance = furi_alloc(sizeof(DisplayTest));
DisplayTest* instance = malloc(sizeof(DisplayTest));

View* view = NULL;

Expand Down
2 changes: 1 addition & 1 deletion applications/debug_tools/display_test/view_display_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ static void view_display_test_timer_callback(void* context) {
}

ViewDisplayTest* view_display_test_alloc() {
ViewDisplayTest* instance = furi_alloc(sizeof(ViewDisplayTest));
ViewDisplayTest* instance = malloc(sizeof(ViewDisplayTest));

instance->view = view_alloc();
view_set_context(instance->view, instance);
Expand Down
6 changes: 3 additions & 3 deletions applications/debug_tools/uart_echo.c
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ static int32_t uart_echo_worker(void* context) {
}

static UartEchoApp* uart_echo_app_alloc() {
UartEchoApp* app = furi_alloc(sizeof(UartEchoApp));
UartEchoApp* app = malloc(sizeof(UartEchoApp));

app->rx_stream = xStreamBufferCreate(2048, 1);

Expand All @@ -201,7 +201,7 @@ static UartEchoApp* uart_echo_app_alloc() {
for(size_t i = 0; i < LINES_ON_SCREEN; i++) {
model->line = 0;
model->escape = false;
model->list[i] = furi_alloc(sizeof(ListElement));
model->list[i] = malloc(sizeof(ListElement));
string_init(model->list[i]->text);
}
return true;
Expand Down Expand Up @@ -265,4 +265,4 @@ int32_t uart_echo_app(void* p) {
view_dispatcher_run(app->view_dispatcher);
uart_echo_app_free(app);
return 0;
}
}
2 changes: 1 addition & 1 deletion applications/debug_tools/usb_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ uint32_t usb_test_exit(void* context) {
}

UsbTestApp* usb_test_app_alloc() {
UsbTestApp* app = furi_alloc(sizeof(UsbTestApp));
UsbTestApp* app = malloc(sizeof(UsbTestApp));

// Gui
app->gui = furi_record_open("gui");
Expand Down
2 changes: 1 addition & 1 deletion applications/desktop/animations/animation_manager.c
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ static void animation_manager_replace_current_animation(
}

AnimationManager* animation_manager_alloc(void) {
AnimationManager* animation_manager = furi_alloc(sizeof(AnimationManager));
AnimationManager* animation_manager = malloc(sizeof(AnimationManager));
animation_manager->animation_view = bubble_animation_view_alloc();
animation_manager->view_stack = view_stack_alloc();
View* animation_view = bubble_animation_get_view(animation_manager->animation_view);
Expand Down
Loading

0 comments on commit afa46b0

Please sign in to comment.