Port merge fixes from firmware repo

blackjack/ui.c

@@ -81,7 +81,7 @@ void draw_score(Canvas* const canvas, bool top, uint8_t amount) {
 
 void draw_money(Canvas* const canvas, uint32_t score) {
     canvas_set_font(canvas, FontSecondary);
-    char drawChar[10];
+    char drawChar[11];
     uint32_t currAmount = score;
     if(currAmount < 1000) {
         snprintf(drawChar, sizeof(drawChar), "$%lu", currAmount);

ble_spam/ble_spam.c

@@ -446,7 +446,7 @@ static bool input_callback(InputEvent* input, void* _ctx) {
         with_view_model(
             state->main_view, State * *model, { (*model)->lock_warning = true; }, true);
         if(state->lock_count == 0) {
-            furi_timer_start(state->lock_timer, pdMS_TO_TICKS(1000));
+            furi_timer_start(state->lock_timer, 1000);
         }
         if(input->type == InputTypeShort && input->key == InputKeyBack) {
             state->lock_count++;

brainfuck/worker.h

@@ -1,3 +1,5 @@
+#pragma once
+
 #include "brainfuck_i.h"
 
 void initWorker(BFApp* application);

cli_bridge/cli_control.c

@@ -5,6 +5,7 @@
 #include <cli/cli_vcp.h>
 #include <furi/core/thread_i.h>
 #include "cligui_main_i.h"
+#include <loader/loader_i.h>
 #include <FreeRTOS.h>
 
 volatile bool gotCallbackSet = false;

cli_bridge/cligui_main.c

@@ -2,7 +2,6 @@
 #include "cli_control.h"
 #include "text_input.h"
 #include "console_output.h"
-#include <loader/loader_i.h>
 #include <gui/view_dispatcher_i.h>
 
 static bool cligui_custom_event_cb(void* context, uint32_t event) {

esp_flasher/esp_flasher_worker.c

@@ -351,7 +351,7 @@ void esp_flasher_worker_stop_thread(EspFlasherApp* app) {
 }
 
 esp_loader_error_t loader_port_read(uint8_t* data, uint16_t size, uint32_t timeout) {
-    size_t read = furi_stream_buffer_receive(flash_rx_stream, data, size, pdMS_TO_TICKS(timeout));
+    size_t read = furi_stream_buffer_receive(flash_rx_stream, data, size, timeout);
     if(read < size) {
         return ESP_LOADER_ERROR_TIMEOUT;
     } else {
@@ -396,7 +396,7 @@ void loader_port_delay_ms(uint32_t ms) {
 
 void loader_port_start_timer(uint32_t ms) {
     _remaining_time = ms;
-    furi_timer_start(timer, pdMS_TO_TICKS(1));
+    furi_timer_start(timer, 1);
 }
 
 uint32_t loader_port_remaining_time(void) {

esp_flasher/lib/esp-serial-flasher/port/esp32_port.c

@@ -96,7 +96,7 @@ void loader_port_esp32_deinit(void)
 esp_loader_error_t loader_port_write(const uint8_t *data, uint16_t size, uint32_t timeout)
 {
     uart_write_bytes(s_uart_port, (const char *)data, size);
-    esp_err_t err = uart_wait_tx_done(s_uart_port, pdMS_TO_TICKS(timeout));
+    esp_err_t err = uart_wait_tx_done(s_uart_port, timeout);
 
     if (err == ESP_OK) {
 #ifdef SERIAL_FLASHER_DEBUG_TRACE
@@ -113,7 +113,7 @@ esp_loader_error_t loader_port_write(const uint8_t *data, uint16_t size, uint32_
 
 esp_loader_error_t loader_port_read(uint8_t *data, uint16_t size, uint32_t timeout)
 {
-    int read = uart_read_bytes(s_uart_port, data, size, pdMS_TO_TICKS(timeout));
+    int read = uart_read_bytes(s_uart_port, data, size, timeout);
 
     if (read < 0) {
         return ESP_LOADER_ERROR_FAIL;

etch_a_sketch/etch_a_sketch.c

@@ -11,6 +11,8 @@
 #include <string.h>
 #include "etch_icons.h"
 
+#include <assets_icons.h>
+
 #define WIDTH 64
 #define HEIGHT 32
 

flizzer_tracker/init_deinit.h

@@ -3,9 +3,6 @@
 #include "flizzer_tracker.h"
 #include "flizzer_tracker_hal.h"
 
-extern bool audio_modes_values[];
-extern char* audio_modes_text[];
-
 FlizzerTrackerApp* init_tracker(
     uint32_t sample_rate,
     uint8_t rate,

flizzer_tracker/input_event.h

@@ -18,8 +18,6 @@
 extern bool audio_modes_values[];
 extern char* audio_modes_text[];
 
-void return_from_keyboard_callback(void* ctx);
-
 void overwrite_file_widget_yes_input_callback(GuiButtonType result, InputType type, void* ctx);
 void overwrite_file_widget_no_input_callback(GuiButtonType result, InputType type, void* ctx);
 

flizzer_tracker/tracker_engine/do_effects.h

@@ -1,3 +1,5 @@
+#pragma once
+
 #include "tracker_engine_defs.h"
 #include <stdbool.h>
 #include <stdio.h>

mass_storage/scenes/mass_storage_scene_start.c

@@ -13,14 +13,13 @@ static void mass_storage_scene_start_variable_item_list_callback(void* context,
 void mass_storage_scene_start_on_enter(void* context) {
     MassStorageApp* app = context;
     VariableItemList* variable_item_list = app->variable_item_list;
-    VariableItem* item;
 
     variable_item_list_add(variable_item_list, "Select Disk Image", 0, NULL, app);
 
     variable_item_list_add(variable_item_list, "Create Disk Image", 0, NULL, app);
 
     variable_item_list_set_enter_callback(
-        variable_item_list, mass_storage_scene_create_image_variable_item_list_callback, app);
+        variable_item_list, mass_storage_scene_start_variable_item_list_callback, app);
 
     variable_item_list_set_header(variable_item_list, "USB Mass Storage");
 

multi_fuzzer/lib/worker/fake_worker.c

@@ -2,8 +2,6 @@
 #include "helpers/hardware_worker.h"
 #include "protocol_i.h"
 
-#include <timer.h>
-
 #include <lib/toolbox/hex.h>
 #include <toolbox/stream/stream.h>
 #include <toolbox/stream/buffered_file_stream.h>

music_tracker/zero_tracker.c

@@ -502,7 +502,7 @@ int32_t zero_tracker_app(void* p) {
 
     while(1) {
         TrackerMessage message;
-        FuriStatus status = furi_message_queue_get(queue, &message, portMAX_DELAY);
+        FuriStatus status = furi_message_queue_get(queue, &message, FuriWaitForever);
         if(status == FuriStatusOk) {
             if(message.type == TrackerPositionChanged) {
                 uint8_t order_list_index = message.data.position.order_list_index;

nfc_maker/nfc_maker.h

@@ -14,7 +14,7 @@
 #include "scenes/nfc_maker_scene.h"
 #include <lib/flipper_format/flipper_format.h>
 #include <toolbox/name_generator.h>
-#include <applications/main/nfc/nfc_i.h>
+#include <applications/main/nfc/nfc_app_i.h>
 #include <furi_hal_bt.h>
 
 #define MAC_INPUT_LEN GAP_MAC_ADDR_SIZE

nfc_maker/scenes/nfc_maker_scene_result.c

@@ -17,7 +17,7 @@ void nfc_maker_scene_result_on_enter(void* context) {
 
     FlipperFormat* file = flipper_format_file_alloc(furi_record_open(RECORD_STORAGE));
     FuriString* path = furi_string_alloc();
-    furi_string_printf(path, NFC_APP_FOLDER "/%s" NFC_APP_FILENAME_EXTENSION, app->save_buf);
+    furi_string_printf(path, NFC_APP_FOLDER "/%s" NFC_APP_EXTENSION, app->save_buf);
 
     uint32_t pages = 135;
     size_t size = pages * 4;

nfc_maker/scenes/nfc_maker_scene_save.c

@@ -27,7 +27,7 @@ void nfc_maker_scene_save_on_enter(void* context) {
         true);
 
     ValidatorIsFile* validator_is_file =
-        validator_is_file_alloc_init(NFC_APP_FOLDER, NFC_APP_FILENAME_EXTENSION, NULL);
+        validator_is_file_alloc_init(NFC_APP_FOLDER, NFC_APP_EXTENSION, NULL);
     text_input_set_validator(text_input, validator_is_file_callback, validator_is_file);
 
     view_dispatcher_switch_to_view(app->view_dispatcher, NfcMakerViewTextInput);

tama_p1/application.fam

@@ -7,7 +7,7 @@ App(
     requires=["gui", "storage"],
     stack_size=2 * 1024,
     order=215,
-    fap_file_assets="files"
+    fap_file_assets="files",
     fap_icon="tamaIcon4.png",
     fap_category="Games",
 )