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

@@ -4,13 +4,13 @@ void lfrfid_scene_saved_info_on_enter(void* context) {
LfRfid* app = context;
Widget* widget = app->widget;
string_t tmp_string;
string_init(tmp_string);
FuriString* tmp_string;
tmp_string = furi_string_alloc();
string_printf(
furi_string_printf(
tmp_string,
"%s [%s]\r\n",
string_get_cstr(app->file_name),
furi_string_get_cstr(app->file_name),
protocol_dict_get_name(app->dict, app->protocol_id));
size_t size = protocol_dict_get_data_size(app->dict, app->protocol_id);
@@ -21,21 +21,21 @@ void lfrfid_scene_saved_info_on_enter(void* context) {
string_cat_printf(tmp_string, ":");
}
string_cat_printf(tmp_string, "%02X", data[i]);
furi_string_cat_printf(tmp_string, "%02X", data[i]);
}
free(data);
string_t render_data;
string_init(render_data);
FuriString* render_data;
render_data = furi_string_alloc();
protocol_dict_render_data(app->dict, render_data, app->protocol_id);
string_cat_printf(tmp_string, "\r\n%s", string_get_cstr(render_data));
string_clear(render_data);
furi_string_cat_printf(tmp_string, "\r\n%s", furi_string_get_cstr(render_data));
furi_string_free(render_data);
widget_add_string_multiline_element(
widget, 0, 1, AlignLeft, AlignTop, FontSecondary, string_get_cstr(tmp_string));
widget, 0, 1, AlignLeft, AlignTop, FontSecondary, furi_string_get_cstr(tmp_string));
view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewWidget);
string_clear(tmp_string);
furi_string_free(tmp_string);
}
bool lfrfid_scene_saved_info_on_event(void* context, SceneManagerEvent event) {