[FL-3168] Add one_wire lib to f18, separate ibutton (#2509)

* Separate ibutton to its own module, add one_wire to f18
* Move onewire cli to a separate app

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>

lib/ibutton/protocols/dallas/dallas_common.c

@@ -0,0 +1,261 @@
+#include "dallas_common.h"
+
+#include <core/common_defines.h>
+#include <one_wire/maxim_crc.h>
+
+#define BITS_IN_BYTE 8U
+
+#define DALLAS_COMMON_ROM_DATA_KEY_V1 "Data"
+#define DALLAS_COMMON_ROM_DATA_KEY_V2 "Rom Data"
+
+#define DALLAS_COMMON_COPY_SCRATCH_MIN_TIMEOUT_US 5U
+#define DALLAS_COMMON_COPY_SCRATCH_POLL_COUNT 20U
+
+#define DALLAS_COMMON_END_ADDRESS_MASK 0x01F
+#define DALLAS_COMMON_STATUS_FLAG_PF (1U << 5)
+#define DALLAS_COMMON_STATUS_FLAG_OF (1U << 6)
+#define DALLAS_COMMON_STATUS_FLAG_AA (1U << 7)
+
+#define DALLAS_COMMON_BRIEF_HEAD_COUNT 4U
+#define DALLAS_COMMON_BRIEF_TAIL_COUNT 3U
+
+#define BITS_IN_BYTE 8U
+#define BITS_IN_KBIT 1024U
+#define BITS_IN_MBIT (BITS_IN_KBIT * 1024U)
+
+bool dallas_common_skip_rom(OneWireHost* host) {
+    onewire_host_write(host, DALLAS_COMMON_CMD_SKIP_ROM);
+    return true;
+}
+
+bool dallas_common_read_rom(OneWireHost* host, DallasCommonRomData* rom_data) {
+    onewire_host_write(host, DALLAS_COMMON_CMD_READ_ROM);
+    onewire_host_read_bytes(host, rom_data->bytes, sizeof(DallasCommonRomData));
+
+    return dallas_common_is_valid_crc(rom_data);
+}
+
+bool dallas_common_write_scratchpad(
+    OneWireHost* host,
+    uint16_t address,
+    const uint8_t* data,
+    size_t data_size) {
+    onewire_host_write(host, DALLAS_COMMON_CMD_WRITE_SCRATCH);
+    onewire_host_write(host, (uint8_t)address);
+    onewire_host_write(host, (uint8_t)(address >> BITS_IN_BYTE));
+
+    onewire_host_write_bytes(host, data, data_size);
+
+    return true;
+}
+
+bool dallas_common_read_scratchpad(
+    OneWireHost* host,
+    DallasCommonAddressRegs* regs,
+    uint8_t* data,
+    size_t data_size) {
+    onewire_host_write(host, DALLAS_COMMON_CMD_READ_SCRATCH);
+    onewire_host_read_bytes(host, regs->bytes, sizeof(DallasCommonAddressRegs));
+    onewire_host_read_bytes(host, data, data_size);
+
+    return true;
+}
+
+bool dallas_common_copy_scratchpad(
+    OneWireHost* host,
+    const DallasCommonAddressRegs* regs,
+    uint32_t timeout_us) {
+    onewire_host_write(host, DALLAS_COMMON_CMD_COPY_SCRATCH);
+    onewire_host_write_bytes(host, regs->bytes, sizeof(DallasCommonAddressRegs));
+
+    const uint32_t poll_delay =
+        MAX(timeout_us / DALLAS_COMMON_COPY_SCRATCH_POLL_COUNT,
+            DALLAS_COMMON_COPY_SCRATCH_MIN_TIMEOUT_US);
+
+    uint32_t time_elapsed;
+    for(time_elapsed = 0; time_elapsed < timeout_us; time_elapsed += poll_delay) {
+        if(!onewire_host_read_bit(host)) break;
+        furi_delay_us(poll_delay);
+    }
+
+    return time_elapsed < timeout_us;
+}
+
+bool dallas_common_read_mem(OneWireHost* host, uint16_t address, uint8_t* data, size_t data_size) {
+    onewire_host_write(host, DALLAS_COMMON_CMD_READ_MEM);
+
+    onewire_host_write(host, (uint8_t)address);
+    onewire_host_write(host, (uint8_t)(address >> BITS_IN_BYTE));
+
+    onewire_host_read_bytes(host, data, (uint16_t)data_size);
+
+    return true;
+}
+
+bool dallas_common_write_mem(
+    OneWireHost* host,
+    uint32_t timeout_us,
+    size_t page_size,
+    const uint8_t* data,
+    size_t data_size) {
+    // Data size must be a multiple of page size
+    furi_check(data_size % page_size == 0);
+
+    DallasCommonAddressRegs regs;
+    uint8_t* scratch = malloc(page_size);
+
+    size_t i;
+    for(i = 0; i < data_size; i += page_size) {
+        const uint8_t* data_ptr = data + i;
+
+        // Write scratchpad with the next page value
+        if(!onewire_host_reset(host)) break;
+        if(!dallas_common_skip_rom(host)) break;
+        if(!dallas_common_write_scratchpad(host, i, data_ptr, page_size)) break;
+
+        // Read back the scratchpad contents and address registers
+        if(!onewire_host_reset(host)) break;
+        if(!dallas_common_skip_rom(host)) break;
+        if(!dallas_common_read_scratchpad(host, &regs, scratch, page_size)) break;
+
+        // Verify scratchpad contents
+        if(memcmp(data_ptr, scratch, page_size) != 0) break;
+
+        // Write scratchpad to internal memory
+        if(!onewire_host_reset(host)) break;
+        if(!dallas_common_skip_rom(host)) break;
+        if(!dallas_common_copy_scratchpad(host, &regs, timeout_us)) break;
+
+        // Read back the address registers again
+        if(!onewire_host_reset(host)) break;
+        if(!dallas_common_skip_rom(host)) break;
+        if(!dallas_common_read_scratchpad(host, &regs, scratch, 0)) break;
+
+        // Check if AA flag is set
+        if(!(regs.fields.status & DALLAS_COMMON_STATUS_FLAG_AA)) break;
+    }
+
+    free(scratch);
+
+    return i == data_size;
+}
+
+bool dallas_common_emulate_search_rom(OneWireSlave* bus, const DallasCommonRomData* rom_data) {
+    for(size_t i = 0; i < sizeof(DallasCommonRomData); i++) {
+        for(size_t j = 0; j < BITS_IN_BYTE; j++) {
+            bool bit = (rom_data->bytes[i] >> j) & 0x01;
+
+            if(!onewire_slave_send_bit(bus, bit)) return false;
+            if(!onewire_slave_send_bit(bus, !bit)) return false;
+
+            onewire_slave_receive_bit(bus);
+            // TODO: check for errors and return if any
+        }
+    }
+
+    return true;
+}
+
+bool dallas_common_emulate_read_rom(OneWireSlave* bus, const DallasCommonRomData* rom_data) {
+    return onewire_slave_send(bus, rom_data->bytes, sizeof(DallasCommonRomData));
+}
+
+bool dallas_common_emulate_read_mem(OneWireSlave* bus, const uint8_t* data, size_t data_size) {
+    bool success = false;
+
+    union {
+        uint8_t bytes[sizeof(uint16_t)];
+        uint16_t word;
+    } address;
+
+    do {
+        if(!onewire_slave_receive(bus, address.bytes, sizeof(address))) break;
+        if(address.word >= data_size) break;
+        if(!onewire_slave_send(bus, data + address.word, data_size - address.word)) break;
+
+        success = true;
+    } while(false);
+
+    return success;
+}
+
+bool dallas_common_save_rom_data(FlipperFormat* ff, const DallasCommonRomData* rom_data) {
+    return flipper_format_write_hex(
+        ff, DALLAS_COMMON_ROM_DATA_KEY_V2, rom_data->bytes, sizeof(DallasCommonRomData));
+}
+
+bool dallas_common_load_rom_data(
+    FlipperFormat* ff,
+    uint32_t format_version,
+    DallasCommonRomData* rom_data) {
+    switch(format_version) {
+    case 1:
+        return flipper_format_read_hex(
+            ff, DALLAS_COMMON_ROM_DATA_KEY_V1, rom_data->bytes, sizeof(DallasCommonRomData));
+    case 2:
+        return flipper_format_read_hex(
+            ff, DALLAS_COMMON_ROM_DATA_KEY_V2, rom_data->bytes, sizeof(DallasCommonRomData));
+    default:
+        return false;
+    }
+}
+
+bool dallas_common_is_valid_crc(const DallasCommonRomData* rom_data) {
+    const uint8_t crc_calculated =
+        maxim_crc8(rom_data->bytes, sizeof(DallasCommonRomData) - 1, MAXIM_CRC8_INIT);
+    const uint8_t crc_received = rom_data->fields.checksum;
+
+    return crc_calculated == crc_received;
+}
+
+void dallas_common_render_brief_data(
+    FuriString* result,
+    const DallasCommonRomData* rom_data,
+    const uint8_t* mem_data,
+    size_t mem_size,
+    const char* mem_name) {
+    for(size_t i = 0; i < sizeof(rom_data->bytes); ++i) {
+        furi_string_cat_printf(result, "%02X ", rom_data->bytes[i]);
+    }
+
+    const char* size_prefix = "";
+    size_t mem_size_bits = mem_size * BITS_IN_BYTE;
+
+    if(mem_size_bits >= BITS_IN_MBIT) {
+        size_prefix = "M";
+        mem_size_bits /= BITS_IN_MBIT;
+    } else if(mem_size_bits >= BITS_IN_KBIT) {
+        size_prefix = "K";
+        mem_size_bits /= BITS_IN_KBIT;
+    }
+
+    furi_string_cat_printf(
+        result, "\nInternal %s: %zu %sbit\n", mem_name, mem_size_bits, size_prefix);
+
+    for(size_t i = 0; i < DALLAS_COMMON_BRIEF_HEAD_COUNT; ++i) {
+        furi_string_cat_printf(result, "%02X ", mem_data[i]);
+    }
+
+    furi_string_cat_printf(result, "[  . . .  ]");
+
+    for(size_t i = mem_size - DALLAS_COMMON_BRIEF_TAIL_COUNT; i < mem_size; ++i) {
+        furi_string_cat_printf(result, " %02X", mem_data[i]);
+    }
+}
+
+void dallas_common_render_crc_error(FuriString* result, const DallasCommonRomData* rom_data) {
+    furi_string_set(result, "CRC Error\n");
+
+    const size_t data_size = sizeof(DallasCommonRomData);
+
+    for(size_t i = 0; i < data_size; ++i) {
+        furi_string_cat_printf(result, (i < data_size - 1) ? "%02X " : "%02X", rom_data->bytes[i]);
+    }
+}
+
+void dallas_common_apply_edits(DallasCommonRomData* rom_data, uint8_t family_code) {
+    rom_data->fields.family_code = family_code;
+    const uint8_t crc =
+        maxim_crc8(rom_data->bytes, sizeof(DallasCommonRomData) - 1, MAXIM_CRC8_INIT);
+    rom_data->fields.checksum = crc;
+}

lib/ibutton/protocols/dallas/dallas_common.h

@@ -0,0 +1,108 @@
+#pragma once
+
+#include <flipper_format.h>
+
+#include <one_wire/one_wire_host.h>
+#include <one_wire/one_wire_slave.h>
+
+#define DALLAS_COMMON_MANUFACTURER_NAME "Dallas"
+
+#define DALLAS_COMMON_CMD_READ_ROM 0x33U
+#define DALLAS_COMMON_CMD_MATCH_ROM 0x55U
+#define DALLAS_COMMON_CMD_SKIP_ROM 0xCCU
+#define DALLAS_COMMON_CMD_COND_SEARCH 0xECU
+#define DALLAS_COMMON_CMD_SEARCH_ROM 0xF0U
+
+#define DALLAS_COMMON_CMD_READ_SCRATCH 0xAAU
+#define DALLAS_COMMON_CMD_WRITE_SCRATCH 0x0FU
+#define DALLAS_COMMON_CMD_COPY_SCRATCH 0x55U
+
+#define DALLAS_COMMON_CMD_READ_MEM 0xF0U
+
+#define DALLAS_COMMON_CMD_OVERDRIVE_SKIP_ROM 0x3CU
+#define DALLAS_COMMON_CMD_OVERDRIVE_MATCH_ROM 0x69U
+
+typedef enum {
+    DallasCommonCommandStateIdle,
+    DallasCommonCommandStateRomCmd,
+    DallasCommonCommandStateMemCmd,
+} DallasCommonCommandState;
+
+typedef union {
+    struct {
+        uint8_t family_code;
+        uint8_t serial_number[6];
+        uint8_t checksum;
+    } fields;
+    uint8_t bytes[8];
+} DallasCommonRomData;
+
+typedef union {
+    struct {
+        uint8_t address_lo;
+        uint8_t address_hi;
+        uint8_t status;
+    } fields;
+    uint8_t bytes[3];
+} DallasCommonAddressRegs;
+
+/* Standard(ish) iButton commands */
+bool dallas_common_skip_rom(OneWireHost* host);
+
+bool dallas_common_read_rom(OneWireHost* host, DallasCommonRomData* rom_data);
+
+bool dallas_common_write_scratchpad(
+    OneWireHost* host,
+    uint16_t address,
+    const uint8_t* data,
+    size_t data_size);
+
+bool dallas_common_read_scratchpad(
+    OneWireHost* host,
+    DallasCommonAddressRegs* regs,
+    uint8_t* data,
+    size_t data_size);
+
+bool dallas_common_copy_scratchpad(
+    OneWireHost* host,
+    const DallasCommonAddressRegs* regs,
+    uint32_t timeout_us);
+
+bool dallas_common_read_mem(OneWireHost* host, uint16_t address, uint8_t* data, size_t data_size);
+
+/* Combined operations */
+bool dallas_common_write_mem(
+    OneWireHost* host,
+    uint32_t timeout_us,
+    size_t page_size,
+    const uint8_t* data,
+    size_t data_size);
+
+/* Emulation */
+bool dallas_common_emulate_search_rom(OneWireSlave* bus, const DallasCommonRomData* rom_data);
+
+bool dallas_common_emulate_read_rom(OneWireSlave* bus, const DallasCommonRomData* rom_data);
+
+bool dallas_common_emulate_read_mem(OneWireSlave* bus, const uint8_t* data, size_t data_size);
+
+/* Save & Load */
+bool dallas_common_save_rom_data(FlipperFormat* ff, const DallasCommonRomData* rom_data);
+
+bool dallas_common_load_rom_data(
+    FlipperFormat* ff,
+    uint32_t format_version,
+    DallasCommonRomData* rom_data);
+
+/* Miscellaneous */
+bool dallas_common_is_valid_crc(const DallasCommonRomData* rom_data);
+
+void dallas_common_render_brief_data(
+    FuriString* result,
+    const DallasCommonRomData* rom_data,
+    const uint8_t* mem_data,
+    size_t mem_size,
+    const char* mem_name);
+
+void dallas_common_render_crc_error(FuriString* result, const DallasCommonRomData* rom_data);
+
+void dallas_common_apply_edits(DallasCommonRomData* rom_data, uint8_t family_code);

lib/ibutton/protocols/dallas/protocol_dallas_base.h

@@ -0,0 +1,39 @@
+#pragma once
+
+#include "../protocol_common_i.h"
+
+#include <flipper_format.h>
+
+#include <one_wire/one_wire_host.h>
+#include <one_wire/one_wire_slave.h>
+
+typedef bool (*iButtonProtocolDallasReadWriteFunc)(OneWireHost*, iButtonProtocolData*);
+typedef void (*iButtonProtocolDallasEmulateFunc)(OneWireSlave*, iButtonProtocolData*);
+typedef bool (*iButtonProtocolDallasSaveFunc)(FlipperFormat*, const iButtonProtocolData*);
+typedef bool (*iButtonProtocolDallasLoadFunc)(FlipperFormat*, uint32_t, iButtonProtocolData*);
+typedef void (*iButtonProtocolDallasRenderDataFunc)(FuriString*, const iButtonProtocolData*);
+typedef bool (*iButtonProtocolDallasIsValidFunc)(const iButtonProtocolData*);
+typedef void (
+    *iButtonProtocolDallasGetEditableDataFunc)(iButtonEditableData*, iButtonProtocolData*);
+typedef void (*iButtonProtocolDallasApplyEditsFunc)(iButtonProtocolData*);
+
+typedef struct {
+    const uint8_t family_code;
+    const uint32_t features;
+    const size_t data_size;
+    const char* manufacturer;
+    const char* name;
+
+    iButtonProtocolDallasReadWriteFunc read;
+    iButtonProtocolDallasReadWriteFunc write_blank;
+    iButtonProtocolDallasReadWriteFunc write_copy;
+    iButtonProtocolDallasEmulateFunc emulate;
+    iButtonProtocolDallasSaveFunc save;
+    iButtonProtocolDallasLoadFunc load;
+    iButtonProtocolDallasRenderDataFunc render_data;
+    iButtonProtocolDallasRenderDataFunc render_brief_data;
+    iButtonProtocolDallasRenderDataFunc render_error;
+    iButtonProtocolDallasIsValidFunc is_valid;
+    iButtonProtocolDallasGetEditableDataFunc get_editable_data;
+    iButtonProtocolDallasApplyEditsFunc apply_edits;
+} iButtonProtocolDallasBase;

lib/ibutton/protocols/dallas/protocol_ds1971.c

@@ -0,0 +1,270 @@
+#include "protocol_ds1971.h"
+
+#include <core/core_defines.h>
+#include <toolbox/pretty_format.h>
+
+#include "dallas_common.h"
+
+#define DS1971_FAMILY_CODE 0x14U
+#define DS1971_FAMILY_NAME "DS1971"
+
+#define DS1971_EEPROM_DATA_SIZE 32U
+#define DS1971_SRAM_PAGE_SIZE 32U
+#define DS1971_COPY_SCRATCH_DELAY_US 250U
+
+#define DS1971_DATA_BYTE_COUNT 4U
+
+#define DS1971_EEPROM_DATA_KEY "Eeprom Data"
+#define DS1971_MEMORY_TYPE "EEPROM"
+
+#define DS1971_CMD_FINALIZATION 0xA5
+
+typedef struct {
+    OneWireSlave* bus;
+    DallasCommonCommandState command_state;
+} DS1971ProtocolState;
+
+typedef struct {
+    DallasCommonRomData rom_data;
+    uint8_t eeprom_data[DS1971_EEPROM_DATA_SIZE];
+    DS1971ProtocolState state;
+} DS1971ProtocolData;
+
+static bool dallas_ds1971_read(OneWireHost*, void*);
+static bool dallas_ds1971_write_copy(OneWireHost*, iButtonProtocolData*);
+static void dallas_ds1971_emulate(OneWireSlave*, iButtonProtocolData*);
+static bool dallas_ds1971_load(FlipperFormat*, uint32_t, iButtonProtocolData*);
+static bool dallas_ds1971_save(FlipperFormat*, const iButtonProtocolData*);
+static void dallas_ds1971_render_data(FuriString*, const iButtonProtocolData*);
+static void dallas_ds1971_render_brief_data(FuriString*, const iButtonProtocolData*);
+static void dallas_ds1971_render_error(FuriString*, const iButtonProtocolData*);
+static bool dallas_ds1971_is_data_valid(const iButtonProtocolData*);
+static void dallas_ds1971_get_editable_data(iButtonEditableData*, iButtonProtocolData*);
+static void dallas_ds1971_apply_edits(iButtonProtocolData*);
+static bool
+    dallas_ds1971_read_mem(OneWireHost* host, uint8_t address, uint8_t* data, size_t data_size);
+static bool ds1971_emulate_read_mem(OneWireSlave* bus, const uint8_t* data, size_t data_size);
+
+const iButtonProtocolDallasBase ibutton_protocol_ds1971 = {
+    .family_code = DS1971_FAMILY_CODE,
+    .features = iButtonProtocolFeatureExtData | iButtonProtocolFeatureWriteCopy,
+    .data_size = sizeof(DS1971ProtocolData),
+    .manufacturer = DALLAS_COMMON_MANUFACTURER_NAME,
+    .name = DS1971_FAMILY_NAME,
+
+    .read = dallas_ds1971_read,
+    .write_blank = NULL, /* No data to write a blank */
+    .write_copy = dallas_ds1971_write_copy,
+    .emulate = dallas_ds1971_emulate,
+    .save = dallas_ds1971_save,
+    .load = dallas_ds1971_load,
+    .render_data = dallas_ds1971_render_data,
+    .render_brief_data = dallas_ds1971_render_brief_data,
+    .render_error = dallas_ds1971_render_error,
+    .is_valid = dallas_ds1971_is_data_valid,
+    .get_editable_data = dallas_ds1971_get_editable_data,
+    .apply_edits = dallas_ds1971_apply_edits,
+};
+
+bool dallas_ds1971_read(OneWireHost* host, iButtonProtocolData* protocol_data) {
+    DS1971ProtocolData* data = protocol_data;
+    return onewire_host_reset(host) && dallas_common_read_rom(host, &data->rom_data) &&
+           dallas_ds1971_read_mem(host, 0, data->eeprom_data, DS1971_EEPROM_DATA_SIZE);
+}
+
+bool dallas_ds1971_write_copy(OneWireHost* host, iButtonProtocolData* protocol_data) {
+    DS1971ProtocolData* data = protocol_data;
+
+    onewire_host_reset(host);
+    onewire_host_skip(host);
+    // Starting writing from address 0x0000
+    onewire_host_write(host, DALLAS_COMMON_CMD_WRITE_SCRATCH);
+    onewire_host_write(host, 0x00);
+    // Write data to scratchpad
+    onewire_host_write_bytes(host, data->eeprom_data, DS1971_EEPROM_DATA_SIZE);
+
+    // Read data from scratchpad and verify
+    bool pad_valid = false;
+    if(onewire_host_reset(host)) {
+        pad_valid = true;
+        onewire_host_skip(host);
+        onewire_host_write(host, DALLAS_COMMON_CMD_READ_SCRATCH);
+        onewire_host_write(host, 0x00);
+
+        for(size_t i = 0; i < DS1971_EEPROM_DATA_SIZE; ++i) {
+            uint8_t scratch = onewire_host_read(host);
+            if(data->eeprom_data[i] != scratch) {
+                pad_valid = false;
+                break;
+            }
+        }
+    }
+
+    // Copy scratchpad to memory and confirm
+    if(pad_valid) {
+        if(onewire_host_reset(host)) {
+            onewire_host_skip(host);
+            onewire_host_write(host, DALLAS_COMMON_CMD_COPY_SCRATCH);
+            onewire_host_write(host, DS1971_CMD_FINALIZATION);
+
+            furi_delay_us(DS1971_COPY_SCRATCH_DELAY_US);
+        }
+    }
+
+    return pad_valid;
+}
+
+static void dallas_ds1971_reset_callback(void* context) {
+    furi_assert(context);
+    DS1971ProtocolData* data = context;
+    data->state.command_state = DallasCommonCommandStateIdle;
+}
+
+static bool dallas_ds1971_command_callback(uint8_t command, void* context) {
+    furi_assert(context);
+    DS1971ProtocolData* data = context;
+    OneWireSlave* bus = data->state.bus;
+
+    switch(command) {
+    case DALLAS_COMMON_CMD_SEARCH_ROM:
+        if(data->state.command_state == DallasCommonCommandStateIdle) {
+            data->state.command_state = DallasCommonCommandStateRomCmd;
+            return dallas_common_emulate_search_rom(bus, &data->rom_data);
+
+        } else if(data->state.command_state == DallasCommonCommandStateRomCmd) {
+            data->state.command_state = DallasCommonCommandStateMemCmd;
+            ds1971_emulate_read_mem(bus, data->eeprom_data, DS1971_EEPROM_DATA_SIZE);
+            return false;
+
+        } else {
+            return false;
+        }
+
+    case DALLAS_COMMON_CMD_READ_ROM:
+        if(data->state.command_state == DallasCommonCommandStateIdle) {
+            data->state.command_state = DallasCommonCommandStateRomCmd;
+            return dallas_common_emulate_read_rom(bus, &data->rom_data);
+        } else {
+            return false;
+        }
+
+    case DALLAS_COMMON_CMD_SKIP_ROM:
+        if(data->state.command_state == DallasCommonCommandStateIdle) {
+            data->state.command_state = DallasCommonCommandStateRomCmd;
+            return true;
+        } else {
+            return false;
+        }
+
+    default:
+        return false;
+    }
+}
+
+void dallas_ds1971_emulate(OneWireSlave* bus, iButtonProtocolData* protocol_data) {
+    DS1971ProtocolData* data = protocol_data;
+    data->state.bus = bus;
+
+    onewire_slave_set_reset_callback(bus, dallas_ds1971_reset_callback, protocol_data);
+    onewire_slave_set_command_callback(bus, dallas_ds1971_command_callback, protocol_data);
+}
+
+bool dallas_ds1971_load(
+    FlipperFormat* ff,
+    uint32_t format_version,
+    iButtonProtocolData* protocol_data) {
+    DS1971ProtocolData* data = protocol_data;
+    bool success = false;
+
+    do {
+        if(format_version < 2) break;
+        if(!dallas_common_load_rom_data(ff, format_version, &data->rom_data)) break;
+        if(!flipper_format_read_hex(
+               ff, DS1971_EEPROM_DATA_KEY, data->eeprom_data, DS1971_EEPROM_DATA_SIZE))
+            break;
+        success = true;
+    } while(false);
+
+    return success;
+}
+
+bool dallas_ds1971_save(FlipperFormat* ff, const iButtonProtocolData* protocol_data) {
+    const DS1971ProtocolData* data = protocol_data;
+    bool success = false;
+
+    do {
+        if(!dallas_common_save_rom_data(ff, &data->rom_data)) break;
+        if(!flipper_format_write_hex(
+               ff, DS1971_EEPROM_DATA_KEY, data->eeprom_data, DS1971_EEPROM_DATA_SIZE))
+            break;
+        success = true;
+    } while(false);
+
+    return success;
+}
+
+void dallas_ds1971_render_data(FuriString* result, const iButtonProtocolData* protocol_data) {
+    const DS1971ProtocolData* data = protocol_data;
+    pretty_format_bytes_hex_canonical(
+        result,
+        DS1971_DATA_BYTE_COUNT,
+        PRETTY_FORMAT_FONT_MONOSPACE,
+        data->eeprom_data,
+        DS1971_EEPROM_DATA_SIZE);
+}
+
+void dallas_ds1971_render_brief_data(FuriString* result, const iButtonProtocolData* protocol_data) {
+    const DS1971ProtocolData* data = protocol_data;
+    dallas_common_render_brief_data(
+        result, &data->rom_data, data->eeprom_data, DS1971_EEPROM_DATA_SIZE, DS1971_MEMORY_TYPE);
+}
+
+void dallas_ds1971_render_error(FuriString* result, const iButtonProtocolData* protocol_data) {
+    const DS1971ProtocolData* data = protocol_data;
+
+    if(!dallas_common_is_valid_crc(&data->rom_data)) {
+        dallas_common_render_crc_error(result, &data->rom_data);
+    }
+}
+
+bool dallas_ds1971_is_data_valid(const iButtonProtocolData* protocol_data) {
+    const DS1971ProtocolData* data = protocol_data;
+    return dallas_common_is_valid_crc(&data->rom_data);
+}
+
+void dallas_ds1971_get_editable_data(
+    iButtonEditableData* editable_data,
+    iButtonProtocolData* protocol_data) {
+    DS1971ProtocolData* data = protocol_data;
+    editable_data->ptr = data->rom_data.bytes;
+    editable_data->size = sizeof(DallasCommonRomData);
+}
+
+void dallas_ds1971_apply_edits(iButtonProtocolData* protocol_data) {
+    DS1971ProtocolData* data = protocol_data;
+    dallas_common_apply_edits(&data->rom_data, DS1971_FAMILY_CODE);
+}
+
+bool dallas_ds1971_read_mem(OneWireHost* host, uint8_t address, uint8_t* data, size_t data_size) {
+    onewire_host_write(host, DALLAS_COMMON_CMD_READ_MEM);
+
+    onewire_host_write(host, address);
+    onewire_host_read_bytes(host, data, (uint8_t)data_size);
+
+    return true;
+}
+
+bool ds1971_emulate_read_mem(OneWireSlave* bus, const uint8_t* data, size_t data_size) {
+    bool success = false;
+
+    do {
+        uint8_t address;
+        if(!onewire_slave_receive(bus, &address, sizeof(address))) break;
+        if(address >= data_size) break;
+        if(!onewire_slave_send(bus, data + address, data_size - address)) break;
+
+        success = true;
+    } while(false);
+
+    return success;
+}

lib/ibutton/protocols/dallas/protocol_ds1971.h

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

lib/ibutton/protocols/dallas/protocol_ds1990.c

@@ -0,0 +1,144 @@
+#include "protocol_ds1990.h"
+
+#include <core/string.h>
+#include <core/core_defines.h>
+
+#include "dallas_common.h"
+
+#include "../blanks/rw1990.h"
+#include "../blanks/tm2004.h"
+
+#define DS1990_FAMILY_CODE 0x01U
+#define DS1990_FAMILY_NAME "DS1990"
+
+#define DS1990_CMD_READ_ROM 0x0FU
+
+typedef struct {
+    OneWireSlave* bus;
+} DS1990ProtocolState;
+
+typedef struct {
+    DallasCommonRomData rom_data;
+    DS1990ProtocolState state;
+} DS1990ProtocolData;
+
+static bool dallas_ds1990_read(OneWireHost*, iButtonProtocolData*);
+static bool dallas_ds1990_write_blank(OneWireHost*, iButtonProtocolData*);
+static void dallas_ds1990_emulate(OneWireSlave*, iButtonProtocolData*);
+static bool dallas_ds1990_load(FlipperFormat*, uint32_t, iButtonProtocolData*);
+static bool dallas_ds1990_save(FlipperFormat*, const iButtonProtocolData*);
+static void dallas_ds1990_render_brief_data(FuriString*, const iButtonProtocolData*);
+static void dallas_ds1990_render_error(FuriString*, const iButtonProtocolData*);
+static bool dallas_ds1990_is_data_valid(const iButtonProtocolData*);
+static void dallas_ds1990_get_editable_data(iButtonEditableData*, iButtonProtocolData*);
+static void dallas_ds1990_apply_edits(iButtonProtocolData*);
+
+const iButtonProtocolDallasBase ibutton_protocol_ds1990 = {
+    .family_code = DS1990_FAMILY_CODE,
+    .features = iButtonProtocolFeatureWriteBlank,
+    .data_size = sizeof(DS1990ProtocolData),
+    .manufacturer = DALLAS_COMMON_MANUFACTURER_NAME,
+    .name = DS1990_FAMILY_NAME,
+
+    .read = dallas_ds1990_read,
+    .write_blank = dallas_ds1990_write_blank,
+    .write_copy = NULL, /* No data to write a copy */
+    .emulate = dallas_ds1990_emulate,
+    .save = dallas_ds1990_save,
+    .load = dallas_ds1990_load,
+    .render_data = NULL, /* No data to render */
+    .render_brief_data = dallas_ds1990_render_brief_data,
+    .render_error = dallas_ds1990_render_error,
+    .is_valid = dallas_ds1990_is_data_valid,
+    .get_editable_data = dallas_ds1990_get_editable_data,
+    .apply_edits = dallas_ds1990_apply_edits,
+};
+
+bool dallas_ds1990_read(OneWireHost* host, iButtonProtocolData* protocol_data) {
+    DS1990ProtocolData* data = protocol_data;
+    return onewire_host_reset(host) && dallas_common_read_rom(host, &data->rom_data);
+}
+
+bool dallas_ds1990_write_blank(OneWireHost* host, iButtonProtocolData* protocol_data) {
+    DS1990ProtocolData* 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_ds1990_command_callback(uint8_t command, void* context) {
+    furi_assert(context);
+    DS1990ProtocolData* 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 DS1990_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_ds1990_emulate(OneWireSlave* bus, iButtonProtocolData* protocol_data) {
+    DS1990ProtocolData* data = protocol_data;
+    data->state.bus = bus;
+
+    onewire_slave_set_reset_callback(bus, NULL, NULL);
+    onewire_slave_set_command_callback(bus, dallas_ds1990_command_callback, protocol_data);
+}
+
+bool dallas_ds1990_save(FlipperFormat* ff, const iButtonProtocolData* protocol_data) {
+    const DS1990ProtocolData* data = protocol_data;
+    return dallas_common_save_rom_data(ff, &data->rom_data);
+}
+
+bool dallas_ds1990_load(
+    FlipperFormat* ff,
+    uint32_t format_version,
+    iButtonProtocolData* protocol_data) {
+    DS1990ProtocolData* data = protocol_data;
+    return dallas_common_load_rom_data(ff, format_version, &data->rom_data);
+}
+
+void dallas_ds1990_render_brief_data(FuriString* result, const iButtonProtocolData* protocol_data) {
+    const DS1990ProtocolData* 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_ds1990_render_error(FuriString* result, const iButtonProtocolData* protocol_data) {
+    const DS1990ProtocolData* data = protocol_data;
+
+    if(!dallas_common_is_valid_crc(&data->rom_data)) {
+        dallas_common_render_crc_error(result, &data->rom_data);
+    }
+}
+
+bool dallas_ds1990_is_data_valid(const iButtonProtocolData* protocol_data) {
+    const DS1990ProtocolData* data = protocol_data;
+    return dallas_common_is_valid_crc(&data->rom_data);
+}
+
+void dallas_ds1990_get_editable_data(
+    iButtonEditableData* editable_data,
+    iButtonProtocolData* protocol_data) {
+    DS1990ProtocolData* data = protocol_data;
+    editable_data->ptr = data->rom_data.bytes;
+    editable_data->size = sizeof(DallasCommonRomData);
+}
+
+void dallas_ds1990_apply_edits(iButtonProtocolData* protocol_data) {
+    DS1990ProtocolData* data = protocol_data;
+    dallas_common_apply_edits(&data->rom_data, DS1990_FAMILY_CODE);
+}

lib/ibutton/protocols/dallas/protocol_ds1990.h

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

lib/ibutton/protocols/dallas/protocol_ds1992.c

@@ -0,0 +1,219 @@
+#include "protocol_ds1992.h"
+
+#include <core/core_defines.h>
+#include <toolbox/pretty_format.h>
+
+#include "dallas_common.h"
+
+#include "../blanks/tm2004.h"
+
+#define DS1992_FAMILY_CODE 0x08U
+#define DS1992_FAMILY_NAME "DS1992"
+
+#define DS1992_SRAM_DATA_SIZE 128U
+#define DS1992_SRAM_PAGE_SIZE 4U
+#define DS1992_COPY_SCRATCH_TIMEOUT_US 100U
+
+#define DS1992_DATA_BYTE_COUNT 4U
+
+#define DS1992_SRAM_DATA_KEY "Sram Data"
+#define DS1992_MEMORY_TYPE "SRAM"
+
+typedef struct {
+    OneWireSlave* bus;
+    DallasCommonCommandState command_state;
+} DS1992ProtocolState;
+
+typedef struct {
+    DallasCommonRomData rom_data;
+    uint8_t sram_data[DS1992_SRAM_DATA_SIZE];
+    DS1992ProtocolState state;
+} DS1992ProtocolData;
+
+static bool dallas_ds1992_read(OneWireHost*, void*);
+static bool dallas_ds1992_write_blank(OneWireHost*, iButtonProtocolData*);
+static bool dallas_ds1992_write_copy(OneWireHost*, iButtonProtocolData*);
+static void dallas_ds1992_emulate(OneWireSlave*, iButtonProtocolData*);
+static bool dallas_ds1992_load(FlipperFormat*, uint32_t, iButtonProtocolData*);
+static bool dallas_ds1992_save(FlipperFormat*, const iButtonProtocolData*);
+static void dallas_ds1992_render_data(FuriString*, const iButtonProtocolData*);
+static void dallas_ds1992_render_brief_data(FuriString*, const iButtonProtocolData*);
+static void dallas_ds1992_render_error(FuriString*, const iButtonProtocolData*);
+static bool dallas_ds1992_is_data_valid(const iButtonProtocolData*);
+static void dallas_ds1992_get_editable_data(iButtonEditableData*, iButtonProtocolData*);
+static void dallas_ds1992_apply_edits(iButtonProtocolData*);
+
+const iButtonProtocolDallasBase ibutton_protocol_ds1992 = {
+    .family_code = DS1992_FAMILY_CODE,
+    .features = iButtonProtocolFeatureExtData | iButtonProtocolFeatureWriteBlank |
+                iButtonProtocolFeatureWriteCopy,
+    .data_size = sizeof(DS1992ProtocolData),
+    .manufacturer = DALLAS_COMMON_MANUFACTURER_NAME,
+    .name = DS1992_FAMILY_NAME,
+
+    .read = dallas_ds1992_read,
+    .write_blank = dallas_ds1992_write_blank,
+    .write_copy = dallas_ds1992_write_copy,
+    .emulate = dallas_ds1992_emulate,
+    .save = dallas_ds1992_save,
+    .load = dallas_ds1992_load,
+    .render_data = dallas_ds1992_render_data,
+    .render_brief_data = dallas_ds1992_render_brief_data,
+    .render_error = dallas_ds1992_render_error,
+    .is_valid = dallas_ds1992_is_data_valid,
+    .get_editable_data = dallas_ds1992_get_editable_data,
+    .apply_edits = dallas_ds1992_apply_edits,
+};
+
+bool dallas_ds1992_read(OneWireHost* host, iButtonProtocolData* protocol_data) {
+    DS1992ProtocolData* data = protocol_data;
+    return onewire_host_reset(host) && dallas_common_read_rom(host, &data->rom_data) &&
+           dallas_common_read_mem(host, 0, data->sram_data, DS1992_SRAM_DATA_SIZE);
+}
+
+bool dallas_ds1992_write_blank(OneWireHost* host, iButtonProtocolData* protocol_data) {
+    DS1992ProtocolData* data = protocol_data;
+    // TODO: Make this work, currently broken
+    return tm2004_write(host, (uint8_t*)data, sizeof(DallasCommonRomData) + DS1992_SRAM_DATA_SIZE);
+}
+
+bool dallas_ds1992_write_copy(OneWireHost* host, iButtonProtocolData* protocol_data) {
+    DS1992ProtocolData* data = protocol_data;
+    return dallas_common_write_mem(
+        host,
+        DS1992_COPY_SCRATCH_TIMEOUT_US,
+        DS1992_SRAM_PAGE_SIZE,
+        data->sram_data,
+        DS1992_SRAM_DATA_SIZE);
+}
+
+static void dallas_ds1992_reset_callback(void* context) {
+    furi_assert(context);
+    DS1992ProtocolData* data = context;
+    data->state.command_state = DallasCommonCommandStateIdle;
+}
+
+static bool dallas_ds1992_command_callback(uint8_t command, void* context) {
+    furi_assert(context);
+    DS1992ProtocolData* data = context;
+    OneWireSlave* bus = data->state.bus;
+
+    switch(command) {
+    case DALLAS_COMMON_CMD_SEARCH_ROM:
+        if(data->state.command_state == DallasCommonCommandStateIdle) {
+            data->state.command_state = DallasCommonCommandStateRomCmd;
+            return dallas_common_emulate_search_rom(bus, &data->rom_data);
+
+        } else if(data->state.command_state == DallasCommonCommandStateRomCmd) {
+            data->state.command_state = DallasCommonCommandStateMemCmd;
+            dallas_common_emulate_read_mem(bus, data->sram_data, DS1992_SRAM_DATA_SIZE);
+            return false;
+
+        } else {
+            return false;
+        }
+
+    case DALLAS_COMMON_CMD_READ_ROM:
+        if(data->state.command_state == DallasCommonCommandStateIdle) {
+            data->state.command_state = DallasCommonCommandStateRomCmd;
+            return dallas_common_emulate_read_rom(bus, &data->rom_data);
+        } else {
+            return false;
+        }
+
+    case DALLAS_COMMON_CMD_SKIP_ROM:
+        if(data->state.command_state == DallasCommonCommandStateIdle) {
+            data->state.command_state = DallasCommonCommandStateRomCmd;
+            return true;
+        } else {
+            return false;
+        }
+
+    default:
+        return false;
+    }
+}
+
+void dallas_ds1992_emulate(OneWireSlave* bus, iButtonProtocolData* protocol_data) {
+    DS1992ProtocolData* data = protocol_data;
+    data->state.bus = bus;
+
+    onewire_slave_set_reset_callback(bus, dallas_ds1992_reset_callback, protocol_data);
+    onewire_slave_set_command_callback(bus, dallas_ds1992_command_callback, protocol_data);
+}
+
+bool dallas_ds1992_load(
+    FlipperFormat* ff,
+    uint32_t format_version,
+    iButtonProtocolData* protocol_data) {
+    DS1992ProtocolData* data = protocol_data;
+    bool success = false;
+
+    do {
+        if(format_version < 2) break;
+        if(!dallas_common_load_rom_data(ff, format_version, &data->rom_data)) break;
+        if(!flipper_format_read_hex(
+               ff, DS1992_SRAM_DATA_KEY, data->sram_data, DS1992_SRAM_DATA_SIZE))
+            break;
+        success = true;
+    } while(false);
+
+    return success;
+}
+
+bool dallas_ds1992_save(FlipperFormat* ff, const iButtonProtocolData* protocol_data) {
+    const DS1992ProtocolData* data = protocol_data;
+    bool success = false;
+
+    do {
+        if(!dallas_common_save_rom_data(ff, &data->rom_data)) break;
+        if(!flipper_format_write_hex(
+               ff, DS1992_SRAM_DATA_KEY, data->sram_data, DS1992_SRAM_DATA_SIZE))
+            break;
+        success = true;
+    } while(false);
+
+    return success;
+}
+
+void dallas_ds1992_render_data(FuriString* result, const iButtonProtocolData* protocol_data) {
+    const DS1992ProtocolData* data = protocol_data;
+    pretty_format_bytes_hex_canonical(
+        result,
+        DS1992_DATA_BYTE_COUNT,
+        PRETTY_FORMAT_FONT_MONOSPACE,
+        data->sram_data,
+        DS1992_SRAM_DATA_SIZE);
+}
+
+void dallas_ds1992_render_brief_data(FuriString* result, const iButtonProtocolData* protocol_data) {
+    const DS1992ProtocolData* data = protocol_data;
+    dallas_common_render_brief_data(
+        result, &data->rom_data, data->sram_data, DS1992_SRAM_DATA_SIZE, DS1992_MEMORY_TYPE);
+}
+
+void dallas_ds1992_render_error(FuriString* result, const iButtonProtocolData* protocol_data) {
+    const DS1992ProtocolData* data = protocol_data;
+
+    if(!dallas_common_is_valid_crc(&data->rom_data)) {
+        dallas_common_render_crc_error(result, &data->rom_data);
+    }
+}
+
+bool dallas_ds1992_is_data_valid(const iButtonProtocolData* protocol_data) {
+    const DS1992ProtocolData* data = protocol_data;
+    return dallas_common_is_valid_crc(&data->rom_data);
+}
+
+void dallas_ds1992_get_editable_data(
+    iButtonEditableData* editable_data,
+    iButtonProtocolData* protocol_data) {
+    DS1992ProtocolData* data = protocol_data;
+    editable_data->ptr = data->rom_data.bytes;
+    editable_data->size = sizeof(DallasCommonRomData);
+}
+
+void dallas_ds1992_apply_edits(iButtonProtocolData* protocol_data) {
+    DS1992ProtocolData* data = protocol_data;
+    dallas_common_apply_edits(&data->rom_data, DS1992_FAMILY_CODE);
+}

lib/ibutton/protocols/dallas/protocol_ds1992.h

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

lib/ibutton/protocols/dallas/protocol_ds1996.c

@@ -0,0 +1,213 @@
+#include "protocol_ds1996.h"
+
+#include <core/core_defines.h>
+#include <toolbox/pretty_format.h>
+
+#include "dallas_common.h"
+
+#define DS1996_FAMILY_CODE 0x0CU
+#define DS1996_FAMILY_NAME "DS1996"
+
+#define DS1996_SRAM_DATA_SIZE 8192U
+#define DS1996_SRAM_PAGE_SIZE 32U
+#define DS1996_COPY_SCRATCH_TIMEOUT_US 100U
+
+#define DS1996_DATA_BYTE_COUNT 4U
+
+#define DS1996_SRAM_DATA_KEY "Sram Data"
+#define DS1996_MEMORY_TYPE "SRAM"
+
+typedef struct {
+    OneWireSlave* bus;
+    DallasCommonCommandState command_state;
+} DS1996ProtocolState;
+
+typedef struct {
+    DallasCommonRomData rom_data;
+    uint8_t sram_data[DS1996_SRAM_DATA_SIZE];
+    DS1996ProtocolState state;
+} DS1996ProtocolData;
+
+static bool dallas_ds1996_read(OneWireHost*, void*);
+static bool dallas_ds1996_write_copy(OneWireHost*, iButtonProtocolData*);
+static void dallas_ds1996_emulate(OneWireSlave*, iButtonProtocolData*);
+static bool dallas_ds1996_load(FlipperFormat*, uint32_t, iButtonProtocolData*);
+static bool dallas_ds1996_save(FlipperFormat*, const iButtonProtocolData*);
+static void dallas_ds1996_render_data(FuriString*, const iButtonProtocolData*);
+static void dallas_ds1996_render_brief_data(FuriString*, const iButtonProtocolData*);
+static void dallas_ds1996_render_error(FuriString*, const iButtonProtocolData*);
+static bool dallas_ds1996_is_data_valid(const iButtonProtocolData*);
+static void dallas_ds1996_get_editable_data(iButtonEditableData*, iButtonProtocolData*);
+static void dallas_ds1996_apply_edits(iButtonProtocolData*);
+
+const iButtonProtocolDallasBase ibutton_protocol_ds1996 = {
+    .family_code = DS1996_FAMILY_CODE,
+    .features = iButtonProtocolFeatureExtData | iButtonProtocolFeatureWriteCopy,
+    .data_size = sizeof(DS1996ProtocolData),
+    .manufacturer = DALLAS_COMMON_MANUFACTURER_NAME,
+    .name = DS1996_FAMILY_NAME,
+
+    .read = dallas_ds1996_read,
+    .write_blank = NULL, /* Data too big for known blanks */
+    .write_copy = dallas_ds1996_write_copy,
+    .emulate = dallas_ds1996_emulate,
+    .save = dallas_ds1996_save,
+    .load = dallas_ds1996_load,
+    .render_data = dallas_ds1996_render_data,
+    .render_brief_data = dallas_ds1996_render_brief_data,
+    .render_error = dallas_ds1996_render_error,
+    .is_valid = dallas_ds1996_is_data_valid,
+    .get_editable_data = dallas_ds1996_get_editable_data,
+    .apply_edits = dallas_ds1996_apply_edits,
+};
+
+bool dallas_ds1996_read(OneWireHost* host, iButtonProtocolData* protocol_data) {
+    DS1996ProtocolData* data = protocol_data;
+    return onewire_host_reset(host) && dallas_common_read_rom(host, &data->rom_data) &&
+           dallas_common_read_mem(host, 0, data->sram_data, DS1996_SRAM_DATA_SIZE);
+}
+
+bool dallas_ds1996_write_copy(OneWireHost* host, iButtonProtocolData* protocol_data) {
+    DS1996ProtocolData* data = protocol_data;
+    return dallas_common_write_mem(
+        host,
+        DS1996_COPY_SCRATCH_TIMEOUT_US,
+        DS1996_SRAM_PAGE_SIZE,
+        data->sram_data,
+        DS1996_SRAM_DATA_SIZE);
+}
+
+static void dallas_ds1996_reset_callback(void* context) {
+    furi_assert(context);
+    DS1996ProtocolData* data = context;
+    data->state.command_state = DallasCommonCommandStateIdle;
+}
+
+static bool dallas_ds1996_command_callback(uint8_t command, void* context) {
+    furi_assert(context);
+    DS1996ProtocolData* data = context;
+    OneWireSlave* bus = data->state.bus;
+
+    switch(command) {
+    case DALLAS_COMMON_CMD_SEARCH_ROM:
+        if(data->state.command_state == DallasCommonCommandStateIdle) {
+            data->state.command_state = DallasCommonCommandStateRomCmd;
+            return dallas_common_emulate_search_rom(bus, &data->rom_data);
+
+        } else if(data->state.command_state == DallasCommonCommandStateRomCmd) {
+            data->state.command_state = DallasCommonCommandStateMemCmd;
+            dallas_common_emulate_read_mem(bus, data->sram_data, DS1996_SRAM_DATA_SIZE);
+            return false;
+
+        } else {
+            return false;
+        }
+
+    case DALLAS_COMMON_CMD_READ_ROM:
+        if(data->state.command_state == DallasCommonCommandStateIdle) {
+            data->state.command_state = DallasCommonCommandStateRomCmd;
+            return dallas_common_emulate_read_rom(bus, &data->rom_data);
+        } else {
+            return false;
+        }
+
+    case DALLAS_COMMON_CMD_SKIP_ROM:
+        if(data->state.command_state == DallasCommonCommandStateIdle) {
+            data->state.command_state = DallasCommonCommandStateRomCmd;
+            return true;
+        } else {
+            return false;
+        }
+
+    case DALLAS_COMMON_CMD_OVERDRIVE_SKIP_ROM:
+    case DALLAS_COMMON_CMD_OVERDRIVE_MATCH_ROM:
+        /* TODO: Overdrive mode support */
+    default:
+        return false;
+    }
+}
+
+void dallas_ds1996_emulate(OneWireSlave* bus, iButtonProtocolData* protocol_data) {
+    DS1996ProtocolData* data = protocol_data;
+    data->state.bus = bus;
+
+    onewire_slave_set_reset_callback(bus, dallas_ds1996_reset_callback, protocol_data);
+    onewire_slave_set_command_callback(bus, dallas_ds1996_command_callback, protocol_data);
+}
+
+bool dallas_ds1996_load(
+    FlipperFormat* ff,
+    uint32_t format_version,
+    iButtonProtocolData* protocol_data) {
+    DS1996ProtocolData* data = protocol_data;
+    bool success = false;
+
+    do {
+        if(format_version < 2) break;
+        if(!dallas_common_load_rom_data(ff, format_version, &data->rom_data)) break;
+        if(!flipper_format_read_hex(
+               ff, DS1996_SRAM_DATA_KEY, data->sram_data, DS1996_SRAM_DATA_SIZE))
+            break;
+        success = true;
+    } while(false);
+
+    return success;
+}
+
+bool dallas_ds1996_save(FlipperFormat* ff, const iButtonProtocolData* protocol_data) {
+    const DS1996ProtocolData* data = protocol_data;
+    bool success = false;
+
+    do {
+        if(!dallas_common_save_rom_data(ff, &data->rom_data)) break;
+        if(!flipper_format_write_hex(
+               ff, DS1996_SRAM_DATA_KEY, data->sram_data, DS1996_SRAM_DATA_SIZE))
+            break;
+        success = true;
+    } while(false);
+
+    return success;
+}
+
+void dallas_ds1996_render_data(FuriString* result, const iButtonProtocolData* protocol_data) {
+    const DS1996ProtocolData* data = protocol_data;
+
+    pretty_format_bytes_hex_canonical(
+        result,
+        DS1996_DATA_BYTE_COUNT,
+        PRETTY_FORMAT_FONT_MONOSPACE,
+        data->sram_data,
+        DS1996_SRAM_DATA_SIZE);
+}
+
+void dallas_ds1996_render_brief_data(FuriString* result, const iButtonProtocolData* protocol_data) {
+    const DS1996ProtocolData* data = protocol_data;
+    dallas_common_render_brief_data(
+        result, &data->rom_data, data->sram_data, DS1996_SRAM_DATA_SIZE, DS1996_MEMORY_TYPE);
+}
+
+void dallas_ds1996_render_error(FuriString* result, const iButtonProtocolData* protocol_data) {
+    const DS1996ProtocolData* data = protocol_data;
+
+    if(!dallas_common_is_valid_crc(&data->rom_data)) {
+        dallas_common_render_crc_error(result, &data->rom_data);
+    }
+}
+
+bool dallas_ds1996_is_data_valid(const iButtonProtocolData* protocol_data) {
+    const DS1996ProtocolData* data = protocol_data;
+    return dallas_common_is_valid_crc(&data->rom_data);
+}
+
+void dallas_ds1996_get_editable_data(
+    iButtonEditableData* editable_data,
+    iButtonProtocolData* protocol_data) {
+    DS1996ProtocolData* data = protocol_data;
+    editable_data->ptr = data->rom_data.bytes;
+    editable_data->size = sizeof(DallasCommonRomData);
+}
+
+void dallas_ds1996_apply_edits(iButtonProtocolData* protocol_data) {
+    DS1996ProtocolData* data = protocol_data;
+    dallas_common_apply_edits(&data->rom_data, DS1996_FAMILY_CODE);
+}

lib/ibutton/protocols/dallas/protocol_ds1996.h

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

lib/ibutton/protocols/dallas/protocol_ds_generic.c

@@ -0,0 +1,133 @@
+#include "protocol_ds_generic.h"
+
+#include <core/string.h>
+#include <core/core_defines.h>
+
+#include "dallas_common.h"
+
+#include "../blanks/tm2004.h"
+
+#define DALLAS_GENERIC_FAMILY_CODE 0x00U
+#define DALLAS_GENERIC_FAMILY_NAME "DSGeneric"
+
+typedef struct {
+    OneWireSlave* bus;
+} DallasGenericProtocolState;
+
+typedef struct {
+    DallasCommonRomData rom_data;
+    DallasGenericProtocolState state;
+} DallasGenericProtocolData;
+
+static bool ds_generic_read(OneWireHost*, iButtonProtocolData*);
+static bool ds_generic_write_blank(OneWireHost*, iButtonProtocolData*);
+static void ds_generic_emulate(OneWireSlave*, iButtonProtocolData*);
+static bool ds_generic_load(FlipperFormat*, uint32_t, iButtonProtocolData*);
+static bool ds_generic_save(FlipperFormat*, const iButtonProtocolData*);
+static void ds_generic_render_brief_data(FuriString*, const iButtonProtocolData*);
+static void ds_generic_render_error(FuriString*, const iButtonProtocolData*);
+static bool ds_generic_is_data_valid(const iButtonProtocolData*);
+static void ds_generic_get_editable_data(iButtonEditableData*, iButtonProtocolData*);
+static void ds_generic_apply_edits(iButtonProtocolData*);
+
+const iButtonProtocolDallasBase ibutton_protocol_ds_generic = {
+    .family_code = DALLAS_GENERIC_FAMILY_CODE,
+    .features = iButtonProtocolFeatureWriteBlank,
+    .data_size = sizeof(DallasGenericProtocolData),
+    .manufacturer = DALLAS_COMMON_MANUFACTURER_NAME,
+    .name = DALLAS_GENERIC_FAMILY_NAME,
+
+    .read = ds_generic_read,
+    .write_blank = ds_generic_write_blank,
+    .write_copy = NULL, /* No data to write a copy */
+    .emulate = ds_generic_emulate,
+    .save = ds_generic_save,
+    .load = ds_generic_load,
+    .render_data = NULL, /* No data to render */
+    .render_brief_data = ds_generic_render_brief_data,
+    .render_error = ds_generic_render_error,
+    .is_valid = ds_generic_is_data_valid,
+    .get_editable_data = ds_generic_get_editable_data,
+    .apply_edits = ds_generic_apply_edits,
+};
+
+bool ds_generic_read(OneWireHost* host, iButtonProtocolData* protocol_data) {
+    DallasGenericProtocolData* data = protocol_data;
+    return onewire_host_reset(host) && dallas_common_read_rom(host, &data->rom_data);
+}
+
+bool ds_generic_write_blank(OneWireHost* host, iButtonProtocolData* protocol_data) {
+    DallasGenericProtocolData* data = protocol_data;
+    return tm2004_write(host, data->rom_data.bytes, sizeof(DallasCommonRomData));
+}
+
+static bool ds_generic_command_callback(uint8_t command, void* context) {
+    furi_assert(context);
+    DallasGenericProtocolData* 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:
+        dallas_common_emulate_read_rom(bus, &data->rom_data);
+        break;
+    default:
+        break;
+    }
+
+    // No support for multiple consecutive commands
+    return false;
+}
+
+void ds_generic_emulate(OneWireSlave* bus, iButtonProtocolData* protocol_data) {
+    DallasGenericProtocolData* data = protocol_data;
+    data->state.bus = bus;
+
+    onewire_slave_set_reset_callback(bus, NULL, NULL);
+    onewire_slave_set_command_callback(bus, ds_generic_command_callback, protocol_data);
+}
+
+bool ds_generic_save(FlipperFormat* ff, const iButtonProtocolData* protocol_data) {
+    const DallasGenericProtocolData* data = protocol_data;
+    return dallas_common_save_rom_data(ff, &data->rom_data);
+}
+
+bool ds_generic_load(
+    FlipperFormat* ff,
+    uint32_t format_version,
+    iButtonProtocolData* protocol_data) {
+    DallasGenericProtocolData* data = protocol_data;
+    return dallas_common_load_rom_data(ff, format_version, &data->rom_data);
+}
+
+void ds_generic_render_brief_data(FuriString* result, const iButtonProtocolData* protocol_data) {
+    const DallasGenericProtocolData* data = protocol_data;
+
+    for(size_t i = 0; i < sizeof(DallasCommonRomData); ++i) {
+        furi_string_cat_printf(result, "%02X ", data->rom_data.bytes[i]);
+    }
+}
+
+void ds_generic_render_error(FuriString* result, const iButtonProtocolData* protocol_data) {
+    UNUSED(result);
+    UNUSED(protocol_data);
+}
+
+bool ds_generic_is_data_valid(const iButtonProtocolData* protocol_data) {
+    UNUSED(protocol_data);
+    return true;
+}
+
+void ds_generic_get_editable_data(
+    iButtonEditableData* editable_data,
+    iButtonProtocolData* protocol_data) {
+    DallasGenericProtocolData* data = protocol_data;
+    editable_data->ptr = data->rom_data.bytes;
+    editable_data->size = sizeof(DallasCommonRomData);
+}
+
+void ds_generic_apply_edits(iButtonProtocolData* protocol_data) {
+    UNUSED(protocol_data);
+}

lib/ibutton/protocols/dallas/protocol_ds_generic.h

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

lib/ibutton/protocols/dallas/protocol_group_dallas.c

@@ -0,0 +1,310 @@
+#include "protocol_group_dallas.h"
+
+#include <furi_hal_resources.h>
+
+#include "protocol_group_dallas_defs.h"
+
+#define IBUTTON_ONEWIRE_ROM_SIZE 8U
+
+typedef struct {
+    OneWireHost* host;
+    OneWireSlave* bus;
+} iButtonProtocolGroupDallas;
+
+static iButtonProtocolGroupDallas* ibutton_protocol_group_dallas_alloc() {
+    iButtonProtocolGroupDallas* group = malloc(sizeof(iButtonProtocolGroupDallas));
+
+    group->host = onewire_host_alloc(&ibutton_gpio);
+    group->bus = onewire_slave_alloc(&ibutton_gpio);
+
+    return group;
+}
+
+static void ibutton_protocol_group_dallas_free(iButtonProtocolGroupDallas* group) {
+    onewire_slave_free(group->bus);
+    onewire_host_free(group->host);
+    free(group);
+}
+
+static size_t ibutton_protocol_group_dallas_get_max_data_size(iButtonProtocolGroupDallas* group) {
+    UNUSED(group);
+    size_t max_data_size = 0;
+
+    for(iButtonProtocolLocalId i = 0; i < iButtonProtocolDSMax; ++i) {
+        const size_t current_rom_size = ibutton_protocols_dallas[i]->data_size;
+        if(current_rom_size > max_data_size) {
+            max_data_size = current_rom_size;
+        }
+    }
+
+    return max_data_size;
+}
+
+static bool ibutton_protocol_group_dallas_get_id_by_name(
+    iButtonProtocolGroupDallas* group,
+    iButtonProtocolLocalId* id,
+    const char* name) {
+    UNUSED(group);
+    // Handle older key files which refer to DS1990 as just "Dallas"
+    if(strcmp(name, "Dallas") == 0) {
+        *id = iButtonProtocolDS1990;
+        return true;
+    }
+
+    for(iButtonProtocolLocalId i = 0; i < iButtonProtocolDSMax; ++i) {
+        if(strcmp(ibutton_protocols_dallas[i]->name, name) == 0) {
+            *id = i;
+            return true;
+        }
+    }
+    return false;
+}
+
+static uint32_t ibutton_protocol_group_dallas_get_features(
+    iButtonProtocolGroupDallas* group,
+    iButtonProtocolLocalId id) {
+    UNUSED(group);
+    furi_assert(id < iButtonProtocolDSMax);
+    return ibutton_protocols_dallas[id]->features;
+}
+
+static const char* ibutton_protocol_group_dallas_get_manufacturer(
+    iButtonProtocolGroupDallas* group,
+    iButtonProtocolLocalId id) {
+    UNUSED(group);
+    furi_assert(id < iButtonProtocolDSMax);
+    return ibutton_protocols_dallas[id]->manufacturer;
+}
+
+static const char* ibutton_protocol_group_dallas_get_name(
+    iButtonProtocolGroupDallas* group,
+    iButtonProtocolLocalId id) {
+    UNUSED(group);
+    furi_assert(id < iButtonProtocolDSMax);
+    return ibutton_protocols_dallas[id]->name;
+}
+
+static iButtonProtocolLocalId
+    ibutton_protocol_group_dallas_get_id_by_family_code(uint8_t family_code) {
+    iButtonProtocolLocalId id;
+
+    for(id = 0; id < iButtonProtocolDSGeneric; ++id) {
+        if(ibutton_protocols_dallas[id]->family_code == family_code) break;
+    }
+
+    return id;
+}
+
+static bool ibutton_protocol_group_dallas_read(
+    iButtonProtocolGroupDallas* group,
+    iButtonProtocolData* data,
+    iButtonProtocolLocalId* id) {
+    bool success = false;
+    uint8_t rom_data[IBUTTON_ONEWIRE_ROM_SIZE];
+    OneWireHost* host = group->host;
+
+    onewire_host_start(host);
+    furi_delay_ms(100);
+
+    FURI_CRITICAL_ENTER();
+
+    if(onewire_host_search(host, rom_data, OneWireHostSearchModeNormal)) {
+        /* Considering any found 1-Wire device a success.
+         * It can be checked later with ibutton_key_is_valid(). */
+        success = true;
+
+        /* If a 1-Wire device was found, id is guaranteed to be
+         * one of the known keys or DSGeneric. */
+        *id = ibutton_protocol_group_dallas_get_id_by_family_code(rom_data[0]);
+        ibutton_protocols_dallas[*id]->read(host, data);
+    }
+
+    onewire_host_reset_search(host);
+    onewire_host_stop(host);
+
+    FURI_CRITICAL_EXIT();
+
+    return success;
+}
+
+static bool ibutton_protocol_group_dallas_write_blank(
+    iButtonProtocolGroupDallas* group,
+    iButtonProtocolData* data,
+    iButtonProtocolLocalId id) {
+    furi_assert(id < iButtonProtocolDSMax);
+    const iButtonProtocolDallasBase* protocol = ibutton_protocols_dallas[id];
+    furi_assert(protocol->features & iButtonProtocolFeatureWriteBlank);
+
+    OneWireHost* host = group->host;
+
+    onewire_host_start(host);
+    furi_delay_ms(100);
+
+    FURI_CRITICAL_ENTER();
+
+    const bool success = protocol->write_blank(host, data);
+    onewire_host_stop(host);
+
+    FURI_CRITICAL_EXIT();
+    return success;
+}
+
+static bool ibutton_protocol_group_dallas_write_copy(
+    iButtonProtocolGroupDallas* group,
+    iButtonProtocolData* data,
+    iButtonProtocolLocalId id) {
+    furi_assert(id < iButtonProtocolDSMax);
+
+    const iButtonProtocolDallasBase* protocol = ibutton_protocols_dallas[id];
+    furi_assert(protocol->features & iButtonProtocolFeatureWriteCopy);
+
+    OneWireHost* host = group->host;
+
+    onewire_host_start(host);
+    furi_delay_ms(100);
+
+    FURI_CRITICAL_ENTER();
+
+    const bool success = protocol->write_copy(host, data);
+    onewire_host_stop(host);
+
+    FURI_CRITICAL_EXIT();
+    return success;
+}
+
+static void ibutton_protocol_group_dallas_emulate_start(
+    iButtonProtocolGroupDallas* group,
+    iButtonProtocolData* data,
+    iButtonProtocolLocalId id) {
+    furi_assert(id < iButtonProtocolDSMax);
+    OneWireSlave* bus = group->bus;
+    ibutton_protocols_dallas[id]->emulate(bus, data);
+    onewire_slave_start(bus);
+}
+
+static void ibutton_protocol_group_dallas_emulate_stop(
+    iButtonProtocolGroupDallas* group,
+    iButtonProtocolData* data,
+    iButtonProtocolLocalId id) {
+    furi_assert(id < iButtonProtocolDSMax);
+    UNUSED(data);
+    onewire_slave_stop(group->bus);
+}
+
+static bool ibutton_protocol_group_dallas_save(
+    iButtonProtocolGroupDallas* group,
+    const iButtonProtocolData* data,
+    iButtonProtocolLocalId id,
+    FlipperFormat* ff) {
+    UNUSED(group);
+    furi_assert(id < iButtonProtocolDSMax);
+    return ibutton_protocols_dallas[id]->save(ff, data);
+}
+
+static bool ibutton_protocol_group_dallas_load(
+    iButtonProtocolGroupDallas* group,
+    iButtonProtocolData* data,
+    iButtonProtocolLocalId id,
+    uint32_t version,
+    FlipperFormat* ff) {
+    UNUSED(group);
+    furi_assert(id < iButtonProtocolDSMax);
+    return ibutton_protocols_dallas[id]->load(ff, version, data);
+}
+
+static void ibutton_protocol_group_dallas_render_data(
+    iButtonProtocolGroupDallas* group,
+    const iButtonProtocolData* data,
+    iButtonProtocolLocalId id,
+    FuriString* result) {
+    UNUSED(group);
+    furi_assert(id < iButtonProtocolDSMax);
+    const iButtonProtocolDallasBase* protocol = ibutton_protocols_dallas[id];
+    furi_assert(protocol->render_data);
+    protocol->render_data(result, data);
+}
+
+static void ibutton_protocol_group_dallas_render_brief_data(
+    iButtonProtocolGroupDallas* group,
+    const iButtonProtocolData* data,
+    iButtonProtocolLocalId id,
+    FuriString* result) {
+    UNUSED(group);
+    furi_assert(id < iButtonProtocolDSMax);
+    ibutton_protocols_dallas[id]->render_brief_data(result, data);
+}
+
+static void ibutton_protocol_group_dallas_render_error(
+    iButtonProtocolGroupDallas* group,
+    const iButtonProtocolData* data,
+    iButtonProtocolLocalId id,
+    FuriString* result) {
+    UNUSED(group);
+    furi_assert(id < iButtonProtocolDSMax);
+    ibutton_protocols_dallas[id]->render_error(result, data);
+}
+
+static bool ibutton_protocol_group_dallas_is_valid(
+    iButtonProtocolGroupDallas* group,
+    const iButtonProtocolData* data,
+    iButtonProtocolLocalId id) {
+    UNUSED(group);
+    furi_assert(id < iButtonProtocolDSMax);
+    return ibutton_protocols_dallas[id]->is_valid(data);
+}
+
+static void ibutton_protocol_group_dallas_get_editable_data(
+    iButtonProtocolGroupDallas* group,
+    iButtonProtocolData* data,
+    iButtonProtocolLocalId id,
+    iButtonEditableData* editable) {
+    UNUSED(group);
+    furi_assert(id < iButtonProtocolDSMax);
+    ibutton_protocols_dallas[id]->get_editable_data(editable, data);
+}
+
+static void ibutton_protocol_group_dallas_apply_edits(
+    iButtonProtocolGroupDallas* group,
+    iButtonProtocolData* data,
+    iButtonProtocolLocalId id) {
+    UNUSED(group);
+    furi_assert(id < iButtonProtocolDSMax);
+    ibutton_protocols_dallas[id]->apply_edits(data);
+}
+
+const iButtonProtocolGroupBase ibutton_protocol_group_dallas = {
+    .protocol_count = iButtonProtocolDSMax,
+
+    .alloc = (iButtonProtocolGroupAllocFunc)ibutton_protocol_group_dallas_alloc,
+    .free = (iButtonProtocolGroupFreeFunc)ibutton_protocol_group_dallas_free,
+
+    .get_max_data_size =
+        (iButtonProtocolGropuGetSizeFunc)ibutton_protocol_group_dallas_get_max_data_size,
+    .get_id_by_name = (iButtonProtocolGroupGetIdFunc)ibutton_protocol_group_dallas_get_id_by_name,
+    .get_features =
+        (iButtonProtocolGroupGetFeaturesFunc)ibutton_protocol_group_dallas_get_features,
+
+    .get_manufacturer =
+        (iButtonProtocolGroupGetStringFunc)ibutton_protocol_group_dallas_get_manufacturer,
+    .get_name = (iButtonProtocolGroupGetStringFunc)ibutton_protocol_group_dallas_get_name,
+
+    .read = (iButtonProtocolGroupReadFunc)ibutton_protocol_group_dallas_read,
+    .write_blank = (iButtonProtocolGroupWriteFunc)ibutton_protocol_group_dallas_write_blank,
+    .write_copy = (iButtonProtocolGroupWriteFunc)ibutton_protocol_group_dallas_write_copy,
+
+    .emulate_start = (iButtonProtocolGroupApplyFunc)ibutton_protocol_group_dallas_emulate_start,
+    .emulate_stop = (iButtonProtocolGroupApplyFunc)ibutton_protocol_group_dallas_emulate_stop,
+
+    .save = (iButtonProtocolGroupSaveFunc)ibutton_protocol_group_dallas_save,
+    .load = (iButtonProtocolGroupLoadFunc)ibutton_protocol_group_dallas_load,
+
+    .render_data = (iButtonProtocolGroupRenderFunc)ibutton_protocol_group_dallas_render_data,
+    .render_brief_data =
+        (iButtonProtocolGroupRenderFunc)ibutton_protocol_group_dallas_render_brief_data,
+    .render_error = (iButtonProtocolGroupRenderFunc)ibutton_protocol_group_dallas_render_error,
+
+    .is_valid = (iButtonProtocolGroupIsValidFunc)ibutton_protocol_group_dallas_is_valid,
+    .get_editable_data =
+        (iButtonProtocolGroupGetDataFunc)ibutton_protocol_group_dallas_get_editable_data,
+    .apply_edits = (iButtonProtocolGroupApplyFunc)ibutton_protocol_group_dallas_apply_edits,
+};

lib/ibutton/protocols/dallas/protocol_group_dallas.h

@@ -0,0 +1,5 @@
+#pragma once
+
+#include "../protocol_group_base.h"
+
+extern const iButtonProtocolGroupBase ibutton_protocol_group_dallas;

lib/ibutton/protocols/dallas/protocol_group_dallas_defs.c

@@ -0,0 +1,18 @@
+#include "protocol_group_dallas_defs.h"
+
+#include "protocol_ds1990.h"
+#include "protocol_ds1992.h"
+#include "protocol_ds1996.h"
+#include "protocol_ds1971.h"
+#include "protocol_ds_generic.h"
+
+const iButtonProtocolDallasBase* ibutton_protocols_dallas[] = {
+    [iButtonProtocolDS1990] = &ibutton_protocol_ds1990,
+    [iButtonProtocolDS1992] = &ibutton_protocol_ds1992,
+    [iButtonProtocolDS1996] = &ibutton_protocol_ds1996,
+    [iButtonProtocolDS1971] = &ibutton_protocol_ds1971,
+    /* Add new 1-Wire protocols here */
+
+    /* Default catch-all 1-Wire protocol */
+    [iButtonProtocolDSGeneric] = &ibutton_protocol_ds_generic,
+};

lib/ibutton/protocols/dallas/protocol_group_dallas_defs.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#include "protocol_dallas_base.h"
+
+typedef enum {
+    iButtonProtocolDS1990,
+    iButtonProtocolDS1992,
+    iButtonProtocolDS1996,
+    iButtonProtocolDS1971,
+    /* Add new 1-Wire protocols here */
+
+    /* Default catch-all 1-Wire protocol */
+    iButtonProtocolDSGeneric,
+    iButtonProtocolDSMax,
+} iButtonProtocolDallas;
+
+extern const iButtonProtocolDallasBase* ibutton_protocols_dallas[];