DarkFlippers/unleashed-firmware
1
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2024-12-27 15:22:29 +03:00
Code Issues Projects Releases Wiki Activity

merge fixes

Browse Source
This commit is contained in:
MX 2024-08-02 16:47:12 +03:00
parent 856fe752de
commit 8189062771
No known key found for this signature in database
GPG Key ID: 7CCC66B7DBDD1C83
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ibutton/protocols/dallas/protocol_ds1420.c
View File

@ -23,7 +23,7 @@ typedef struct {
} DS1420ProtocolData; } DS1420ProtocolData;
static bool dallas_ds1420_read(OneWireHost*, iButtonProtocolData*); static bool dallas_ds1420_read(OneWireHost*, iButtonProtocolData*);
static bool dallas_ds1420_write_blank(OneWireHost*, iButtonProtocolData*); static bool dallas_ds1420_write_id(OneWireHost*, iButtonProtocolData*);
static void dallas_ds1420_emulate(OneWireSlave*, iButtonProtocolData*); static void dallas_ds1420_emulate(OneWireSlave*, iButtonProtocolData*);
static bool dallas_ds1420_load(FlipperFormat*, uint32_t, iButtonProtocolData*); static bool dallas_ds1420_load(FlipperFormat*, uint32_t, iButtonProtocolData*);
static bool dallas_ds1420_save(FlipperFormat*, const iButtonProtocolData*); static bool dallas_ds1420_save(FlipperFormat*, const iButtonProtocolData*);
@ -36,13 +36,13 @@ static void dallas_ds1420_apply_edits(iButtonProtocolData*);
const iButtonProtocolDallasBase ibutton_protocol_ds1420 = { const iButtonProtocolDallasBase ibutton_protocol_ds1420 = {
.family_code = DS1420_FAMILY_CODE, .family_code = DS1420_FAMILY_CODE,
.features = iButtonProtocolFeatureWriteBlank, .features = iButtonProtocolFeatureWriteId,
.data_size = sizeof(DS1420ProtocolData), .data_size = sizeof(DS1420ProtocolData),
.manufacturer = DALLAS_COMMON_MANUFACTURER_NAME, .manufacturer = DALLAS_COMMON_MANUFACTURER_NAME,
.name = DS1420_FAMILY_NAME, .name = DS1420_FAMILY_NAME,
.read = dallas_ds1420_read, .read = dallas_ds1420_read,
.write_blank = dallas_ds1420_write_blank, .write_id = dallas_ds1420_write_id,
.write_copy = NULL, /* No data to write a copy */ .write_copy = NULL, /* No data to write a copy */
.emulate = dallas_ds1420_emulate, .emulate = dallas_ds1420_emulate,
.save = dallas_ds1420_save, .save = dallas_ds1420_save,
@ -61,7 +61,7 @@ bool dallas_ds1420_read(OneWireHost* host, iButtonProtocolData* protocol_data) {
return onewire_host_reset(host) && dallas_common_read_rom(host, &data->rom_data); return onewire_host_reset(host) && dallas_common_read_rom(host, &data->rom_data);
} }
bool dallas_ds1420_write_blank(OneWireHost* host, iButtonProtocolData* protocol_data) { bool dallas_ds1420_write_id(OneWireHost* host, iButtonProtocolData* protocol_data) {
DS1420ProtocolData* data = protocol_data; DS1420ProtocolData* data = protocol_data;
return rw1990_write_v1(host, data->rom_data.bytes, sizeof(DallasCommonRomData)) || return rw1990_write_v1(host, data->rom_data.bytes, sizeof(DallasCommonRomData)) ||