From a57dbe446e654153be05c2602e673247089f14b6 Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Wed, 1 May 2024 16:53:49 +0300 Subject: [PATCH] update DS1420 for latest ibutton changes --- lib/ibutton/protocols/dallas/protocol_ds1420.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/ibutton/protocols/dallas/protocol_ds1420.c b/lib/ibutton/protocols/dallas/protocol_ds1420.c index 85e0145f4..42af9f0b1 100644 --- a/lib/ibutton/protocols/dallas/protocol_ds1420.c +++ b/lib/ibutton/protocols/dallas/protocol_ds1420.c @@ -27,6 +27,7 @@ static bool dallas_ds1420_write_blank(OneWireHost*, iButtonProtocolData*); static void dallas_ds1420_emulate(OneWireSlave*, iButtonProtocolData*); static bool dallas_ds1420_load(FlipperFormat*, uint32_t, iButtonProtocolData*); static bool dallas_ds1420_save(FlipperFormat*, const iButtonProtocolData*); +static void dallas_ds1420_render_uid(FuriString*, const iButtonProtocolData*); static void dallas_ds1420_render_brief_data(FuriString*, const iButtonProtocolData*); static void dallas_ds1420_render_error(FuriString*, const iButtonProtocolData*); static bool dallas_ds1420_is_data_valid(const iButtonProtocolData*); @@ -46,6 +47,7 @@ const iButtonProtocolDallasBase ibutton_protocol_ds1420 = { .emulate = dallas_ds1420_emulate, .save = dallas_ds1420_save, .load = dallas_ds1420_load, + .render_uid = dallas_ds1420_render_uid, .render_data = NULL, /* No data to render */ .render_brief_data = dallas_ds1420_render_brief_data, .render_error = dallas_ds1420_render_error, @@ -117,12 +119,20 @@ bool dallas_ds1420_load( return dallas_common_load_rom_data(ff, format_version, &data->rom_data); } +void dallas_ds1420_render_uid(FuriString* result, const iButtonProtocolData* protocol_data) { + const DS1420ProtocolData* data = protocol_data; + + dallas_common_render_uid(result, &data->rom_data); +} + void dallas_ds1420_render_brief_data(FuriString* result, const iButtonProtocolData* protocol_data) { const DS1420ProtocolData* data = protocol_data; + furi_string_cat_printf(result, "ID: "); for(size_t i = 0; i < sizeof(DallasCommonRomData); ++i) { furi_string_cat_printf(result, "%02X ", data->rom_data.bytes[i]); } + furi_string_cat_printf(result, "\nFamily Code: %02X\n", data->rom_data.bytes[0]); } void dallas_ds1420_render_error(FuriString* result, const iButtonProtocolData* protocol_data) {