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

This commit is contained in:
MX
2024-04-18 17:22:36 +03:00
parent b079b46681
commit 4422a03ae9
47 changed files with 1243 additions and 148 deletions

View File

@@ -8,19 +8,24 @@ void ibutton_scene_info_on_enter(void* context) {
const iButtonProtocolId protocol_id = ibutton_key_get_protocol_id(key);
FuriString* tmp = furi_string_alloc();
FuriString* keynumber = furi_string_alloc();
ibutton_protocols_render_brief_data(ibutton->protocols, key, keynumber);
FuriString* brief_data = furi_string_alloc();
furi_string_printf(
tmp,
"\e#%s\n[%s]\e#\n%s",
"Name:%s\n\e#%s %s\e#\n",
ibutton->key_name,
ibutton_protocols_get_name(ibutton->protocols, protocol_id),
furi_string_get_cstr(keynumber));
ibutton_protocols_get_manufacturer(ibutton->protocols, protocol_id),
ibutton_protocols_get_name(ibutton->protocols, protocol_id));
ibutton_protocols_render_brief_data(ibutton->protocols, key, brief_data);
furi_string_cat(tmp, brief_data);
widget_add_text_box_element(
widget, 0, 2, 128, 64, AlignLeft, AlignTop, furi_string_get_cstr(tmp), true);
widget, 0, 0, 128, 64, AlignLeft, AlignTop, furi_string_get_cstr(tmp), false);
furi_string_reset(tmp);
furi_string_reset(brief_data);
if(ibutton_protocols_get_features(ibutton->protocols, protocol_id) &
iButtonProtocolFeatureExtData) {
@@ -30,7 +35,7 @@ void ibutton_scene_info_on_enter(void* context) {
view_dispatcher_switch_to_view(ibutton->view_dispatcher, iButtonViewWidget);
furi_string_free(tmp);
furi_string_free(keynumber);
furi_string_free(brief_data);
}
bool ibutton_scene_info_on_event(void* context, SceneManagerEvent event) {