From 28bcc09d9bbd135166fb1e1c748b26dc9672db1a Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Thu, 26 Oct 2023 04:03:42 +0100 Subject: [PATCH] This can just be made global at this point lol --- .../drivers/subghz/cc1101_ext/cc1101_ext.c | 11 ++-- .../external/advanced_wifisniff/sniffer.c | 10 ++-- .../views/camera_suite_view_camera.h | 5 +- .../external/esp8266_deauth/esp8266_deauth.c | 5 +- .../external/esp_flasher/esp_flasher_uart.c | 5 +- .../external/evil_portal/evil_portal_app_i.h | 5 +- .../external/gps_nmea_uart/gps_uart.h | 5 +- .../external/nrf24batch/lib/nrf24/nrf24.c | 8 +-- .../external/nrf24batch/lib/nrf24/nrf24.h | 2 +- .../nrf24channelscanner/lib/nrf24/nrf24.c | 8 +-- .../nrf24channelscanner/lib/nrf24/nrf24.h | 2 +- .../nrf24mousejacker/lib/nrf24/nrf24.c | 10 ++-- .../nrf24mousejacker/lib/nrf24/nrf24.h | 2 +- .../external/nrf24scan/lib/nrf24/nrf24.c | 8 +-- .../external/nrf24scan/lib/nrf24/nrf24.h | 2 +- .../external/nrf24sniff/lib/nrf24/nrf24.c | 8 +-- .../external/nrf24sniff/lib/nrf24/nrf24.h | 2 +- .../uart_terminal/uart_terminal_app_i.h | 6 +- .../wifi_deauther/wifi_deauther_app_i.h | 5 +- .../wifi_marauder_app_i.h | 5 +- .../FlipperZeroWiFiModuleDefines.h | 5 +- .../main/archive/helpers/archive_browser.c | 9 ++- .../main/archive/helpers/archive_files.h | 2 +- .../main/archive/helpers/favorite_timeout.c | 2 +- applications/main/bad_kb/bad_kb_app.c | 4 +- .../main/bad_kb/helpers/ducky_script.c | 9 ++- applications/main/bad_kb/views/bad_kb_view.c | 6 +- applications/main/subghz/helpers/subghz_gps.h | 7 +-- .../subghz/scenes/subghz_scene_transmitter.c | 2 +- applications/main/subghz/subghz.c | 2 +- applications/main/u2f/views/u2f_view.c | 10 ++-- .../xtreme_app_scene_interface_filebrowser.c | 27 +++++---- .../xtreme_app_scene_interface_graphics.c | 23 ++++---- .../xtreme_app_scene_interface_lockscreen.c | 55 +++++++++---------- .../xtreme_app_scene_interface_mainmenu.c | 7 +-- .../xtreme_app_scene_interface_statusbar.c | 31 +++++------ .../xtreme_app/scenes/xtreme_app_scene_misc.c | 5 +- .../scenes/xtreme_app_scene_misc_dolphin.c | 5 +- .../scenes/xtreme_app_scene_misc_screen.c | 25 ++++----- .../scenes/xtreme_app_scene_protocols.c | 13 ++--- .../scenes/xtreme_app_scene_protocols_gpio.c | 41 +++++++------- applications/main/xtreme_app/xtreme_app.c | 4 +- .../desktop/animations/animation_manager.c | 18 +++--- .../desktop/animations/animation_storage.c | 7 +-- applications/services/desktop/desktop.c | 8 +-- .../desktop/scenes/desktop_scene_fault.c | 2 +- .../desktop/scenes/desktop_scene_pin_input.c | 2 +- .../desktop/views/desktop_view_lock_menu.c | 4 +- .../desktop/views/desktop_view_locked.c | 13 ++--- applications/services/dolphin/dolphin.c | 2 +- applications/services/gui/canvas.c | 4 +- applications/services/gui/gui.c | 20 +++---- .../services/gui/modules/file_browser.c | 2 +- applications/services/gui/modules/menu.c | 12 ++-- .../services/power/power_service/power.c | 6 +- applications/services/rpc/rpc.c | 3 +- ...ktop_settings_scene_keybinds_action_type.c | 2 +- .../settings/dolphin_passport/passport.c | 2 +- .../scenes/power_settings_scene_power_off.c | 2 +- firmware/targets/f7/api_symbols.csv | 2 +- firmware/targets/f7/furi_hal/furi_hal_light.c | 2 +- lib/xtreme/assets.c | 8 +-- lib/xtreme/settings.c | 4 -- lib/xtreme/xtreme.h | 2 +- 64 files changed, 249 insertions(+), 286 deletions(-) diff --git a/applications/drivers/subghz/cc1101_ext/cc1101_ext.c b/applications/drivers/subghz/cc1101_ext/cc1101_ext.c index a9a0ddeea..163bb03c6 100644 --- a/applications/drivers/subghz/cc1101_ext/cc1101_ext.c +++ b/applications/drivers/subghz/cc1101_ext/cc1101_ext.c @@ -214,16 +214,15 @@ bool subghz_device_cc1101_ext_alloc(SubGhzDeviceConf* conf) { subghz_device_cc1101_ext->async_rx.capture_delta_duration = 0; subghz_device_cc1101_ext->spi_bus_handle = - (XTREME_SETTINGS()->spi_cc1101_handle == SpiDefault ? + (xtreme_settings.spi_cc1101_handle == SpiDefault ? &furi_hal_spi_bus_handle_external : &furi_hal_spi_bus_handle_external_extra); // this is needed if multiple SPI devices are connected to the same bus but with different CS pins - if(XTREME_SETTINGS()->spi_cc1101_handle == SpiDefault && - !furi_hal_subghz_get_ext_power_amp()) { + if(xtreme_settings.spi_cc1101_handle == SpiDefault && !furi_hal_subghz_get_ext_power_amp()) { furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeOutputPushPull); furi_hal_gpio_write(&gpio_ext_pc3, true); - } else if(XTREME_SETTINGS()->spi_cc1101_handle == SpiExtra) { + } else if(xtreme_settings.spi_cc1101_handle == SpiExtra) { furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeOutputPushPull); furi_hal_gpio_write(&gpio_ext_pa4, true); } @@ -245,9 +244,9 @@ void subghz_device_cc1101_ext_free() { free(subghz_device_cc1101_ext); // resetting the CS pins to floating - if(XTREME_SETTINGS()->spi_nrf24_handle == SpiDefault || subghz_device_cc1101_ext->power_amp) { + if(xtreme_settings.spi_nrf24_handle == SpiDefault || subghz_device_cc1101_ext->power_amp) { furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeAnalog); - } else if(XTREME_SETTINGS()->spi_nrf24_handle == SpiExtra) { + } else if(xtreme_settings.spi_nrf24_handle == SpiExtra) { furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeAnalog); } diff --git a/applications/external/advanced_wifisniff/sniffer.c b/applications/external/advanced_wifisniff/sniffer.c index ce1a1b193..4f2896285 100644 --- a/applications/external/advanced_wifisniff/sniffer.c +++ b/applications/external/advanced_wifisniff/sniffer.c @@ -17,13 +17,11 @@ #define MAX_SSID_LENGTH 32 #define MAX_BSSID_LENGTH 18 -#define UART_CH_ESP \ - (XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \ - FuriHalUartIdLPUART1) +#define UART_CH_ESP \ + (xtreme_settings.uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : FuriHalUartIdLPUART1) -#define UART_CH_GPS \ - (XTREME_SETTINGS()->uart_nmea_channel == UARTDefault ? FuriHalUartIdUSART1 : \ - FuriHalUartIdLPUART1) +#define UART_CH_GPS \ + (xtreme_settings.uart_nmea_channel == UARTDefault ? FuriHalUartIdUSART1 : FuriHalUartIdLPUART1) #define WORKER_ALL_RX_EVENTS (WorkerEvtStop | WorkerEvtRxDone) diff --git a/applications/external/camera_suite/views/camera_suite_view_camera.h b/applications/external/camera_suite/views/camera_suite_view_camera.h index 4e2f29ddc..0267bf555 100644 --- a/applications/external/camera_suite/views/camera_suite_view_camera.h +++ b/applications/external/camera_suite/views/camera_suite_view_camera.h @@ -16,9 +16,8 @@ #include -#define UART_CH \ - (XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \ - FuriHalUartIdLPUART1) +#define UART_CH \ + (xtreme_settings.uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : FuriHalUartIdLPUART1) #pragma once diff --git a/applications/external/esp8266_deauth/esp8266_deauth.c b/applications/external/esp8266_deauth/esp8266_deauth.c index 41015c21b..29d33b7df 100644 --- a/applications/external/esp8266_deauth/esp8266_deauth.c +++ b/applications/external/esp8266_deauth/esp8266_deauth.c @@ -14,9 +14,8 @@ #include "FlipperZeroWiFiDeauthModuleDefines.h" -#define UART_CH \ - (XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \ - FuriHalUartIdLPUART1) +#define UART_CH \ + (xtreme_settings.uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : FuriHalUartIdLPUART1) #define DEAUTH_APP_DEBUG 0 diff --git a/applications/external/esp_flasher/esp_flasher_uart.c b/applications/external/esp_flasher/esp_flasher_uart.c index b4b7928b8..98051c8e9 100644 --- a/applications/external/esp_flasher/esp_flasher_uart.c +++ b/applications/external/esp_flasher/esp_flasher_uart.c @@ -2,9 +2,8 @@ #include "esp_flasher_uart.h" #include -#define UART_CH \ - (XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \ - FuriHalUartIdLPUART1) +#define UART_CH \ + (xtreme_settings.uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : FuriHalUartIdLPUART1) #define BAUDRATE (115200) struct EspFlasherUart { diff --git a/applications/external/evil_portal/evil_portal_app_i.h b/applications/external/evil_portal/evil_portal_app_i.h index 5fa6f62b8..0ba3ce1da 100644 --- a/applications/external/evil_portal/evil_portal_app_i.h +++ b/applications/external/evil_portal/evil_portal_app_i.h @@ -22,9 +22,8 @@ #define NUM_MENU_ITEMS (6) #define EVIL_PORTAL_TEXT_BOX_STORE_SIZE (4096) -#define UART_CH \ - (XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \ - FuriHalUartIdLPUART1) +#define UART_CH \ + (xtreme_settings.uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : FuriHalUartIdLPUART1) #define SET_HTML_CMD "sethtml" #define SET_AP_CMD "setap" diff --git a/applications/external/gps_nmea_uart/gps_uart.h b/applications/external/gps_nmea_uart/gps_uart.h index cddc37b17..428168a2d 100644 --- a/applications/external/gps_nmea_uart/gps_uart.h +++ b/applications/external/gps_nmea_uart/gps_uart.h @@ -4,9 +4,8 @@ #include #include -#define UART_CH \ - (XTREME_SETTINGS()->uart_nmea_channel == UARTDefault ? FuriHalUartIdUSART1 : \ - FuriHalUartIdLPUART1) +#define UART_CH \ + (xtreme_settings.uart_nmea_channel == UARTDefault ? FuriHalUartIdUSART1 : FuriHalUartIdLPUART1) #define RX_BUF_SIZE 1024 diff --git a/applications/external/nrf24batch/lib/nrf24/nrf24.c b/applications/external/nrf24batch/lib/nrf24/nrf24.c index e074860ed..dbc1c1966 100644 --- a/applications/external/nrf24batch/lib/nrf24/nrf24.c +++ b/applications/external/nrf24batch/lib/nrf24/nrf24.c @@ -9,10 +9,10 @@ void nrf24_init() { // this is needed if multiple SPI devices are connected to the same bus but with different CS pins - if(XTREME_SETTINGS()->spi_nrf24_handle == SpiDefault) { + if(xtreme_settings.spi_nrf24_handle == SpiDefault) { furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeOutputPushPull); furi_hal_gpio_write(&gpio_ext_pc3, true); - } else if(XTREME_SETTINGS()->spi_nrf24_handle == SpiExtra) { + } else if(xtreme_settings.spi_nrf24_handle == SpiExtra) { furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeOutputPushPull); furi_hal_gpio_write(&gpio_ext_pa4, true); } @@ -30,9 +30,9 @@ void nrf24_deinit() { furi_hal_gpio_init(nrf24_CE_PIN, GpioModeAnalog, GpioPullNo, GpioSpeedLow); // resetting the CS pins to floating - if(XTREME_SETTINGS()->spi_nrf24_handle == SpiDefault) { + if(xtreme_settings.spi_nrf24_handle == SpiDefault) { furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeAnalog); - } else if(XTREME_SETTINGS()->spi_nrf24_handle == SpiExtra) { + } else if(xtreme_settings.spi_nrf24_handle == SpiExtra) { furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeAnalog); } } diff --git a/applications/external/nrf24batch/lib/nrf24/nrf24.h b/applications/external/nrf24batch/lib/nrf24/nrf24.h index 605513d4b..2fb249f68 100644 --- a/applications/external/nrf24batch/lib/nrf24/nrf24.h +++ b/applications/external/nrf24batch/lib/nrf24/nrf24.h @@ -56,7 +56,7 @@ extern "C" { #define nrf24_TIMEOUT 500 #define nrf24_CE_PIN &gpio_ext_pb2 #define nrf24_HANDLE \ - (XTREME_SETTINGS()->spi_nrf24_handle == SpiDefault ? &furi_hal_spi_bus_handle_external : \ + (xtreme_settings.spi_nrf24_handle == SpiDefault ? &furi_hal_spi_bus_handle_external : \ &furi_hal_spi_bus_handle_external_extra) /* Low level API */ diff --git a/applications/external/nrf24channelscanner/lib/nrf24/nrf24.c b/applications/external/nrf24channelscanner/lib/nrf24/nrf24.c index 2307d6daf..d9f53658b 100644 --- a/applications/external/nrf24channelscanner/lib/nrf24/nrf24.c +++ b/applications/external/nrf24channelscanner/lib/nrf24/nrf24.c @@ -7,10 +7,10 @@ void nrf24_init() { // this is needed if multiple SPI devices are connected to the same bus but with different CS pins - if(XTREME_SETTINGS()->spi_nrf24_handle == SpiDefault) { + if(xtreme_settings.spi_nrf24_handle == SpiDefault) { furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeOutputPushPull); furi_hal_gpio_write(&gpio_ext_pc3, true); - } else if(XTREME_SETTINGS()->spi_nrf24_handle == SpiExtra) { + } else if(xtreme_settings.spi_nrf24_handle == SpiExtra) { furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeOutputPushPull); furi_hal_gpio_write(&gpio_ext_pa4, true); } @@ -28,9 +28,9 @@ void nrf24_deinit() { furi_hal_gpio_init(nrf24_CE_PIN, GpioModeAnalog, GpioPullNo, GpioSpeedLow); // resetting the CS pins to floating - if(XTREME_SETTINGS()->spi_nrf24_handle == SpiDefault) { + if(xtreme_settings.spi_nrf24_handle == SpiDefault) { furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeAnalog); - } else if(XTREME_SETTINGS()->spi_nrf24_handle == SpiExtra) { + } else if(xtreme_settings.spi_nrf24_handle == SpiExtra) { furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeAnalog); } } diff --git a/applications/external/nrf24channelscanner/lib/nrf24/nrf24.h b/applications/external/nrf24channelscanner/lib/nrf24/nrf24.h index fdbdb0e3f..ca80816af 100644 --- a/applications/external/nrf24channelscanner/lib/nrf24/nrf24.h +++ b/applications/external/nrf24channelscanner/lib/nrf24/nrf24.h @@ -43,7 +43,7 @@ extern "C" { #define nrf24_TIMEOUT 500 #define nrf24_CE_PIN &gpio_ext_pb2 #define nrf24_HANDLE \ - (XTREME_SETTINGS()->spi_nrf24_handle == SpiDefault ? &furi_hal_spi_bus_handle_external : \ + (xtreme_settings.spi_nrf24_handle == SpiDefault ? &furi_hal_spi_bus_handle_external : \ &furi_hal_spi_bus_handle_external_extra) /* Low level API */ diff --git a/applications/external/nrf24mousejacker/lib/nrf24/nrf24.c b/applications/external/nrf24mousejacker/lib/nrf24/nrf24.c index d85196e86..fe62d5db3 100644 --- a/applications/external/nrf24mousejacker/lib/nrf24/nrf24.c +++ b/applications/external/nrf24mousejacker/lib/nrf24/nrf24.c @@ -7,10 +7,10 @@ void nrf24_init() { // this is needed if multiple SPI devices are connected to the same bus but with different CS pins - if(XTREME_SETTINGS()->spi_nrf24_handle == SpiDefault) { + if(xtreme_settings.spi_nrf24_handle == SpiDefault) { furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeOutputPushPull); furi_hal_gpio_write(&gpio_ext_pc3, true); - } else if(XTREME_SETTINGS()->spi_nrf24_handle == SpiExtra) { + } else if(xtreme_settings.spi_nrf24_handle == SpiExtra) { furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeOutputPushPull); furi_hal_gpio_write(&gpio_ext_pa4, true); } @@ -28,9 +28,9 @@ void nrf24_deinit() { furi_hal_gpio_init(nrf24_CE_PIN, GpioModeAnalog, GpioPullNo, GpioSpeedLow); // resetting the CS pins to floating - if(XTREME_SETTINGS()->spi_nrf24_handle == SpiDefault) { + if(xtreme_settings.spi_nrf24_handle == SpiDefault) { furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeAnalog); - } else if(XTREME_SETTINGS()->spi_nrf24_handle == SpiExtra) { + } else if(xtreme_settings.spi_nrf24_handle == SpiExtra) { furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeAnalog); } } @@ -543,4 +543,4 @@ bool nrf24_check_connected(FuriHalSpiBusHandle* handle) { } else { return false; } -} \ No newline at end of file +} diff --git a/applications/external/nrf24mousejacker/lib/nrf24/nrf24.h b/applications/external/nrf24mousejacker/lib/nrf24/nrf24.h index 58dbad0c8..de9212af2 100644 --- a/applications/external/nrf24mousejacker/lib/nrf24/nrf24.h +++ b/applications/external/nrf24mousejacker/lib/nrf24/nrf24.h @@ -42,7 +42,7 @@ extern "C" { #define nrf24_TIMEOUT 500 #define nrf24_CE_PIN &gpio_ext_pb2 #define nrf24_HANDLE \ - (XTREME_SETTINGS()->spi_nrf24_handle == SpiDefault ? &furi_hal_spi_bus_handle_external : \ + (xtreme_settings.spi_nrf24_handle == SpiDefault ? &furi_hal_spi_bus_handle_external : \ &furi_hal_spi_bus_handle_external_extra) /* Low level API */ diff --git a/applications/external/nrf24scan/lib/nrf24/nrf24.c b/applications/external/nrf24scan/lib/nrf24/nrf24.c index acd0130c7..8ee8e7828 100644 --- a/applications/external/nrf24scan/lib/nrf24/nrf24.c +++ b/applications/external/nrf24scan/lib/nrf24/nrf24.c @@ -9,10 +9,10 @@ void nrf24_init() { // this is needed if multiple SPI devices are connected to the same bus but with different CS pins - if(XTREME_SETTINGS()->spi_nrf24_handle == SpiDefault) { + if(xtreme_settings.spi_nrf24_handle == SpiDefault) { furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeOutputPushPull); furi_hal_gpio_write(&gpio_ext_pc3, true); - } else if(XTREME_SETTINGS()->spi_nrf24_handle == SpiExtra) { + } else if(xtreme_settings.spi_nrf24_handle == SpiExtra) { furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeOutputPushPull); furi_hal_gpio_write(&gpio_ext_pa4, true); } @@ -30,9 +30,9 @@ void nrf24_deinit() { furi_hal_gpio_init(nrf24_CE_PIN, GpioModeAnalog, GpioPullNo, GpioSpeedLow); // resetting the CS pins to floating - if(XTREME_SETTINGS()->spi_nrf24_handle == SpiDefault) { + if(xtreme_settings.spi_nrf24_handle == SpiDefault) { furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeAnalog); - } else if(XTREME_SETTINGS()->spi_nrf24_handle == SpiExtra) { + } else if(xtreme_settings.spi_nrf24_handle == SpiExtra) { furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeAnalog); } } diff --git a/applications/external/nrf24scan/lib/nrf24/nrf24.h b/applications/external/nrf24scan/lib/nrf24/nrf24.h index d5fdced3b..5016a89ad 100644 --- a/applications/external/nrf24scan/lib/nrf24/nrf24.h +++ b/applications/external/nrf24scan/lib/nrf24/nrf24.h @@ -54,7 +54,7 @@ extern "C" { #define nrf24_TIMEOUT 500 #define nrf24_CE_PIN &gpio_ext_pb2 #define nrf24_HANDLE \ - (XTREME_SETTINGS()->spi_nrf24_handle == SpiDefault ? &furi_hal_spi_bus_handle_external : \ + (xtreme_settings.spi_nrf24_handle == SpiDefault ? &furi_hal_spi_bus_handle_external : \ &furi_hal_spi_bus_handle_external_extra) /* Low level API */ diff --git a/applications/external/nrf24sniff/lib/nrf24/nrf24.c b/applications/external/nrf24sniff/lib/nrf24/nrf24.c index 8b39cf5eb..fe62d5db3 100644 --- a/applications/external/nrf24sniff/lib/nrf24/nrf24.c +++ b/applications/external/nrf24sniff/lib/nrf24/nrf24.c @@ -7,10 +7,10 @@ void nrf24_init() { // this is needed if multiple SPI devices are connected to the same bus but with different CS pins - if(XTREME_SETTINGS()->spi_nrf24_handle == SpiDefault) { + if(xtreme_settings.spi_nrf24_handle == SpiDefault) { furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeOutputPushPull); furi_hal_gpio_write(&gpio_ext_pc3, true); - } else if(XTREME_SETTINGS()->spi_nrf24_handle == SpiExtra) { + } else if(xtreme_settings.spi_nrf24_handle == SpiExtra) { furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeOutputPushPull); furi_hal_gpio_write(&gpio_ext_pa4, true); } @@ -28,9 +28,9 @@ void nrf24_deinit() { furi_hal_gpio_init(nrf24_CE_PIN, GpioModeAnalog, GpioPullNo, GpioSpeedLow); // resetting the CS pins to floating - if(XTREME_SETTINGS()->spi_nrf24_handle == SpiDefault) { + if(xtreme_settings.spi_nrf24_handle == SpiDefault) { furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeAnalog); - } else if(XTREME_SETTINGS()->spi_nrf24_handle == SpiExtra) { + } else if(xtreme_settings.spi_nrf24_handle == SpiExtra) { furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeAnalog); } } diff --git a/applications/external/nrf24sniff/lib/nrf24/nrf24.h b/applications/external/nrf24sniff/lib/nrf24/nrf24.h index 58dbad0c8..de9212af2 100644 --- a/applications/external/nrf24sniff/lib/nrf24/nrf24.h +++ b/applications/external/nrf24sniff/lib/nrf24/nrf24.h @@ -42,7 +42,7 @@ extern "C" { #define nrf24_TIMEOUT 500 #define nrf24_CE_PIN &gpio_ext_pb2 #define nrf24_HANDLE \ - (XTREME_SETTINGS()->spi_nrf24_handle == SpiDefault ? &furi_hal_spi_bus_handle_external : \ + (xtreme_settings.spi_nrf24_handle == SpiDefault ? &furi_hal_spi_bus_handle_external : \ &furi_hal_spi_bus_handle_external_extra) /* Low level API */ diff --git a/applications/external/uart_terminal/uart_terminal_app_i.h b/applications/external/uart_terminal/uart_terminal_app_i.h index 5d2e3078c..ee831de21 100644 --- a/applications/external/uart_terminal/uart_terminal_app_i.h +++ b/applications/external/uart_terminal/uart_terminal_app_i.h @@ -18,9 +18,9 @@ #define UART_TERMINAL_TEXT_BOX_STORE_SIZE (4096) #define UART_TERMINAL_TEXT_INPUT_STORE_SIZE (512) -#define UART_CH \ - (XTREME_SETTINGS()->uart_general_channel == UARTDefault ? FuriHalUartIdUSART1 : \ - FuriHalUartIdLPUART1) +#define UART_CH \ + (xtreme_settings.uart_general_channel == UARTDefault ? FuriHalUartIdUSART1 : \ + FuriHalUartIdLPUART1) struct UART_TerminalApp { Gui* gui; diff --git a/applications/external/wifi_deauther/wifi_deauther_app_i.h b/applications/external/wifi_deauther/wifi_deauther_app_i.h index a26950d98..91d837d0c 100644 --- a/applications/external/wifi_deauther/wifi_deauther_app_i.h +++ b/applications/external/wifi_deauther/wifi_deauther_app_i.h @@ -14,9 +14,8 @@ #include -#define UART_CH \ - (XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \ - FuriHalUartIdLPUART1) +#define UART_CH \ + (xtreme_settings.uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : FuriHalUartIdLPUART1) #define NUM_MENU_ITEMS (11) diff --git a/applications/external/wifi_marauder_companion/wifi_marauder_app_i.h b/applications/external/wifi_marauder_companion/wifi_marauder_app_i.h index 13e76c0c2..6c846023f 100644 --- a/applications/external/wifi_marauder_companion/wifi_marauder_app_i.h +++ b/applications/external/wifi_marauder_companion/wifi_marauder_app_i.h @@ -28,9 +28,8 @@ #include #include -#define XTREME_UART_CH \ - (XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \ - FuriHalUartIdLPUART1) +#define XTREME_UART_CH \ + (xtreme_settings.uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : FuriHalUartIdLPUART1) #define US_ART_CH (FuriHalUartIdUSART1) #define LP_UART_CH (FuriHalUartIdLPUART1) diff --git a/applications/external/wifi_scanner/FlipperZeroWiFiModuleDefines.h b/applications/external/wifi_scanner/FlipperZeroWiFiModuleDefines.h index 8ec46ce79..f05c9bb9d 100644 --- a/applications/external/wifi_scanner/FlipperZeroWiFiModuleDefines.h +++ b/applications/external/wifi_scanner/FlipperZeroWiFiModuleDefines.h @@ -18,6 +18,5 @@ #include -#define UART_CH \ - (XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \ - FuriHalUartIdLPUART1) +#define UART_CH \ + (xtreme_settings.uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : FuriHalUartIdLPUART1) diff --git a/applications/main/archive/helpers/archive_browser.c b/applications/main/archive/helpers/archive_browser.c index d0111b363..c6efc5558 100644 --- a/applications/main/archive/helpers/archive_browser.c +++ b/applications/main/archive/helpers/archive_browser.c @@ -547,7 +547,7 @@ void archive_switch_tab(ArchiveBrowserView* browser, InputKey key) { } else { tab = (tab + 1) % ArchiveTabTotal; } - if(tab == ArchiveTabInternal && !XTREME_SETTINGS()->show_internal_tab) continue; + if(tab == ArchiveTabInternal && !xtreme_settings.show_internal_tab) continue; break; } @@ -579,10 +579,9 @@ void archive_switch_tab(ArchiveBrowserView* browser, InputKey key) { bool is_browser = !strcmp(archive_get_tab_ext(tab), "*"); bool skip_assets = !is_browser; // Hide dot files everywhere except Browser if in debug mode - bool hide_dot_files = !is_browser ? true : - tab == ArchiveTabInternal ? - false : - !XTREME_SETTINGS()->show_hidden_files; + bool hide_dot_files = !is_browser ? true : + tab == ArchiveTabInternal ? false : + !xtreme_settings.show_hidden_files; archive_file_browser_set_path( browser, browser->path, archive_get_tab_ext(tab), skip_assets, hide_dot_files); tab_empty = false; // Empty check will be performed later diff --git a/applications/main/archive/helpers/archive_files.h b/applications/main/archive/helpers/archive_files.h index 84a35ec30..702cb1c6b 100644 --- a/applications/main/archive/helpers/archive_files.h +++ b/applications/main/archive/helpers/archive_files.h @@ -84,7 +84,7 @@ static void ArchiveFile_t_clear(ArchiveFile_t* obj) { } static int ArchiveFile_t_cmp(const ArchiveFile_t* a, const ArchiveFile_t* b) { - if(XTREME_SETTINGS()->sort_dirs_first) { + if(xtreme_settings.sort_dirs_first) { if(a->type == ArchiveFileTypeFolder && b->type != ArchiveFileTypeFolder) { return -1; } diff --git a/applications/main/archive/helpers/favorite_timeout.c b/applications/main/archive/helpers/favorite_timeout.c index f38fb53c3..f0b02a1c4 100644 --- a/applications/main/archive/helpers/favorite_timeout.c +++ b/applications/main/archive/helpers/favorite_timeout.c @@ -17,7 +17,7 @@ void favorite_timeout_callback(void* _ctx) { } void favorite_timeout_run(ViewDispatcher* view_dispatcher, SceneManager* scene_manager) { - uint32_t timeout = XTREME_SETTINGS()->favorite_timeout; + uint32_t timeout = xtreme_settings.favorite_timeout; if(timeout == 0) { view_dispatcher_run(view_dispatcher); return; diff --git a/applications/main/bad_kb/bad_kb_app.c b/applications/main/bad_kb/bad_kb_app.c index e62ad4d3a..1c3156bcd 100644 --- a/applications/main/bad_kb/bad_kb_app.c +++ b/applications/main/bad_kb/bad_kb_app.c @@ -146,8 +146,8 @@ BadKbApp* bad_kb_app_alloc(char* arg) { Bt* bt = furi_record_open(RECORD_BT); app->bt = bt; app->bt->suppress_pin_screen = true; - app->is_bt = XTREME_SETTINGS()->bad_bt; - app->bt_remember = XTREME_SETTINGS()->bad_bt_remember; + app->is_bt = xtreme_settings.bad_bt; + app->bt_remember = xtreme_settings.bad_bt_remember; bad_kb_config_adjust(&app->config); // Save prev config diff --git a/applications/main/bad_kb/helpers/ducky_script.c b/applications/main/bad_kb/helpers/ducky_script.c index 0a02e162d..d55bacbc6 100644 --- a/applications/main/bad_kb/helpers/ducky_script.c +++ b/applications/main/bad_kb/helpers/ducky_script.c @@ -687,11 +687,10 @@ void bad_kb_config_refresh(BadKbApp* app) { scene_manager_previous_scene(app->scene_manager); // Update settings - XtremeSettings* xtreme_settings = XTREME_SETTINGS(); - if(xtreme_settings->bad_bt != app->is_bt || - xtreme_settings->bad_bt_remember != app->bt_remember) { - xtreme_settings->bad_bt = app->is_bt; - xtreme_settings->bad_bt_remember = app->bt_remember; + if(xtreme_settings.bad_bt != app->is_bt || + xtreme_settings.bad_bt_remember != app->bt_remember) { + xtreme_settings.bad_bt = app->is_bt; + xtreme_settings.bad_bt_remember = app->bt_remember; XTREME_SETTINGS_SAVE(); } } diff --git a/applications/main/bad_kb/views/bad_kb_view.c b/applications/main/bad_kb/views/bad_kb_view.c index 8bb4054a2..5ea6a1bf6 100644 --- a/applications/main/bad_kb/views/bad_kb_view.c +++ b/applications/main/bad_kb/views/bad_kb_view.c @@ -50,7 +50,7 @@ static void bad_kb_draw_callback(Canvas* canvas, void* _model) { if((state == BadKbStateIdle) || (state == BadKbStateDone) || (state == BadKbStateNotConnected)) { - if(XTREME_SETTINGS()->is_nsfw) { + if(xtreme_settings.is_nsfw) { elements_button_center(canvas, "Cum"); } else { elements_button_center(canvas, "Run"); @@ -73,7 +73,7 @@ static void bad_kb_draw_callback(Canvas* canvas, void* _model) { if(state == BadKbStateNotConnected) { canvas_draw_icon(canvas, 4, 26, &I_Clock_18x18); canvas_set_font(canvas, FontPrimary); - if(XTREME_SETTINGS()->is_nsfw) { + if(xtreme_settings.is_nsfw) { canvas_draw_str_aligned(canvas, 127, 31, AlignRight, AlignBottom, "Plug me"); canvas_draw_str_aligned(canvas, 127, 43, AlignRight, AlignBottom, "in, Daddy"); } else { @@ -83,7 +83,7 @@ static void bad_kb_draw_callback(Canvas* canvas, void* _model) { } else if(state == BadKbStateWillRun) { canvas_draw_icon(canvas, 4, 26, &I_Clock_18x18); canvas_set_font(canvas, FontPrimary); - if(XTREME_SETTINGS()->is_nsfw) { + if(xtreme_settings.is_nsfw) { canvas_draw_str_aligned(canvas, 127, 31, AlignRight, AlignBottom, "Will cum"); } else { canvas_draw_str_aligned(canvas, 127, 31, AlignRight, AlignBottom, "Will run"); diff --git a/applications/main/subghz/helpers/subghz_gps.h b/applications/main/subghz/helpers/subghz_gps.h index 6408a040d..bb42895a6 100644 --- a/applications/main/subghz/helpers/subghz_gps.h +++ b/applications/main/subghz/helpers/subghz_gps.h @@ -2,9 +2,8 @@ #include #include "minmea.h" -#define UART_CH \ - (XTREME_SETTINGS()->uart_nmea_channel == UARTDefault ? FuriHalUartIdUSART1 : \ - FuriHalUartIdLPUART1) +#define UART_CH \ + (xtreme_settings.uart_nmea_channel == UARTDefault ? FuriHalUartIdUSART1 : FuriHalUartIdLPUART1) #define RX_BUF_SIZE 1024 @@ -97,4 +96,4 @@ double subghz_gps_calc_distance(double lat1d, double lon1d, double lat2d, double * @param lon2 Longitude 2 * @return double Angle in degree */ -double subghz_gps_calc_angle(double lat1, double lon1, double lat2, double lon2); \ No newline at end of file +double subghz_gps_calc_angle(double lat1, double lon1, double lat2, double lon2); diff --git a/applications/main/subghz/scenes/subghz_scene_transmitter.c b/applications/main/subghz/scenes/subghz_scene_transmitter.c index 14ddb7fc2..8e8c096e0 100644 --- a/applications/main/subghz/scenes/subghz_scene_transmitter.c +++ b/applications/main/subghz/scenes/subghz_scene_transmitter.c @@ -81,7 +81,7 @@ void subghz_scene_transmitter_on_enter(void* context) { subghz->fav_timer = furi_timer_alloc(fav_timer_callback, FuriTimerTypeOnce, subghz); furi_timer_start( subghz->fav_timer, - XTREME_SETTINGS()->favorite_timeout * furi_kernel_get_tick_frequency()); + xtreme_settings.favorite_timeout * furi_kernel_get_tick_frequency()); // subghz->state_notifications = SubGhzNotificationStateTx; } } diff --git a/applications/main/subghz/subghz.c b/applications/main/subghz/subghz.c index 744ffc756..ab78c9c7c 100644 --- a/applications/main/subghz/subghz.c +++ b/applications/main/subghz/subghz.c @@ -373,7 +373,7 @@ int32_t subghz_app(char* p) { } // Check argument and run corresponding scene - bool is_favorite = process_favorite_launch(&p) && XTREME_SETTINGS()->favorite_timeout; + bool is_favorite = process_favorite_launch(&p) && xtreme_settings.favorite_timeout; if(p && strlen(p)) { uint32_t rpc_ctx = 0; diff --git a/applications/main/u2f/views/u2f_view.c b/applications/main/u2f/views/u2f_view.c index e80c0cbae..646278e06 100644 --- a/applications/main/u2f/views/u2f_view.c +++ b/applications/main/u2f/views/u2f_view.c @@ -21,7 +21,7 @@ static void u2f_view_draw_callback(Canvas* canvas, void* _model) { if(model->display_msg == U2fMsgNotConnected) { canvas_draw_icon(canvas, 22, 15, &I_Connect_me_62x31); - if(XTREME_SETTINGS()->is_nsfw) { + if(xtreme_settings.is_nsfw) { canvas_draw_str_aligned( canvas, 128 / 2, 3, AlignCenter, AlignTop, "Plug me in d-daddy"); } else { @@ -32,7 +32,7 @@ static void u2f_view_draw_callback(Canvas* canvas, void* _model) { canvas_draw_icon(canvas, 22, 15, &I_Connected_62x31); canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Connected!"); } else if(model->display_msg == U2fMsgRegister) { - if(XTREME_SETTINGS()->is_nsfw) { + if(xtreme_settings.is_nsfw) { elements_button_center(canvas, "CUM"); canvas_draw_icon(canvas, 22, 15, &I_Auth_62x31); canvas_draw_str_aligned( @@ -44,7 +44,7 @@ static void u2f_view_draw_callback(Canvas* canvas, void* _model) { canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press OK to register"); } } else if(model->display_msg == U2fMsgAuth) { - if(XTREME_SETTINGS()->is_nsfw) { + if(xtreme_settings.is_nsfw) { elements_button_center(canvas, "CUM"); canvas_draw_icon(canvas, 22, 15, &I_Auth_62x31); canvas_draw_str_aligned( @@ -57,7 +57,7 @@ static void u2f_view_draw_callback(Canvas* canvas, void* _model) { } } else if(model->display_msg == U2fMsgSuccess) { canvas_draw_icon(canvas, 22, 15, &I_Connected_62x31); - if(XTREME_SETTINGS()->is_nsfw) { + if(xtreme_settings.is_nsfw) { canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Cum released~"); } else { canvas_draw_str_aligned( @@ -65,7 +65,7 @@ static void u2f_view_draw_callback(Canvas* canvas, void* _model) { } } else if(model->display_msg == U2fMsgError) { canvas_draw_icon(canvas, 22, 15, &I_Error_62x31); - if(XTREME_SETTINGS()->is_nsfw) { + if(xtreme_settings.is_nsfw) { canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Unable to cum"); } else { canvas_draw_str_aligned( diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_filebrowser.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_filebrowser.c index 93093a54f..99e2a19a5 100644 --- a/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_filebrowser.c +++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_filebrowser.c @@ -16,7 +16,7 @@ static void xtreme_app_scene_interface_filebrowser_sort_dirs_first_changed(Varia XtremeApp* app = variable_item_get_context(item); bool value = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, value ? "ON" : "OFF"); - XTREME_SETTINGS()->sort_dirs_first = value; + xtreme_settings.sort_dirs_first = value; app->save_settings = true; } @@ -24,7 +24,7 @@ static void xtreme_app_scene_interface_filebrowser_show_hidden_files_changed(Var XtremeApp* app = variable_item_get_context(item); bool value = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, value ? "ON" : "OFF"); - XTREME_SETTINGS()->show_hidden_files = value; + xtreme_settings.show_hidden_files = value; app->save_settings = true; } @@ -32,7 +32,7 @@ static void xtreme_app_scene_interface_filebrowser_show_internal_tab_changed(Var XtremeApp* app = variable_item_get_context(item); bool value = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, value ? "ON" : "OFF"); - XTREME_SETTINGS()->show_internal_tab = value; + xtreme_settings.show_internal_tab = value; app->save_settings = true; } @@ -42,13 +42,12 @@ static void xtreme_app_scene_interface_filebrowser_favorite_timeout_changed(Vari char text[6]; snprintf(text, sizeof(text), "%lu S", value); variable_item_set_current_value_text(item, value ? text : "OFF"); - XTREME_SETTINGS()->favorite_timeout = value; + xtreme_settings.favorite_timeout = value; app->save_settings = true; } void xtreme_app_scene_interface_filebrowser_on_enter(void* context) { XtremeApp* app = context; - XtremeSettings* xtreme_settings = XTREME_SETTINGS(); VariableItemList* var_item_list = app->var_item_list; VariableItem* item; @@ -58,8 +57,8 @@ void xtreme_app_scene_interface_filebrowser_on_enter(void* context) { 2, xtreme_app_scene_interface_filebrowser_sort_dirs_first_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->sort_dirs_first); - variable_item_set_current_value_text(item, xtreme_settings->sort_dirs_first ? "ON" : "OFF"); + variable_item_set_current_value_index(item, xtreme_settings.sort_dirs_first); + variable_item_set_current_value_text(item, xtreme_settings.sort_dirs_first ? "ON" : "OFF"); item = variable_item_list_add( var_item_list, @@ -67,8 +66,8 @@ void xtreme_app_scene_interface_filebrowser_on_enter(void* context) { 2, xtreme_app_scene_interface_filebrowser_show_hidden_files_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->show_hidden_files); - variable_item_set_current_value_text(item, xtreme_settings->show_hidden_files ? "ON" : "OFF"); + variable_item_set_current_value_index(item, xtreme_settings.show_hidden_files); + variable_item_set_current_value_text(item, xtreme_settings.show_hidden_files ? "ON" : "OFF"); item = variable_item_list_add( var_item_list, @@ -76,8 +75,8 @@ void xtreme_app_scene_interface_filebrowser_on_enter(void* context) { 2, xtreme_app_scene_interface_filebrowser_show_internal_tab_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->show_internal_tab); - variable_item_set_current_value_text(item, xtreme_settings->show_internal_tab ? "ON" : "OFF"); + variable_item_set_current_value_index(item, xtreme_settings.show_internal_tab); + variable_item_set_current_value_text(item, xtreme_settings.show_internal_tab ? "ON" : "OFF"); item = variable_item_list_add( var_item_list, @@ -85,10 +84,10 @@ void xtreme_app_scene_interface_filebrowser_on_enter(void* context) { 61, xtreme_app_scene_interface_filebrowser_favorite_timeout_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->favorite_timeout); + variable_item_set_current_value_index(item, xtreme_settings.favorite_timeout); char text[4]; - snprintf(text, sizeof(text), "%lu S", xtreme_settings->favorite_timeout); - variable_item_set_current_value_text(item, xtreme_settings->favorite_timeout ? text : "OFF"); + snprintf(text, sizeof(text), "%lu S", xtreme_settings.favorite_timeout); + variable_item_set_current_value_text(item, xtreme_settings.favorite_timeout ? text : "OFF"); variable_item_list_set_enter_callback( var_item_list, xtreme_app_scene_interface_filebrowser_var_item_list_callback, app); diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_graphics.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_graphics.c index c03b2abb3..0420af5f5 100644 --- a/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_graphics.c +++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_graphics.c @@ -19,7 +19,7 @@ static void xtreme_app_scene_interface_graphics_asset_pack_changed(VariableItem* variable_item_set_current_value_text( item, index == 0 ? "Default" : *CharList_get(app->asset_pack_names, index - 1)); strlcpy( - XTREME_SETTINGS()->asset_pack, + xtreme_settings.asset_pack, index == 0 ? "" : *CharList_get(app->asset_pack_names, index - 1), XTREME_ASSETS_PACK_NAME_LEN); app->asset_pack_index = index; @@ -59,7 +59,7 @@ static void xtreme_app_scene_interface_graphics_anim_speed_changed(VariableItem* XtremeApp* app = variable_item_get_context(item); uint8_t index = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, anim_speed_names[index]); - XTREME_SETTINGS()->anim_speed = anim_speed_values[index]; + xtreme_settings.anim_speed = anim_speed_values[index]; app->save_settings = true; } @@ -97,7 +97,7 @@ static void xtreme_app_scene_interface_graphics_cycle_anims_changed(VariableItem XtremeApp* app = variable_item_get_context(item); uint8_t index = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, cycle_anims_names[index]); - XTREME_SETTINGS()->cycle_anims = cycle_anims_values[index]; + xtreme_settings.cycle_anims = cycle_anims_values[index]; app->save_settings = true; } @@ -105,7 +105,7 @@ static void xtreme_app_scene_interface_graphics_unlock_anims_changed(VariableIte XtremeApp* app = variable_item_get_context(item); bool value = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, value ? "ON" : "OFF"); - XTREME_SETTINGS()->unlock_anims = value; + xtreme_settings.unlock_anims = value; app->save_settings = true; } @@ -113,13 +113,12 @@ static void xtreme_app_scene_interface_graphics_fallback_anim_changed(VariableIt XtremeApp* app = variable_item_get_context(item); bool value = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, value ? "ON" : "OFF"); - XTREME_SETTINGS()->fallback_anim = value; + xtreme_settings.fallback_anim = value; app->save_settings = true; } void xtreme_app_scene_interface_graphics_on_enter(void* context) { XtremeApp* app = context; - XtremeSettings* xtreme_settings = XTREME_SETTINGS(); VariableItemList* var_item_list = app->var_item_list; VariableItem* item; uint8_t value_index; @@ -144,7 +143,7 @@ void xtreme_app_scene_interface_graphics_on_enter(void* context) { xtreme_app_scene_interface_graphics_anim_speed_changed, app); value_index = value_index_uint32( - xtreme_settings->anim_speed, anim_speed_values, COUNT_OF(anim_speed_values)); + xtreme_settings.anim_speed, anim_speed_values, COUNT_OF(anim_speed_values)); variable_item_set_current_value_index(item, value_index); variable_item_set_current_value_text(item, anim_speed_names[value_index]); @@ -155,7 +154,7 @@ void xtreme_app_scene_interface_graphics_on_enter(void* context) { xtreme_app_scene_interface_graphics_cycle_anims_changed, app); value_index = value_index_int32( - xtreme_settings->cycle_anims, cycle_anims_values, COUNT_OF(cycle_anims_values)); + xtreme_settings.cycle_anims, cycle_anims_values, COUNT_OF(cycle_anims_values)); variable_item_set_current_value_index(item, value_index); variable_item_set_current_value_text(item, cycle_anims_names[value_index]); @@ -165,8 +164,8 @@ void xtreme_app_scene_interface_graphics_on_enter(void* context) { 2, xtreme_app_scene_interface_graphics_unlock_anims_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->unlock_anims); - variable_item_set_current_value_text(item, xtreme_settings->unlock_anims ? "ON" : "OFF"); + variable_item_set_current_value_index(item, xtreme_settings.unlock_anims); + variable_item_set_current_value_text(item, xtreme_settings.unlock_anims ? "ON" : "OFF"); item = variable_item_list_add( var_item_list, @@ -174,8 +173,8 @@ void xtreme_app_scene_interface_graphics_on_enter(void* context) { 2, xtreme_app_scene_interface_graphics_fallback_anim_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->fallback_anim); - variable_item_set_current_value_text(item, xtreme_settings->fallback_anim ? "ON" : "OFF"); + variable_item_set_current_value_index(item, xtreme_settings.fallback_anim); + variable_item_set_current_value_text(item, xtreme_settings.fallback_anim ? "ON" : "OFF"); variable_item_list_set_enter_callback( var_item_list, xtreme_app_scene_interface_graphics_var_item_list_callback, app); diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_lockscreen.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_lockscreen.c index b949b0410..4a7b60aac 100644 --- a/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_lockscreen.c +++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_lockscreen.c @@ -20,7 +20,7 @@ static void xtreme_app_scene_interface_lockscreen_lock_on_boot_changed(VariableI XtremeApp* app = variable_item_get_context(item); bool value = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, value ? "ON" : "OFF"); - XTREME_SETTINGS()->lock_on_boot = value; + xtreme_settings.lock_on_boot = value; app->save_settings = true; } @@ -28,7 +28,7 @@ static void xtreme_app_scene_interface_lockscreen_bad_pins_format_changed(Variab XtremeApp* app = variable_item_get_context(item); bool value = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, value ? "ON" : "OFF"); - XTREME_SETTINGS()->bad_pins_format = value; + xtreme_settings.bad_pins_format = value; app->save_settings = true; } @@ -37,7 +37,7 @@ static void XtremeApp* app = variable_item_get_context(item); bool value = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, value ? "ON" : "OFF"); - XTREME_SETTINGS()->allow_locked_rpc_commands = value; + xtreme_settings.allow_locked_rpc_commands = value; app->save_settings = true; } @@ -45,7 +45,7 @@ static void xtreme_app_scene_interface_lockscreen_lockscreen_time_changed(Variab XtremeApp* app = variable_item_get_context(item); bool value = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, value ? "ON" : "OFF"); - XTREME_SETTINGS()->lockscreen_time = value; + xtreme_settings.lockscreen_time = value; app->save_settings = true; } @@ -53,7 +53,7 @@ static void xtreme_app_scene_interface_lockscreen_lockscreen_seconds_changed(Var XtremeApp* app = variable_item_get_context(item); bool value = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, value ? "ON" : "OFF"); - XTREME_SETTINGS()->lockscreen_seconds = value; + xtreme_settings.lockscreen_seconds = value; app->save_settings = true; } @@ -61,7 +61,7 @@ static void xtreme_app_scene_interface_lockscreen_lockscreen_date_changed(Variab XtremeApp* app = variable_item_get_context(item); bool value = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, value ? "ON" : "OFF"); - XTREME_SETTINGS()->lockscreen_date = value; + xtreme_settings.lockscreen_date = value; app->save_settings = true; } @@ -70,7 +70,7 @@ static void XtremeApp* app = variable_item_get_context(item); bool value = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, value ? "ON" : "OFF"); - XTREME_SETTINGS()->lockscreen_statusbar = value; + xtreme_settings.lockscreen_statusbar = value; app->save_settings = true; } @@ -78,7 +78,7 @@ static void xtreme_app_scene_interface_lockscreen_lockscreen_prompt_changed(Vari XtremeApp* app = variable_item_get_context(item); bool value = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, value ? "ON" : "OFF"); - XTREME_SETTINGS()->lockscreen_prompt = value; + xtreme_settings.lockscreen_prompt = value; app->save_settings = true; } @@ -87,13 +87,12 @@ static void XtremeApp* app = variable_item_get_context(item); bool value = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, value ? "ON" : "OFF"); - XTREME_SETTINGS()->lockscreen_transparent = value; + xtreme_settings.lockscreen_transparent = value; app->save_settings = true; } void xtreme_app_scene_interface_lockscreen_on_enter(void* context) { XtremeApp* app = context; - XtremeSettings* xtreme_settings = XTREME_SETTINGS(); VariableItemList* var_item_list = app->var_item_list; VariableItem* item; @@ -103,8 +102,8 @@ void xtreme_app_scene_interface_lockscreen_on_enter(void* context) { 2, xtreme_app_scene_interface_lockscreen_lock_on_boot_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->lock_on_boot); - variable_item_set_current_value_text(item, xtreme_settings->lock_on_boot ? "ON" : "OFF"); + variable_item_set_current_value_index(item, xtreme_settings.lock_on_boot); + variable_item_set_current_value_text(item, xtreme_settings.lock_on_boot ? "ON" : "OFF"); item = variable_item_list_add( var_item_list, @@ -112,8 +111,8 @@ void xtreme_app_scene_interface_lockscreen_on_enter(void* context) { 2, xtreme_app_scene_interface_lockscreen_bad_pins_format_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->bad_pins_format); - variable_item_set_current_value_text(item, xtreme_settings->bad_pins_format ? "ON" : "OFF"); + variable_item_set_current_value_index(item, xtreme_settings.bad_pins_format); + variable_item_set_current_value_text(item, xtreme_settings.bad_pins_format ? "ON" : "OFF"); item = variable_item_list_add( var_item_list, @@ -121,9 +120,9 @@ void xtreme_app_scene_interface_lockscreen_on_enter(void* context) { 2, xtreme_app_scene_interface_lockscreen_allow_locked_rpc_commands_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->allow_locked_rpc_commands); + variable_item_set_current_value_index(item, xtreme_settings.allow_locked_rpc_commands); variable_item_set_current_value_text( - item, xtreme_settings->allow_locked_rpc_commands ? "ON" : "OFF"); + item, xtreme_settings.allow_locked_rpc_commands ? "ON" : "OFF"); item = variable_item_list_add( var_item_list, @@ -131,8 +130,8 @@ void xtreme_app_scene_interface_lockscreen_on_enter(void* context) { 2, xtreme_app_scene_interface_lockscreen_lockscreen_time_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->lockscreen_time); - variable_item_set_current_value_text(item, xtreme_settings->lockscreen_time ? "ON" : "OFF"); + variable_item_set_current_value_index(item, xtreme_settings.lockscreen_time); + variable_item_set_current_value_text(item, xtreme_settings.lockscreen_time ? "ON" : "OFF"); item = variable_item_list_add( var_item_list, @@ -140,8 +139,8 @@ void xtreme_app_scene_interface_lockscreen_on_enter(void* context) { 2, xtreme_app_scene_interface_lockscreen_lockscreen_seconds_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->lockscreen_seconds); - variable_item_set_current_value_text(item, xtreme_settings->lockscreen_seconds ? "ON" : "OFF"); + variable_item_set_current_value_index(item, xtreme_settings.lockscreen_seconds); + variable_item_set_current_value_text(item, xtreme_settings.lockscreen_seconds ? "ON" : "OFF"); item = variable_item_list_add( var_item_list, @@ -149,8 +148,8 @@ void xtreme_app_scene_interface_lockscreen_on_enter(void* context) { 2, xtreme_app_scene_interface_lockscreen_lockscreen_date_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->lockscreen_date); - variable_item_set_current_value_text(item, xtreme_settings->lockscreen_date ? "ON" : "OFF"); + variable_item_set_current_value_index(item, xtreme_settings.lockscreen_date); + variable_item_set_current_value_text(item, xtreme_settings.lockscreen_date ? "ON" : "OFF"); item = variable_item_list_add( var_item_list, @@ -158,9 +157,9 @@ void xtreme_app_scene_interface_lockscreen_on_enter(void* context) { 2, xtreme_app_scene_interface_lockscreen_lockscreen_statusbar_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->lockscreen_statusbar); + variable_item_set_current_value_index(item, xtreme_settings.lockscreen_statusbar); variable_item_set_current_value_text( - item, xtreme_settings->lockscreen_statusbar ? "ON" : "OFF"); + item, xtreme_settings.lockscreen_statusbar ? "ON" : "OFF"); item = variable_item_list_add( var_item_list, @@ -168,8 +167,8 @@ void xtreme_app_scene_interface_lockscreen_on_enter(void* context) { 2, xtreme_app_scene_interface_lockscreen_lockscreen_prompt_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->lockscreen_prompt); - variable_item_set_current_value_text(item, xtreme_settings->lockscreen_prompt ? "ON" : "OFF"); + variable_item_set_current_value_index(item, xtreme_settings.lockscreen_prompt); + variable_item_set_current_value_text(item, xtreme_settings.lockscreen_prompt ? "ON" : "OFF"); item = variable_item_list_add( var_item_list, @@ -177,9 +176,9 @@ void xtreme_app_scene_interface_lockscreen_on_enter(void* context) { 2, xtreme_app_scene_interface_lockscreen_lockscreen_transparent_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->lockscreen_transparent); + variable_item_set_current_value_index(item, xtreme_settings.lockscreen_transparent); variable_item_set_current_value_text( - item, xtreme_settings->lockscreen_transparent ? "ON" : "OFF"); + item, xtreme_settings.lockscreen_transparent ? "ON" : "OFF"); variable_item_list_set_enter_callback( var_item_list, xtreme_app_scene_interface_lockscreen_var_item_list_callback, app); diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_mainmenu.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_mainmenu.c index b72c8062e..d9f973790 100644 --- a/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_mainmenu.c +++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_mainmenu.c @@ -29,7 +29,7 @@ static void xtreme_app_scene_interface_mainmenu_menu_style_changed(VariableItem* XtremeApp* app = variable_item_get_context(item); uint8_t index = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, menu_style_names[index]); - XTREME_SETTINGS()->menu_style = index; + xtreme_settings.menu_style = index; app->save_settings = true; } @@ -68,7 +68,6 @@ static void xtreme_app_scene_interface_mainmenu_move_app_changed(VariableItem* i void xtreme_app_scene_interface_mainmenu_on_enter(void* context) { XtremeApp* app = context; - XtremeSettings* xtreme_settings = XTREME_SETTINGS(); VariableItemList* var_item_list = app->var_item_list; VariableItem* item; @@ -78,8 +77,8 @@ void xtreme_app_scene_interface_mainmenu_on_enter(void* context) { MenuStyleCount, xtreme_app_scene_interface_mainmenu_menu_style_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->menu_style); - variable_item_set_current_value_text(item, menu_style_names[xtreme_settings->menu_style]); + variable_item_set_current_value_index(item, xtreme_settings.menu_style); + variable_item_set_current_value_text(item, menu_style_names[xtreme_settings.menu_style]); variable_item_list_add(var_item_list, "Reset Menu", 0, NULL, app); diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_statusbar.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_statusbar.c index 953c08c95..b29269631 100644 --- a/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_statusbar.c +++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_statusbar.c @@ -26,7 +26,7 @@ static void xtreme_app_scene_interface_statusbar_battery_icon_changed(VariableIt XtremeApp* app = variable_item_get_context(item); uint8_t index = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, battery_icon_names[index]); - XTREME_SETTINGS()->battery_icon = index; + xtreme_settings.battery_icon = index; app->save_settings = true; power_set_battery_icon_enabled(furi_record_open(RECORD_POWER), index != BatteryIconOff); furi_record_close(RECORD_POWER); @@ -36,7 +36,7 @@ static void xtreme_app_scene_interface_statusbar_statusbar_clock_changed(Variabl XtremeApp* app = variable_item_get_context(item); bool value = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, value ? "ON" : "OFF"); - XTREME_SETTINGS()->statusbar_clock = value; + xtreme_settings.statusbar_clock = value; app->save_settings = true; } @@ -44,7 +44,7 @@ static void xtreme_app_scene_interface_statusbar_status_icons_changed(VariableIt XtremeApp* app = variable_item_get_context(item); bool value = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, value ? "ON" : "OFF"); - XTREME_SETTINGS()->status_icons = value; + xtreme_settings.status_icons = value; app->save_settings = true; } @@ -52,7 +52,7 @@ static void xtreme_app_scene_interface_statusbar_bar_borders_changed(VariableIte XtremeApp* app = variable_item_get_context(item); bool value = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, value ? "ON" : "OFF"); - XTREME_SETTINGS()->bar_borders = value; + xtreme_settings.bar_borders = value; app->save_settings = true; } @@ -60,13 +60,12 @@ static void xtreme_app_scene_interface_statusbar_bar_background_changed(Variable XtremeApp* app = variable_item_get_context(item); bool value = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, value ? "ON" : "OFF"); - XTREME_SETTINGS()->bar_background = value; + xtreme_settings.bar_background = value; app->save_settings = true; } void xtreme_app_scene_interface_statusbar_on_enter(void* context) { XtremeApp* app = context; - XtremeSettings* xtreme_settings = XTREME_SETTINGS(); VariableItemList* var_item_list = app->var_item_list; VariableItem* item; @@ -76,8 +75,8 @@ void xtreme_app_scene_interface_statusbar_on_enter(void* context) { BatteryIconCount, xtreme_app_scene_interface_statusbar_battery_icon_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->battery_icon); - variable_item_set_current_value_text(item, battery_icon_names[xtreme_settings->battery_icon]); + variable_item_set_current_value_index(item, xtreme_settings.battery_icon); + variable_item_set_current_value_text(item, battery_icon_names[xtreme_settings.battery_icon]); item = variable_item_list_add( var_item_list, @@ -85,8 +84,8 @@ void xtreme_app_scene_interface_statusbar_on_enter(void* context) { 2, xtreme_app_scene_interface_statusbar_statusbar_clock_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->statusbar_clock); - variable_item_set_current_value_text(item, xtreme_settings->statusbar_clock ? "ON" : "OFF"); + variable_item_set_current_value_index(item, xtreme_settings.statusbar_clock); + variable_item_set_current_value_text(item, xtreme_settings.statusbar_clock ? "ON" : "OFF"); item = variable_item_list_add( var_item_list, @@ -94,8 +93,8 @@ void xtreme_app_scene_interface_statusbar_on_enter(void* context) { 2, xtreme_app_scene_interface_statusbar_status_icons_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->status_icons); - variable_item_set_current_value_text(item, xtreme_settings->status_icons ? "ON" : "OFF"); + variable_item_set_current_value_index(item, xtreme_settings.status_icons); + variable_item_set_current_value_text(item, xtreme_settings.status_icons ? "ON" : "OFF"); item = variable_item_list_add( var_item_list, @@ -103,8 +102,8 @@ void xtreme_app_scene_interface_statusbar_on_enter(void* context) { 2, xtreme_app_scene_interface_statusbar_bar_borders_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->bar_borders); - variable_item_set_current_value_text(item, xtreme_settings->bar_borders ? "ON" : "OFF"); + variable_item_set_current_value_index(item, xtreme_settings.bar_borders); + variable_item_set_current_value_text(item, xtreme_settings.bar_borders ? "ON" : "OFF"); item = variable_item_list_add( var_item_list, @@ -112,8 +111,8 @@ void xtreme_app_scene_interface_statusbar_on_enter(void* context) { 2, xtreme_app_scene_interface_statusbar_bar_background_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->bar_background); - variable_item_set_current_value_text(item, xtreme_settings->bar_background ? "ON" : "OFF"); + variable_item_set_current_value_index(item, xtreme_settings.bar_background); + variable_item_set_current_value_text(item, xtreme_settings.bar_background ? "ON" : "OFF"); variable_item_list_set_enter_callback( var_item_list, xtreme_app_scene_interface_statusbar_var_item_list_callback, app); diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_misc.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_misc.c index 677bebe8f..8b74d2bb8 100644 --- a/applications/main/xtreme_app/scenes/xtreme_app_scene_misc.c +++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_misc.c @@ -20,13 +20,12 @@ static void xtreme_app_scene_misc_charge_cap_changed(VariableItem* item) { uint32_t value = (variable_item_get_current_value_index(item) + 1) * CHARGE_CAP_INTV; snprintf(cap_str, 6, "%lu%%", value); variable_item_set_current_value_text(item, cap_str); - XTREME_SETTINGS()->charge_cap = value; + xtreme_settings.charge_cap = value; app->save_settings = true; } void xtreme_app_scene_misc_on_enter(void* context) { XtremeApp* app = context; - XtremeSettings* xtreme_settings = XTREME_SETTINGS(); VariableItemList* var_item_list = app->var_item_list; VariableItem* item; uint8_t value_index; @@ -40,7 +39,7 @@ void xtreme_app_scene_misc_on_enter(void* context) { variable_item_list_add(var_item_list, "Change Device Name", 0, NULL, app); char cap_str[6]; - value_index = xtreme_settings->charge_cap / CHARGE_CAP_INTV; + value_index = xtreme_settings.charge_cap / CHARGE_CAP_INTV; snprintf(cap_str, 6, "%lu%%", (uint32_t)value_index * CHARGE_CAP_INTV); item = variable_item_list_add( var_item_list, diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_misc_dolphin.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_misc_dolphin.c index e4d344e09..06881e629 100644 --- a/applications/main/xtreme_app/scenes/xtreme_app_scene_misc_dolphin.c +++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_misc_dolphin.c @@ -57,14 +57,13 @@ static void xtreme_app_scene_misc_dolphin_butthurt_timer_changed(VariableItem* i XtremeApp* app = variable_item_get_context(item); uint8_t index = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, butthurt_timer_names[index]); - XTREME_SETTINGS()->butthurt_timer = butthurt_timer_values[index]; + xtreme_settings.butthurt_timer = butthurt_timer_values[index]; app->save_settings = true; app->require_reboot = true; } void xtreme_app_scene_misc_dolphin_on_enter(void* context) { XtremeApp* app = context; - XtremeSettings* xtreme_settings = XTREME_SETTINGS(); VariableItemList* var_item_list = app->var_item_list; VariableItem* item; uint8_t value_index; @@ -98,7 +97,7 @@ void xtreme_app_scene_misc_dolphin_on_enter(void* context) { xtreme_app_scene_misc_dolphin_butthurt_timer_changed, app); value_index = value_index_uint32( - xtreme_settings->butthurt_timer, butthurt_timer_values, COUNT_OF(butthurt_timer_values)); + xtreme_settings.butthurt_timer, butthurt_timer_values, COUNT_OF(butthurt_timer_values)); variable_item_set_current_value_index(item, value_index); variable_item_set_current_value_text(item, butthurt_timer_names[value_index]); diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_misc_screen.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_misc_screen.c index 8f8a2bef5..e58236102 100644 --- a/applications/main/xtreme_app/scenes/xtreme_app_scene_misc_screen.c +++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_misc_screen.c @@ -22,7 +22,7 @@ static void xtreme_app_scene_misc_screen_dark_mode_changed(VariableItem* item) { XtremeApp* app = variable_item_get_context(item); bool value = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, value ? "ON" : "OFF"); - XTREME_SETTINGS()->dark_mode = value; + xtreme_settings.dark_mode = value; app->save_settings = true; } @@ -140,15 +140,14 @@ static void xtreme_app_scene_misc_screen_rainbow_saturation_changed(VariableItem void xtreme_app_scene_misc_screen_on_enter(void* context) { XtremeApp* app = context; - XtremeSettings* xtreme_settings = XTREME_SETTINGS(); VariableItemList* var_item_list = app->var_item_list; VariableItem* item; uint8_t value_index; item = variable_item_list_add( var_item_list, "Dark Mode", 2, xtreme_app_scene_misc_screen_dark_mode_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->dark_mode); - variable_item_set_current_value_text(item, xtreme_settings->dark_mode ? "ON" : "OFF"); + variable_item_set_current_value_index(item, xtreme_settings.dark_mode); + variable_item_set_current_value_text(item, xtreme_settings.dark_mode ? "ON" : "OFF"); item = variable_item_list_add( var_item_list, "Left Handed", 2, xtreme_app_scene_misc_screen_hand_orient_changed, app); @@ -157,7 +156,7 @@ void xtreme_app_scene_misc_screen_on_enter(void* context) { variable_item_set_current_value_text(item, value ? "ON" : "OFF"); item = variable_item_list_add(var_item_list, "RGB Backlight", 1, NULL, app); - variable_item_set_current_value_text(item, xtreme_settings->rgb_backlight ? "ON" : "OFF"); + variable_item_set_current_value_text(item, xtreme_settings.rgb_backlight ? "ON" : "OFF"); struct { uint8_t led; @@ -190,7 +189,7 @@ void xtreme_app_scene_misc_screen_on_enter(void* context) { snprintf(str, sizeof(str), "%02X%02X%02X", color.r, color.g, color.b); variable_item_set_current_value_text(item, str); } - variable_item_set_locked(item, !xtreme_settings->rgb_backlight, "Needs RGB\nBacklight!"); + variable_item_set_locked(item, !xtreme_settings.rgb_backlight, "Needs RGB\nBacklight!"); } item = variable_item_list_add( @@ -202,7 +201,7 @@ void xtreme_app_scene_misc_screen_on_enter(void* context) { value_index = rgb_backlight_get_rainbow_mode(); variable_item_set_current_value_index(item, value_index); variable_item_set_current_value_text(item, rainbow_lcd_names[value_index]); - variable_item_set_locked(item, !xtreme_settings->rgb_backlight, "Needs RGB\nBacklight!"); + variable_item_set_locked(item, !xtreme_settings.rgb_backlight, "Needs RGB\nBacklight!"); item = variable_item_list_add( var_item_list, @@ -215,7 +214,7 @@ void xtreme_app_scene_misc_screen_on_enter(void* context) { char speed_str[4]; snprintf(speed_str, sizeof(speed_str), "%d", value_index); variable_item_set_current_value_text(item, speed_str); - variable_item_set_locked(item, !xtreme_settings->rgb_backlight, "Needs RGB\nBacklight!"); + variable_item_set_locked(item, !xtreme_settings.rgb_backlight, "Needs RGB\nBacklight!"); item = variable_item_list_add( var_item_list, @@ -229,7 +228,7 @@ void xtreme_app_scene_misc_screen_on_enter(void* context) { COUNT_OF(rainbow_interval_values)); variable_item_set_current_value_index(item, value_index); variable_item_set_current_value_text(item, rainbow_interval_names[value_index]); - variable_item_set_locked(item, !xtreme_settings->rgb_backlight, "Needs RGB\nBacklight!"); + variable_item_set_locked(item, !xtreme_settings.rgb_backlight, "Needs RGB\nBacklight!"); item = variable_item_list_add( var_item_list, @@ -242,7 +241,7 @@ void xtreme_app_scene_misc_screen_on_enter(void* context) { char saturation_str[4]; snprintf(saturation_str, sizeof(saturation_str), "%d", value_index); variable_item_set_current_value_text(item, saturation_str); - variable_item_set_locked(item, !xtreme_settings->rgb_backlight, "Needs RGB\nBacklight!"); + variable_item_set_locked(item, !xtreme_settings.rgb_backlight, "Needs RGB\nBacklight!"); variable_item_list_set_enter_callback( var_item_list, xtreme_app_scene_misc_screen_var_item_list_callback, app); @@ -263,7 +262,7 @@ bool xtreme_app_scene_misc_screen_on_event(void* context, SceneManagerEvent even consumed = true; switch(event.event) { case VarItemListIndexRgbBacklight: { - bool change = XTREME_SETTINGS()->rgb_backlight; + bool change = xtreme_settings.rgb_backlight; if(!change) { DialogMessage* msg = dialog_message_alloc(); dialog_message_set_header(msg, "RGB Backlight", 64, 0, AlignCenter, AlignTop); @@ -281,11 +280,11 @@ bool xtreme_app_scene_misc_screen_on_event(void* context, SceneManagerEvent even dialog_message_free(msg); } if(change) { - XTREME_SETTINGS()->rgb_backlight = !XTREME_SETTINGS()->rgb_backlight; + xtreme_settings.rgb_backlight = !xtreme_settings.rgb_backlight; app->save_settings = true; app->save_backlight = true; notification_message(app->notification, &sequence_display_backlight_on); - rgb_backlight_reconfigure(XTREME_SETTINGS()->rgb_backlight); + rgb_backlight_reconfigure(xtreme_settings.rgb_backlight); scene_manager_previous_scene(app->scene_manager); scene_manager_next_scene(app->scene_manager, XtremeAppSceneMiscScreen); } diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols.c index 5912d1e80..ccf8e2a34 100644 --- a/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols.c +++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols.c @@ -17,7 +17,7 @@ static void xtreme_app_scene_protocols_bad_bt_changed(VariableItem* item) { XtremeApp* app = variable_item_get_context(item); bool value = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, value ? "BT" : "USB"); - XTREME_SETTINGS()->bad_bt = value; + xtreme_settings.bad_bt = value; app->save_settings = true; } @@ -25,7 +25,7 @@ static void xtreme_app_scene_protocols_bad_bt_remember_changed(VariableItem* ite XtremeApp* app = variable_item_get_context(item); bool value = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, value ? "ON" : "OFF"); - XTREME_SETTINGS()->bad_bt_remember = value; + xtreme_settings.bad_bt_remember = value; app->save_settings = true; } @@ -38,14 +38,13 @@ static void xtreme_app_scene_protocols_subghz_extend_changed(VariableItem* item) void xtreme_app_scene_protocols_on_enter(void* context) { XtremeApp* app = context; - XtremeSettings* xtreme_settings = XTREME_SETTINGS(); VariableItemList* var_item_list = app->var_item_list; VariableItem* item; item = variable_item_list_add( var_item_list, "BadKB Mode", 2, xtreme_app_scene_protocols_bad_bt_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->bad_bt); - variable_item_set_current_value_text(item, xtreme_settings->bad_bt ? "BT" : "USB"); + variable_item_set_current_value_index(item, xtreme_settings.bad_bt); + variable_item_set_current_value_text(item, xtreme_settings.bad_bt ? "BT" : "USB"); item = variable_item_list_add( var_item_list, @@ -53,8 +52,8 @@ void xtreme_app_scene_protocols_on_enter(void* context) { 2, xtreme_app_scene_protocols_bad_bt_remember_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->bad_bt_remember); - variable_item_set_current_value_text(item, xtreme_settings->bad_bt_remember ? "ON" : "OFF"); + variable_item_set_current_value_index(item, xtreme_settings.bad_bt_remember); + variable_item_set_current_value_text(item, xtreme_settings.bad_bt_remember ? "ON" : "OFF"); item = variable_item_list_add(var_item_list, "SubGHz Freqs", 0, NULL, app); variable_item_set_current_value_text(item, ">"); diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols_gpio.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols_gpio.c index 76bb03f75..2921fa30b 100644 --- a/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols_gpio.c +++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols_gpio.c @@ -15,52 +15,51 @@ void xtreme_app_scene_protocols_gpio_var_item_list_callback(void* context, uint3 static void xtreme_app_scene_protocols_gpio_cc1101_handle_changed(VariableItem* item) { XtremeApp* app = variable_item_get_context(item); - XTREME_SETTINGS()->spi_cc1101_handle = + xtreme_settings.spi_cc1101_handle = variable_item_get_current_value_index(item) == 0 ? SpiDefault : SpiExtra; variable_item_set_current_value_text( - item, XTREME_SETTINGS()->spi_cc1101_handle == SpiDefault ? "Default" : "Extra"); + item, xtreme_settings.spi_cc1101_handle == SpiDefault ? "Default" : "Extra"); app->save_settings = true; } static void xtreme_app_scene_protocols_gpio_nrf24_handle_changed(VariableItem* item) { XtremeApp* app = variable_item_get_context(item); - XTREME_SETTINGS()->spi_nrf24_handle = + xtreme_settings.spi_nrf24_handle = variable_item_get_current_value_index(item) == 0 ? SpiDefault : SpiExtra; variable_item_set_current_value_text( - item, XTREME_SETTINGS()->spi_nrf24_handle == SpiDefault ? "Default" : "Extra"); + item, xtreme_settings.spi_nrf24_handle == SpiDefault ? "Default" : "Extra"); app->save_settings = true; } static void xtreme_app_scene_protocols_gpio_esp32_channel_changed(VariableItem* item) { XtremeApp* app = variable_item_get_context(item); - XTREME_SETTINGS()->uart_esp_channel = + xtreme_settings.uart_esp_channel = variable_item_get_current_value_index(item) == 0 ? UARTDefault : UARTExtra; variable_item_set_current_value_text( - item, XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? "13,14" : "15,16"); + item, xtreme_settings.uart_esp_channel == UARTDefault ? "13,14" : "15,16"); app->save_settings = true; } static void xtreme_app_scene_protocols_gpio_nmea_channel_changed(VariableItem* item) { XtremeApp* app = variable_item_get_context(item); - XTREME_SETTINGS()->uart_nmea_channel = + xtreme_settings.uart_nmea_channel = variable_item_get_current_value_index(item) == 0 ? UARTDefault : UARTExtra; variable_item_set_current_value_text( - item, XTREME_SETTINGS()->uart_nmea_channel == UARTDefault ? "13,14" : "15,16"); + item, xtreme_settings.uart_nmea_channel == UARTDefault ? "13,14" : "15,16"); app->save_settings = true; } static void xtreme_app_scene_protocols_gpio_general_channel_changed(VariableItem* item) { XtremeApp* app = variable_item_get_context(item); - XTREME_SETTINGS()->uart_general_channel = + xtreme_settings.uart_general_channel = variable_item_get_current_value_index(item) == 0 ? UARTDefault : UARTExtra; variable_item_set_current_value_text( - item, XTREME_SETTINGS()->uart_general_channel == UARTDefault ? "13,14" : "15,16"); + item, xtreme_settings.uart_general_channel == UARTDefault ? "13,14" : "15,16"); app->save_settings = true; } void xtreme_app_scene_protocols_gpio_on_enter(void* context) { XtremeApp* app = context; - XtremeSettings* xtreme_settings = XTREME_SETTINGS(); VariableItemList* var_item_list = app->var_item_list; VariableItem* item; @@ -70,9 +69,9 @@ void xtreme_app_scene_protocols_gpio_on_enter(void* context) { 2, xtreme_app_scene_protocols_gpio_cc1101_handle_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->spi_cc1101_handle); + variable_item_set_current_value_index(item, xtreme_settings.spi_cc1101_handle); variable_item_set_current_value_text( - item, xtreme_settings->spi_cc1101_handle == SpiDefault ? "Default" : "Extra"); + item, xtreme_settings.spi_cc1101_handle == SpiDefault ? "Default" : "Extra"); item = variable_item_list_add( var_item_list, @@ -80,9 +79,9 @@ void xtreme_app_scene_protocols_gpio_on_enter(void* context) { 2, xtreme_app_scene_protocols_gpio_nrf24_handle_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->spi_nrf24_handle); + variable_item_set_current_value_index(item, xtreme_settings.spi_nrf24_handle); variable_item_set_current_value_text( - item, xtreme_settings->spi_nrf24_handle == SpiDefault ? "Default" : "Extra"); + item, xtreme_settings.spi_nrf24_handle == SpiDefault ? "Default" : "Extra"); item = variable_item_list_add( var_item_list, @@ -90,9 +89,9 @@ void xtreme_app_scene_protocols_gpio_on_enter(void* context) { 2, xtreme_app_scene_protocols_gpio_esp32_channel_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->uart_esp_channel); + variable_item_set_current_value_index(item, xtreme_settings.uart_esp_channel); variable_item_set_current_value_text( - item, xtreme_settings->uart_esp_channel == UARTDefault ? "13,14" : "15,16"); + item, xtreme_settings.uart_esp_channel == UARTDefault ? "13,14" : "15,16"); item = variable_item_list_add( var_item_list, @@ -100,9 +99,9 @@ void xtreme_app_scene_protocols_gpio_on_enter(void* context) { 2, xtreme_app_scene_protocols_gpio_nmea_channel_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->uart_nmea_channel); + variable_item_set_current_value_index(item, xtreme_settings.uart_nmea_channel); variable_item_set_current_value_text( - item, xtreme_settings->uart_nmea_channel == UARTDefault ? "13,14" : "15,16"); + item, xtreme_settings.uart_nmea_channel == UARTDefault ? "13,14" : "15,16"); item = variable_item_list_add( var_item_list, @@ -110,9 +109,9 @@ void xtreme_app_scene_protocols_gpio_on_enter(void* context) { 2, xtreme_app_scene_protocols_gpio_general_channel_changed, app); - variable_item_set_current_value_index(item, xtreme_settings->uart_general_channel); + variable_item_set_current_value_index(item, xtreme_settings.uart_general_channel); variable_item_set_current_value_text( - item, xtreme_settings->uart_general_channel == UARTDefault ? "13,14" : "15,16"); + item, xtreme_settings.uart_general_channel == UARTDefault ? "13,14" : "15,16"); variable_item_list_set_enter_callback( var_item_list, xtreme_app_scene_protocols_gpio_var_item_list_callback, app); diff --git a/applications/main/xtreme_app/xtreme_app.c b/applications/main/xtreme_app/xtreme_app.c index ce198a3e4..99aa7af14 100644 --- a/applications/main/xtreme_app/xtreme_app.c +++ b/applications/main/xtreme_app/xtreme_app.c @@ -206,8 +206,6 @@ XtremeApp* xtreme_app_alloc() { // Settings init - XtremeSettings* xtreme_settings = XTREME_SETTINGS(); - app->asset_pack_index = 0; CharList_init(app->asset_pack_names); Storage* storage = furi_record_open(RECORD_STORAGE); @@ -229,7 +227,7 @@ XtremeApp* xtreme_app_alloc() { if(app->asset_pack_index != 0) { if(idx < app->asset_pack_index) app->asset_pack_index++; } else { - if(strcmp(copy, xtreme_settings->asset_pack) == 0) + if(strcmp(copy, xtreme_settings.asset_pack) == 0) app->asset_pack_index = idx + 1; } } diff --git a/applications/services/desktop/animations/animation_manager.c b/applications/services/desktop/animations/animation_manager.c index 88ec09fce..dcc60bad1 100644 --- a/applications/services/desktop/animations/animation_manager.c +++ b/applications/services/desktop/animations/animation_manager.c @@ -148,7 +148,7 @@ void animation_manager_check_blocking_process(AnimationManager* animation_manage const StorageAnimationManifestInfo* manifest_info = animation_storage_get_meta(animation_manager->current_animation); bool valid = animation_manager_is_valid_idle_animation( - manifest_info, &stats, XTREME_SETTINGS()->unlock_anims); + manifest_info, &stats, xtreme_settings.unlock_anims); if(!valid) { animation_manager_start_new_idle(animation_manager); @@ -203,9 +203,8 @@ static void animation_manager_start_new_idle(AnimationManager* animation_manager const BubbleAnimation* bubble_animation = animation_storage_get_bubble_animation(animation_manager->current_animation); animation_manager->state = AnimationManagerStateIdle; - XtremeSettings* xtreme_settings = XTREME_SETTINGS(); - int32_t duration = (xtreme_settings->cycle_anims == 0) ? (bubble_animation->duration) : - (xtreme_settings->cycle_anims); + int32_t duration = (xtreme_settings.cycle_anims == 0) ? (bubble_animation->duration) : + (xtreme_settings.cycle_anims); furi_timer_start( animation_manager->idle_animation_timer, (duration > 0) ? (duration * 1000) : 0); } @@ -389,14 +388,14 @@ static StorageAnimation* furi_record_close(RECORD_DOLPHIN); uint32_t whole_weight = 0; - bool fallback = XTREME_SETTINGS()->fallback_anim; + bool fallback = xtreme_settings.fallback_anim; if(StorageAnimationList_size(animation_list) == dolphin_internal_size + 1 && !fallback) { // One ext anim and fallback disabled, dont skip current anim (current = only ext one) avoid_animation = NULL; } StorageAnimationList_it_t it; - bool unlock = XTREME_SETTINGS()->unlock_anims; + bool unlock = xtreme_settings.unlock_anims; for(StorageAnimationList_it(it, animation_list); !StorageAnimationList_end_p(it);) { StorageAnimation* storage_animation = *StorageAnimationList_ref(it); const StorageAnimationManifestInfo* manifest_info = @@ -531,7 +530,7 @@ void animation_manager_load_and_continue_animation(AnimationManager* animation_m const StorageAnimationManifestInfo* manifest_info = animation_storage_get_meta(restore_animation); bool valid = animation_manager_is_valid_idle_animation( - manifest_info, &stats, XTREME_SETTINGS()->unlock_anims); + manifest_info, &stats, xtreme_settings.unlock_anims); if(valid) { animation_manager_replace_current_animation( animation_manager, restore_animation); @@ -545,10 +544,9 @@ void animation_manager_load_and_continue_animation(AnimationManager* animation_m const BubbleAnimation* bubble_animation = animation_storage_get_bubble_animation( animation_manager->current_animation); - XtremeSettings* xtreme_settings = XTREME_SETTINGS(); - int32_t duration = (xtreme_settings->cycle_anims == 0) ? + int32_t duration = (xtreme_settings.cycle_anims == 0) ? (bubble_animation->duration) : - (xtreme_settings->cycle_anims); + (xtreme_settings.cycle_anims); furi_timer_start( animation_manager->idle_animation_timer, (duration > 0) ? (duration * 1000) : 0); diff --git a/applications/services/desktop/animations/animation_storage.c b/applications/services/desktop/animations/animation_storage.c index d8287c692..101140699 100644 --- a/applications/services/desktop/animations/animation_storage.c +++ b/applications/services/desktop/animations/animation_storage.c @@ -23,13 +23,12 @@ static void animation_storage_free_animation(BubbleAnimation** storage_animation static BubbleAnimation* animation_storage_load_animation(const char* name); void animation_handler_select_manifest() { - XtremeSettings* xtreme_settings = XTREME_SETTINGS(); FuriString* anim_dir = furi_string_alloc(); FuriString* manifest = furi_string_alloc(); - bool use_asset_pack = xtreme_settings->asset_pack[0] != '\0'; + bool use_asset_pack = xtreme_settings.asset_pack[0] != '\0'; if(use_asset_pack) { furi_string_printf( - anim_dir, "%s/%s/Anims", XTREME_ASSETS_PATH, xtreme_settings->asset_pack); + anim_dir, "%s/%s/Anims", XTREME_ASSETS_PATH, xtreme_settings.asset_pack); furi_string_printf(manifest, "%s/manifest.txt", furi_string_get_cstr(anim_dir)); Storage* storage = furi_record_open(RECORD_STORAGE); if(storage_common_stat(storage, furi_string_get_cstr(manifest), NULL) == FSE_OK) { @@ -514,7 +513,7 @@ static BubbleAnimation* animation_storage_load_animation(const char* name) { if(!flipper_format_read_uint32(ff, "Active cycles", &u32value, 1)) break; //-V779 animation->active_cycles = u32value; if(!flipper_format_read_uint32(ff, "Frame rate", &u32value, 1)) break; - uint32_t anim_speed = XTREME_SETTINGS()->anim_speed; + uint32_t anim_speed = xtreme_settings.anim_speed; u32value = (u32value * anim_speed) / 100; FURI_CONST_ASSIGN(animation->icon_animation.frame_rate, u32value < 1 ? 1 : u32value); if(!flipper_format_read_uint32(ff, "Duration", &u32value, 1)) break; diff --git a/applications/services/desktop/desktop.c b/applications/services/desktop/desktop.c index 32a346dba..f43877bf1 100644 --- a/applications/services/desktop/desktop.c +++ b/applications/services/desktop/desktop.c @@ -66,13 +66,13 @@ static void desktop_clock_reconfigure(Desktop* desktop) { desktop_clock_update(desktop); - if(XTREME_SETTINGS()->statusbar_clock) { + if(xtreme_settings.statusbar_clock) { furi_timer_start(desktop->update_clock_timer, furi_ms_to_ticks(1000)); } else { furi_timer_stop(desktop->update_clock_timer); } - view_port_enabled_set(desktop->clock_viewport, XTREME_SETTINGS()->statusbar_clock); + view_port_enabled_set(desktop->clock_viewport, xtreme_settings.statusbar_clock); } static void desktop_clock_draw_callback(Canvas* canvas, void* context) { @@ -209,7 +209,7 @@ void desktop_lock(Desktop* desktop, bool pin_lock) { Cli* cli = furi_record_open(RECORD_CLI); cli_session_close(cli); furi_record_close(RECORD_CLI); - if(!XTREME_SETTINGS()->allow_locked_rpc_commands) { + if(!xtreme_settings.allow_locked_rpc_commands) { Bt* bt = furi_record_open(RECORD_BT); bt_close_rpc_connection(bt); furi_record_close(RECORD_BT); @@ -484,7 +484,7 @@ int32_t desktop_srv(void* p) { scene_manager_next_scene(desktop->scene_manager, DesktopSceneMain); - if(XTREME_SETTINGS()->lock_on_boot || furi_hal_rtc_is_flag_set(FuriHalRtcFlagLock)) { + if(xtreme_settings.lock_on_boot || furi_hal_rtc_is_flag_set(FuriHalRtcFlagLock)) { desktop_lock(desktop, true); } else { if(!loader_is_locked(desktop->loader)) { diff --git a/applications/services/desktop/scenes/desktop_scene_fault.c b/applications/services/desktop/scenes/desktop_scene_fault.c index e6cadcaef..9a010af05 100644 --- a/applications/services/desktop/scenes/desktop_scene_fault.c +++ b/applications/services/desktop/scenes/desktop_scene_fault.c @@ -15,7 +15,7 @@ void desktop_scene_fault_on_enter(void* context) { Popup* popup = desktop->hw_mismatch_popup; popup_set_context(popup, desktop); - if(XTREME_SETTINGS()->is_nsfw) { + if(xtreme_settings.is_nsfw) { popup_set_header( popup, "Slut passed out\n but is now back", diff --git a/applications/services/desktop/scenes/desktop_scene_pin_input.c b/applications/services/desktop/scenes/desktop_scene_pin_input.c index f6af083f1..360d2cf7d 100644 --- a/applications/services/desktop/scenes/desktop_scene_pin_input.c +++ b/applications/services/desktop/scenes/desktop_scene_pin_input.c @@ -59,7 +59,7 @@ static void desktop_scene_pin_input_done_callback(const PinCode* pin_code, void* view_dispatcher_send_custom_event(desktop->view_dispatcher, DesktopPinInputEventUnlocked); } else { uint32_t pin_fails = furi_hal_rtc_get_pin_fails() + 1; - if(pin_fails >= 10 && XTREME_SETTINGS()->bad_pins_format) { + if(pin_fails >= 10 && xtreme_settings.bad_pins_format) { furi_hal_rtc_set_pin_fails(0); furi_hal_rtc_set_flag(FuriHalRtcFlagFactoryReset); storage_sd_format(furi_record_open(RECORD_STORAGE)); diff --git a/applications/services/desktop/views/desktop_view_lock_menu.c b/applications/services/desktop/views/desktop_view_lock_menu.c index 10e5860dd..6f2874d94 100644 --- a/applications/services/desktop/views/desktop_view_lock_menu.c +++ b/applications/services/desktop/views/desktop_view_lock_menu.c @@ -101,7 +101,7 @@ void desktop_lock_menu_draw_callback(Canvas* canvas, void* model) { break; case DesktopLockMenuIndexDarkMode: icon = &I_CC_DarkMode_16x16; - enabled = XTREME_SETTINGS()->dark_mode; + enabled = xtreme_settings.dark_mode; break; case DesktopLockMenuIndexLock: icon = &I_CC_Lock_16x16; @@ -287,7 +287,7 @@ bool desktop_lock_menu_input_callback(InputEvent* event, void* context) { desktop_event = DesktopLockMenuEventSettings; break; case DesktopLockMenuIndexDarkMode: - XTREME_SETTINGS()->dark_mode = !XTREME_SETTINGS()->dark_mode; + xtreme_settings.dark_mode = !xtreme_settings.dark_mode; lock_menu->save_xtreme = true; break; case DesktopLockMenuIndexBluetooth: diff --git a/applications/services/desktop/views/desktop_view_locked.c b/applications/services/desktop/views/desktop_view_locked.c index 2720cdbfc..7c677fb31 100644 --- a/applications/services/desktop/views/desktop_view_locked.c +++ b/applications/services/desktop/views/desktop_view_locked.c @@ -74,7 +74,6 @@ void desktop_view_locked_draw_lockscreen(Canvas* canvas, void* m) { furi_hal_rtc_get_datetime(&datetime); LocaleTimeFormat time_format = locale_get_time_format(); LocaleDateFormat date_format = locale_get_date_format(); - XtremeSettings* xtreme_settings = XTREME_SETTINGS(); bool pm; if(time_format == LocaleTimeFormat24h) { @@ -94,14 +93,14 @@ void desktop_view_locked_draw_lockscreen(Canvas* canvas, void* m) { snprintf(date_str, 14, "%.2d-%.2d-%.4d", datetime.day, datetime.month, datetime.year); } - if(!xtreme_settings->lockscreen_transparent) { + if(!xtreme_settings.lockscreen_transparent) { canvas_draw_icon(canvas, 0, 0 + y, &I_Lockscreen); } - if(xtreme_settings->lockscreen_time) { + if(xtreme_settings.lockscreen_time) { canvas_set_font(canvas, FontBigNumbers); canvas_draw_str(canvas, 0, 64 + y, time_str); int offset = canvas_string_width(canvas, time_str) + 2; - if(xtreme_settings->lockscreen_seconds) { + if(xtreme_settings.lockscreen_seconds) { canvas_set_font(canvas, FontSecondary); canvas_draw_str(canvas, 0 + offset, 64 + y, second_str); offset += canvas_string_width(canvas, ":00") + 2; @@ -111,12 +110,12 @@ void desktop_view_locked_draw_lockscreen(Canvas* canvas, void* m) { canvas_draw_str(canvas, 0 + offset, 64 + y, meridian_str); } } - if(xtreme_settings->lockscreen_date) { + if(xtreme_settings.lockscreen_date) { canvas_set_font(canvas, FontSecondary); - canvas_draw_str(canvas, 0, 48 + y + 16 * !xtreme_settings->lockscreen_time, date_str); + canvas_draw_str(canvas, 0, 48 + y + 16 * !xtreme_settings.lockscreen_time, date_str); } if(model->view_state == DesktopViewLockedStateLockedHintShown && - xtreme_settings->lockscreen_prompt) { + xtreme_settings.lockscreen_prompt) { canvas_set_font(canvas, FontSecondary); if(model->pin_locked) { elements_bubble_str( diff --git a/applications/services/dolphin/dolphin.c b/applications/services/dolphin/dolphin.c index 128d8b0ac..224af1df6 100644 --- a/applications/services/dolphin/dolphin.c +++ b/applications/services/dolphin/dolphin.c @@ -81,7 +81,7 @@ Dolphin* dolphin_alloc() { dolphin->state = dolphin_state_alloc(); dolphin->event_queue = furi_message_queue_alloc(8, sizeof(DolphinEvent)); dolphin->pubsub = furi_pubsub_alloc(); - uint32_t butthurt_timer = XTREME_SETTINGS()->butthurt_timer; + uint32_t butthurt_timer = xtreme_settings.butthurt_timer; dolphin->butthurt_timer = xTimerCreate( NULL, butthurt_timer ? ((int32_t)butthurt_timer * 1000) : -1, diff --git a/applications/services/gui/canvas.c b/applications/services/gui/canvas.c index fe11b6586..42814fb47 100644 --- a/applications/services/gui/canvas.c +++ b/applications/services/gui/canvas.c @@ -117,7 +117,7 @@ const CanvasFontParameters* canvas_get_font_params(const Canvas* canvas, Font fo void canvas_clear(Canvas* canvas) { furi_assert(canvas); - if(XTREME_SETTINGS()->dark_mode) { + if(xtreme_settings.dark_mode) { u8g2_FillBuffer(&canvas->fb); } else { u8g2_ClearBuffer(&canvas->fb); @@ -126,7 +126,7 @@ void canvas_clear(Canvas* canvas) { void canvas_set_color(Canvas* canvas, Color color) { furi_assert(canvas); - if(XTREME_SETTINGS()->dark_mode) { + if(xtreme_settings.dark_mode) { if(color == ColorBlack) { color = ColorWhite; } else if(color == ColorWhite) { diff --git a/applications/services/gui/gui.c b/applications/services/gui/gui.c index 23ebf33e7..471817f24 100644 --- a/applications/services/gui/gui.c +++ b/applications/services/gui/gui.c @@ -84,12 +84,10 @@ static void gui_redraw_status_bar(Gui* gui, bool need_attention) { canvas_frame_set( gui->canvas, GUI_STATUS_BAR_X, GUI_STATUS_BAR_Y, GUI_DISPLAY_WIDTH, GUI_STATUS_BAR_HEIGHT); - XtremeSettings* xtreme_settings = XTREME_SETTINGS(); - /* for support black theme - paint white area and * draw icon with transparent white color */ - if(xtreme_settings->bar_background) { + if(xtreme_settings.bar_background) { canvas_set_color(gui->canvas, ColorWhite); canvas_draw_box(gui->canvas, 1, 1, 9, 7); canvas_draw_box(gui->canvas, 7, 3, 58, 6); @@ -122,7 +120,7 @@ static void gui_redraw_status_bar(Gui* gui, bool need_attention) { width + 2, GUI_STATUS_BAR_WORKAREA_HEIGHT + 2); // Hide battery background - if(xtreme_settings->bar_borders) { + if(xtreme_settings.bar_borders) { canvas_set_color(gui->canvas, ColorWhite); canvas_draw_box( gui->canvas, -1, 0, canvas_width(gui->canvas) + 1, canvas_height(gui->canvas)); @@ -131,7 +129,7 @@ static void gui_redraw_status_bar(Gui* gui, bool need_attention) { // ViewPort draw canvas_frame_set( gui->canvas, - x - xtreme_settings->bar_borders, + x - xtreme_settings.bar_borders, GUI_STATUS_BAR_Y + 2, width, GUI_STATUS_BAR_WORKAREA_HEIGHT); @@ -148,7 +146,7 @@ static void gui_redraw_status_bar(Gui* gui, bool need_attention) { right_used + 4, GUI_STATUS_BAR_HEIGHT); // Disable battery border - if(xtreme_settings->bar_borders) { + if(xtreme_settings.bar_borders) { canvas_set_color(gui->canvas, ColorBlack); canvas_draw_rframe( gui->canvas, 0, 0, canvas_width(gui->canvas), canvas_height(gui->canvas), 1); @@ -168,7 +166,7 @@ static void gui_redraw_status_bar(Gui* gui, bool need_attention) { } // Left side - if(xtreme_settings->status_icons) { + if(xtreme_settings.status_icons) { x = 2; ViewPortArray_it(it, gui->layers[GuiLayerStatusBarLeft]); while(!ViewPortArray_end_p(it) && (right_used + left_used) < GUI_STATUS_BAR_WIDTH) { @@ -183,7 +181,7 @@ static void gui_redraw_status_bar(Gui* gui, bool need_attention) { GUI_STATUS_BAR_Y + 1, width + 2, GUI_STATUS_BAR_WORKAREA_HEIGHT + 2); - if(xtreme_settings->bar_borders) { + if(xtreme_settings.bar_borders) { canvas_set_color(gui->canvas, ColorWhite); canvas_draw_box( gui->canvas, 0, 0, canvas_width(gui->canvas), canvas_height(gui->canvas)); @@ -209,7 +207,7 @@ static void gui_redraw_status_bar(Gui* gui, bool need_attention) { GUI_STATUS_BAR_Y + 1, width + 2, GUI_STATUS_BAR_WORKAREA_HEIGHT + 2); - if(xtreme_settings->bar_borders) { + if(xtreme_settings.bar_borders) { canvas_set_color(gui->canvas, ColorWhite); canvas_draw_box( gui->canvas, 0, 0, canvas_width(gui->canvas), canvas_height(gui->canvas)); @@ -226,7 +224,7 @@ static void gui_redraw_status_bar(Gui* gui, bool need_attention) { // Draw frame around icons on the left if(left_used) { canvas_frame_set(gui->canvas, 0, 0, left_used + 3, GUI_STATUS_BAR_HEIGHT); - if(xtreme_settings->bar_borders) { + if(xtreme_settings.bar_borders) { canvas_draw_rframe( gui->canvas, 0, 0, canvas_width(gui->canvas), canvas_height(gui->canvas), 1); canvas_draw_line( @@ -283,7 +281,7 @@ static void gui_redraw(Gui* gui) { bool need_attention = (gui_view_port_find_enabled(gui->layers[GuiLayerWindow]) != 0 || gui_view_port_find_enabled(gui->layers[GuiLayerFullscreen]) != 0); - if(XTREME_SETTINGS()->lockscreen_statusbar) { + if(xtreme_settings.lockscreen_statusbar) { gui_redraw_status_bar(gui, need_attention); } } else { diff --git a/applications/services/gui/modules/file_browser.c b/applications/services/gui/modules/file_browser.c index edbd76446..edde31c20 100644 --- a/applications/services/gui/modules/file_browser.c +++ b/applications/services/gui/modules/file_browser.c @@ -85,7 +85,7 @@ static int BrowserItem_t_cmp(const BrowserItem_t* a, const BrowserItem_t* b) { if(b->type == BrowserItemTypeBack) { return 1; } - if(XTREME_SETTINGS()->sort_dirs_first) { + if(xtreme_settings.sort_dirs_first) { if(a->type == BrowserItemTypeFolder && b->type != BrowserItemTypeFolder) { return -1; } diff --git a/applications/services/gui/modules/menu.c b/applications/services/gui/modules/menu.c index 6307a4ebe..5f8983efa 100644 --- a/applications/services/gui/modules/menu.c +++ b/applications/services/gui/modules/menu.c @@ -99,7 +99,7 @@ static void menu_draw_callback(Canvas* canvas, void* _model) { MenuItem* item; size_t shift_position; FuriString* name = furi_string_alloc(); - switch(XTREME_SETTINGS()->menu_style) { + switch(xtreme_settings.menu_style) { case MenuStyleList: { for(uint8_t i = 0; i < 3; i++) { canvas_set_font(canvas, i == 1 ? FontPrimary : FontSecondary); @@ -442,7 +442,7 @@ static void menu_draw_callback(Canvas* canvas, void* _model) { static bool menu_input_callback(InputEvent* event, void* context) { Menu* menu = context; bool consumed = true; - if(XTREME_SETTINGS()->menu_style == MenuStyleVertical && + if(xtreme_settings.menu_style == MenuStyleVertical && furi_hal_rtc_is_flag_set(FuriHalRtcFlagHandOrient)) { if(event->key == InputKeyLeft) { event->key = InputKeyRight; @@ -651,7 +651,7 @@ static void menu_process_up(Menu* menu) { size_t count = MenuItemArray_size(model->items); size_t vertical_offset = model->vertical_offset; - switch(XTREME_SETTINGS()->menu_style) { + switch(xtreme_settings.menu_style) { case MenuStyleList: case MenuStyleEurocorp: case MenuStyleTerminal: @@ -703,7 +703,7 @@ static void menu_process_down(Menu* menu) { size_t count = MenuItemArray_size(model->items); size_t vertical_offset = model->vertical_offset; - switch(XTREME_SETTINGS()->menu_style) { + switch(xtreme_settings.menu_style) { case MenuStyleList: case MenuStyleEurocorp: case MenuStyleTerminal: @@ -755,7 +755,7 @@ static void menu_process_left(Menu* menu) { size_t count = MenuItemArray_size(model->items); size_t vertical_offset = model->vertical_offset; - switch(XTREME_SETTINGS()->menu_style) { + switch(xtreme_settings.menu_style) { case MenuStyleWii: if(position < 2) { if(count % 2) { @@ -818,7 +818,7 @@ static void menu_process_right(Menu* menu) { size_t count = MenuItemArray_size(model->items); size_t vertical_offset = model->vertical_offset; - switch(XTREME_SETTINGS()->menu_style) { + switch(xtreme_settings.menu_style) { case MenuStyleWii: if(count % 2) { if(position == count - 1) { diff --git a/applications/services/power/power_service/power.c b/applications/services/power/power_service/power.c index dd49c8de0..aa55efde2 100644 --- a/applications/services/power/power_service/power.c +++ b/applications/services/power/power_service/power.c @@ -16,7 +16,7 @@ void power_set_battery_icon_enabled(Power* power, bool is_enabled) { void power_draw_battery_callback(Canvas* canvas, void* context) { furi_assert(context); Power* power = context; - BatteryIcon battery_icon = XTREME_SETTINGS()->battery_icon; + BatteryIcon battery_icon = xtreme_settings.battery_icon; if(battery_icon == BatteryIconOff) return; canvas_draw_icon(canvas, 0, 0, &I_Battery_25x8); @@ -359,7 +359,7 @@ Power* power_alloc() { // Battery view port power->battery_view_port = power_battery_view_port_alloc(power); - power_set_battery_icon_enabled(power, XTREME_SETTINGS()->battery_icon != BatteryIconOff); + power_set_battery_icon_enabled(power, xtreme_settings.battery_icon != BatteryIconOff); power->show_low_bat_level_message = true; //Auto shutdown timer @@ -478,7 +478,7 @@ static void power_check_battery_level_change(Power* power) { } static void power_check_charge_cap(Power* power) { - uint32_t cap = XTREME_SETTINGS()->charge_cap; + uint32_t cap = xtreme_settings.charge_cap; if(power->info.charge >= cap && cap < 100) { if(!power->info.is_charge_capped) { // Suppress charging if charge reaches custom cap power->info.is_charge_capped = true; diff --git a/applications/services/rpc/rpc.c b/applications/services/rpc/rpc.c index 3393d948d..791b14478 100644 --- a/applications/services/rpc/rpc.c +++ b/applications/services/rpc/rpc.c @@ -376,8 +376,7 @@ static void rpc_session_thread_state_callback(FuriThreadState thread_state, void } RpcSession* rpc_session_open(Rpc* rpc, RpcOwner owner) { - if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagLock) && - !XTREME_SETTINGS()->allow_locked_rpc_commands) + if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagLock) && !xtreme_settings.allow_locked_rpc_commands) return NULL; furi_assert(rpc); diff --git 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 index dc0acb5b5..b71e71727 100644 --- 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 @@ -47,7 +47,7 @@ static void const DialogsFileBrowserOptions browser_options = { .extension = extension, .icon = &I_unknown_10px, - .hide_dot_files = !XTREME_SETTINGS()->show_hidden_files, + .hide_dot_files = !xtreme_settings.show_hidden_files, .skip_assets = true, .hide_ext = hide_ext, .item_loader_callback = keybinds_fap_selector_item_callback, diff --git a/applications/settings/dolphin_passport/passport.c b/applications/settings/dolphin_passport/passport.c index fa7ca9e3a..fdfee9c84 100644 --- a/applications/settings/dolphin_passport/passport.c +++ b/applications/settings/dolphin_passport/passport.c @@ -38,7 +38,7 @@ static void render_callback(Canvas* canvas, void* _ctx) { const char* mood_str = NULL; const Icon* portrait = NULL; - if(XTREME_SETTINGS()->is_nsfw) { + if(xtreme_settings.is_nsfw) { if(stats->butthurt <= 4) { portrait = &I_passport_happy_46x49; mood_str = "Status: Wet"; diff --git 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 index 65f10762f..9ad60bfd1 100644 --- 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 @@ -12,7 +12,7 @@ void power_settings_scene_power_off_on_enter(void* context) { DialogEx* dialog = app->dialog; dialog_ex_set_header(dialog, "Turn Off Device?", 64, 2, AlignCenter, AlignTop); - if(XTREME_SETTINGS()->is_nsfw) { + if(xtreme_settings.is_nsfw) { dialog_ex_set_text( dialog, " I will be\nwaiting for\n you master", 78, 16, AlignLeft, AlignTop); } else { diff --git a/firmware/targets/f7/api_symbols.csv b/firmware/targets/f7/api_symbols.csv index 2b8625f62..1f04be3f9 100644 --- a/firmware/targets/f7/api_symbols.csv +++ b/firmware/targets/f7/api_symbols.csv @@ -341,7 +341,6 @@ Function,-,SystemCoreClockUpdate,void, Function,-,SystemInit,void, Function,+,XTREME_ASSETS_FREE,void, Function,+,XTREME_ASSETS_LOAD,void, -Function,+,XTREME_SETTINGS,XtremeSettings*, Function,-,XTREME_SETTINGS_LOAD,void, Function,+,XTREME_SETTINGS_SAVE,void, Function,-,_Exit,void,int @@ -3894,3 +3893,4 @@ Variable,+,usb_cdc_single,FuriHalUsbInterface, Variable,+,usb_hid,FuriHalUsbInterface, Variable,+,usb_hid_u2f,FuriHalUsbInterface, Variable,+,usbd_devfs,const usbd_driver, +Variable,+,xtreme_settings,XtremeSettings, diff --git a/firmware/targets/f7/furi_hal/furi_hal_light.c b/firmware/targets/f7/furi_hal/furi_hal_light.c index df7c23d56..17d0e40a3 100644 --- a/firmware/targets/f7/furi_hal/furi_hal_light.c +++ b/firmware/targets/f7/furi_hal/furi_hal_light.c @@ -44,7 +44,7 @@ void furi_hal_light_set(Light light, uint8_t value) { lp5562_set_channel_value(&furi_hal_i2c_handle_power, LP5562ChannelBlue, value); } if(light & LightBacklight) { - if(XTREME_SETTINGS()->rgb_backlight) { + if(xtreme_settings.rgb_backlight) { rgb_backlight_update(value, false); } else { uint8_t prev = diff --git a/lib/xtreme/assets.c b/lib/xtreme/assets.c index df28ebbc9..3ec556df6 100644 --- a/lib/xtreme/assets.c +++ b/lib/xtreme/assets.c @@ -10,7 +10,7 @@ #define ICONS_FMT XTREME_ASSETS_PATH "/%s/Icons/%s" void load_icon_animated(const Icon* replace, const char* name, FuriString* path, File* file) { - const char* pack = XTREME_SETTINGS()->asset_pack; + const char* pack = xtreme_settings.asset_pack; furi_string_printf(path, ICONS_FMT "/meta", pack, name); if(storage_file_open(file, furi_string_get_cstr(path), FSAM_READ, FSOM_OPEN_EXISTING)) { int32_t icon_width, icon_height, frame_rate, frame_count; @@ -61,7 +61,7 @@ void load_icon_animated(const Icon* replace, const char* name, FuriString* path, } void load_icon_static(const Icon* replace, const char* name, FuriString* path, File* file) { - furi_string_printf(path, ICONS_FMT ".bmx", XTREME_SETTINGS()->asset_pack, name); + furi_string_printf(path, ICONS_FMT ".bmx", xtreme_settings.asset_pack, name); if(storage_file_open(file, furi_string_get_cstr(path), FSAM_READ, FSOM_OPEN_EXISTING)) { uint64_t size = storage_file_size(file) - 8; uint8_t* frame = malloc(size); @@ -102,8 +102,8 @@ void free_icon(const Icon* icon) { } void XTREME_ASSETS_LOAD() { - const char* pack = XTREME_SETTINGS()->asset_pack; - XTREME_SETTINGS()->is_nsfw = !strncmp(pack, "NSFW", strlen("NSFW")); + const char* pack = xtreme_settings.asset_pack; + xtreme_settings.is_nsfw = !strncmp(pack, "NSFW", strlen("NSFW")); if(pack[0] == '\0') return; Storage* storage = furi_record_open(RECORD_STORAGE); diff --git a/lib/xtreme/settings.c b/lib/xtreme/settings.c index af432eb89..d178fae48 100644 --- a/lib/xtreme/settings.c +++ b/lib/xtreme/settings.c @@ -252,7 +252,3 @@ void XTREME_SETTINGS_SAVE() { flipper_format_free(file); furi_record_close(RECORD_STORAGE); } - -XtremeSettings* XTREME_SETTINGS() { - return &xtreme_settings; -} diff --git a/lib/xtreme/xtreme.h b/lib/xtreme/xtreme.h index 89a2fdb01..47760797d 100644 --- a/lib/xtreme/xtreme.h +++ b/lib/xtreme/xtreme.h @@ -92,7 +92,7 @@ typedef struct { void XTREME_SETTINGS_LOAD(); void XTREME_SETTINGS_SAVE(); -XtremeSettings* XTREME_SETTINGS(); +extern XtremeSettings xtreme_settings; void XTREME_ASSETS_LOAD(); void XTREME_ASSETS_FREE();