Mass app fixes for new API

Thanks @Willy-JL for finding issues and fixing many of those apps
Other apps fixed by me

apps_source_code/brainfuck/brainfuck.c

@@ -117,15 +117,14 @@ void brainfuck_free(BFApp* brainfuck) {
 
 void brainfuck_show_loading_popup(void* context, bool show) {
     BFApp* brainfuck = context;
-    TaskHandle_t timer_task = xTaskGetHandle(configTIMER_SERVICE_TASK_NAME);
 
     if(show) {
         // Raise timer priority so that animations can play
-        vTaskPrioritySet(timer_task, configMAX_PRIORITIES - 1);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityElevated);
         view_dispatcher_switch_to_view(brainfuck->view_dispatcher, brainfuckViewLoading);
     } else {
         // Restore default timer priority
-        vTaskPrioritySet(timer_task, configTIMER_TASK_PRIORITY);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityNormal);
     }
 }
 

apps_source_code/brainfuck/worker.h

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

apps_source_code/musictracker/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;

base_pack/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++;

base_pack/mass_storage/mass_storage_app.c

@@ -22,15 +22,14 @@ static void mass_storage_app_tick_event_callback(void* context) {
 }
 
 void mass_storage_app_show_loading_popup(MassStorageApp* app, bool show) {
-    TaskHandle_t timer_task = xTaskGetHandle(configTIMER_SERVICE_TASK_NAME);
 
     if(show) {
         // Raise timer priority so that animations can play
-        vTaskPrioritySet(timer_task, configMAX_PRIORITIES - 1);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityElevated);
         view_dispatcher_switch_to_view(app->view_dispatcher, MassStorageAppViewLoading);
     } else {
         // Restore default timer priority
-        vTaskPrioritySet(timer_task, configTIMER_TASK_PRIORITY);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityNormal);
     }
 }
 

base_pack/mifare_nested/mifare_nested.c

@@ -21,15 +21,14 @@ void mifare_nested_tick_event_callback(void* context) {
 
 void mifare_nested_show_loading_popup(void* context, bool show) {
     MifareNested* mifare_nested = context;
-    TaskHandle_t timer_task = xTaskGetHandle(configTIMER_SERVICE_TASK_NAME);
-
+    
     if(show) {
         // Raise timer priority so that animations can play
-        vTaskPrioritySet(timer_task, configMAX_PRIORITIES - 1);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityElevated);
         view_dispatcher_switch_to_view(mifare_nested->view_dispatcher, MifareNestedViewLoading);
     } else {
         // Restore default timer priority
-        vTaskPrioritySet(timer_task, configTIMER_TASK_PRIORITY);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityNormal);
     }
 }
 

base_pack/multi_fuzzer

@@ -1 +1 @@
-Subproject commit be4400adda3bc149a11fb45e68a1b33d82b126c5
+Subproject commit 8507a3a189708343e69b5de19f49f29f467fdf7b

base_pack/nfc_magic/nfc_magic_app.c

@@ -23,15 +23,14 @@ void nfc_magic_app_tick_event_callback(void* context) {
 
 void nfc_magic_app_show_loading_popup(void* context, bool show) {
     NfcMagicApp* instance = context;
-    TaskHandle_t timer_task = xTaskGetHandle(configTIMER_SERVICE_TASK_NAME);
 
     if(show) {
         // Raise timer priority so that animations can play
-        vTaskPrioritySet(timer_task, configMAX_PRIORITIES - 1);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityElevated);
         view_dispatcher_switch_to_view(instance->view_dispatcher, NfcMagicAppViewLoading);
     } else {
         // Restore default timer priority
-        vTaskPrioritySet(timer_task, configTIMER_TASK_PRIORITY);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityNormal);
     }
 }
 

base_pack/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>
 #include "strnlen.h"
 

base_pack/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;

base_pack/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);
     nfc_maker_text_input_set_validator(text_input, validator_is_file_callback, validator_is_file);
 
     view_dispatcher_switch_to_view(app->view_dispatcher, NfcMakerViewTextInput);

base_pack/picopass/picopass.c

@@ -196,15 +196,14 @@ void picopass_blink_stop(Picopass* picopass) {
 
 void picopass_show_loading_popup(void* context, bool show) {
     Picopass* picopass = context;
-    TaskHandle_t timer_task = xTaskGetHandle(configTIMER_SERVICE_TASK_NAME);
 
     if(show) {
         // Raise timer priority so that animations can play
-        vTaskPrioritySet(timer_task, configMAX_PRIORITIES - 1);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityElevated);
         view_dispatcher_switch_to_view(picopass->view_dispatcher, PicopassViewLoading);
     } else {
         // Restore default timer priority
-        vTaskPrioritySet(timer_task, configTIMER_TASK_PRIORITY);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityNormal);
     }
 }
 

base_pack/pocsag_pager/views/pocsag_pager_receiver.c

@@ -89,7 +89,7 @@ void pcsg_view_receiver_set_lock(PCSGReceiver* pcsg_receiver, PCSGLock lock) {
             PCSGReceiverModel * model,
             { model->bar_show = PCSGReceiverBarShowLock; },
             true);
-        furi_timer_start(pcsg_receiver->timer, pdMS_TO_TICKS(1000));
+        furi_timer_start(pcsg_receiver->timer, 1000);
     } else {
         with_view_model(
             pcsg_receiver->view,
@@ -307,7 +307,7 @@ bool pcsg_view_receiver_input(InputEvent* event, void* context) {
             { model->bar_show = PCSGReceiverBarShowToUnlockPress; },
             true);
         if(pcsg_receiver->lock_count == 0) {
-            furi_timer_start(pcsg_receiver->timer, pdMS_TO_TICKS(1000));
+            furi_timer_start(pcsg_receiver->timer, 1000);
         }
         if(event->key == InputKeyBack && event->type == InputTypeShort) {
             pcsg_receiver->lock_count++;
@@ -320,7 +320,7 @@ bool pcsg_view_receiver_input(InputEvent* event, void* context) {
                 { model->bar_show = PCSGReceiverBarShowUnlock; },
                 true);
             pcsg_receiver->lock = PCSGLockOff;
-            furi_timer_start(pcsg_receiver->timer, pdMS_TO_TICKS(650));
+            furi_timer_start(pcsg_receiver->timer, 650);
         }
 
         return true;

base_pack/tetris_game/tetris_game.c

@@ -366,9 +366,7 @@ int32_t tetris_game_app() {
     }
 
     // Not doing this eventually causes issues with TimerSvc due to not sleeping/yielding enough in this task
-    TaskHandle_t timer_task = xTaskGetHandle(configTIMER_SERVICE_TASK_NAME);
-
-    vTaskPrioritySet(timer_task, configMAX_PRIORITIES - 1);
+    furi_timer_set_thread_priority(FuriTimerThreadPriorityElevated);
 
     ViewPort* view_port = view_port_alloc();
     view_port_set_orientation(view_port, ViewPortOrientationVertical);
@@ -472,7 +470,7 @@ int32_t tetris_game_app() {
     view_port_free(view_port);
     furi_message_queue_free(event_queue);
     furi_mutex_free(tetris_state->mutex);
-    vTaskPrioritySet(timer_task, configTIMER_TASK_PRIORITY);
+    furi_timer_set_thread_priority(FuriTimerThreadPriorityNormal)
     free(newPiece);
     free(tetris_state);
 

base_pack/unitemp/sensors/BME680.h

@@ -74,17 +74,16 @@ typedef struct {
     int32_t t_fine;
 } BME680_instance;
 
-extern const SensorType BMP280;
 extern const SensorType BME680;
 /**
- * @brief Выделение памяти и установка начальных значений датчика BMP280
+ * @brief Выделение памяти и установка начальных значений датчика BME680
  * @param sensor Указатель на создаваемый датчик
  * @return Истина при успехе
  */
 bool unitemp_BME680_alloc(Sensor* sensor, char* args);
 
 /**
- * @brief Инициализации датчика BMP280
+ * @brief Инициализации датчика BME680
  * @param sensor Указатель на датчик
  * @return Истина если инициализация упспешная
  */

base_pack/unitemp/sensors/BMP180.c

@@ -56,8 +56,8 @@ bool unitemp_BMP180_I2C_alloc(Sensor* sensor, char* args) {
     i2c_sensor->minI2CAdr = 0x77 << 1;
     i2c_sensor->maxI2CAdr = 0x77 << 1;
 
-    BMP180_instance* bmx280_instance = malloc(sizeof(BMP180_instance));
-    i2c_sensor->sensorInstance = bmx280_instance;
+    BMP180_instance* bmx180_instance = malloc(sizeof(BMP180_instance));
+    i2c_sensor->sensorInstance = bmx180_instance;
     return true;
 }
 

base_pack/unitemp/sensors/SCD30.c

@@ -30,12 +30,6 @@ typedef union {
     float value;
 } ByteToFl;
 
-bool unitemp_SCD30_alloc(Sensor* sensor, char* args);
-bool unitemp_SCD30_init(Sensor* sensor);
-bool unitemp_SCD30_deinit(Sensor* sensor);
-UnitempStatus unitemp_SCD30_update(Sensor* sensor);
-bool unitemp_SCD30_free(Sensor* sensor);
-
 const SensorType SCD30 = {
     .typename = "SCD30",
     .interface = &I2C,

base_pack/unitemp/sensors/SCD40.c

@@ -19,17 +19,11 @@
 
 // Some information may be seen on https://github.com/sparkfun/SparkFun_SCD30_Arduino_Library
 
-#include "SCD30.h"
+#include "SCD40.h"
 #include "../interfaces/I2CSensor.h"
 #include "../interfaces/endianness.h"
 //#include <3rdparty/everest/include/everest/kremlin/c_endianness.h>
 
-bool unitemp_SCD40_alloc(Sensor* sensor, char* args);
-bool unitemp_SCD40_init(Sensor* sensor);
-bool unitemp_SCD40_deinit(Sensor* sensor);
-UnitempStatus unitemp_SCD40_update(Sensor* sensor);
-bool unitemp_SCD40_free(Sensor* sensor);
-
 const SensorType SCD40 = {
     .typename = "SCD40",
     .interface = &I2C,
@@ -185,7 +179,7 @@ static bool getSettingValue(Sensor* sensor, uint16_t registerAddress, uint16_t*
     return loadWord(bytes, val);
 }
 
-// Get 18 bytes from SCD30
+// Get 18 bytes from SCD40
 // Updates global variables with floats
 // Returns true if success
 static bool readMeasurement(Sensor* sensor) {

base_pack/weather_station/views/weather_station_receiver.c

@@ -89,7 +89,7 @@ void ws_view_receiver_set_lock(WSReceiver* ws_receiver, WSLock lock) {
             WSReceiverModel * model,
             { model->bar_show = WSReceiverBarShowLock; },
             true);
-        furi_timer_start(ws_receiver->timer, pdMS_TO_TICKS(1000));
+        furi_timer_start(ws_receiver->timer, 1000);
     } else {
         with_view_model(
             ws_receiver->view,
@@ -300,7 +300,7 @@ bool ws_view_receiver_input(InputEvent* event, void* context) {
             { model->bar_show = WSReceiverBarShowToUnlockPress; },
             true);
         if(ws_receiver->lock_count == 0) {
-            furi_timer_start(ws_receiver->timer, pdMS_TO_TICKS(1000));
+            furi_timer_start(ws_receiver->timer, 1000);
         }
         if(event->key == InputKeyBack && event->type == InputTypeShort) {
             ws_receiver->lock_count++;
@@ -313,7 +313,7 @@ bool ws_view_receiver_input(InputEvent* event, void* context) {
                 { model->bar_show = WSReceiverBarShowUnlock; },
                 true);
             ws_receiver->lock = WSLockOff;
-            furi_timer_start(ws_receiver->timer, pdMS_TO_TICKS(650));
+            furi_timer_start(ws_receiver->timer, 650);
         }
 
         return true;

non_catalog_apps/flipper_evil_portal/scenes/evil_portal_scene_select_html.c

@@ -2,17 +2,16 @@
 #include "../helpers/evil_portal_storage.h"
 
 void evil_portal_show_loading_popup(Evil_PortalApp* app, bool show) {
-    TaskHandle_t timer_task = xTaskGetHandle(configTIMER_SERVICE_TASK_NAME);
     ViewStack* view_stack = app->view_stack;
     Loading* loading = app->loading;
     if(show) {
         // Raise timer priority so that animations can play
-        vTaskPrioritySet(timer_task, configMAX_PRIORITIES - 1);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityElevated);
         view_stack_add_view(view_stack, loading_get_view(loading));
     } else {
         view_stack_remove_view(view_stack, loading_get_view(loading));
         // Restore default timer priority
-        vTaskPrioritySet(timer_task, configTIMER_TASK_PRIORITY);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityNormal);
     }
 }
 

non_catalog_apps/flipperzero-esp-flasher/esp_flasher_worker.c

@@ -343,7 +343,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 {
@@ -380,7 +380,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) {

non_catalog_apps/flipperzero-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;

non_catalog_apps/flipperzero_vb_migrate/scenes/vb_migrate_scene_from_app.c

@@ -246,7 +246,7 @@ static void vb_migrate_scene_from_app_set_state(VbMigrate* inst, FromAppState st
             // Save the tag
             inst->next_id = vb_migrate_get_next_id(inst, inst->text_store, inst->next_id, false);
             FuriString* save_path = furi_string_alloc_printf(
-                VB_MIGRATE_CAPTURE_FORMAT, inst->next_id, NFC_APP_FILENAME_EXTENSION);
+                VB_MIGRATE_CAPTURE_FORMAT, inst->next_id, NFC_APP_EXTENSION);
             if(vb_migrate_save_nfc(inst, inst->text_store, furi_string_get_cstr(save_path))) {
                 view_dispatcher_send_custom_event(
                     inst->view_dispatcher, FromAppEventTypeCaptureSaveSuccess);

non_catalog_apps/flipperzero_vb_migrate/scenes/vb_migrate_scene_to_app.c

@@ -195,7 +195,7 @@ static void vb_migrate_scene_to_app_load_capture(VbMigrate* inst, bool go_next)
         uint32_t state = scene_manager_get_scene_state(inst->scene_manager, VbMigrateSceneToApp);
         inst->next_id = vb_migrate_get_next_id(inst, inst->text_store, inst->next_id, true);
         FuriString* temp_str = furi_string_alloc_printf(
-            VB_MIGRATE_CAPTURE_FORMAT, inst->next_id, NFC_APP_FILENAME_EXTENSION);
+            VB_MIGRATE_CAPTURE_FORMAT, inst->next_id, NFC_APP_EXTENSION);
 
         vb_migrate_show_loading_popup(inst, true);
         if(vb_migrate_load_nfc(inst, inst->text_store, furi_string_get_cstr(temp_str))) {

non_catalog_apps/flipperzero_vb_migrate/vb_migrate.c

@@ -103,7 +103,7 @@ bool vb_migrate_delete(VbMigrate* inst, const char* dev_name, bool whole_vb) {
             while(storage_dir_read(dir_handle, &file_info, name, sizeof(name))) {
                 // Files that is .nfc, but is not template
                 if(!(file_info.flags & FSF_DIRECTORY) &&
-                   strstr(name, NFC_APP_FILENAME_EXTENSION) &&
+                   strstr(name, NFC_APP_EXTENSION) &&
                    !strstr(name, VB_MIGRATE_TEMPLATE_NAME)) {
                     furi_string_printf(file_path, "%s/%s", furi_string_get_cstr(dir_path), name);
                     deleted =
@@ -132,7 +132,7 @@ int vb_migrate_count_captured_mons(VbMigrate* inst, const char* dev_name) {
         char name[256];
         while(storage_dir_read(dir_handle, &file_info, name, sizeof(name))) {
             // Files that is .nfc, but is not template
-            if(!(file_info.flags & FSF_DIRECTORY) && strstr(name, NFC_APP_FILENAME_EXTENSION) &&
+            if(!(file_info.flags & FSF_DIRECTORY) && strstr(name, NFC_APP_EXTENSION) &&
                !strstr(name, VB_MIGRATE_TEMPLATE_NAME))
                 ++count;
         }
@@ -154,7 +154,7 @@ int vb_migrate_get_next_id(VbMigrate* inst, const char* dev_name, int i, bool is
             "%s/" VB_MIGRATE_CAPTURE_FORMAT,
             furi_string_get_cstr(dir_path),
             i,
-            NFC_APP_FILENAME_EXTENSION);
+            NFC_APP_EXTENSION);
         bool exit_cond =
             storage_common_stat(inst->storage, furi_string_get_cstr(file_path), NULL) ==
             FSE_NOT_EXIST;
@@ -169,15 +169,14 @@ int vb_migrate_get_next_id(VbMigrate* inst, const char* dev_name, int i, bool is
 }
 
 void vb_migrate_show_loading_popup(VbMigrate* inst, bool show) {
-    TaskHandle_t timer_task = xTaskGetHandle(configTIMER_SERVICE_TASK_NAME);
 
     if(show) {
         // Raise timer priority so that animations can play
-        vTaskPrioritySet(timer_task, configMAX_PRIORITIES - 1);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityElevated);
         view_dispatcher_switch_to_view(inst->view_dispatcher, VbMigrateViewLoading);
     } else {
         // Restore default timer priority
-        vTaskPrioritySet(timer_task, configTIMER_TASK_PRIORITY);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityNormal);
     }
 }
 

non_catalog_apps/flipperzero_vb_migrate/vb_migrate_i.h

@@ -42,7 +42,7 @@
 
 #include "vb_migrate_icons.h"
 
-#define VB_MIGRATE_TEMPLATE_NAME "template" NFC_APP_FILENAME_EXTENSION
+#define VB_MIGRATE_TEMPLATE_NAME "template" NFC_APP_EXTENSION
 #define VB_MIGRATE_CAPTURE_FORMAT "%03d%s"
 
 #define VB_MIGRATE_MAX_DEV_NAME_LENGTH (30)

non_catalog_apps/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,

non_catalog_apps/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);
 

non_catalog_apps/flizzer_tracker/tracker_engine/do_effects.h

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

non_catalog_apps/magspoof_flipper/mag.c

@@ -244,14 +244,13 @@ void mag_text_input_callback(void* context) {
 
 void mag_show_loading_popup(void* context, bool show) {
     Mag* mag = context;
-    TaskHandle_t timer_task = xTaskGetHandle(configTIMER_SERVICE_TASK_NAME);
 
     if(show) {
         // Raise timer priority so that animations can play
-        vTaskPrioritySet(timer_task, configMAX_PRIORITIES - 1);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityElevated);
         view_dispatcher_switch_to_view(mag->view_dispatcher, MagViewLoading);
     } else {
         // Restore default timer priority
-        vTaskPrioritySet(timer_task, configTIMER_TASK_PRIORITY);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityNormal);
     }
 }

non_catalog_apps/seader/seader.c

@@ -179,15 +179,14 @@ void seader_blink_stop(Seader* seader) {
 
 void seader_show_loading_popup(void* context, bool show) {
     Seader* seader = context;
-    TaskHandle_t timer_task = xTaskGetHandle(configTIMER_SERVICE_TASK_NAME);
 
     if(show) {
         // Raise timer priority so that animations can play
-        vTaskPrioritySet(timer_task, configMAX_PRIORITIES - 1);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityElevated);
         view_dispatcher_switch_to_view(seader->view_dispatcher, SeaderViewLoading);
     } else {
         // Restore default timer priority
-        vTaskPrioritySet(timer_task, configTIMER_TASK_PRIORITY);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityNormal);
     }
 }
 

non_catalog_apps/tpms_receiver/views/tpms_receiver.c

@@ -93,7 +93,7 @@ void tpms_view_receiver_set_lock(TPMSReceiver* tpms_receiver, TPMSLock lock) {
             TPMSReceiverModel * model,
             { model->bar_show = TPMSReceiverBarShowLock; },
             true);
-        furi_timer_start(tpms_receiver->lock_timer, pdMS_TO_TICKS(1000));
+        furi_timer_start(tpms_receiver->lock_timer, 1000);
     } else {
         with_view_model(
             tpms_receiver->view,
@@ -312,7 +312,7 @@ static void tpms_relearn_start(void* context) {
     if(tpms_receiver->relearn_active) tpms_relearn_stop(context);
     tpms_receiver->relearn_active = true;
     furi_hal_rfid_tim_read_start(125000, 0.5);
-    furi_timer_start(tpms_receiver->relearn_timer, pdMS_TO_TICKS(3000));
+    furi_timer_start(tpms_receiver->relearn_timer, 3000);
 }
 
 static void tpms_view_receiver_relearn_timer_callback(void* context) {
@@ -331,7 +331,7 @@ bool tpms_view_receiver_input(InputEvent* event, void* context) {
             { model->bar_show = TPMSReceiverBarShowToUnlockPress; },
             true);
         if(tpms_receiver->lock_count == 0) {
-            furi_timer_start(tpms_receiver->lock_timer, pdMS_TO_TICKS(1000));
+            furi_timer_start(tpms_receiver->lock_timer, 1000);
         }
         if(event->key == InputKeyBack && event->type == InputTypeShort) {
             tpms_receiver->lock_count++;
@@ -344,7 +344,7 @@ bool tpms_view_receiver_input(InputEvent* event, void* context) {
                 { model->bar_show = TPMSReceiverBarShowUnlock; },
                 true);
             tpms_receiver->lock = TPMSLockOff;
-            furi_timer_start(tpms_receiver->lock_timer, pdMS_TO_TICKS(650));
+            furi_timer_start(tpms_receiver->lock_timer, 650);
         }
 
         return true;

non_catalog_apps/uhf_rfid/uhf_app.c

@@ -182,15 +182,14 @@ void uhf_blink_stop(UHFApp* uhf_app) {
 
 void uhf_show_loading_popup(void* ctx, bool show) {
     UHFApp* uhf_app = ctx;
-    TaskHandle_t timer_task = xTaskGetHandle(configTIMER_SERVICE_TASK_NAME);
 
     if(show) {
         // Raise timer priority so that animations can play
-        vTaskPrioritySet(timer_task, configMAX_PRIORITIES - 1);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityElevated);
         view_dispatcher_switch_to_view(uhf_app->view_dispatcher, UHFViewLoading);
     } else {
         // Restore default timer priority
-        vTaskPrioritySet(timer_task, configTIMER_TASK_PRIORITY);
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityNormal);
     }
 }
 

non_catalog_apps/wifi_deauther/wifi_deauther_uart.c

@@ -1,6 +1,7 @@
 #include "wifi_deauther_app_i.h"
 #include "wifi_deauther_uart.h"
 
+#include <FreeRTOS.h>
 #include <stream_buffer.h>
 
 #define UART_CH (FuriHalUartIdUSART1)