Merge remote-tracking branch 'ul/dev' into mntm-dev

This commit is contained in:
Willy-JL
2024-07-05 17:46:05 +02:00
2 changed files with 8 additions and 4 deletions
+3 -1
View File
@@ -61,7 +61,9 @@
- Streamline generic serialize +1.5k free flash (by @Willy-JL)
- JS: Refactored widget and keyboard modules with `ViewHolder`, fix crash (by @Willy-JL)
- Desktop: Slim down internal anims, +3.4kb free flash (by @Willy-JL)
- UL: RFID: Update T5577 password list (by @korden32)
- RFID:
- UL: Update T5577 password list (by @korden32)
- UL: DEZ 8 display form for EM4100 (by @korden32 & @mishamyte)
- OFW: iButton/RFID: Separate editing and renaming (by @Astrrra)
- CLI:
- Simpler plugin wrapper +0.5k free flash (by @Willy-JL)
+5 -3
View File
@@ -347,11 +347,13 @@ void protocol_em4100_render_data(ProtocolEM4100* protocol, FuriString* result) {
uint8_t* data = protocol->data;
furi_string_printf(
result,
"FC: %03u\n"
"Card: %05hu (RF/%hhu)",
"FC: %03u Card: %05hu CL:%hhu\n"
"DEZ 8: %08lu",
data[2],
(uint16_t)((data[3] << 8) | (data[4])),
protocol->clock_per_bit);
protocol->clock_per_bit,
(uint32_t)((data[2] << 16) | (data[3] << 8) | (data[4]))
);
};
const ProtocolBase protocol_em4100 = {