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

Merge remote-tracking branch 'OFW/dev' into dev

Browse Source
This commit is contained in:
MX
2024-09-06 00:48:44 +03:00
parent a4eebd7ad6 c6326915ae
commit eed32aca77
15 changed files with 153 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
applications/services/gui/modules/dialog_ex.c
View File

@@ -222,7 +222,7 @@ void dialog_ex_set_header(
dialog_ex->view,
DialogExModel * model,
{
furi_string_set(model->header.text, text);
furi_string_set(model->header.text, text ? text : "");
model->header.x = x;
model->header.y = y;
model->header.horizontal = horizontal;
@@ -243,7 +243,7 @@ void dialog_ex_set_text(
dialog_ex->view,
DialogExModel * model,
{
furi_string_set(model->text.text, text);
furi_string_set(model->text.text, text ? text : "");
model->text.x = x;
model->text.y = y;
model->text.horizontal = horizontal;
@@ -268,7 +268,10 @@ void dialog_ex_set_icon(DialogEx* dialog_ex, uint8_t x, uint8_t y, const Icon* i
void dialog_ex_set_left_button_text(DialogEx* dialog_ex, const char* text) {
furi_check(dialog_ex);
with_view_model(
dialog_ex->view, DialogExModel * model, { furi_string_set(model->left_text, text); }, true);
dialog_ex->view,
DialogExModel * model,
{ furi_string_set(model->left_text, text ? text : ""); },
true);
}
void dialog_ex_set_center_button_text(DialogEx* dialog_ex, const char* text) {
@@ -276,7 +279,7 @@ void dialog_ex_set_center_button_text(DialogEx* dialog_ex, const char* text) {
with_view_model(
dialog_ex->view,
DialogExModel * model,
{ furi_string_set(model->center_text, text); },
{ furi_string_set(model->center_text, text ? text : ""); },
true);
}
@@ -285,7 +288,7 @@ void dialog_ex_set_right_button_text(DialogEx* dialog_ex, const char* text) {
with_view_model(
dialog_ex->view,
DialogExModel * model,
{ furi_string_set(model->right_text, text); },
{ furi_string_set(model->right_text, text ? text : ""); },
true);
}

1
applications/services/rpc/rpc_app.h
View File

@@ -13,6 +13,7 @@
#pragma once
#include "rpc.h"
#include "rpc_app_error_codes.h"
#ifdef __cplusplus
extern "C" {

11
applications/services/rpc/rpc_app_error_codes.h Normal file
View File

@@ -0,0 +1,11 @@
#pragma once
/**
* @brief Enumeration of possible error codes for application which can be started through rpc
*/
typedef enum {
RpcAppSystemErrorCodeNone, /** There are no errors */
RpcAppSystemErrorCodeParseFile, /** File parsing error, or wrong file structure, or missing required parameters. more accurate data can be obtained through the debug port */
RpcAppSystemErrorCodeRegionLock, /** Requested function is blocked by regional settings */
RpcAppSystemErrorCodeInternalParse, /** Error in protocol parameters description, or some data in opened file are unsupported */
} RpcAppSystemErrorCode;