mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-04-24 03:29:57 -07:00
Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev
This commit is contained in:
@@ -20,6 +20,8 @@
|
||||
#include <notification/notification_messages.h>
|
||||
#include <flipper_format/flipper_format_i.h>
|
||||
|
||||
#include <lib/subghz/blocks/custom_btn.h>
|
||||
|
||||
#define SUBGHZ_FREQUENCY_RANGE_STR \
|
||||
"299999755...348000000 or 386999938...464000000 or 778999847...928000000"
|
||||
|
||||
@@ -61,8 +63,6 @@ static SubGhzEnvironment* subghz_cli_environment_init(void) {
|
||||
} else {
|
||||
printf("Load_keystore keeloq_mfcodes_user \033[0;33mAbsent\033[0m\r\n");
|
||||
}
|
||||
subghz_environment_set_came_atomo_rainbow_table_file_name(
|
||||
environment, SUBGHZ_CAME_ATOMO_DIR_NAME);
|
||||
subghz_environment_set_alutech_at_4n_rainbow_table_file_name(
|
||||
environment, SUBGHZ_ALUTECH_AT_4N_DIR_NAME);
|
||||
subghz_environment_set_nice_flor_s_rainbow_table_file_name(
|
||||
@@ -800,7 +800,7 @@ void subghz_cli_command_tx_from_file(Cli* cli, FuriString* args, void* context)
|
||||
subghz_devices_stop_async_tx(device);
|
||||
|
||||
} else {
|
||||
printf("Transmission on this frequency is restricted in your region\r\n");
|
||||
printf("Transmission on this frequency is restricted in your settings\r\n");
|
||||
}
|
||||
|
||||
if(!strcmp(furi_string_get_cstr(temp_str), "RAW")) {
|
||||
@@ -825,6 +825,11 @@ void subghz_cli_command_tx_from_file(Cli* cli, FuriString* args, void* context)
|
||||
furi_string_free(file_name);
|
||||
furi_string_free(temp_str);
|
||||
subghz_devices_deinit();
|
||||
// Reset custom settings
|
||||
subghz_environment_reset_keeloq(environment);
|
||||
faac_slh_reset_prog_mode();
|
||||
subghz_custom_btns_reset();
|
||||
// Free environment
|
||||
subghz_environment_free(environment);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user