Fix xtreme lib import

2026-04-24 03:29:57 -07:00 · 2023-12-02 06:32:04 +00:00
parent f4d58c286b
commit 0a55300926
36 changed files with 38 additions and 38 deletions
--- a/applications/drivers/subghz/cc1101_ext/cc1101_ext.h
+++ b/applications/drivers/subghz/cc1101_ext/cc1101_ext.h
@@ -11,7 +11,7 @@
 #include <stddef.h>
 #include <toolbox/level_duration.h>
 #include <furi_hal_gpio.h>
-#include <xtreme.h>
+#include <xtreme/xtreme.h>

 #ifdef __cplusplus
 extern "C" {
--- a/applications/external
+++ b/applications/external
--- a/applications/main/archive/helpers/archive_files.h
+++ b/applications/main/archive/helpers/archive_files.h
@@ -5,7 +5,7 @@
 #include <m-algo.h>
 #include <storage/storage.h>
 #include "toolbox/path.h"
-#include <xtreme.h>
+#include <xtreme/xtreme.h>

 #define FAP_MANIFEST_MAX_ICON_SIZE 32

--- a/applications/main/archive/helpers/favorite_timeout.c
+++ b/applications/main/archive/helpers/favorite_timeout.c
@@ -1,5 +1,5 @@
 #include "archive_helpers_ext.h"
-#include <xtreme.h>
+#include <xtreme/xtreme.h>

 bool process_favorite_launch(char** args) {
    if(*args && strlen(*args) > 4 && strncmp(*args, "fav/", 4) == 0) {
--- a/applications/main/bad_kb/bad_kb_app.c
+++ b/applications/main/bad_kb/bad_kb_app.c
@@ -3,7 +3,7 @@
 #include <furi_hal.h>
 #include <storage/storage.h>
 #include <lib/toolbox/path.h>
-#include <xtreme.h>
+#include <xtreme/xtreme.h>
 #include <lib/flipper_format/flipper_format.h>

 #include <bt/bt_service/bt_i.h>
--- a/applications/main/bad_kb/helpers/ducky_script.c
+++ b/applications/main/bad_kb/helpers/ducky_script.c
@@ -11,7 +11,7 @@
 #include "ducky_script_i.h"
 #include <dolphin/dolphin.h>
 #include <toolbox/hex.h>
-#include <xtreme.h>
+#include <xtreme/xtreme.h>
 #include "../scenes/bad_kb_scene.h"

 const uint8_t BAD_KB_EMPTY_MAC[BAD_KB_MAC_LEN] = FURI_HAL_BT_EMPTY_MAC_ADDR;
--- a/applications/main/bad_kb/scenes/bad_kb_scene_config.c
+++ b/applications/main/bad_kb/scenes/bad_kb_scene_config.c
@@ -2,7 +2,7 @@
 #include "../helpers/ducky_script.h"
 #include "furi_hal_power.h"
 #include "furi_hal_usb.h"
-#include <xtreme.h>
+#include <xtreme/xtreme.h>

 enum VarItemListIndex {
    VarItemListIndexKeyboardLayout,
--- a/applications/main/bad_kb/views/bad_kb_view.c
+++ b/applications/main/bad_kb/views/bad_kb_view.c
@@ -4,7 +4,7 @@
 #include <toolbox/path.h>
 #include <gui/elements.h>
 #include <assets_icons.h>
-#include <xtreme.h>
+#include <xtreme/xtreme.h>

 #define MAX_NAME_LEN 64

--- a/applications/main/subghz/helpers/subghz_gps.h
+++ b/applications/main/subghz/helpers/subghz_gps.h
@@ -1,5 +1,5 @@
 #include <furi_hal.h>
-#include <xtreme.h>
+#include <xtreme/xtreme.h>

 #define UART_CH \
    (xtreme_settings.uart_nmea_channel == UARTDefault ? FuriHalUartIdUSART1 : FuriHalUartIdLPUART1)
--- a/applications/main/subghz/scenes/subghz_scene_transmitter.c
+++ b/applications/main/subghz/scenes/subghz_scene_transmitter.c
@@ -1,7 +1,7 @@
 #include "../subghz_i.h"
 #include "../views/transmitter.h"
 #include <dolphin/dolphin.h>
-#include <xtreme.h>
+#include <xtreme/xtreme.h>

 #include <lib/subghz/blocks/custom_btn.h>

--- a/applications/main/subghz/subghz.c
+++ b/applications/main/subghz/subghz.c
@@ -6,7 +6,7 @@
 #include <float_tools.h>
 #include "subghz_i.h"
 #include <applications/main/archive/helpers/archive_helpers_ext.h>
-#include <xtreme.h>
+#include <xtreme/xtreme.h>

 #define TAG "SubGhzApp"

--- a/applications/main/u2f/scenes/u2f_scene_error.c
+++ b/applications/main/u2f/scenes/u2f_scene_error.c
@@ -1,5 +1,5 @@
 #include "../u2f_app_i.h"
-#include <xtreme.h>
+#include <xtreme/xtreme.h>

 static void u2f_scene_error_event_callback(GuiButtonType result, InputType type, void* context) {
    furi_assert(context);
--- a/applications/main/u2f/views/u2f_view.c
+++ b/applications/main/u2f/views/u2f_view.c
@@ -1,7 +1,7 @@
 #include "u2f_view.h"
 #include <gui/elements.h>
 #include <assets_icons.h>
-#include <xtreme.h>
+#include <xtreme/xtreme.h>

 struct U2fView {
    View* view;
--- a/applications/main/xtreme_app/xtreme_app.h
+++ b/applications/main/xtreme_app/xtreme_app.h
@@ -27,8 +27,8 @@
 #include <power/power_service/power.h>
 #include <rgb_backlight.h>
 #include <m-array.h>
-#include <namespoof.h>
-#include <xtreme.h>
+#include <xtreme/namespoof.h>
+#include <xtreme/xtreme.h>

 #define XTREME_SUBGHZ_FREQ_BUFFER_SIZE 7

--- a/applications/services/desktop/animations/animation_manager.c
+++ b/applications/services/desktop/animations/animation_manager.c
@@ -13,7 +13,7 @@
 #include "animation_storage.h"
 #include "animation_manager.h"

-#include <xtreme.h>
+#include <xtreme/xtreme.h>

 #define TAG "AnimationManager"

--- a/applications/services/desktop/animations/animation_storage.c
+++ b/applications/services/desktop/animations/animation_storage.c
@@ -11,7 +11,7 @@
 #include "animation_storage_i.h"
 #include <assets_dolphin_internal.h>
 #include <assets_dolphin_blocking.h>
-#include <xtreme.h>
+#include <xtreme/xtreme.h>
 #define ANIMATION_META_FILE "meta.txt"
 #define TAG "AnimationStorage"
 char ANIMATION_DIR[23 /*"/ext/asset_packs//Anims"*/ + XTREME_ASSETS_PACK_NAME_LEN + 1];
--- a/applications/services/desktop/desktop.c
+++ b/applications/services/desktop/desktop.c
@@ -11,7 +11,7 @@
 #include <cli/cli_vcp.h>
 #include <locale/locale.h>
 #include <applications/main/archive/helpers/archive_helpers_ext.h>
-#include <xtreme.h>
+#include <xtreme/xtreme.h>

 #include "animations/animation_manager.h"
 #include "desktop/scenes/desktop_scene.h"
--- a/applications/services/desktop/scenes/desktop_scene_fault.c
+++ b/applications/services/desktop/scenes/desktop_scene_fault.c
@@ -1,7 +1,7 @@
 #include <furi_hal.h>

 #include "../desktop_i.h"
-#include <xtreme.h>
+#include <xtreme/xtreme.h>

 #define DesktopFaultEventExit 0x00FF00FF

--- a/applications/services/desktop/scenes/desktop_scene_lock_menu.c
+++ b/applications/services/desktop/scenes/desktop_scene_lock_menu.c
@@ -4,7 +4,7 @@
 #include <toolbox/saved_struct.h>
 #include <stdbool.h>
 #include <loader/loader.h>
-#include <xtreme.h>
+#include <xtreme/xtreme.h>

 #include "../desktop_i.h"
 #include <desktop/desktop_settings.h>
--- a/applications/services/desktop/scenes/desktop_scene_locked.c
+++ b/applications/services/desktop/scenes/desktop_scene_locked.c
@@ -13,7 +13,7 @@
 #include "../views/desktop_view_locked.h"
 #include "desktop_scene.h"
 #include "desktop_scene_i.h"
-#include <xtreme.h>
+#include <xtreme/xtreme.h>

 #define TAG "DesktopSrv"

--- a/applications/services/desktop/scenes/desktop_scene_pin_input.c
+++ b/applications/services/desktop/scenes/desktop_scene_pin_input.c
@@ -5,7 +5,7 @@
 #include <stdint.h>
 #include <notification/notification.h>
 #include <notification/notification_messages.h>
-#include <xtreme.h>
+#include <xtreme/xtreme.h>

 #include "../desktop.h"
 #include "../desktop_i.h"
--- a/applications/services/desktop/views/desktop_view_lock_menu.c
+++ b/applications/services/desktop/views/desktop_view_lock_menu.c
@@ -1,7 +1,7 @@
 #include <furi.h>
 #include <gui/elements.h>
 #include <assets_icons.h>
-#include <xtreme.h>
+#include <xtreme/xtreme.h>
 #include <furi_hal_rtc.h>

 #include "../desktop_i.h"
--- a/applications/services/desktop/views/desktop_view_locked.c
+++ b/applications/services/desktop/views/desktop_view_locked.c
@@ -6,7 +6,7 @@
 #include <gui/view.h>
 #include <assets_icons.h>
 #include <locale/locale.h>
-#include <xtreme.h>
+#include <xtreme/xtreme.h>

 #include <desktop/desktop_settings.h>
 #include "../desktop_i.h"
--- a/applications/services/dolphin/dolphin.c
+++ b/applications/services/dolphin/dolphin.c
@@ -5,7 +5,7 @@
 #include <furi_hal.h>
 #include <stdint.h>
 #include <furi.h>
-#include <xtreme.h>
+#include <xtreme/xtreme.h>
 #define DOLPHIN_LOCK_EVENT_FLAG (0x1)

 #define TAG "Dolphin"
--- a/applications/services/gui/canvas.c
+++ b/applications/services/gui/canvas.c
@@ -6,7 +6,7 @@
 #include <furi_hal.h>
 #include <stdint.h>
 #include <u8g2_glue.h>
-#include <xtreme.h>
+#include <xtreme/xtreme.h>

 const CanvasFontParameters canvas_font_params[FontTotalNumber] = {
    [FontPrimary] = {.leading_default = 12, .leading_min = 11, .height = 8, .descender = 2},
--- a/applications/services/gui/gui.c
+++ b/applications/services/gui/gui.c
@@ -1,4 +1,4 @@
-#include <xtreme.h>
+#include <xtreme/xtreme.h>
 #include "gui_i.h"
 #include <assets_icons.h>
 #include <storage/storage.h>
--- a/applications/services/gui/modules/file_browser.c
+++ b/applications/services/gui/modules/file_browser.c
@@ -13,7 +13,7 @@
 #include <core/log.h>
 #include "m-algo.h"
 #include <m-array.h>
-#include <xtreme.h>
+#include <xtreme/xtreme.h>

 #define LIST_ITEMS 5u
 #define MAX_LEN_PX 110
--- a/applications/services/gui/modules/menu.c
+++ b/applications/services/gui/modules/menu.c
@@ -9,7 +9,7 @@
 #include <dolphin/helpers/dolphin_state.h>
 #include <furi.h>
 #include <m-array.h>
-#include <xtreme.h>
+#include <xtreme/xtreme.h>
 #include <m-string.h>

 struct Menu {
--- a/applications/services/loader/loader.c
+++ b/applications/services/loader/loader.c
@@ -4,7 +4,7 @@
 #include <applications.h>
 #include <storage/storage.h>
 #include <furi_hal.h>
-#include <xtreme.h>
+#include <xtreme/xtreme.h>

 #include <dialogs/dialogs.h>
 #include <toolbox/path.h>
--- a/applications/services/power/power_service/power.c
+++ b/applications/services/power/power_service/power.c
@@ -2,7 +2,7 @@

 #include <furi.h>
 #include <furi_hal.h>
-#include <xtreme.h>
+#include <xtreme/xtreme.h>

 #define POWER_OFF_TIMEOUT 90
 #define TAG "Power"
--- a/applications/services/rpc/rpc.c
+++ b/applications/services/rpc/rpc.c
@@ -14,7 +14,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <m-dict.h>
-#include <xtreme.h>
+#include <xtreme/xtreme.h>

 #include <bt/bt_service/bt.h>

--- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_keybinds_action_type.c
+++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_keybinds_action_type.c
@@ -4,7 +4,7 @@
 #include <storage/storage.h>
 #include <dialogs/dialogs.h>
 #include <flipper_application/flipper_application.h>
-#include <xtreme.h>
+#include <xtreme/xtreme.h>

 static bool keybinds_fap_selector_item_callback(
    FuriString* file_path,
--- a/applications/settings/dolphin_passport/passport.c
+++ b/applications/settings/dolphin_passport/passport.c
@@ -6,7 +6,7 @@
 #include <gui/gui.h>
 #include <furi_hal_version.h>
 #include "dolphin/dolphin.h"
-#include <xtreme.h>
+#include <xtreme/xtreme.h>
 #include "math.h"

 typedef struct {
--- a/applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c
+++ b/applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c
@@ -1,5 +1,5 @@
 #include "../power_settings_app.h"
-#include <xtreme.h>
+#include <xtreme/xtreme.h>

 void power_settings_scene_power_off_dialog_callback(DialogExResult result, void* context) {
    furi_assert(context);
--- a/furi/flipper.c
+++ b/furi/flipper.c
@@ -14,8 +14,8 @@
 #include <dolphin/helpers/dolphin_state.h>
 #include <applications/main/u2f/u2f_data.h>
 #include <applications/main/archive/helpers/archive_favorites.h>
-#include <namespoof.h>
-#include <xtreme.h>
+#include <xtreme/namespoof.h>
+#include <xtreme/xtreme.h>

 #include <FreeRTOS.h>

--- a/targets/f7/furi_hal/furi_hal_light.c
+++ b/targets/f7/furi_hal/furi_hal_light.c
@@ -3,7 +3,7 @@
 #include <furi_hal_light.h>
 #include <lp5562.h>
 #include <stdint.h>
-#include <xtreme.h>
+#include <xtreme/xtreme.h>
 #include <rgb_backlight.h>

 #define LED_CURRENT_RED 50