Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-06 05:19:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Flipper-XFW/Xtreme-Firmware into dev

Browse Source
This commit is contained in:
Sil333033
2023-10-27 18:56:05 +02:00
parent 3a69fd56f8 46fd5d2eae
commit 67967a254f
72 changed files with 674 additions and 566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
applications/drivers/subghz/cc1101_ext/cc1101_ext.c
View File

@@ -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);
}

10
applications/external/advanced_wifisniff/sniffer.c vendored
View File

@@ -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)

65
applications/external/ble_spam/ble_spam.c vendored
View File

@@ -30,7 +30,7 @@ static Attack attacks[] = {
.payload =
{
.random_mac = false,
.cfg.specific.continuity =
.cfg.continuity =
{
.type = ContinuityTypeCustomCrash,
.data = {},
@@ -44,7 +44,7 @@ static Attack attacks[] = {
.payload =
{
.random_mac = false,
.cfg.specific.continuity =
.cfg.continuity =
{
.type = ContinuityTypeNearbyAction,
.data = {},
@@ -58,7 +58,7 @@ static Attack attacks[] = {
.payload =
{
.random_mac = false,
.cfg.specific.continuity =
.cfg.continuity =
{
.type = ContinuityTypeProximityPair,
.data = {},
@@ -72,7 +72,7 @@ static Attack attacks[] = {
.payload =
{
.random_mac = true,
.cfg.specific.fastpair = {},
.cfg.fastpair = {},
},
},
{
@@ -82,7 +82,7 @@ static Attack attacks[] = {
.payload =
{
.random_mac = true,
.cfg.specific.easysetup =
.cfg.easysetup =
{
.type = EasysetupTypeBuds,
.data = {},
@@ -96,7 +96,7 @@ static Attack attacks[] = {
.payload =
{
.random_mac = true,
.cfg.specific.easysetup =
.cfg.easysetup =
{
.type = EasysetupTypeWatch,
.data = {},
@@ -110,7 +110,7 @@ static Attack attacks[] = {
.payload =
{
.random_mac = true,
.cfg.specific.swiftpair = {},
.cfg.swiftpair = {},
},
},
};
@@ -171,18 +171,17 @@ static int32_t adv_thread(void* _ctx) {
uint8_t mac[GAP_MAC_ADDR_SIZE];
Payload* payload = &attacks[state->index].payload;
const Protocol* protocol = attacks[state->index].protocol;
ProtocolCfg* _cfg = &payload->cfg;
if(!payload->random_mac) furi_hal_random_fill_buf(mac, sizeof(mac));
if(state->ctx.led_indicator) start_blink(state);
while(state->advertising) {
if(protocol) {
if(_cfg->mode == ProtocolModeBruteforce && _cfg->bruteforce.counter++ >= 10) {
_cfg->bruteforce.counter = 0;
_cfg->bruteforce.value =
(_cfg->bruteforce.value + 1) % (1 << (_cfg->bruteforce.size * 8));
if(payload->mode == PayloadModeBruteforce && payload->bruteforce.counter++ >= 10) {
payload->bruteforce.counter = 0;
payload->bruteforce.value =
(payload->bruteforce.value + 1) % (1 << (payload->bruteforce.size * 8));
}
protocol->make_packet(&size, &packet, &payload->cfg);
protocol->make_packet(&size, &packet, payload);
} else {
protocols[rand() % protocols_count]->make_packet(&size, &packet, NULL);
}
@@ -367,13 +366,13 @@ static void draw_callback(Canvas* canvas, void* _ctx) {
char str[32];
canvas_set_font(canvas, FontBatteryPercent);
if(payload->cfg.mode == ProtocolModeBruteforce) {
if(payload->mode == PayloadModeBruteforce) {
snprintf(
str,
sizeof(str),
"0x%0*lX",
payload->cfg.bruteforce.size * 2,
payload->cfg.bruteforce.value);
payload->bruteforce.size * 2,
payload->bruteforce.value);
} else {
snprintf(str, sizeof(str), "%ims", delays[state->delay]);
}
@@ -382,7 +381,7 @@ static void draw_callback(Canvas* canvas, void* _ctx) {
canvas_draw_icon(canvas, 119, 10, &I_SmallArrowDown_3x5);
canvas_set_font(canvas, FontBatteryPercent);
if(payload->cfg.mode == ProtocolModeBruteforce) {
if(payload->mode == PayloadModeBruteforce) {
canvas_draw_str_aligned(canvas, 64, 22, AlignCenter, AlignBottom, "Bruteforce");
if(delays[state->delay] < 100) {
snprintf(str, sizeof(str), "%ims>", delays[state->delay]);
@@ -403,7 +402,7 @@ static void draw_callback(Canvas* canvas, void* _ctx) {
"%02i/%02i: %s",
state->index + 1,
ATTACKS_COUNT,
protocol ? protocol->get_name(&payload->cfg) : "Everything AND");
protocol ? protocol->get_name(payload) : "Everything AND");
canvas_draw_str(canvas, 4 - (state->index < 19 ? 1 : 0), 22, str);
}
@@ -461,7 +460,7 @@ static bool input_callback(InputEvent* input, void* _ctx) {
consumed = true;
bool is_attack = state->index >= 0 && state->index <= ATTACKS_COUNT - 1;
ProtocolCfg* _cfg = is_attack ? &attacks[state->index].payload.cfg : NULL;
Payload* payload = is_attack ? &attacks[state->index].payload : NULL;
bool advertising = state->advertising;
switch(input->key) {
@@ -479,10 +478,10 @@ static bool input_callback(InputEvent* input, void* _ctx) {
break;
case InputKeyUp:
if(is_attack) {
if(_cfg->mode == ProtocolModeBruteforce) {
_cfg->bruteforce.counter = 0;
_cfg->bruteforce.value =
(_cfg->bruteforce.value + 1) % (1 << (_cfg->bruteforce.size * 8));
if(payload->mode == PayloadModeBruteforce) {
payload->bruteforce.counter = 0;
payload->bruteforce.value =
(payload->bruteforce.value + 1) % (1 << (payload->bruteforce.size * 8));
} else if(state->delay < COUNT_OF(delays) - 1) {
state->delay++;
if(advertising) start_blink(state);
@@ -491,10 +490,10 @@ static bool input_callback(InputEvent* input, void* _ctx) {
break;
case InputKeyDown:
if(is_attack) {
if(_cfg->mode == ProtocolModeBruteforce) {
_cfg->bruteforce.counter = 0;
_cfg->bruteforce.value =
(_cfg->bruteforce.value - 1) % (1 << (_cfg->bruteforce.size * 8));
if(payload->mode == PayloadModeBruteforce) {
payload->bruteforce.counter = 0;
payload->bruteforce.value =
(payload->bruteforce.value - 1) % (1 << (payload->bruteforce.size * 8));
} else if(state->delay > 0) {
state->delay--;
if(advertising) start_blink(state);
@@ -503,10 +502,11 @@ static bool input_callback(InputEvent* input, void* _ctx) {
break;
case InputKeyLeft:
if(input->type == InputTypeLong) {
state->ignore_bruteforce = _cfg ? (_cfg->mode != ProtocolModeBruteforce) : true;
state->ignore_bruteforce = payload ? (payload->mode != PayloadModeBruteforce) :
true;
}
if(input->type == InputTypeShort || !is_attack || state->ignore_bruteforce ||
_cfg->mode != ProtocolModeBruteforce) {
payload->mode != PayloadModeBruteforce) {
if(state->index > PAGE_MIN) {
if(advertising) toggle_adv(state);
state->index--;
@@ -520,7 +520,7 @@ static bool input_callback(InputEvent* input, void* _ctx) {
uint8_t size;
uint8_t* packet;
protocol->make_packet(&size, &packet, &payload->cfg);
protocol->make_packet(&size, &packet, payload);
furi_hal_bt_custom_adv_set(packet, size);
free(packet);
@@ -541,10 +541,11 @@ static bool input_callback(InputEvent* input, void* _ctx) {
break;
case InputKeyRight:
if(input->type == InputTypeLong) {
state->ignore_bruteforce = _cfg ? (_cfg->mode != ProtocolModeBruteforce) : true;
state->ignore_bruteforce = payload ? (payload->mode != PayloadModeBruteforce) :
true;
}
if(input->type == InputTypeShort || !is_attack || state->ignore_bruteforce ||
_cfg->mode != ProtocolModeBruteforce) {
payload->mode != PayloadModeBruteforce) {
if(state->index < PAGE_MAX) {
if(advertising) toggle_adv(state);
state->index++;

8
applications/external/ble_spam/protocols/_base.h vendored
View File

@@ -10,12 +10,12 @@
#include <core/core_defines.h>
#include "../ble_spam.h"
typedef struct ProtocolCfg ProtocolCfg;
typedef struct Payload Payload;
typedef struct {
const Icon* icon;
const char* (*get_name)(const ProtocolCfg* _cfg);
void (*make_packet)(uint8_t* _size, uint8_t** _packet, ProtocolCfg* _cfg);
const char* (*get_name)(const Payload* payload);
void (*make_packet)(uint8_t* _size, uint8_t** _packet, Payload* payload);
void (*extra_config)(Ctx* ctx);
uint8_t (*config_count)(const ProtocolCfg* _cfg);
uint8_t (*config_count)(const Payload* payload);
} Protocol;

20
applications/external/ble_spam/protocols/_protocols.h vendored
View File

@@ -6,13 +6,14 @@
#include "swiftpair.h"
typedef enum {
ProtocolModeRandom,
ProtocolModeValue,
ProtocolModeBruteforce,
} ProtocolMode;
PayloadModeRandom,
PayloadModeValue,
PayloadModeBruteforce,
} PayloadMode;
struct ProtocolCfg {
ProtocolMode mode;
struct Payload {
bool random_mac;
PayloadMode mode;
struct {
uint8_t counter;
uint32_t value;
@@ -23,18 +24,13 @@ struct ProtocolCfg {
FastpairCfg fastpair;
EasysetupCfg easysetup;
SwiftpairCfg swiftpair;
} specific;
} cfg;
};
extern const Protocol* protocols[];
extern const size_t protocols_count;
typedef struct {
bool random_mac;
ProtocolCfg cfg;
} Payload;
struct Attack {
const char* title;
const char* text;

184
applications/external/ble_spam/protocols/continuity.c vendored
View File

@@ -71,8 +71,8 @@ static const char* type_names[ContinuityTypeCOUNT] = {
[ContinuityTypeNearbyInfo] = "Nearby Info",
[ContinuityTypeCustomCrash] = "Continuity Custom",
};
static const char* get_name(const ProtocolCfg* _cfg) {
const ContinuityCfg* cfg = &_cfg->specific.continuity;
static const char* get_name(const Payload* payload) {
const ContinuityCfg* cfg = &payload->cfg.continuity;
return type_names[cfg->type];
}
@@ -87,8 +87,8 @@ static uint8_t packet_sizes[ContinuityTypeCOUNT] = {
[ContinuityTypeNearbyInfo] = HEADER_LEN + 5,
[ContinuityTypeCustomCrash] = HEADER_LEN + 11,
};
static void make_packet(uint8_t* _size, uint8_t** _packet, ProtocolCfg* _cfg) {
ContinuityCfg* cfg = _cfg ? &_cfg->specific.continuity : NULL;
static void make_packet(uint8_t* _size, uint8_t** _packet, Payload* payload) {
ContinuityCfg* cfg = payload ? &payload->cfg.continuity : NULL;
ContinuityType type;
if(cfg && cfg->type != 0x00) {
@@ -139,16 +139,16 @@ static void make_packet(uint8_t* _size, uint8_t** _packet, ProtocolCfg* _cfg) {
case ContinuityTypeProximityPair: {
uint16_t model;
switch(cfg ? _cfg->mode : ProtocolModeRandom) {
case ProtocolModeRandom:
switch(payload ? payload->mode : PayloadModeRandom) {
case PayloadModeRandom:
default:
model = pp_models[rand() % pp_models_count].value;
break;
case ProtocolModeValue:
case PayloadModeValue:
model = cfg->data.proximity_pair.model;
break;
case ProtocolModeBruteforce:
model = cfg->data.proximity_pair.model = _cfg->bruteforce.value;
case PayloadModeBruteforce:
model = cfg->data.proximity_pair.model = payload->bruteforce.value;
break;
}
@@ -216,16 +216,16 @@ static void make_packet(uint8_t* _size, uint8_t** _packet, ProtocolCfg* _cfg) {
case ContinuityTypeNearbyAction: {
uint8_t action;
switch(cfg ? _cfg->mode : ProtocolModeRandom) {
case ProtocolModeRandom:
switch(payload ? payload->mode : PayloadModeRandom) {
case PayloadModeRandom:
default:
action = na_actions[rand() % na_actions_count].value;
break;
case ProtocolModeValue:
case PayloadModeValue:
action = cfg->data.nearby_action.action;
break;
case ProtocolModeBruteforce:
action = cfg->data.nearby_action.action = _cfg->bruteforce.value;
case PayloadModeBruteforce:
action = cfg->data.nearby_action.action = payload->bruteforce.value;
break;
}
@@ -307,8 +307,8 @@ enum {
};
static void config_callback(void* _ctx, uint32_t index) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
ContinuityCfg* cfg = &_cfg->specific.continuity;
Payload* payload = &ctx->attack->payload;
ContinuityCfg* cfg = &payload->cfg.continuity;
scene_manager_set_scene_state(ctx->scene_manager, SceneConfig, index);
switch(cfg->type) {
case ContinuityTypeProximityPair: {
@@ -356,22 +356,22 @@ static void config_callback(void* _ctx, uint32_t index) {
}
}
static void pp_model_changed(VariableItem* item) {
ProtocolCfg* _cfg = variable_item_get_context(item);
ContinuityCfg* cfg = &_cfg->specific.continuity;
Payload* payload = variable_item_get_context(item);
ContinuityCfg* cfg = &payload->cfg.continuity;
uint8_t index = variable_item_get_current_value_index(item);
if(index) {
index--;
_cfg->mode = ProtocolModeValue;
payload->mode = PayloadModeValue;
cfg->data.proximity_pair.model = pp_models[index].value;
variable_item_set_current_value_text(item, pp_models[index].name);
} else {
_cfg->mode = ProtocolModeRandom;
payload->mode = PayloadModeRandom;
variable_item_set_current_value_text(item, "Random");
}
}
static void pp_prefix_changed(VariableItem* item) {
ProtocolCfg* _cfg = variable_item_get_context(item);
ContinuityCfg* cfg = &_cfg->specific.continuity;
Payload* payload = variable_item_get_context(item);
ContinuityCfg* cfg = &payload->cfg.continuity;
uint8_t index = variable_item_get_current_value_index(item);
if(index) {
index--;
@@ -383,22 +383,22 @@ static void pp_prefix_changed(VariableItem* item) {
}
}
static void na_action_changed(VariableItem* item) {
ProtocolCfg* _cfg = variable_item_get_context(item);
ContinuityCfg* cfg = &_cfg->specific.continuity;
Payload* payload = variable_item_get_context(item);
ContinuityCfg* cfg = &payload->cfg.continuity;
uint8_t index = variable_item_get_current_value_index(item);
if(index) {
index--;
_cfg->mode = ProtocolModeValue;
payload->mode = PayloadModeValue;
cfg->data.nearby_action.action = na_actions[index].value;
variable_item_set_current_value_text(item, na_actions[index].name);
} else {
_cfg->mode = ProtocolModeRandom;
payload->mode = PayloadModeRandom;
variable_item_set_current_value_text(item, "Random");
}
}
static void extra_config(Ctx* ctx) {
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
ContinuityCfg* cfg = &_cfg->specific.continuity;
Payload* payload = &ctx->attack->payload;
ContinuityCfg* cfg = &payload->cfg.continuity;
VariableItemList* list = ctx->variable_item_list;
VariableItem* item;
size_t value_index;
@@ -406,16 +406,16 @@ static void extra_config(Ctx* ctx) {
switch(cfg->type) {
case ContinuityTypeProximityPair: {
item = variable_item_list_add(
list, "Model Code", pp_models_count + 1, pp_model_changed, _cfg);
list, "Model Code", pp_models_count + 1, pp_model_changed, payload);
const char* model_name = NULL;
char model_name_buf[5];
switch(_cfg->mode) {
case ProtocolModeRandom:
switch(payload->mode) {
case PayloadModeRandom:
default:
model_name = "Random";
value_index = 0;
break;
case ProtocolModeValue:
case PayloadModeValue:
for(uint8_t i = 0; i < pp_models_count; i++) {
if(cfg->data.proximity_pair.model == pp_models[i].value) {
model_name = pp_models[i].name;
@@ -430,7 +430,7 @@ static void extra_config(Ctx* ctx) {
value_index = pp_models_count + 1;
}
break;
case ProtocolModeBruteforce:
case PayloadModeBruteforce:
model_name = "Bruteforce";
value_index = pp_models_count + 1;
break;
@@ -438,8 +438,8 @@ static void extra_config(Ctx* ctx) {
variable_item_set_current_value_index(item, value_index);
variable_item_set_current_value_text(item, model_name);
item =
variable_item_list_add(list, "Prefix", pp_prefixes_count + 1, pp_prefix_changed, _cfg);
item = variable_item_list_add(
list, "Prefix", pp_prefixes_count + 1, pp_prefix_changed, payload);
const char* prefix_name = NULL;
char prefix_name_buf[3];
if(cfg->data.proximity_pair.prefix == 0x00) {
@@ -469,16 +469,16 @@ static void extra_config(Ctx* ctx) {
}
case ContinuityTypeNearbyAction: {
item = variable_item_list_add(
list, "Action Type", na_actions_count + 1, na_action_changed, _cfg);
list, "Action Type", na_actions_count + 1, na_action_changed, payload);
const char* action_name = NULL;
char action_name_buf[3];
switch(_cfg->mode) {
case ProtocolModeRandom:
switch(payload->mode) {
case PayloadModeRandom:
default:
action_name = "Random";
value_index = 0;
break;
case ProtocolModeValue:
case PayloadModeValue:
for(uint8_t i = 0; i < na_actions_count; i++) {
if(cfg->data.nearby_action.action == na_actions[i].value) {
action_name = na_actions[i].name;
@@ -496,7 +496,7 @@ static void extra_config(Ctx* ctx) {
value_index = na_actions_count + 1;
}
break;
case ProtocolModeBruteforce:
case PayloadModeBruteforce:
action_name = "Bruteforce";
value_index = na_actions_count + 1;
break;
@@ -539,8 +539,8 @@ static uint8_t config_counts[ContinuityTypeCOUNT] = {
[ContinuityTypeNearbyInfo] = 0,
[ContinuityTypeCustomCrash] = ConfigCcCOUNT - ConfigExtraStart - 1,
};
static uint8_t config_count(const ProtocolCfg* _cfg) {
const ContinuityCfg* cfg = &_cfg->specific.continuity;
static uint8_t config_count(const Payload* payload) {
const ContinuityCfg* cfg = &payload->cfg.continuity;
return config_counts[cfg->type];
}
@@ -554,25 +554,25 @@ const Protocol protocol_continuity = {
static void pp_model_callback(void* _ctx, uint32_t index) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
ContinuityCfg* cfg = &_cfg->specific.continuity;
Payload* payload = &ctx->attack->payload;
ContinuityCfg* cfg = &payload->cfg.continuity;
switch(index) {
case 0:
_cfg->mode = ProtocolModeRandom;
payload->mode = PayloadModeRandom;
scene_manager_previous_scene(ctx->scene_manager);
break;
case pp_models_count + 1:
scene_manager_next_scene(ctx->scene_manager, SceneContinuityPpModelCustom);
break;
case pp_models_count + 2:
_cfg->mode = ProtocolModeBruteforce;
_cfg->bruteforce.counter = 0;
_cfg->bruteforce.value = cfg->data.proximity_pair.model;
_cfg->bruteforce.size = 2;
payload->mode = PayloadModeBruteforce;
payload->bruteforce.counter = 0;
payload->bruteforce.value = cfg->data.proximity_pair.model;
payload->bruteforce.size = 2;
scene_manager_previous_scene(ctx->scene_manager);
break;
default:
_cfg->mode = ProtocolModeValue;
payload->mode = PayloadModeValue;
cfg->data.proximity_pair.model = pp_models[index - 1].value;
scene_manager_previous_scene(ctx->scene_manager);
break;
@@ -580,33 +580,33 @@ static void pp_model_callback(void* _ctx, uint32_t index) {
}
void scene_continuity_pp_model_on_enter(void* _ctx) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
ContinuityCfg* cfg = &_cfg->specific.continuity;
Payload* payload = &ctx->attack->payload;
ContinuityCfg* cfg = &payload->cfg.continuity;
Submenu* submenu = ctx->submenu;
uint32_t selected = 0;
submenu_reset(submenu);
submenu_add_item(submenu, "Random", 0, pp_model_callback, ctx);
if(_cfg->mode == ProtocolModeRandom) {
if(payload->mode == PayloadModeRandom) {
selected = 0;
}
bool found = false;
for(uint8_t i = 0; i < pp_models_count; i++) {
submenu_add_item(submenu, pp_models[i].name, i + 1, pp_model_callback, ctx);
if(!found && _cfg->mode == ProtocolModeValue &&
if(!found && payload->mode == PayloadModeValue &&
cfg->data.proximity_pair.model == pp_models[i].value) {
found = true;
selected = i + 1;
}
}
submenu_add_item(submenu, "Custom", pp_models_count + 1, pp_model_callback, ctx);
if(!found && _cfg->mode == ProtocolModeValue) {
if(!found && payload->mode == PayloadModeValue) {
selected = pp_models_count + 1;
}
submenu_add_item(submenu, "Bruteforce", pp_models_count + 2, pp_model_callback, ctx);
if(_cfg->mode == ProtocolModeBruteforce) {
if(payload->mode == PayloadModeBruteforce) {
selected = pp_models_count + 2;
}
@@ -625,17 +625,17 @@ void scene_continuity_pp_model_on_exit(void* _ctx) {
static void pp_model_custom_callback(void* _ctx) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
ContinuityCfg* cfg = &_cfg->specific.continuity;
_cfg->mode = ProtocolModeValue;
Payload* payload = &ctx->attack->payload;
ContinuityCfg* cfg = &payload->cfg.continuity;
payload->mode = PayloadModeValue;
cfg->data.proximity_pair.model = (ctx->byte_store[0] << 0x08) + (ctx->byte_store[1] << 0x00);
scene_manager_previous_scene(ctx->scene_manager);
scene_manager_previous_scene(ctx->scene_manager);
}
void scene_continuity_pp_model_custom_on_enter(void* _ctx) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
ContinuityCfg* cfg = &_cfg->specific.continuity;
Payload* payload = &ctx->attack->payload;
ContinuityCfg* cfg = &payload->cfg.continuity;
ByteInput* byte_input = ctx->byte_input;
byte_input_set_header_text(byte_input, "Enter custom Model Code");
@@ -659,8 +659,8 @@ void scene_continuity_pp_model_custom_on_exit(void* _ctx) {
static void pp_prefix_callback(void* _ctx, uint32_t index) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
ContinuityCfg* cfg = &_cfg->specific.continuity;
Payload* payload = &ctx->attack->payload;
ContinuityCfg* cfg = &payload->cfg.continuity;
switch(index) {
case 0:
cfg->data.proximity_pair.prefix = 0x00;
@@ -677,8 +677,8 @@ static void pp_prefix_callback(void* _ctx, uint32_t index) {
}
void scene_continuity_pp_prefix_on_enter(void* _ctx) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
ContinuityCfg* cfg = &_cfg->specific.continuity;
Payload* payload = &ctx->attack->payload;
ContinuityCfg* cfg = &payload->cfg.continuity;
Submenu* submenu = ctx->submenu;
uint32_t selected = 0;
bool found = false;
@@ -717,16 +717,16 @@ void scene_continuity_pp_prefix_on_exit(void* _ctx) {
static void pp_prefix_custom_callback(void* _ctx) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
ContinuityCfg* cfg = &_cfg->specific.continuity;
Payload* payload = &ctx->attack->payload;
ContinuityCfg* cfg = &payload->cfg.continuity;
cfg->data.proximity_pair.prefix = (ctx->byte_store[0] << 0x00);
scene_manager_previous_scene(ctx->scene_manager);
scene_manager_previous_scene(ctx->scene_manager);
}
void scene_continuity_pp_prefix_custom_on_enter(void* _ctx) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
ContinuityCfg* cfg = &_cfg->specific.continuity;
Payload* payload = &ctx->attack->payload;
ContinuityCfg* cfg = &payload->cfg.continuity;
ByteInput* byte_input = ctx->byte_input;
byte_input_set_header_text(byte_input, "Enter custom Prefix");
@@ -749,25 +749,25 @@ void scene_continuity_pp_prefix_custom_on_exit(void* _ctx) {
static void na_action_callback(void* _ctx, uint32_t index) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
ContinuityCfg* cfg = &_cfg->specific.continuity;
Payload* payload = &ctx->attack->payload;
ContinuityCfg* cfg = &payload->cfg.continuity;
switch(index) {
case 0:
_cfg->mode = ProtocolModeRandom;
payload->mode = PayloadModeRandom;
scene_manager_previous_scene(ctx->scene_manager);
break;
case na_actions_count + 1:
scene_manager_next_scene(ctx->scene_manager, SceneContinuityNaActionCustom);
break;
case na_actions_count + 2:
_cfg->mode = ProtocolModeBruteforce;
_cfg->bruteforce.counter = 0;
_cfg->bruteforce.value = cfg->data.nearby_action.action;
_cfg->bruteforce.size = 1;
payload->mode = PayloadModeBruteforce;
payload->bruteforce.counter = 0;
payload->bruteforce.value = cfg->data.nearby_action.action;
payload->bruteforce.size = 1;
scene_manager_previous_scene(ctx->scene_manager);
break;
default:
_cfg->mode = ProtocolModeValue;
payload->mode = PayloadModeValue;
cfg->data.nearby_action.action = na_actions[index - 1].value;
scene_manager_previous_scene(ctx->scene_manager);
break;
@@ -775,33 +775,33 @@ static void na_action_callback(void* _ctx, uint32_t index) {
}
void scene_continuity_na_action_on_enter(void* _ctx) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
ContinuityCfg* cfg = &_cfg->specific.continuity;
Payload* payload = &ctx->attack->payload;
ContinuityCfg* cfg = &payload->cfg.continuity;
Submenu* submenu = ctx->submenu;
uint32_t selected = 0;
submenu_reset(submenu);
submenu_add_item(submenu, "Random", 0, na_action_callback, ctx);
if(_cfg->mode == ProtocolModeRandom) {
if(payload->mode == PayloadModeRandom) {
selected = 0;
}
bool found = false;
for(uint8_t i = 0; i < na_actions_count; i++) {
submenu_add_item(submenu, na_actions[i].name, i + 1, na_action_callback, ctx);
if(!found && _cfg->mode == ProtocolModeValue &&
if(!found && payload->mode == PayloadModeValue &&
cfg->data.nearby_action.action == na_actions[i].value) {
found = true;
selected = i + 1;
}
}
submenu_add_item(submenu, "Custom", na_actions_count + 1, na_action_callback, ctx);
if(!found && _cfg->mode == ProtocolModeValue) {
if(!found && payload->mode == PayloadModeValue) {
selected = na_actions_count + 1;
}
submenu_add_item(submenu, "Bruteforce", na_actions_count + 2, na_action_callback, ctx);
if(_cfg->mode == ProtocolModeBruteforce) {
if(payload->mode == PayloadModeBruteforce) {
selected = na_actions_count + 2;
}
@@ -820,17 +820,17 @@ void scene_continuity_na_action_on_exit(void* _ctx) {
static void na_action_custom_callback(void* _ctx) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
ContinuityCfg* cfg = &_cfg->specific.continuity;
_cfg->mode = ProtocolModeValue;
Payload* payload = &ctx->attack->payload;
ContinuityCfg* cfg = &payload->cfg.continuity;
payload->mode = PayloadModeValue;
cfg->data.nearby_action.action = (ctx->byte_store[0] << 0x00);
scene_manager_previous_scene(ctx->scene_manager);
scene_manager_previous_scene(ctx->scene_manager);
}
void scene_continuity_na_action_custom_on_enter(void* _ctx) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
ContinuityCfg* cfg = &_cfg->specific.continuity;
Payload* payload = &ctx->attack->payload;
ContinuityCfg* cfg = &payload->cfg.continuity;
ByteInput* byte_input = ctx->byte_input;
byte_input_set_header_text(byte_input, "Enter custom Action Type");
@@ -857,8 +857,8 @@ static void na_flags_callback(void* _ctx) {
}
void scene_continuity_na_flags_on_enter(void* _ctx) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
ContinuityCfg* cfg = &_cfg->specific.continuity;
Payload* payload = &ctx->attack->payload;
ContinuityCfg* cfg = &payload->cfg.continuity;
ByteInput* byte_input = ctx->byte_input;
byte_input_set_header_text(byte_input, "Press back for automatic");
@@ -879,7 +879,7 @@ bool scene_continuity_na_flags_on_event(void* _ctx, SceneManagerEvent event) {
}
void scene_continuity_na_flags_on_exit(void* _ctx) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
ContinuityCfg* cfg = &_cfg->specific.continuity;
Payload* payload = &ctx->attack->payload;
ContinuityCfg* cfg = &payload->cfg.continuity;
cfg->data.nearby_action.flags = (ctx->byte_store[0] << 0x00);
}

152
applications/external/ble_spam/protocols/easysetup.c vendored
View File

@@ -68,8 +68,8 @@ static const char* type_names[EasysetupTypeCOUNT] = {
[EasysetupTypeBuds] = "EasySetup Buds",
[EasysetupTypeWatch] = "EasySetup Watch",
};
static const char* get_name(const ProtocolCfg* _cfg) {
const EasysetupCfg* cfg = &_cfg->specific.easysetup;
static const char* get_name(const Payload* payload) {
const EasysetupCfg* cfg = &payload->cfg.easysetup;
return type_names[cfg->type];
}
@@ -77,8 +77,8 @@ static uint8_t packet_sizes[EasysetupTypeCOUNT] = {
[EasysetupTypeBuds] = 31,
[EasysetupTypeWatch] = 15,
};
void make_packet(uint8_t* out_size, uint8_t** out_packet, ProtocolCfg* _cfg) {
EasysetupCfg* cfg = _cfg ? &_cfg->specific.easysetup : NULL;
void make_packet(uint8_t* out_size, uint8_t** out_packet, Payload* payload) {
EasysetupCfg* cfg = payload ? &payload->cfg.easysetup : NULL;
EasysetupType type;
if(cfg && cfg->type != 0x00) {
@@ -98,16 +98,16 @@ void make_packet(uint8_t* out_size, uint8_t** out_packet, ProtocolCfg* _cfg) {
switch(type) {
case EasysetupTypeBuds: {
uint32_t model;
switch(cfg ? _cfg->mode : ProtocolModeRandom) {
case ProtocolModeRandom:
switch(cfg ? payload->mode : PayloadModeRandom) {
case PayloadModeRandom:
default:
model = buds_models[rand() % buds_models_count].value;
break;
case ProtocolModeValue:
case PayloadModeValue:
model = cfg->data.buds.model;
break;
case ProtocolModeBruteforce:
model = cfg->data.buds.model = _cfg->bruteforce.value;
case PayloadModeBruteforce:
model = cfg->data.buds.model = payload->bruteforce.value;
break;
}
@@ -148,16 +148,16 @@ void make_packet(uint8_t* out_size, uint8_t** out_packet, ProtocolCfg* _cfg) {
}
case EasysetupTypeWatch: {
uint8_t model;
switch(cfg ? _cfg->mode : ProtocolModeRandom) {
case ProtocolModeRandom:
switch(cfg ? payload->mode : PayloadModeRandom) {
case PayloadModeRandom:
default:
model = watch_models[rand() % watch_models_count].value;
break;
case ProtocolModeValue:
case PayloadModeValue:
model = cfg->data.watch.model;
break;
case ProtocolModeBruteforce:
model = cfg->data.watch.model = _cfg->bruteforce.value;
case PayloadModeBruteforce:
model = cfg->data.watch.model = payload->bruteforce.value;
break;
}
@@ -199,8 +199,8 @@ enum {
};
static void config_callback(void* _ctx, uint32_t index) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
EasysetupCfg* cfg = &_cfg->specific.easysetup;
Payload* payload = &ctx->attack->payload;
EasysetupCfg* cfg = &payload->cfg.easysetup;
scene_manager_set_scene_state(ctx->scene_manager, SceneConfig, index);
switch(cfg->type) {
case EasysetupTypeBuds: {
@@ -233,36 +233,36 @@ static void config_callback(void* _ctx, uint32_t index) {
}
}
static void buds_model_changed(VariableItem* item) {
ProtocolCfg* _cfg = variable_item_get_context(item);
EasysetupCfg* cfg = &_cfg->specific.easysetup;
Payload* payload = variable_item_get_context(item);
EasysetupCfg* cfg = &payload->cfg.easysetup;
uint8_t index = variable_item_get_current_value_index(item);
if(index) {
index--;
_cfg->mode = ProtocolModeValue;
payload->mode = PayloadModeValue;
cfg->data.buds.model = buds_models[index].value;
variable_item_set_current_value_text(item, buds_models[index].name);
} else {
_cfg->mode = ProtocolModeRandom;
payload->mode = PayloadModeRandom;
variable_item_set_current_value_text(item, "Random");
}
}
static void watch_model_changed(VariableItem* item) {
ProtocolCfg* _cfg = variable_item_get_context(item);
EasysetupCfg* cfg = &_cfg->specific.easysetup;
Payload* payload = variable_item_get_context(item);
EasysetupCfg* cfg = &payload->cfg.easysetup;
uint8_t index = variable_item_get_current_value_index(item);
if(index) {
index--;
_cfg->mode = ProtocolModeValue;
payload->mode = PayloadModeValue;
cfg->data.watch.model = watch_models[index].value;
variable_item_set_current_value_text(item, watch_models[index].name);
} else {
_cfg->mode = ProtocolModeRandom;
payload->mode = PayloadModeRandom;
variable_item_set_current_value_text(item, "Random");
}
}
static void extra_config(Ctx* ctx) {
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
EasysetupCfg* cfg = &_cfg->specific.easysetup;
Payload* payload = &ctx->attack->payload;
EasysetupCfg* cfg = &payload->cfg.easysetup;
VariableItemList* list = ctx->variable_item_list;
VariableItem* item;
size_t value_index;
@@ -270,16 +270,16 @@ static void extra_config(Ctx* ctx) {
switch(cfg->type) {
case EasysetupTypeBuds: {
item = variable_item_list_add(
list, "Model Code", buds_models_count + 1, buds_model_changed, _cfg);
list, "Model Code", buds_models_count + 1, buds_model_changed, payload);
const char* model_name = NULL;
char model_name_buf[9];
switch(_cfg->mode) {
case ProtocolModeRandom:
switch(payload->mode) {
case PayloadModeRandom:
default:
model_name = "Random";
value_index = 0;
break;
case ProtocolModeValue:
case PayloadModeValue:
for(uint8_t i = 0; i < buds_models_count; i++) {
if(cfg->data.buds.model == buds_models[i].value) {
model_name = buds_models[i].name;
@@ -293,7 +293,7 @@ static void extra_config(Ctx* ctx) {
value_index = buds_models_count + 1;
}
break;
case ProtocolModeBruteforce:
case PayloadModeBruteforce:
model_name = "Bruteforce";
value_index = buds_models_count + 1;
break;
@@ -306,16 +306,16 @@ static void extra_config(Ctx* ctx) {
}
case EasysetupTypeWatch: {
item = variable_item_list_add(
list, "Model Code", watch_models_count + 1, watch_model_changed, _cfg);
list, "Model Code", watch_models_count + 1, watch_model_changed, payload);
const char* model_name = NULL;
char model_name_buf[3];
switch(_cfg->mode) {
case ProtocolModeRandom:
switch(payload->mode) {
case PayloadModeRandom:
default:
model_name = "Random";
value_index = 0;
break;
case ProtocolModeValue:
case PayloadModeValue:
for(uint8_t i = 0; i < watch_models_count; i++) {
if(cfg->data.watch.model == watch_models[i].value) {
model_name = watch_models[i].name;
@@ -329,7 +329,7 @@ static void extra_config(Ctx* ctx) {
value_index = watch_models_count + 1;
}
break;
case ProtocolModeBruteforce:
case PayloadModeBruteforce:
model_name = "Bruteforce";
value_index = watch_models_count + 1;
break;
@@ -349,8 +349,8 @@ static uint8_t config_counts[EasysetupTypeCOUNT] = {
[EasysetupTypeBuds] = ConfigBudsCOUNT - ConfigExtraStart - 1,
[EasysetupTypeWatch] = ConfigWatchCOUNT - ConfigExtraStart - 1,
};
static uint8_t config_count(const ProtocolCfg* _cfg) {
const EasysetupCfg* cfg = &_cfg->specific.easysetup;
static uint8_t config_count(const Payload* payload) {
const EasysetupCfg* cfg = &payload->cfg.easysetup;
return config_counts[cfg->type];
}
@@ -364,25 +364,25 @@ const Protocol protocol_easysetup = {
static void buds_model_callback(void* _ctx, uint32_t index) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
EasysetupCfg* cfg = &_cfg->specific.easysetup;
Payload* payload = &ctx->attack->payload;
EasysetupCfg* cfg = &payload->cfg.easysetup;
switch(index) {
case 0:
_cfg->mode = ProtocolModeRandom;
payload->mode = PayloadModeRandom;
scene_manager_previous_scene(ctx->scene_manager);
break;
case buds_models_count + 1:
scene_manager_next_scene(ctx->scene_manager, SceneEasysetupBudsModelCustom);
break;
case buds_models_count + 2:
_cfg->mode = ProtocolModeBruteforce;
_cfg->bruteforce.counter = 0;
_cfg->bruteforce.value = cfg->data.buds.model;
_cfg->bruteforce.size = 3;
payload->mode = PayloadModeBruteforce;
payload->bruteforce.counter = 0;
payload->bruteforce.value = cfg->data.buds.model;
payload->bruteforce.size = 3;
scene_manager_previous_scene(ctx->scene_manager);
break;
default:
_cfg->mode = ProtocolModeValue;
payload->mode = PayloadModeValue;
cfg->data.buds.model = buds_models[index - 1].value;
scene_manager_previous_scene(ctx->scene_manager);
break;
@@ -390,33 +390,33 @@ static void buds_model_callback(void* _ctx, uint32_t index) {
}
void scene_easysetup_buds_model_on_enter(void* _ctx) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
EasysetupCfg* cfg = &_cfg->specific.easysetup;
Payload* payload = &ctx->attack->payload;
EasysetupCfg* cfg = &payload->cfg.easysetup;
Submenu* submenu = ctx->submenu;
uint32_t selected = 0;
submenu_reset(submenu);
submenu_add_item(submenu, "Random", 0, buds_model_callback, ctx);
if(_cfg->mode == ProtocolModeRandom) {
if(payload->mode == PayloadModeRandom) {
selected = 0;
}
bool found = false;
for(uint8_t i = 0; i < buds_models_count; i++) {
submenu_add_item(submenu, buds_models[i].name, i + 1, buds_model_callback, ctx);
if(!found && _cfg->mode == ProtocolModeValue &&
if(!found && payload->mode == PayloadModeValue &&
cfg->data.buds.model == buds_models[i].value) {
found = true;
selected = i + 1;
}
}
submenu_add_item(submenu, "Custom", buds_models_count + 1, buds_model_callback, ctx);
if(!found && _cfg->mode == ProtocolModeValue) {
if(!found && payload->mode == PayloadModeValue) {
selected = buds_models_count + 1;
}
submenu_add_item(submenu, "Bruteforce", buds_models_count + 2, buds_model_callback, ctx);
if(_cfg->mode == ProtocolModeBruteforce) {
if(payload->mode == PayloadModeBruteforce) {
selected = buds_models_count + 2;
}
@@ -435,9 +435,9 @@ void scene_easysetup_buds_model_on_exit(void* _ctx) {
static void buds_model_custom_callback(void* _ctx) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
EasysetupCfg* cfg = &_cfg->specific.easysetup;
_cfg->mode = ProtocolModeValue;
Payload* payload = &ctx->attack->payload;
EasysetupCfg* cfg = &payload->cfg.easysetup;
payload->mode = PayloadModeValue;
cfg->data.buds.model =
(ctx->byte_store[0] << 0x10) + (ctx->byte_store[1] << 0x08) + (ctx->byte_store[2] << 0x00);
scene_manager_previous_scene(ctx->scene_manager);
@@ -445,8 +445,8 @@ static void buds_model_custom_callback(void* _ctx) {
}
void scene_easysetup_buds_model_custom_on_enter(void* _ctx) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
EasysetupCfg* cfg = &_cfg->specific.easysetup;
Payload* payload = &ctx->attack->payload;
EasysetupCfg* cfg = &payload->cfg.easysetup;
ByteInput* byte_input = ctx->byte_input;
byte_input_set_header_text(byte_input, "Enter custom Model Code");
@@ -471,25 +471,25 @@ void scene_easysetup_buds_model_custom_on_exit(void* _ctx) {
static void watch_model_callback(void* _ctx, uint32_t index) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
EasysetupCfg* cfg = &_cfg->specific.easysetup;
Payload* payload = &ctx->attack->payload;
EasysetupCfg* cfg = &payload->cfg.easysetup;
switch(index) {
case 0:
_cfg->mode = ProtocolModeRandom;
payload->mode = PayloadModeRandom;
scene_manager_previous_scene(ctx->scene_manager);
break;
case watch_models_count + 1:
scene_manager_next_scene(ctx->scene_manager, SceneEasysetupWatchModelCustom);
break;
case watch_models_count + 2:
_cfg->mode = ProtocolModeBruteforce;
_cfg->bruteforce.counter = 0;
_cfg->bruteforce.value = cfg->data.watch.model;
_cfg->bruteforce.size = 1;
payload->mode = PayloadModeBruteforce;
payload->bruteforce.counter = 0;
payload->bruteforce.value = cfg->data.watch.model;
payload->bruteforce.size = 1;
scene_manager_previous_scene(ctx->scene_manager);
break;
default:
_cfg->mode = ProtocolModeValue;
payload->mode = PayloadModeValue;
cfg->data.watch.model = watch_models[index - 1].value;
scene_manager_previous_scene(ctx->scene_manager);
break;
@@ -497,33 +497,33 @@ static void watch_model_callback(void* _ctx, uint32_t index) {
}
void scene_easysetup_watch_model_on_enter(void* _ctx) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
EasysetupCfg* cfg = &_cfg->specific.easysetup;
Payload* payload = &ctx->attack->payload;
EasysetupCfg* cfg = &payload->cfg.easysetup;
Submenu* submenu = ctx->submenu;
uint32_t selected = 0;
submenu_reset(submenu);
submenu_add_item(submenu, "Random", 0, watch_model_callback, ctx);
if(_cfg->mode == ProtocolModeRandom) {
if(payload->mode == PayloadModeRandom) {
selected = 0;
}
bool found = false;
for(uint8_t i = 0; i < watch_models_count; i++) {
submenu_add_item(submenu, watch_models[i].name, i + 1, watch_model_callback, ctx);
if(!found && _cfg->mode == ProtocolModeValue &&
if(!found && payload->mode == PayloadModeValue &&
cfg->data.watch.model == watch_models[i].value) {
found = true;
selected = i + 1;
}
}
submenu_add_item(submenu, "Custom", watch_models_count + 1, watch_model_callback, ctx);
if(!found && _cfg->mode == ProtocolModeValue) {
if(!found && payload->mode == PayloadModeValue) {
selected = watch_models_count + 1;
}
submenu_add_item(submenu, "Bruteforce", watch_models_count + 2, watch_model_callback, ctx);
if(_cfg->mode == ProtocolModeBruteforce) {
if(payload->mode == PayloadModeBruteforce) {
selected = watch_models_count + 2;
}
@@ -542,17 +542,17 @@ void scene_easysetup_watch_model_on_exit(void* _ctx) {
static void watch_model_custom_callback(void* _ctx) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
EasysetupCfg* cfg = &_cfg->specific.easysetup;
_cfg->mode = ProtocolModeValue;
Payload* payload = &ctx->attack->payload;
EasysetupCfg* cfg = &payload->cfg.easysetup;
payload->mode = PayloadModeValue;
cfg->data.watch.model = (ctx->byte_store[0] << 0x00);
scene_manager_previous_scene(ctx->scene_manager);
scene_manager_previous_scene(ctx->scene_manager);
}
void scene_easysetup_watch_model_custom_on_enter(void* _ctx) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
EasysetupCfg* cfg = &_cfg->specific.easysetup;
Payload* payload = &ctx->attack->payload;
EasysetupCfg* cfg = &payload->cfg.easysetup;
ByteInput* byte_input = ctx->byte_input;
byte_input_set_header_text(byte_input, "Enter custom Model Code");

238
applications/external/ble_spam/protocols/fastpair.c vendored
View File

@@ -8,12 +8,10 @@ const struct {
uint32_t value;
const char* name;
} models[] = {
// Genuine actions
{0x00000C, "Set Up Device"},
// Genuine non-production/forgotten (good job Google)
{0x0001F0, "Bisto CSR8670 Dev Board"},
{0x000047, "Arduino 101"},
{0x470000, "Arduino 101 2"},
{0x00000A, "Anti-Spoof Test"},
{0x0A0000, "Anti-Spoof Test 2"},
{0x00000B, "Google Gphones"},
@@ -26,12 +24,30 @@ const struct {
{0x080000, "Foocorp Foophones 2"},
{0x000009, "Test Android TV"},
{0x090000, "Test Android TV 2"},
{0x000035, "Test 000035"},
{0x350000, "Test 000035 2"},
{0x000048, "Fast Pair Headphones"},
{0x000049, "Fast Pair Headphones 2"},
{0x480000, "Fast Pair Headphones 2"},
{0x000049, "Fast Pair Headphones 3"},
{0x490000, "Fast Pair Headphones 4"},
{0x001000, "LG HBS1110"},
{0x00B727, "Smart Controller 1"},
{0x01E5CE, "BLE-Phone"},
{0x0200F0, "Goodyear"},
{0x00F7D4, "Smart Setup"},
{0xF00002, "Goodyear"},
{0xF00400, "T10"},
{0x1E89A7, "ATS2833_EVB"},
// Phone setup
{0x00000C, "Google Gphones Transfer"},
{0x0577B1, "Galaxy S23 Ultra"},
{0x05A9BC, "Galaxy S20+"},
// Genuine devices
{0xCD8256, "Bose NC 700"},
{0x0000F0, "Bose QuietComfort 35 II"},
{0xF00000, "Bose QuietComfort 35 II 2"},
{0x821F66, "JBL Flip 6"},
{0xF52494, "JBL Buds Pro"},
{0x718FA4, "JBL Live 300TWS"},
@@ -45,6 +61,138 @@ const struct {
{0x72EF8D, "Razer Hammerhead TWS X"},
{0x72FB00, "Soundcore Spirit Pro GVA"},
{0x0003F0, "LG HBS-835S"},
{0x002000, "AIAIAI TMA-2 (H60)"},
{0x003000, "Libratone Q Adapt On-Ear"},
{0x003001, "Libratone Q Adapt On-Ear 2"},
{0x00A168, "boAt Airdopes 621"},
{0x00AA48, "Jabra Elite 2"},
{0x00AA91, "Beoplay E8 2.0"},
{0x00C95C, "Sony WF-1000X"},
{0x01EEB4, "WH-1000XM4"},
{0x02AA91, "B&O Earset"},
{0x01C95C, "Sony WF-1000X"},
{0x02D815, "ATH-CK1TW"},
{0x035764, "PLT V8200 Series"},
{0x038CC7, "JBL TUNE760NC"},
{0x02DD4F, "JBL TUNE770NC"},
{0x02E2A9, "TCL MOVEAUDIO S200"},
{0x035754, "Plantronics PLT_K2"},
{0x02C95C, "Sony WH-1000XM2"},
{0x038B91, "DENON AH-C830NCW"},
{0x02F637, "JBL LIVE FLEX"},
{0x02D886, "JBL REFLECT MINI NC"},
{0xF00000, "Bose QuietComfort 35 II"},
{0xF00001, "Bose QuietComfort 35 II"},
{0xF00201, "JBL Everest 110GA"},
{0xF00204, "JBL Everest 310GA"},
{0xF00209, "JBL LIVE400BT"},
{0xF00205, "JBL Everest 310GA"},
{0xF00200, "JBL Everest 110GA"},
{0xF00208, "JBL Everest 710GA"},
{0xF00207, "JBL Everest 710GA"},
{0xF00206, "JBL Everest 310GA"},
{0xF0020A, "JBL LIVE400BT"},
{0xF0020B, "JBL LIVE400BT"},
{0xF0020C, "JBL LIVE400BT"},
{0xF00203, "JBL Everest 310GA"},
{0xF00202, "JBL Everest 110GA"},
{0xF00213, "JBL LIVE650BTNC"},
{0xF0020F, "JBL LIVE500BT"},
{0xF0020E, "JBL LIVE500BT"},
{0xF00214, "JBL LIVE650BTNC"},
{0xF00212, "JBL LIVE500BT"},
{0xF0020D, "JBL LIVE400BT"},
{0xF00211, "JBL LIVE500BT"},
{0xF00215, "JBL LIVE650BTNC"},
{0xF00210, "JBL LIVE500BT"},
{0xF00305, "LG HBS-1500"},
{0xF00304, "LG HBS-1010"},
{0xF00308, "LG HBS-1125"},
{0xF00303, "LG HBS-930"},
{0xF00306, "LG HBS-1700"},
{0xF00300, "LG HBS-835S"},
{0xF00309, "LG HBS-2000"},
{0xF00302, "LG HBS-830"},
{0xF00307, "LG HBS-1120"},
{0xF00301, "LG HBS-835"},
{0xF00E97, "JBL VIBE BEAM"},
{0x04ACFC, "JBL WAVE BEAM"},
{0x04AA91, "Beoplay H4"},
{0x04AFB8, "JBL TUNE 720BT"},
{0x05A963, "WONDERBOOM 3"},
{0x05AA91, "B&O Beoplay E6"},
{0x05C452, "JBL LIVE220BT"},
{0x05C95C, "Sony WI-1000X"},
{0x0602F0, "JBL Everest 310GA"},
{0x0603F0, "LG HBS-1700"},
{0x1E8B18, "SRS-XB43"},
{0x1E955B, "WI-1000XM2"},
{0x1EC95C, "Sony WF-SP700N"},
{0x1ED9F9, "JBL WAVE FLEX"},
{0x1EE890, "ATH-CKS30TW WH"},
{0x1EEDF5, "Teufel REAL BLUE TWS 3"},
{0x1F1101, "TAG Heuer Calibre E4 45mm"},
{0x1F181A, "LinkBuds S"},
{0x1F2E13, "Jabra Elite 2"},
{0x1F4589, "Jabra Elite 2"},
{0x1F4627, "SRS-XG300"},
{0x1F5865, "boAt Airdopes 441"},
{0x1FBB50, "WF-C700N"},
{0x1FC95C, "Sony WF-SP700N"},
{0x1FE765, "TONE-TF7Q"},
{0x1FF8FA, "JBL REFLECT MINI NC"},
{0x201C7C, "SUMMIT"},
{0x202B3D, "Amazfit PowerBuds"},
{0x20330C, "SRS-XB33"},
{0x003B41, "M&D MW65"},
{0x003D8A, "Cleer FLOW II"},
{0x005BC3, "Panasonic RP-HD610N"},
{0x008F7D, "soundcore Glow Mini"},
{0x00FA72, "Pioneer SE-MS9BN"},
{0x0100F0, "Bose QuietComfort 35 II"},
{0x011242, "Nirvana Ion"},
{0x013D8A, "Cleer EDGE Voice"},
{0x01AA91, "Beoplay H9 3rd Generation"},
{0x038F16, "Beats Studio Buds"},
{0x039F8F, "Michael Kors Darci 5e"},
{0x03AA91, "B&O Beoplay H8i"},
{0x03B716, "YY2963"},
{0x03C95C, "Sony WH-1000XM2"},
{0x03C99C, "MOTO BUDS 135"},
{0x03F5D4, "Writing Account Key"},
{0x045754, "Plantronics PLT_K2"},
{0x045764, "PLT V8200 Series"},
{0x04C95C, "Sony WI-1000X"},
{0x050F0C, "Major III Voice"},
{0x052CC7, "MINOR III"},
{0x057802, "TicWatch Pro 5"},
{0x0582FD, "Pixel Buds"},
{0x058D08, "WH-1000XM4"},
{0x06AE20, "Galaxy S21 5G"},
{0x06C197, "OPPO Enco Air3 Pro"},
{0x06C95C, "Sony WH-1000XM2"},
{0x06D8FC, "soundcore Liberty 4 NC"},
{0x0744B6, "Technics EAH-AZ60M2"},
{0x07A41C, "WF-C700N"},
{0x07C95C, "Sony WH-1000XM2"},
{0x07F426, "Nest Hub Max"},
{0x0102F0, "JBL Everest 110GA - Gun Metal"},
{0x0202F0, "JBL Everest 110GA - Silver"},
{0x0302F0, "JBL Everest 310GA - Brown"},
{0x0402F0, "JBL Everest 310GA - Gun Metal"},
{0x0502F0, "JBL Everest 310GA - Silver"},
{0x0702F0, "JBL Everest 710GA - Gun Metal"},
{0x0802F0, "JBL Everest 710GA - Silver"},
{0x054B2D, "JBL TUNE125TWS"},
{0x0660D7, "JBL LIVE770NC"},
{0x0103F0, "LG HBS-835"},
{0x0203F0, "LG HBS-830"},
{0x0303F0, "LG HBS-930"},
{0x0403F0, "LG HBS-1010"},
{0x0503F0, "LG HBS-1500"},
{0x0703F0, "LG HBS-1120"},
{0x0803F0, "LG HBS-1125"},
{0x0903F0, "LG HBS-2000"},
// Custom debug popups
{0xD99CA1, "Flipper Zero"},
@@ -65,25 +213,25 @@ const struct {
};
const uint8_t models_count = COUNT_OF(models);
static const char* get_name(const ProtocolCfg* _cfg) {
UNUSED(_cfg);
static const char* get_name(const Payload* payload) {
UNUSED(payload);
return "FastPair";
}
static void make_packet(uint8_t* _size, uint8_t** _packet, ProtocolCfg* _cfg) {
FastpairCfg* cfg = _cfg ? &_cfg->specific.fastpair : NULL;
static void make_packet(uint8_t* _size, uint8_t** _packet, Payload* payload) {
FastpairCfg* cfg = payload ? &payload->cfg.fastpair : NULL;
uint32_t model;
switch(cfg ? _cfg->mode : ProtocolModeRandom) {
case ProtocolModeRandom:
switch(cfg ? payload->mode : PayloadModeRandom) {
case PayloadModeRandom:
default:
model = models[rand() % models_count].value;
break;
case ProtocolModeValue:
case PayloadModeValue:
model = cfg->model;
break;
case ProtocolModeBruteforce:
model = cfg->model = _cfg->bruteforce.value;
case PayloadModeBruteforce:
model = cfg->model = payload->bruteforce.value;
break;
}
@@ -133,36 +281,36 @@ static void config_callback(void* _ctx, uint32_t index) {
}
}
static void model_changed(VariableItem* item) {
ProtocolCfg* _cfg = variable_item_get_context(item);
FastpairCfg* cfg = &_cfg->specific.fastpair;
Payload* payload = variable_item_get_context(item);
FastpairCfg* cfg = &payload->cfg.fastpair;
uint8_t index = variable_item_get_current_value_index(item);
if(index) {
index--;
_cfg->mode = ProtocolModeValue;
payload->mode = PayloadModeValue;
cfg->model = models[index].value;
variable_item_set_current_value_text(item, models[index].name);
} else {
_cfg->mode = ProtocolModeRandom;
payload->mode = PayloadModeRandom;
variable_item_set_current_value_text(item, "Random");
}
}
static void extra_config(Ctx* ctx) {
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
FastpairCfg* cfg = &_cfg->specific.fastpair;
Payload* payload = &ctx->attack->payload;
FastpairCfg* cfg = &payload->cfg.fastpair;
VariableItemList* list = ctx->variable_item_list;
VariableItem* item;
size_t value_index;
item = variable_item_list_add(list, "Model Code", models_count + 1, model_changed, _cfg);
item = variable_item_list_add(list, "Model Code", models_count + 1, model_changed, payload);
const char* model_name = NULL;
char model_name_buf[9];
switch(_cfg->mode) {
case ProtocolModeRandom:
switch(payload->mode) {
case PayloadModeRandom:
default:
model_name = "Random";
value_index = 0;
break;
case ProtocolModeValue:
case PayloadModeValue:
for(uint8_t i = 0; i < models_count; i++) {
if(cfg->model == models[i].value) {
model_name = models[i].name;
@@ -176,7 +324,7 @@ static void extra_config(Ctx* ctx) {
value_index = models_count + 1;
}
break;
case ProtocolModeBruteforce:
case PayloadModeBruteforce:
model_name = "Bruteforce";
value_index = models_count + 1;
break;
@@ -189,8 +337,8 @@ static void extra_config(Ctx* ctx) {
variable_item_list_set_enter_callback(list, config_callback, ctx);
}
static uint8_t config_count(const ProtocolCfg* _cfg) {
UNUSED(_cfg);
static uint8_t config_count(const Payload* payload) {
UNUSED(payload);
return ConfigCOUNT - ConfigExtraStart - 1;
}
@@ -204,25 +352,25 @@ const Protocol protocol_fastpair = {
static void model_callback(void* _ctx, uint32_t index) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
FastpairCfg* cfg = &_cfg->specific.fastpair;
Payload* payload = &ctx->attack->payload;
FastpairCfg* cfg = &payload->cfg.fastpair;
switch(index) {
case 0:
_cfg->mode = ProtocolModeRandom;
payload->mode = PayloadModeRandom;
scene_manager_previous_scene(ctx->scene_manager);
break;
case models_count + 1:
scene_manager_next_scene(ctx->scene_manager, SceneFastpairModelCustom);
break;
case models_count + 2:
_cfg->mode = ProtocolModeBruteforce;
_cfg->bruteforce.counter = 0;
_cfg->bruteforce.value = cfg->model;
_cfg->bruteforce.size = 3;
payload->mode = PayloadModeBruteforce;
payload->bruteforce.counter = 0;
payload->bruteforce.value = cfg->model;
payload->bruteforce.size = 3;
scene_manager_previous_scene(ctx->scene_manager);
break;
default:
_cfg->mode = ProtocolModeValue;
payload->mode = PayloadModeValue;
cfg->model = models[index - 1].value;
scene_manager_previous_scene(ctx->scene_manager);
break;
@@ -230,32 +378,32 @@ static void model_callback(void* _ctx, uint32_t index) {
}
void scene_fastpair_model_on_enter(void* _ctx) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
FastpairCfg* cfg = &_cfg->specific.fastpair;
Payload* payload = &ctx->attack->payload;
FastpairCfg* cfg = &payload->cfg.fastpair;
Submenu* submenu = ctx->submenu;
uint32_t selected = 0;
submenu_reset(submenu);
submenu_add_item(submenu, "Random", 0, model_callback, ctx);
if(_cfg->mode == ProtocolModeRandom) {
if(payload->mode == PayloadModeRandom) {
selected = 0;
}
bool found = false;
for(uint8_t i = 0; i < models_count; i++) {
submenu_add_item(submenu, models[i].name, i + 1, model_callback, ctx);
if(!found && _cfg->mode == ProtocolModeValue && cfg->model == models[i].value) {
if(!found && payload->mode == PayloadModeValue && cfg->model == models[i].value) {
found = true;
selected = i + 1;
}
}
submenu_add_item(submenu, "Custom", models_count + 1, model_callback, ctx);
if(!found && _cfg->mode == ProtocolModeValue) {
if(!found && payload->mode == PayloadModeValue) {
selected = models_count + 1;
}
submenu_add_item(submenu, "Bruteforce", models_count + 2, model_callback, ctx);
if(_cfg->mode == ProtocolModeBruteforce) {
if(payload->mode == PayloadModeBruteforce) {
selected = models_count + 2;
}
@@ -274,9 +422,9 @@ void scene_fastpair_model_on_exit(void* _ctx) {
static void model_custom_callback(void* _ctx) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
FastpairCfg* cfg = &_cfg->specific.fastpair;
_cfg->mode = ProtocolModeValue;
Payload* payload = &ctx->attack->payload;
FastpairCfg* cfg = &payload->cfg.fastpair;
payload->mode = PayloadModeValue;
cfg->model =
(ctx->byte_store[0] << 0x10) + (ctx->byte_store[1] << 0x08) + (ctx->byte_store[2] << 0x00);
scene_manager_previous_scene(ctx->scene_manager);
@@ -284,8 +432,8 @@ static void model_custom_callback(void* _ctx) {
}
void scene_fastpair_model_custom_on_enter(void* _ctx) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
FastpairCfg* cfg = &_cfg->specific.fastpair;
Payload* payload = &ctx->attack->payload;
FastpairCfg* cfg = &payload->cfg.fastpair;
ByteInput* byte_input = ctx->byte_input;
byte_input_set_header_text(byte_input, "Enter custom Model Code");

36
applications/external/ble_spam/protocols/swiftpair.c vendored
View File

@@ -14,21 +14,21 @@ const char* names[] = {
};
const uint8_t names_count = COUNT_OF(names);
static const char* get_name(const ProtocolCfg* _cfg) {
UNUSED(_cfg);
static const char* get_name(const Payload* payload) {
UNUSED(payload);
return "SwiftPair";
}
static void make_packet(uint8_t* _size, uint8_t** _packet, ProtocolCfg* _cfg) {
SwiftpairCfg* cfg = _cfg ? &_cfg->specific.swiftpair : NULL;
static void make_packet(uint8_t* _size, uint8_t** _packet, Payload* payload) {
SwiftpairCfg* cfg = payload ? &payload->cfg.swiftpair : NULL;
const char* name;
switch(cfg ? _cfg->mode : ProtocolModeRandom) {
case ProtocolModeRandom:
switch(cfg ? payload->mode : PayloadModeRandom) {
case PayloadModeRandom:
default:
name = names[rand() % names_count];
break;
case ProtocolModeValue:
case PayloadModeValue:
name = cfg->name;
break;
}
@@ -73,22 +73,22 @@ static void config_callback(void* _ctx, uint32_t index) {
}
}
static void extra_config(Ctx* ctx) {
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
SwiftpairCfg* cfg = &_cfg->specific.swiftpair;
Payload* payload = &ctx->attack->payload;
SwiftpairCfg* cfg = &payload->cfg.swiftpair;
VariableItemList* list = ctx->variable_item_list;
VariableItem* item;
item = variable_item_list_add(list, "Display Name", 0, NULL, NULL);
variable_item_set_current_value_text(
item, _cfg->mode == ProtocolModeRandom ? "Random" : cfg->name);
item, payload->mode == PayloadModeRandom ? "Random" : cfg->name);
variable_item_list_add(list, "Requires enabling SwiftPair", 0, NULL, NULL);
variable_item_list_set_enter_callback(list, config_callback, ctx);
}
static uint8_t config_count(const ProtocolCfg* _cfg) {
UNUSED(_cfg);
static uint8_t config_count(const Payload* payload) {
UNUSED(payload);
return ConfigCOUNT - ConfigExtraStart - 1;
}
@@ -102,14 +102,14 @@ const Protocol protocol_swiftpair = {
static void name_callback(void* _ctx) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
_cfg->mode = ProtocolModeValue;
Payload* payload = &ctx->attack->payload;
payload->mode = PayloadModeValue;
scene_manager_previous_scene(ctx->scene_manager);
}
void scene_swiftpair_name_on_enter(void* _ctx) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
SwiftpairCfg* cfg = &_cfg->specific.swiftpair;
Payload* payload = &ctx->attack->payload;
SwiftpairCfg* cfg = &payload->cfg.swiftpair;
TextInput* text_input = ctx->text_input;
text_input_reset(text_input);
@@ -124,9 +124,9 @@ void scene_swiftpair_name_on_enter(void* _ctx) {
}
bool scene_swiftpair_name_on_event(void* _ctx, SceneManagerEvent event) {
Ctx* ctx = _ctx;
ProtocolCfg* _cfg = &ctx->attack->payload.cfg;
Payload* payload = &ctx->attack->payload;
if(event.type == SceneManagerEventTypeBack) {
_cfg->mode = ProtocolModeRandom;
payload->mode = PayloadModeRandom;
}
return false;
}

2
applications/external/ble_spam/scenes/config.c vendored
View File

@@ -19,7 +19,7 @@ static void config_callback(void* _ctx, uint32_t index) {
if(!ctx->attack->protocol) {
index--;
} else if(ctx->attack->protocol->config_count) {
uint8_t extra = ctx->attack->protocol->config_count(&ctx->attack->payload.cfg);
uint8_t extra = ctx->attack->protocol->config_count(&ctx->attack->payload);
if(index > extra) index -= extra;
}

5
applications/external/camera_suite/views/camera_suite_view_camera.h vendored
View File

@@ -16,9 +16,8 @@
#include <xtreme.h>
#define UART_CH \
(XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \
FuriHalUartIdLPUART1)
#define UART_CH \
(xtreme_settings.uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : FuriHalUartIdLPUART1)
#pragma once

5
applications/external/esp8266_deauth/esp8266_deauth.c vendored
View File

@@ -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

5
applications/external/esp_flasher/esp_flasher_uart.c vendored
View File

@@ -2,9 +2,8 @@
#include "esp_flasher_uart.h"
#include <xtreme.h>
#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 {

5
applications/external/evil_portal/evil_portal_app_i.h vendored
View File

@@ -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"

5
applications/external/gps_nmea_uart/gps_uart.h vendored
View File

@@ -4,9 +4,8 @@
#include <notification/notification_messages.h>
#include <xtreme.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

8
applications/external/nrf24batch/lib/nrf24/nrf24.c vendored
View File

@@ -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);
}
}

2
applications/external/nrf24batch/lib/nrf24/nrf24.h vendored
View File

@@ -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 */

8
applications/external/nrf24channelscanner/lib/nrf24/nrf24.c vendored
View File

@@ -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);
}
}

2
applications/external/nrf24channelscanner/lib/nrf24/nrf24.h vendored
View File

@@ -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 */

10
applications/external/nrf24mousejacker/lib/nrf24/nrf24.c vendored
View File

@@ -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;
}
}
}

2
applications/external/nrf24mousejacker/lib/nrf24/nrf24.h vendored
View File

@@ -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 */

8
applications/external/nrf24scan/lib/nrf24/nrf24.c vendored
View File

@@ -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);
}
}

2
applications/external/nrf24scan/lib/nrf24/nrf24.h vendored
View File

@@ -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 */

8
applications/external/nrf24sniff/lib/nrf24/nrf24.c vendored
View File

@@ -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);
}
}

2
applications/external/nrf24sniff/lib/nrf24/nrf24.h vendored
View File

@@ -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 */

6
applications/external/uart_terminal/uart_terminal_app_i.h vendored
View File

@@ -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;

5
applications/external/wifi_deauther/wifi_deauther_app_i.h vendored
View File

@@ -14,9 +14,8 @@
#include <xtreme.h>
#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)

5
applications/external/wifi_marauder_companion/wifi_marauder_app_i.h vendored
View File

@@ -28,9 +28,8 @@
#include <dialogs/dialogs.h>
#include <xtreme.h>
#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)

5
applications/external/wifi_scanner/FlipperZeroWiFiModuleDefines.h vendored
View File

@@ -18,6 +18,5 @@
#include <xtreme.h>
#define UART_CH \
(XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \
FuriHalUartIdLPUART1)
#define UART_CH \
(xtreme_settings.uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : FuriHalUartIdLPUART1)

9
applications/main/archive/helpers/archive_browser.c
View File

@@ -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

2
applications/main/archive/helpers/archive_files.h
View File

@@ -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;
}

2
applications/main/archive/helpers/favorite_timeout.c
View File

@@ -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;

4
applications/main/bad_kb/bad_kb_app.c
View File

@@ -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

9
applications/main/bad_kb/helpers/ducky_script.c
View File

@@ -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();
}
}

6
applications/main/bad_kb/views/bad_kb_view.c
View File

@@ -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");

7
applications/main/subghz/helpers/subghz_gps.h
View File

@@ -2,9 +2,8 @@
#include <xtreme.h>
#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);
double subghz_gps_calc_angle(double lat1, double lon1, double lat2, double lon2);

2
applications/main/subghz/scenes/subghz_scene_transmitter.c
View File

@@ -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;
}
}

2
applications/main/subghz/subghz.c
View File

@@ -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;

10
applications/main/u2f/views/u2f_view.c
View File

@@ -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(

27
applications/main/xtreme_app/scenes/xtreme_app_scene_interface_filebrowser.c
View File

@@ -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);

23
applications/main/xtreme_app/scenes/xtreme_app_scene_interface_graphics.c
View File

@@ -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);

55
applications/main/xtreme_app/scenes/xtreme_app_scene_interface_lockscreen.c
View File

@@ -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);

7
applications/main/xtreme_app/scenes/xtreme_app_scene_interface_mainmenu.c
View File

@@ -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);

31
applications/main/xtreme_app/scenes/xtreme_app_scene_interface_statusbar.c
View File

@@ -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);

5
applications/main/xtreme_app/scenes/xtreme_app_scene_misc.c
View File

@@ -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,

5
applications/main/xtreme_app/scenes/xtreme_app_scene_misc_dolphin.c
View File

@@ -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]);

25
applications/main/xtreme_app/scenes/xtreme_app_scene_misc_screen.c
View File

@@ -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);
}

13
applications/main/xtreme_app/scenes/xtreme_app_scene_protocols.c
View File

@@ -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, ">");

41
applications/main/xtreme_app/scenes/xtreme_app_scene_protocols_gpio.c
View File

@@ -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);

4
applications/main/xtreme_app/xtreme_app.c
View File

@@ -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;
}
}

18
applications/services/desktop/animations/animation_manager.c
View File

@@ -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);

7
applications/services/desktop/animations/animation_storage.c
View File

@@ -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;

8
applications/services/desktop/desktop.c
View File

@@ -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)) {

2
applications/services/desktop/scenes/desktop_scene_fault.c
View File

@@ -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",

2
applications/services/desktop/scenes/desktop_scene_pin_input.c
View File

@@ -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));

4
applications/services/desktop/views/desktop_view_lock_menu.c
View File

@@ -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:

13
applications/services/desktop/views/desktop_view_locked.c
View File

@@ -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(

2
applications/services/dolphin/dolphin.c
View File

@@ -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,

4
applications/services/gui/canvas.c
View File

@@ -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) {

20
applications/services/gui/gui.c
View File

@@ -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 {

2
applications/services/gui/modules/file_browser.c
View File

@@ -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;
}

12
applications/services/gui/modules/menu.c
View File

@@ -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) {

6
applications/services/power/power_service/power.c
View File

@@ -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;

3
applications/services/rpc/rpc.c
View File

@@ -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);

2
applications/settings/desktop_settings/scenes/desktop_settings_scene_keybinds_action_type.c
View File

@@ -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,

2
applications/settings/dolphin_passport/passport.c
View File

@@ -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";

2
applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c
View File

@@ -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 {

2
firmware/targets/f7/api_symbols.csv
View File

@@ -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,
1 entry status name type params
341 Function - SystemInit void
342 Function + XTREME_ASSETS_FREE void
343 Function + XTREME_ASSETS_LOAD void
Function + XTREME_SETTINGS XtremeSettings*
344 Function - XTREME_SETTINGS_LOAD void
345 Function + XTREME_SETTINGS_SAVE void
346 Function - _Exit void int
3893 Variable + usb_hid FuriHalUsbInterface
3894 Variable + usb_hid_u2f FuriHalUsbInterface
3895 Variable + usbd_devfs const usbd_driver
3896 Variable + xtreme_settings XtremeSettings

2
firmware/targets/f7/furi_hal/furi_hal_light.c
View File

@@ -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 =

8
lib/xtreme/assets.c
View File

@@ -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);

4
lib/xtreme/settings.c
View File

@@ -252,7 +252,3 @@ void XTREME_SETTINGS_SAVE() {
flipper_format_free(file);
furi_record_close(RECORD_STORAGE);
}
XtremeSettings* XTREME_SETTINGS() {
return &xtreme_settings;
}

2
lib/xtreme/xtreme.h
View File

@@ -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();