Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for -Wundef and iButton ID

Browse Source
This commit is contained in:
Willy-JL
2024-07-31 23:36:25 +02:00
parent b4c24e6e4b
commit 10bc24145e
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/external

Submodule applications/external updated: 6230b6bf30...e2962d9619

2
applications/system/findmy/findmy_i.h
View File

@@ -20,7 +20,7 @@
#include <gui/modules/popup.h>
#include "scenes/findmy_scene.h"
#include "helpers/base64.h"
#if FW_ORIGIN_Official
#ifdef FW_ORIGIN_Official
void furi_hal_bt_reverse_mac_addr(uint8_t mac_addr[GAP_MAC_ADDR_SIZE]);
#endif

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

@@ -23,7 +23,7 @@ typedef struct {
} DS1420ProtocolData;
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 bool dallas_ds1420_load(FlipperFormat*, uint32_t, 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 = {
.family_code = DS1420_FAMILY_CODE,
.features = iButtonProtocolFeatureWriteBlank,
.features = iButtonProtocolFeatureWriteId,
.data_size = sizeof(DS1420ProtocolData),
.manufacturer = DALLAS_COMMON_MANUFACTURER_NAME,
.name = DS1420_FAMILY_NAME,
.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 */
.emulate = dallas_ds1420_emulate,
.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);
}
bool dallas_ds1420_write_blank(OneWireHost* host, iButtonProtocolData* protocol_data) {
bool dallas_ds1420_write_id(OneWireHost* host, iButtonProtocolData* protocol_data) {
DS1420ProtocolData* data = protocol_data;
return rw1990_write_v1(host, data->rom_data.bytes, sizeof(DallasCommonRomData)) ||