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

Merge remote-tracking branch 'OFW/dev' into dev

Browse Source
This commit is contained in:
MX
2024-04-18 17:22:36 +03:00
parent b079b46681
commit 4422a03ae9
47 changed files with 1243 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/ibutton/protocols/misc/protocol_cyfral.c
View File

@@ -325,7 +325,15 @@ static LevelDuration protocol_cyfral_encoder_yield(ProtocolCyfral* proto) {
return result;
}
static void protocol_cyfral_render_uid(FuriString* result, ProtocolCyfral* proto) {
furi_string_cat_printf(result, "ID: ");
for(size_t i = 0; i < CYFRAL_DATA_SIZE; ++i) {
furi_string_cat_printf(result, "%02X ", ((uint8_t*)&proto->data)[i]);
}
}
static void protocol_cyfral_render_brief_data(ProtocolCyfral* proto, FuriString* result) {
furi_string_cat_printf(result, "ID: ");
for(size_t i = 0; i < CYFRAL_DATA_SIZE; ++i) {
furi_string_cat_printf(result, "%02X ", ((uint8_t*)&proto->data)[i]);
}
@@ -348,5 +356,6 @@ const ProtocolBase ibutton_protocol_misc_cyfral = {
.start = (ProtocolEncoderStart)protocol_cyfral_encoder_start,
.yield = (ProtocolEncoderYield)protocol_cyfral_encoder_yield,
},
.render_uid = (ProtocolRenderData)protocol_cyfral_render_uid,
.render_brief_data = (ProtocolRenderData)protocol_cyfral_render_brief_data,
};

8
lib/ibutton/protocols/misc/protocol_metakom.c
View File

@@ -301,12 +301,17 @@ static LevelDuration protocol_metakom_encoder_yield(ProtocolMetakom* proto) {
return result;
}
static void protocol_metakom_render_brief_data(ProtocolMetakom* proto, FuriString* result) {
static void protocol_metakom_render_uid(ProtocolMetakom* proto, FuriString* result) {
furi_string_cat_printf(result, "ID: ");
for(size_t i = 0; i < METAKOM_DATA_SIZE; ++i) {
furi_string_cat_printf(result, "%02X ", ((uint8_t*)&proto->data)[i]);
}
}
static void protocol_metakom_render_brief_data(ProtocolMetakom* proto, FuriString* result) {
protocol_metakom_render_uid(proto, result);
}
const ProtocolBase ibutton_protocol_misc_metakom = {
.name = "Metakom",
.manufacturer = "Metakom",
@@ -324,5 +329,6 @@ const ProtocolBase ibutton_protocol_misc_metakom = {
.start = (ProtocolEncoderStart)protocol_metakom_encoder_start,
.yield = (ProtocolEncoderYield)protocol_metakom_encoder_yield,
},
.render_uid = (ProtocolRenderData)protocol_metakom_render_uid,
.render_brief_data = (ProtocolRenderData)protocol_metakom_render_brief_data,
};