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

RFID: Add DEZ10 representation to EM410X (#418)

Browse Source 
* Add DEZ10 to EM410X output

* make EM410X read success scene text box scrollable so no content overlaps with the buttons

* Reduce DEZ10 variable to 32bits as 64 is not needed

* run ./fbt format for consistent code formatting

* Preview next line like other apps

* Update changelog

---------

Co-authored-by: WillyJL <49810075+WillyJL@users.noreply.github.com>
This commit is contained in:
Thea Juna Schwanke
2025-06-03 03:16:13 +02:00
committed by GitHub
parent 894e5b6e39
commit 966cd39250
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -21,6 +21,7 @@
- WiFi Marauder: Support for new commands from ESP32Marauder 1.6.x (by @justcallmekoko)
- VGM Tool: Fixed RGB firmware UART regression (by @WillyJL)
- UL: Sub-GHz Playlist: Add support for custom modulation presets, remake with txrx library and support for dynamic signals, cleanup code (by @xMasterX)
- RFID: Add DEZ10 representation to EM410X (by @realcatgirly)
- OFW: Infrared: Add text scroll to remote buttons (by @956MB)
- Sub-GHz:
- UL: Rename and extend Alarms ignore option with Hollarm & GangQi (by @xMasterX)

3
applications/main/lfrfid/scenes/lfrfid_scene_read_success.c
View File

@@ -41,8 +41,7 @@ void lfrfid_scene_read_success_on_enter(void* context) {
furi_string_cat_printf(display_text, "\n%s", furi_string_get_cstr(rendered_data));
furi_string_free(rendered_data);
widget_add_text_box_element(
widget, 0, 16, 128, 52, AlignLeft, AlignTop, furi_string_get_cstr(display_text), true);
widget_add_text_scroll_element(widget, 0, 16, 128, 35, furi_string_get_cstr(display_text));
widget_add_button_element(widget, GuiButtonTypeLeft, "Retry", lfrfid_widget_callback, app);
widget_add_button_element(widget, GuiButtonTypeRight, "More", lfrfid_widget_callback, app);

6
lib/lfrfid/protocols/protocol_em4100.c
View File

@@ -374,11 +374,13 @@ void protocol_em4100_render_data(ProtocolEM4100* protocol, FuriString* result) {
furi_string_printf(
result,
"FC: %03u Card: %05hu CL:%hhu\n"
"DEZ 8: %08lu",
"DEZ 8: %08lu\n"
"DEZ 10: %010lu",
data[2],
(uint16_t)((data[3] << 8) | (data[4])),
protocol->clock_per_bit,
(uint32_t)((data[2] << 16) | (data[3] << 8) | (data[4])));
(uint32_t)((data[2] << 16) | (data[3] << 8) | (data[4])),
(uint32_t)((data[1] << 24) | (data[2] << 16) | (data[3] << 8) | (data[4])));
}
const ProtocolBase protocol_em4100 = {