Merge remote-tracking branch 'origin/dev' into electra

This commit is contained in:
Methodius
2024-04-19 18:07:23 +03:00
963 changed files with 17968 additions and 7052 deletions

View File

@@ -335,8 +335,8 @@ bool protocol_em4100_write_data(ProtocolEM4100* protocol, void* data) {
request->t5577.block[0] =
(LFRFID_T5577_MODULATION_MANCHESTER | protocol_em4100_get_t5577_bitrate(protocol) |
(2 << LFRFID_T5577_MAXBLOCK_SHIFT));
request->t5577.block[1] = protocol->encoded_data;
request->t5577.block[2] = protocol->encoded_data >> 32;
request->t5577.block[1] = protocol->encoded_data >> 32;
request->t5577.block[2] = protocol->encoded_data;
request->t5577.blocks_to_write = 3;
result = true;
}
@@ -347,7 +347,8 @@ void protocol_em4100_render_data(ProtocolEM4100* protocol, FuriString* result) {
uint8_t* data = protocol->data;
furi_string_printf(
result,
"FC: %03u, Card: %05u\n(RF/%u)",
"FC: %03u\n"
"Card: %05hu (RF/%hhu)",
data[2],
(uint16_t)((data[3] << 8) | (data[4])),
protocol->clock_per_bit);