Merge branch 'fz-dev' into dev

This commit is contained in:
MX
2022-10-05 19:27:46 +03:00
368 changed files with 5461 additions and 3819 deletions

View File

@@ -63,20 +63,20 @@ bool subghz_scene_rpc_on_event(void* context, SceneManagerEvent event) {
if(subghz_key_load(subghz, arg, false)) {
scene_manager_set_scene_state(
subghz->scene_manager, SubGhzSceneRpc, SubGhzRpcStateLoaded);
string_set_str(subghz->file_path, arg);
furi_string_set(subghz->file_path, arg);
result = true;
string_t file_name;
string_init(file_name);
FuriString* file_name;
file_name = furi_string_alloc();
path_extract_filename(subghz->file_path, file_name, true);
snprintf(
subghz->file_name_tmp,
SUBGHZ_MAX_LEN_NAME,
"loaded\n%s",
string_get_cstr(file_name));
furi_string_get_cstr(file_name));
popup_set_text(popup, subghz->file_name_tmp, 89, 44, AlignCenter, AlignTop);
string_clear(file_name);
furi_string_free(file_name);
}
}
rpc_system_app_confirm(subghz->rpc_ctx, RpcAppEventLoadFile, result);