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

Move sfw mode to custom app

Browse Source
This commit is contained in:
Willy-JL
2023-01-17 19:58:27 +00:00
parent 68eefc4ae7
commit da2ce47bd3
58 changed files with 147 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/plugins/dap_link/dap_link.c
+2 -5
View File
@@ -16,7 +16,7 @@
#include <dialogs/dialogs.h>
#include "DAP_Link_icons.h"
#include "../../settings/desktop_settings/desktop_settings_app.h"
#include "../../settings/xtreme_settings/xtreme_settings.h"
/***************************************************************************/
/****************************** DAP COMMON *********************************/
@@ -484,13 +484,11 @@ DapConfig* dap_app_get_config(DapApp* app) {
int32_t dap_link_app(void* p) {
UNUSED(p);
DesktopSettings* settings = malloc(sizeof(DesktopSettings));
DESKTOP_SETTINGS_LOAD(settings);
if(furi_hal_usb_is_locked()) {
DialogsApp* dialogs = furi_record_open(RECORD_DIALOGS);
DialogMessage* message = dialog_message_alloc();
if(settings->sfw_mode) {
if(XTREME_SETTINGS()->sfw_mode) {
dialog_message_set_header(
message, "Connection\nis active!", 3, 2, AlignLeft, AlignTop);
dialog_message_set_text(
@@ -514,7 +512,6 @@ int32_t dap_link_app(void* p) {
dialog_message_show(dialogs, message);
dialog_message_free(message);
furi_record_close(RECORD_DIALOGS);
free(settings);
return -1;
}
applications/plugins/dice/dice.c
+5 -3
View File
@@ -5,7 +5,7 @@
#include <gui/gui.h>
#include <input/input.h>
#include <dolphin/dolphin.h>
#include "applications/settings/desktop_settings/desktop_settings_app.h"
#include "applications/settings/xtreme_settings/xtreme_settings.h"
#define TAG "Dice Roller"
@@ -480,6 +480,8 @@ 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));
// Main loop
PluginEvent event;
for(bool processing = true; processing;) {
@@ -510,7 +512,7 @@ int32_t dice_app(void* p) {
} else if(plugin_state->diceSelect == 20) {
plugin_state->diceSelect = 100;
} else if(plugin_state->diceSelect == 100) {
if(plugin_state->desktop_settings->is_sfwmode) {
if(xtreme_settings->sfw_mode) {
plugin_state->diceSelect = 231;
} else {
plugin_state->diceSelect = 230;
@@ -524,7 +526,7 @@ int32_t dice_app(void* p) {
} else if(plugin_state->diceSelect == 229) {
plugin_state->diceSelect = 228;
} else if(plugin_state->diceSelect == 228) {
if(plugin_state->desktop_settings->is_sfwmode) {
if(xtreme_settings->sfw_mode) {
plugin_state->diceSelect = 59;
} else {
plugin_state->diceSelect = 232;
applications/plugins/pocsag_pager/views/pocsag_pager_receiver.c
+4 -6
View File
@@ -7,7 +7,7 @@
#include <gui/elements.h>
#include <m-array.h>
#include "../../../settings/desktop_settings/desktop_settings_app.h"
#include "../../../settings/xtreme_settings/xtreme_settings.h"
#define FRAME_HEIGHT 12
#define MAX_LEN_PX 112
@@ -181,8 +181,7 @@ void pcsg_view_receiver_draw(Canvas* canvas, PCSGReceiverModel* model) {
FuriString* str_buff;
str_buff = furi_string_alloc();
DesktopSettings* settings = malloc(sizeof(DesktopSettings));
DESKTOP_SETTINGS_LOAD(settings);
XtremeSettings* xtreme_settings = malloc(sizeof(XtremeSettings));
PCSGReceiverMenuItem* item_menu;
@@ -209,7 +208,7 @@ void pcsg_view_receiver_draw(Canvas* canvas, PCSGReceiverModel* model) {
canvas_set_color(canvas, ColorBlack);
if(model->history_item == 0) {
if(settings->sfw_mode) {
if(xtreme_settings->sfw_mode) {
canvas_draw_icon(canvas, 0, 0, &I_Scanning_123x52_sfw);
} else {
canvas_draw_icon(canvas, 0, 0, &I_Scanning_123x52);
@@ -235,7 +234,7 @@ void pcsg_view_receiver_draw(Canvas* canvas, PCSGReceiverModel* model) {
canvas_draw_icon(canvas, 65, 42, &I_Pin_back_arrow_10x8);
canvas_draw_icon(canvas, 80, 42, &I_Pin_back_arrow_10x8);
canvas_draw_icon(canvas, 95, 42, &I_Pin_back_arrow_10x8);
if(settings->sfw_mode) {
if(xtreme_settings->sfw_mode) {
canvas_draw_icon(canvas, 16, 13, &I_WarningDolphin_45x42_sfw);
} else {
canvas_draw_icon(canvas, 16, 13, &I_WarningDolphin_45x42);
@@ -252,7 +251,6 @@ void pcsg_view_receiver_draw(Canvas* canvas, PCSGReceiverModel* model) {
canvas_draw_str(canvas, 96, 62, furi_string_get_cstr(model->history_stat_str));
break;
}
free(settings);
}
static void pcsg_view_receiver_timer_callback(void* context) {
applications/plugins/unitemp/views/General_view.c
+2 -5
View File
@@ -19,7 +19,7 @@
#include "unitemp_icons.h"
#include <assets_icons.h>
#include "../../../settings/desktop_settings/desktop_settings_app.h"
#include "../../../settings/xtreme_settings/xtreme_settings.h"
static View* view;
@@ -170,9 +170,7 @@ static void _draw_singleSensor(Canvas* canvas, Sensor* sensor, const uint8_t pos
}
static void _draw_view_noSensors(Canvas* canvas) {
DesktopSettings* settings = malloc(sizeof(DesktopSettings));
DESKTOP_SETTINGS_LOAD(settings);
if(settings->sfw_mode) {
if(XTREME_SETTINGS()->sfw_mode) {
canvas_draw_icon(canvas, 7, 17, &I_sherlok_53x45_sfw);
} else {
canvas_draw_icon(canvas, 7, 17, &I_sherlok_53x45);
@@ -191,7 +189,6 @@ static void _draw_view_noSensors(Canvas* canvas) {
canvas_draw_str(canvas, x, y + 18, "press OK");
canvas_draw_icon(canvas, x + 37, y + 10, &I_Ok_btn_9x9);
free(settings);
}
static void _draw_view_sensorsList(Canvas* canvas) {
applications/plugins/weather_station/views/weather_station_receiver.c
+4 -6
View File
@@ -7,7 +7,7 @@
#include <gui/elements.h>
#include <m-array.h>
#include "../../../settings/desktop_settings/desktop_settings_app.h"
#include "../../../settings/xtreme_settings/xtreme_settings.h"
#define FRAME_HEIGHT 12
#define MAX_LEN_PX 112
@@ -178,8 +178,7 @@ void ws_view_receiver_draw(Canvas* canvas, WSReceiverModel* model) {
FuriString* str_buff;
str_buff = furi_string_alloc();
DesktopSettings* settings = malloc(sizeof(DesktopSettings));
DESKTOP_SETTINGS_LOAD(settings);
XtremeSettings* xtreme_settings = malloc(sizeof(XtremeSettings));
WSReceiverMenuItem* item_menu;
@@ -205,7 +204,7 @@ void ws_view_receiver_draw(Canvas* canvas, WSReceiverModel* model) {
canvas_set_color(canvas, ColorBlack);
if(model->history_item == 0) {
if(settings->sfw_mode) {
if(xtreme_settings->sfw_mode) {
canvas_draw_icon(canvas, 0, 0, &I_Scanning_123x52_sfw);
} else {
canvas_draw_icon(canvas, 0, 0, &I_Scanning_123x52);
@@ -231,7 +230,7 @@ void ws_view_receiver_draw(Canvas* canvas, WSReceiverModel* model) {
canvas_draw_icon(canvas, 65, 42, &I_Pin_back_arrow_10x8);
canvas_draw_icon(canvas, 80, 42, &I_Pin_back_arrow_10x8);
canvas_draw_icon(canvas, 95, 42, &I_Pin_back_arrow_10x8);
if(settings->sfw_mode) {
if(xtreme_settings->sfw_mode) {
canvas_draw_icon(canvas, 16, 13, &I_WarningDolphin_45x42_sfw);
} else {
canvas_draw_icon(canvas, 16, 13, &I_WarningDolphin_45x42);
@@ -248,7 +247,6 @@ void ws_view_receiver_draw(Canvas* canvas, WSReceiverModel* model) {
canvas_draw_str(canvas, 96, 62, furi_string_get_cstr(model->history_stat_str));
break;
}
free(settings);
}
static void ws_view_receiver_timer_callback(void* context) {