Merge branch 'flipperdevices:dev' into dev

This commit is contained in:
Eng1n33r
2022-04-21 19:50:27 +03:00
committed by GitHub
10 changed files with 126 additions and 117 deletions

View File

@@ -252,8 +252,8 @@ void subghz_free(SubGhz* subghz) {
subghz->notifications = NULL;
// About birds
furi_assert(subghz->file_name[SUBGHZ_MAX_LEN_NAME] == 0);
furi_assert(subghz->file_name_tmp[SUBGHZ_MAX_LEN_NAME] == 0);
furi_assert(subghz->file_path[SUBGHZ_MAX_LEN_NAME] == 0);
furi_assert(subghz->file_path_tmp[SUBGHZ_MAX_LEN_NAME] == 0);
// The rest
free(subghz);
@@ -270,12 +270,8 @@ int32_t subghz_app(void* p) {
// Check argument and run corresponding scene
if(p) {
if(subghz_key_load(subghz, p)) {
string_t filename;
string_init(filename);
strncpy(subghz->file_path, p, SUBGHZ_MAX_LEN_NAME);
path_extract_filename_no_ext(p, filename);
strncpy(subghz->file_name, string_get_cstr(filename), SUBGHZ_MAX_LEN_NAME);
string_clear(filename);
if((!strcmp(subghz->txrx->decoder_result->protocol->name, "RAW"))) {
//Load Raw TX
subghz->txrx->rx_key_state = SubGhzRxKeyStateRAWLoad;