Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix xtreme_settings fetch

Browse Source
This commit is contained in:
Willy-JL
2023-01-18 10:46:25 +00:00
parent e6daceb1ff
commit 3302613ec5
9 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/main/bad_usb/views/bad_usb_view.c
View File

@@ -28,7 +28,7 @@ static void bad_usb_draw_callback(Canvas* canvas, void* _model) {
elements_string_fit_width(canvas, disp_str, 128 - 2);
canvas_set_font(canvas, FontSecondary);
canvas_draw_str(canvas, 2, 8, furi_string_get_cstr(disp_str));
XtremeSettings* xtreme_settings = malloc(sizeof(XtremeSettings));
XtremeSettings* xtreme_settings = XTREME_SETTINGS();
if(strlen(model->layout) == 0) {
furi_string_set(disp_str, "(default)");

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

@@ -195,7 +195,7 @@ void subghz_view_receiver_draw(Canvas* canvas, SubGhzViewReceiverModel* model) {
canvas_clear(canvas);
canvas_set_color(canvas, ColorBlack);
canvas_set_font(canvas, FontSecondary);
XtremeSettings* xtreme_settings = malloc(sizeof(XtremeSettings));
XtremeSettings* xtreme_settings = XTREME_SETTINGS();
if(model->mode == SubGhzViewReceiverModeLive) {
elements_button_left(canvas, "Config");

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

@@ -15,7 +15,7 @@ typedef struct {
static void u2f_view_draw_callback(Canvas* canvas, void* _model) {
U2fModel* model = _model;
XtremeSettings* xtreme_settings = malloc(sizeof(XtremeSettings));
XtremeSettings* xtreme_settings = XTREME_SETTINGS();
canvas_draw_icon(canvas, 8, 14, &I_Drive_112x35);
canvas_set_font(canvas, FontSecondary);

2
applications/plugins/dice/dice.c
View File

@@ -477,7 +477,7 @@ int32_t dice_app(void* p) {
gui_add_view_port(gui, view_port, GuiLayerFullscreen);
furi_timer_start(timer, furi_kernel_get_tick_frequency());
XtremeSettings* xtreme_settings = malloc(sizeof(XtremeSettings));
XtremeSettings* xtreme_settings = XTREME_SETTINGS();
// Main loop
PluginEvent event;

2
applications/plugins/pocsag_pager/views/pocsag_pager_receiver.c
View File

@@ -181,7 +181,7 @@ void pcsg_view_receiver_draw(Canvas* canvas, PCSGReceiverModel* model) {
FuriString* str_buff;
str_buff = furi_string_alloc();
XtremeSettings* xtreme_settings = malloc(sizeof(XtremeSettings));
XtremeSettings* xtreme_settings = XTREME_SETTINGS();
PCSGReceiverMenuItem* item_menu;

2
applications/plugins/weather_station/views/weather_station_receiver.c
View File

@@ -178,7 +178,7 @@ void ws_view_receiver_draw(Canvas* canvas, WSReceiverModel* model) {
FuriString* str_buff;
str_buff = furi_string_alloc();
XtremeSettings* xtreme_settings = malloc(sizeof(XtremeSettings));
XtremeSettings* xtreme_settings = XTREME_SETTINGS();
WSReceiverMenuItem* item_menu;

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

@@ -200,12 +200,12 @@ 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 = XTREME_SETTINGS();
XtremeSettings* xtreme_settings = XTREME_SETTINGS();
int32_t duration = 0;
if (xtreme->cycle_anims == 0) {
if (xtreme_settings->cycle_anims == 0) {
duration = bubble_animation->duration;
} else if (xtreme->cycle_anims != -1) {
duration = xtreme->cycle_anims;
} else if (xtreme_settings->cycle_anims != -1) {
duration = xtreme_settings->cycle_anims;
}
furi_timer_start(animation_manager->idle_animation_timer, duration * 1000);
}
@@ -521,12 +521,12 @@ void animation_manager_load_and_continue_animation(AnimationManager* animation_m
} else {
const BubbleAnimation* bubble_animation = animation_storage_get_bubble_animation(
animation_manager->current_animation);
XtremeSettings* xtreme = XTREME_SETTINGS();
XtremeSettings* xtreme_settings = XTREME_SETTINGS();
int32_t duration = 0;
if (xtreme->cycle_anims == 0) {
if (xtreme_settings->cycle_anims == 0) {
duration = bubble_animation->duration;
} else if (xtreme->cycle_anims != -1) {
duration = xtreme->cycle_anims;
} else if (xtreme_settings->cycle_anims != -1) {
duration = xtreme_settings->cycle_anims;
}
furi_timer_start(
animation_manager->idle_animation_timer, duration * 1000);

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

@@ -60,7 +60,7 @@ static void render_callback(Canvas* canvas, void* _ctx) {
PassportContext* ctx = _ctx;
DolphinStats* stats = ctx->stats;
XtremeSettings* xtreme_settings = malloc(sizeof(XtremeSettings));
XtremeSettings* xtreme_settings = XTREME_SETTINGS();
char level_str[20];
char xp_str[12];

12
applications/settings/xtreme_settings/scenes/xtreme_settings_scene_start.c
View File

@@ -81,7 +81,7 @@ static void xtreme_settings_scene_start_subghz_bypass_changed(VariableItem* item
void xtreme_settings_scene_start_on_enter(void* context) {
XtremeSettingsApp* app = context;
XtremeSettings* xtreme = XTREME_SETTINGS();
XtremeSettings* xtreme_settings = XTREME_SETTINGS();
VariableItemList* var_item_list = app->var_item_list;
VariableItem* item;
uint8_t value_index;
@@ -108,8 +108,8 @@ void xtreme_settings_scene_start_on_enter(void* context) {
2,
xtreme_settings_scene_start_base_mode_changed,
app);
variable_item_set_current_value_index(item, xtreme->sfw_mode);
variable_item_set_current_value_text(item, xtreme->sfw_mode ? "SFW" : "NSFW");
variable_item_set_current_value_index(item, xtreme_settings->sfw_mode);
variable_item_set_current_value_text(item, xtreme_settings->sfw_mode ? "SFW" : "NSFW");
item = variable_item_list_add(
var_item_list,
@@ -118,7 +118,7 @@ void xtreme_settings_scene_start_on_enter(void* context) {
xtreme_settings_scene_start_cycle_anims_changed,
app);
value_index = value_index_int32(
xtreme->cycle_anims, cycle_anims_values, CYCLE_ANIMS_COUNT);
xtreme_settings->cycle_anims, cycle_anims_values, CYCLE_ANIMS_COUNT);
variable_item_set_current_value_index(item, value_index);
variable_item_set_current_value_text(item, cycle_anims_names[value_index]);
@@ -128,8 +128,8 @@ void xtreme_settings_scene_start_on_enter(void* context) {
2,
xtreme_settings_scene_start_unlock_anims_changed,
app);
variable_item_set_current_value_index(item, xtreme->unlock_anims);
variable_item_set_current_value_text(item, xtreme->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");
char level_str[4];
snprintf(level_str, 4, "%i", app->dolphin_level);