Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-11 06:09:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into mntm-dev --nobuild

Browse Source
This commit is contained in:
Willy-JL
2024-05-26 07:48:31 +01:00
parent dc209ab43c 7ac189aa2a
commit 3358ee63bb
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog.md
View File

@@ -32,6 +32,8 @@
### Fixed: ### Fixed:
- Storage: Fix process aliases in rename (by @Willy-JL) - Storage: Fix process aliases in rename (by @Willy-JL)
- Desktop: Show "safe to unplug the USB cable" even when locked (by @Willy-JL) - Desktop: Show "safe to unplug the USB cable" even when locked (by @Willy-JL)
- UL: RFID: Electra fix non-initialized encoded epilogue on render (by @Leptopt1los)
- OFW: NFC: Fix changing UID (by @gornekich)
- OFW: Settings: Refactor fixes (by @Astrrra) - OFW: Settings: Refactor fixes (by @Astrrra)
- OFW: GUI: Fix calling both `view_free_model()` and `view_free()` (by @Willy-JL) - OFW: GUI: Fix calling both `view_free_model()` and `view_free()` (by @Willy-JL)
- OFW: Archive: Fix condition race on exit (by @skotopes) - OFW: Archive: Fix condition race on exit (by @skotopes)

4
applications/main/archive/archive.c
View File

@@ -21,16 +21,14 @@ static void archive_tick_event_callback(void* context) {
static ArchiveApp* archive_alloc(void) { static ArchiveApp* archive_alloc(void) {
ArchiveApp* archive = malloc(sizeof(ArchiveApp)); ArchiveApp* archive = malloc(sizeof(ArchiveApp));
archive->gui = furi_record_open(RECORD_GUI);
archive->loader = furi_record_open(RECORD_LOADER); archive->loader = furi_record_open(RECORD_LOADER);
archive->fav_move_str = furi_string_alloc(); archive->fav_move_str = furi_string_alloc();
archive->file_extension = furi_string_alloc(); archive->file_extension = furi_string_alloc();
archive->scene_manager = scene_manager_alloc(&archive_scene_handlers, archive); archive->scene_manager = scene_manager_alloc(&archive_scene_handlers, archive);
archive->view_dispatcher = view_dispatcher_alloc(); archive->view_dispatcher = view_dispatcher_alloc();
archive->gui = furi_record_open(RECORD_GUI);
ViewDispatcher* view_dispatcher = archive->view_dispatcher; ViewDispatcher* view_dispatcher = archive->view_dispatcher;
view_dispatcher_enable_queue(view_dispatcher); view_dispatcher_enable_queue(view_dispatcher);
view_dispatcher_set_event_callback_context(view_dispatcher, archive); view_dispatcher_set_event_callback_context(view_dispatcher, archive);

1
lib/lfrfid/protocols/protocol_electra.c
View File

@@ -411,6 +411,7 @@ bool protocol_electra_write_data(ProtocolElectra* protocol, void* data) {
}; };
void protocol_electra_render_data(ProtocolElectra* protocol, FuriString* result) { void protocol_electra_render_data(ProtocolElectra* protocol, FuriString* result) {
protocol_electra_encoder_start(protocol);
furi_string_printf(result, "Epilogue: %016llX", protocol->encoded_epilogue); furi_string_printf(result, "Epilogue: %016llX", protocol->encoded_epilogue);
}; };

2
lib/nfc/SConscript
View File

@@ -34,8 +34,8 @@ env.Append(
File("protocols/mf_ultralight/mf_ultralight_poller.h"), File("protocols/mf_ultralight/mf_ultralight_poller.h"),
File("protocols/mf_classic/mf_classic_poller.h"), File("protocols/mf_classic/mf_classic_poller.h"),
File("protocols/mf_desfire/mf_desfire_poller.h"), File("protocols/mf_desfire/mf_desfire_poller.h"),
File("protocols/emv/emv_poller.h"),
File("protocols/slix/slix_poller.h"), File("protocols/slix/slix_poller.h"),
File("protocols/emv/emv_poller.h"),
File("protocols/st25tb/st25tb_poller.h"), File("protocols/st25tb/st25tb_poller.h"),
File("protocols/felica/felica_poller.h"), File("protocols/felica/felica_poller.h"),
# Listeners # Listeners