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

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

Browse Source
This commit is contained in:
Willy-JL
2024-01-23 23:52:32 +00:00
parent b833ebab1a 46eec3f568
commit f821c4cdc0
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/main/nfc/helpers/protocol_support/nfc_protocol_support.c
View File

@@ -590,7 +590,11 @@ static void nfc_protocol_support_scene_emulate_on_enter(NfcApp* instance) {
} else {
widget_add_string_element(widget, 90, 13, AlignCenter, AlignTop, FontPrimary, "Emulating");
if(!furi_string_empty(instance->file_name)) {
furi_string_set(temp_str, instance->file_name);
furi_string_printf(
temp_str,
"%s\n%s",
nfc_device_get_name(instance->nfc_device, NfcDeviceNameTypeFull),
furi_string_get_cstr(instance->file_name));
} else {
furi_string_printf(
temp_str,

4
applications/main/subghz/scenes/subghz_scene_frequency_analyzer.c
View File

@@ -63,6 +63,10 @@ bool subghz_scene_frequency_analyzer_on_event(void* context, SceneManagerEvent e
#ifdef FURI_DEBUG
subghz_last_settings_log(subghz->last_settings);
#endif
// Disable Hopping before opening the receiver scene!
if(subghz->last_settings->enable_hopping) {
subghz->last_settings->enable_hopping = false;
}
subghz_last_settings_save(subghz->last_settings);
}