iButton: Add DS1420 / Update changelog

CHANGELOG.md

@@ -1,5 +1,9 @@
 ### New changes
+* iButton: Add support for DS1420 (not fully tested)
 * Desktop: Option to set Tertiary favourite app (Hold right arrow on desktop) - **Desktop settings (pin code, favourite app, autolock time) will be resetted!!! Only one time after installing - due to changes in settings structure, after installing of this release desktop settings will not be reset with next release**
+* Desktop: Fix issue #387 (Ok button was showing invalid file error in dummy mode)
+* OFW PR: SD Driver: reinit sd card on error (by DrZlo13 | OFW PR 2493)
+* OFW PR: iButton -> Fix a typo: use right shift instead of greater than (by gsurkov | OFW PR 2506)
 * OFW: Optimize trailing slash check
 
 #### [🎲 Download latest extra apps pack](https://github.com/xMasterX/unleashed-extra-pack/archive/refs/heads/main.zip)

lib/one_wire/ibutton/protocols/dallas/protocol_ds1420.c

@@ -0,0 +1,144 @@
+#include "protocol_ds1420.h"
+
+#include <core/string.h>
+#include <core/core_defines.h>
+
+#include "dallas_common.h"
+
+#include "../blanks/rw1990.h"
+#include "../blanks/tm2004.h"
+
+#define DS1420_FAMILY_CODE 0x81U
+#define DS1420_FAMILY_NAME "DS1420"
+
+#define DS1420_CMD_READ_ROM 0x0FU
+
+typedef struct {
+    OneWireSlave* bus;
+} DS1420ProtocolState;
+
+typedef struct {
+    DallasCommonRomData rom_data;
+    DS1420ProtocolState state;
+} DS1420ProtocolData;
+
+static bool dallas_ds1420_read(OneWireHost*, iButtonProtocolData*);
+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_brief_data(FuriString*, const iButtonProtocolData*);
+static void dallas_ds1420_render_error(FuriString*, const iButtonProtocolData*);
+static bool dallas_ds1420_is_data_valid(const iButtonProtocolData*);
+static void dallas_ds1420_get_editable_data(iButtonEditableData*, iButtonProtocolData*);
+static void dallas_ds1420_apply_edits(iButtonProtocolData*);
+
+const iButtonProtocolDallasBase ibutton_protocol_ds1420 = {
+    .family_code = DS1420_FAMILY_CODE,
+    .features = iButtonProtocolFeatureWriteBlank,
+    .data_size = sizeof(DS1420ProtocolData),
+    .manufacturer = DALLAS_COMMON_MANUFACTURER_NAME,
+    .name = DS1420_FAMILY_NAME,
+
+    .read = dallas_ds1420_read,
+    .write_blank = dallas_ds1420_write_blank,
+    .write_copy = NULL, /* No data to write a copy */
+    .emulate = dallas_ds1420_emulate,
+    .save = dallas_ds1420_save,
+    .load = dallas_ds1420_load,
+    .render_data = NULL, /* No data to render */
+    .render_brief_data = dallas_ds1420_render_brief_data,
+    .render_error = dallas_ds1420_render_error,
+    .is_valid = dallas_ds1420_is_data_valid,
+    .get_editable_data = dallas_ds1420_get_editable_data,
+    .apply_edits = dallas_ds1420_apply_edits,
+};
+
+bool dallas_ds1420_read(OneWireHost* host, iButtonProtocolData* protocol_data) {
+    DS1420ProtocolData* data = protocol_data;
+    return onewire_host_reset(host) && dallas_common_read_rom(host, &data->rom_data);
+}
+
+bool dallas_ds1420_write_blank(OneWireHost* host, iButtonProtocolData* protocol_data) {
+    DS1420ProtocolData* data = protocol_data;
+
+    return rw1990_write_v1(host, data->rom_data.bytes, sizeof(DallasCommonRomData)) ||
+           rw1990_write_v2(host, data->rom_data.bytes, sizeof(DallasCommonRomData)) ||
+           tm2004_write(host, data->rom_data.bytes, sizeof(DallasCommonRomData));
+}
+
+static bool dallas_ds1420_command_callback(uint8_t command, void* context) {
+    furi_assert(context);
+    DS1420ProtocolData* data = context;
+    OneWireSlave* bus = data->state.bus;
+
+    switch(command) {
+    case DALLAS_COMMON_CMD_SEARCH_ROM:
+        dallas_common_emulate_search_rom(bus, &data->rom_data);
+        break;
+    case DALLAS_COMMON_CMD_READ_ROM:
+    case DS1420_CMD_READ_ROM:
+        dallas_common_emulate_read_rom(bus, &data->rom_data);
+        break;
+    default:
+        break;
+    }
+
+    // No support for multiple consecutive commands
+    return false;
+}
+
+void dallas_ds1420_emulate(OneWireSlave* bus, iButtonProtocolData* protocol_data) {
+    DS1420ProtocolData* data = protocol_data;
+    data->state.bus = bus;
+
+    onewire_slave_set_reset_callback(bus, NULL, NULL);
+    onewire_slave_set_command_callback(bus, dallas_ds1420_command_callback, protocol_data);
+}
+
+bool dallas_ds1420_save(FlipperFormat* ff, const iButtonProtocolData* protocol_data) {
+    const DS1420ProtocolData* data = protocol_data;
+    return dallas_common_save_rom_data(ff, &data->rom_data);
+}
+
+bool dallas_ds1420_load(
+    FlipperFormat* ff,
+    uint32_t format_version,
+    iButtonProtocolData* protocol_data) {
+    DS1420ProtocolData* data = protocol_data;
+    return dallas_common_load_rom_data(ff, format_version, &data->rom_data);
+}
+
+void dallas_ds1420_render_brief_data(FuriString* result, const iButtonProtocolData* protocol_data) {
+    const DS1420ProtocolData* data = protocol_data;
+
+    for(size_t i = 0; i < sizeof(DallasCommonRomData); ++i) {
+        furi_string_cat_printf(result, "%02X ", data->rom_data.bytes[i]);
+    }
+}
+
+void dallas_ds1420_render_error(FuriString* result, const iButtonProtocolData* protocol_data) {
+    const DS1420ProtocolData* data = protocol_data;
+
+    if(!dallas_common_is_valid_crc(&data->rom_data)) {
+        dallas_common_render_crc_error(result, &data->rom_data);
+    }
+}
+
+bool dallas_ds1420_is_data_valid(const iButtonProtocolData* protocol_data) {
+    const DS1420ProtocolData* data = protocol_data;
+    return dallas_common_is_valid_crc(&data->rom_data);
+}
+
+void dallas_ds1420_get_editable_data(
+    iButtonEditableData* editable_data,
+    iButtonProtocolData* protocol_data) {
+    DS1420ProtocolData* data = protocol_data;
+    editable_data->ptr = data->rom_data.bytes;
+    editable_data->size = sizeof(DallasCommonRomData);
+}
+
+void dallas_ds1420_apply_edits(iButtonProtocolData* protocol_data) {
+    DS1420ProtocolData* data = protocol_data;
+    dallas_common_apply_edits(&data->rom_data, DS1420_FAMILY_CODE);
+}

lib/one_wire/ibutton/protocols/dallas/protocol_ds1420.h

@@ -0,0 +1,5 @@
+#pragma once
+
+#include "protocol_dallas_base.h"
+
+extern const iButtonProtocolDallasBase ibutton_protocol_ds1420;

lib/one_wire/ibutton/protocols/dallas/protocol_group_dallas_defs.c

@@ -4,6 +4,7 @@
 #include "protocol_ds1992.h"
 #include "protocol_ds1996.h"
 #include "protocol_ds1971.h"
+#include "protocol_ds1420.h"
 #include "protocol_ds_generic.h"
 
 const iButtonProtocolDallasBase* ibutton_protocols_dallas[] = {
@@ -11,6 +12,7 @@ const iButtonProtocolDallasBase* ibutton_protocols_dallas[] = {
     [iButtonProtocolDS1992] = &ibutton_protocol_ds1992,
     [iButtonProtocolDS1996] = &ibutton_protocol_ds1996,
     [iButtonProtocolDS1971] = &ibutton_protocol_ds1971,
+    [iButtonProtocolDS1420] = &ibutton_protocol_ds1420,
     /* Add new 1-Wire protocols here */
 
     /* Default catch-all 1-Wire protocol */

lib/one_wire/ibutton/protocols/dallas/protocol_group_dallas_defs.h

@@ -7,6 +7,7 @@ typedef enum {
     iButtonProtocolDS1992,
     iButtonProtocolDS1996,
     iButtonProtocolDS1971,
+    iButtonProtocolDS1420,
     /* Add new 1-Wire protocols here */
 
     /* Default catch-all 1-Wire protocol */