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

@@ -40,25 +40,24 @@ void ibutton_scene_write_on_enter(void* context) {
widget_add_icon_element(widget, 3, 10, &I_iButtonKey_49x44);
furi_string_printf(
tmp,
"[%s]\n%s ",
ibutton_protocols_get_name(ibutton->protocols, protocol_id),
ibutton->key_name);
if(furi_string_empty(ibutton->file_path)) {
furi_string_printf(
tmp, "Unsaved\n%s", ibutton_protocols_get_name(ibutton->protocols, protocol_id));
} else {
furi_string_printf(tmp, "%s", ibutton->key_name);
}
widget_add_text_box_element(
widget, 52, 30, 75, 40, AlignCenter, AlignCenter, furi_string_get_cstr(tmp), true);
widget, 52, 23, 75, 26, AlignCenter, AlignTop, furi_string_get_cstr(tmp), false);
ibutton_worker_write_set_callback(worker, ibutton_scene_write_callback, ibutton);
furi_string_set(tmp, "iButton\nwriting ");
if(ibutton->write_mode == iButtonWriteModeBlank) {
furi_string_cat(tmp, "Blank");
furi_string_set(tmp, "Writing ID");
ibutton_worker_write_blank_start(worker, key);
} else if(ibutton->write_mode == iButtonWriteModeCopy) {
furi_string_cat(tmp, "Copy");
furi_string_set(tmp, "Full Writing");
ibutton_worker_write_copy_start(worker, key);
}