fix saving files

This commit is contained in:
DerSkythe
2022-10-10 03:05:51 +04:00
parent b65a2e9c94
commit 323a56e987
4 changed files with 13 additions and 12 deletions

View File

@@ -1,6 +1,6 @@
App( App(
appid="SubGHz_Bruteforcer", appid="SubGHz_Bruteforcer_v3",
name="Sub-GHz Bruteforcer", name="Sub-GHz Bruteforcer v3",
apptype=FlipperAppType.EXTERNAL, apptype=FlipperAppType.EXTERNAL,
entry_point="subbrute_app", entry_point="subbrute_app",
cdefines=["APP_SUB_BRUTE"], cdefines=["APP_SUB_BRUTE"],

View File

@@ -47,7 +47,7 @@ bool subbrute_scene_save_name_on_event(void* context, SceneManagerEvent event) {
if(strcmp(instance->text_store, "")) { if(strcmp(instance->text_store, "")) {
furi_string_reset(instance->file_path); furi_string_reset(instance->file_path);
furi_string_cat_printf( furi_string_cat_printf(
instance->file_path, "/%s%s", instance->text_store, SUBBRUTE_FILE_EXT); instance->file_path, "%s/%s%s", SUBBRUTE_PATH, instance->text_store, SUBBRUTE_FILE_EXT);
if(subbrute_device_save_file(instance->device, furi_string_get_cstr(instance->file_path))) { if(subbrute_device_save_file(instance->device, furi_string_get_cstr(instance->file_path))) {
scene_manager_next_scene(instance->scene_manager, SubBruteSceneSaveSuccess); scene_manager_next_scene(instance->scene_manager, SubBruteSceneSaveSuccess);

View File

@@ -20,7 +20,7 @@ SubBruteDevice* subbrute_device_alloc() {
instance->environment = subghz_environment_alloc(); instance->environment = subghz_environment_alloc();
#ifdef FURI_DEBUG #ifdef FURI_DEBUG
subbrute_device_attack_set_default_values(instance, SubBruteAttackLoadFile); subbrute_device_attack_set_default_values(instance, SubBruteAttackCAME12bit433);
#else #else
subbrute_device_attack_set_default_values(instance, SubBruteAttackCAME12bit433); subbrute_device_attack_set_default_values(instance, SubBruteAttackCAME12bit433);
#endif #endif
@@ -88,6 +88,7 @@ bool subbrute_device_save_file(SubBruteDevice* instance, const char* dev_file_na
bool result = false; bool result = false;
do { do {
if(!flipper_format_file_open_always(file, dev_file_name)) { if(!flipper_format_file_open_always(file, dev_file_name)) {
FURI_LOG_E(TAG, "Failed to open file: %s", dev_file_name);
break; break;
} }
Stream* stream = flipper_format_get_raw_stream(file); Stream* stream = flipper_format_get_raw_stream(file);

View File

@@ -362,8 +362,8 @@ void subbrute_protocol_default_generate_file(
stream, stream,
subbrute_key_file_start_with_tail, subbrute_key_file_start_with_tail,
frequency, frequency,
preset, subbrute_protocol_preset(preset),
file, subbrute_protocol_file(file),
bits, bits,
furi_string_get_cstr(candidate), furi_string_get_cstr(candidate),
te, te,
@@ -373,8 +373,8 @@ void subbrute_protocol_default_generate_file(
stream, stream,
subbrute_key_file_start_no_tail, subbrute_key_file_start_no_tail,
frequency, frequency,
preset, subbrute_protocol_preset(preset),
file, subbrute_protocol_file(file),
bits, bits,
furi_string_get_cstr(candidate), furi_string_get_cstr(candidate),
repeat); repeat);
@@ -409,8 +409,8 @@ void subbrute_protocol_file_generate_file(
stream, stream,
subbrute_key_file_start_with_tail, subbrute_key_file_start_with_tail,
frequency, frequency,
preset, subbrute_protocol_preset(preset),
file, subbrute_protocol_file(file),
bits, bits,
furi_string_get_cstr(candidate), furi_string_get_cstr(candidate),
te, te,
@@ -420,8 +420,8 @@ void subbrute_protocol_file_generate_file(
stream, stream,
subbrute_key_file_start_no_tail, subbrute_key_file_start_no_tail,
frequency, frequency,
preset, subbrute_protocol_preset(preset),
file, subbrute_protocol_file(file),
bits, bits,
furi_string_get_cstr(candidate), furi_string_get_cstr(candidate),
repeat); repeat);