diff --git a/applications/main/subghz/helpers/subghz_txrx.c b/applications/main/subghz/helpers/subghz_txrx.c index 70ec48ab7..d0489db49 100644 --- a/applications/main/subghz/helpers/subghz_txrx.c +++ b/applications/main/subghz/helpers/subghz_txrx.c @@ -701,7 +701,7 @@ void subghz_txrx_set_default_preset(SubGhzTxRx* instance, uint32_t frequency) { if(frequency == 0) { frequency = subghz_setting_get_default_frequency(subghz_txrx_get_setting(instance)); } - subghz_txrx_set_preset(instance, default_modulation, frequency, 0, 0, NULL, 0); + subghz_txrx_set_preset(instance, default_modulation, frequency, NAN, NAN, NULL, 0); } const char* @@ -716,8 +716,8 @@ const char* instance, preset_name, frequency, - 0, - 0, + NAN, + NAN, subghz_setting_get_preset_data(setting, index), subghz_setting_get_preset_data_size(setting, index)); diff --git a/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c b/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c index 680935fbb..00ae4a201 100644 --- a/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c +++ b/applications/main/subghz/helpers/subghz_txrx_create_protocol_key.c @@ -25,7 +25,7 @@ bool subghz_txrx_gen_data_protocol( bool res = false; - subghz_txrx_set_preset(instance, preset_name, frequency, 0, 0, NULL, 0); + subghz_txrx_set_preset(instance, preset_name, frequency, NAN, NAN, NULL, 0); instance->decoder_result = subghz_receiver_search_decoder_base_by_name(instance->receiver, protocol_name); @@ -98,7 +98,7 @@ bool subghz_txrx_gen_keeloq_protocol( //TODO lead to a general appearance instance->transmitter = subghz_transmitter_alloc_init(instance->environment, SUBGHZ_PROTOCOL_KEELOQ_NAME); - subghz_txrx_set_preset(instance, preset_name, frequency, 0, 0, NULL, 0); + subghz_txrx_set_preset(instance, preset_name, frequency, NAN, NAN, NULL, 0); if(instance->transmitter && subghz_protocol_keeloq_create_data( @@ -131,7 +131,7 @@ bool subghz_txrx_gen_keeloq_bft_protocol( txrx->transmitter = subghz_transmitter_alloc_init(txrx->environment, SUBGHZ_PROTOCOL_KEELOQ_NAME); - subghz_txrx_set_preset(txrx, preset_name, frequency, 0, 0, NULL, 0); + subghz_txrx_set_preset(txrx, preset_name, frequency, NAN, NAN, NULL, 0); if(txrx->transmitter && subghz_protocol_keeloq_bft_create_data( subghz_transmitter_get_protocol_instance(txrx->transmitter), @@ -175,7 +175,7 @@ bool subghz_txrx_gen_nice_flor_s_protocol( txrx->transmitter = subghz_transmitter_alloc_init(txrx->environment, SUBGHZ_PROTOCOL_NICE_FLOR_S_NAME); - subghz_txrx_set_preset(txrx, preset_name, frequency, 0, 0, NULL, 0); + subghz_txrx_set_preset(txrx, preset_name, frequency, NAN, NAN, NULL, 0); if(txrx->transmitter && subghz_protocol_nice_flor_s_create_data( subghz_transmitter_get_protocol_instance(txrx->transmitter), @@ -208,7 +208,7 @@ bool subghz_txrx_gen_faac_slh_protocol( txrx->transmitter = subghz_transmitter_alloc_init(txrx->environment, SUBGHZ_PROTOCOL_FAAC_SLH_NAME); - subghz_txrx_set_preset(txrx, preset_name, frequency, 0, 0, NULL, 0); + subghz_txrx_set_preset(txrx, preset_name, frequency, NAN, NAN, NULL, 0); if(txrx->transmitter && subghz_protocol_faac_slh_create_data( subghz_transmitter_get_protocol_instance(txrx->transmitter), @@ -251,7 +251,7 @@ bool subghz_txrx_gen_alutech_at_4n_protocol( txrx->transmitter = subghz_transmitter_alloc_init(txrx->environment, SUBGHZ_PROTOCOL_ALUTECH_AT_4N_NAME); - subghz_txrx_set_preset(txrx, preset_name, frequency, 0, 0, NULL, 0); + subghz_txrx_set_preset(txrx, preset_name, frequency, NAN, NAN, NULL, 0); if(txrx->transmitter && subghz_protocol_alutech_at_4n_create_data( subghz_transmitter_get_protocol_instance(txrx->transmitter), @@ -280,7 +280,7 @@ bool subghz_txrx_gen_came_atomo_protocol( txrx->transmitter = subghz_transmitter_alloc_init(txrx->environment, SUBGHZ_PROTOCOL_CAME_ATOMO_NAME); - subghz_txrx_set_preset(txrx, preset_name, frequency, 0, 0, NULL, 0); + subghz_txrx_set_preset(txrx, preset_name, frequency, NAN, NAN, NULL, 0); if(txrx->transmitter && subghz_protocol_came_atomo_create_data( subghz_transmitter_get_protocol_instance(txrx->transmitter), @@ -309,7 +309,7 @@ bool subghz_txrx_gen_somfy_telis_protocol( txrx->transmitter = subghz_transmitter_alloc_init(txrx->environment, SUBGHZ_PROTOCOL_SOMFY_TELIS_NAME); - subghz_txrx_set_preset(txrx, preset_name, frequency, 0, 0, NULL, 0); + subghz_txrx_set_preset(txrx, preset_name, frequency, NAN, NAN, NULL, 0); if(txrx->transmitter && subghz_protocol_somfy_telis_create_data( subghz_transmitter_get_protocol_instance(txrx->transmitter), @@ -338,7 +338,7 @@ bool subghz_txrx_gen_secplus_v2_protocol( bool ret = false; instance->transmitter = subghz_transmitter_alloc_init(instance->environment, SUBGHZ_PROTOCOL_SECPLUS_V2_NAME); - subghz_txrx_set_preset(instance, name_preset, frequency, 0, 0, NULL, 0); + subghz_txrx_set_preset(instance, name_preset, frequency, NAN, NAN, NULL, 0); if(instance->transmitter) { subghz_protocol_secplus_v2_create_data( subghz_transmitter_get_protocol_instance(instance->transmitter), diff --git a/applications/main/subghz/scenes/subghz_scene_need_saving.c b/applications/main/subghz/scenes/subghz_scene_need_saving.c index 64ab2cbf2..5095b5ca2 100644 --- a/applications/main/subghz/scenes/subghz_scene_need_saving.c +++ b/applications/main/subghz/scenes/subghz_scene_need_saving.c @@ -57,7 +57,7 @@ bool subghz_scene_need_saving_on_event(void* context, SceneManagerEvent event) { } subghz_txrx_set_preset( - subghz->txrx, "AM650", subghz->last_settings->frequency, 0, 0, NULL, 0); + subghz->txrx, "AM650", subghz->last_settings->frequency, NAN, NAN, NULL, 0); scene_manager_search_and_switch_to_previous_scene( subghz->scene_manager, SubGhzSceneStart); } else if(state == SubGhzRxKeyStateTX) { diff --git a/applications/main/subghz/scenes/subghz_scene_receiver_config.c b/applications/main/subghz/scenes/subghz_scene_receiver_config.c index 5d02cb387..ce0d82ee6 100644 --- a/applications/main/subghz/scenes/subghz_scene_receiver_config.c +++ b/applications/main/subghz/scenes/subghz_scene_receiver_config.c @@ -178,8 +178,8 @@ static void subghz_scene_receiver_config_set_frequency(VariableItem* item) { subghz->txrx, furi_string_get_cstr(preset.name), frequency, - 0, - 0, + NAN, + NAN, preset.data, preset.data_size); @@ -206,8 +206,8 @@ static void subghz_scene_receiver_config_set_preset(VariableItem* item) { subghz->txrx, preset_name, preset.frequency, - 0, - 0, + NAN, + NAN, subghz_setting_get_preset_data(setting, index), subghz_setting_get_preset_data_size(setting, index)); subghz->last_settings->preset_index = index; @@ -240,8 +240,8 @@ static void subghz_scene_receiver_config_set_hopping_running(VariableItem* item) subghz->txrx, furi_string_get_cstr(preset.name), frequency, - 0, - 0, + NAN, + NAN, preset.data, preset.data_size); variable_item_set_current_value_index( diff --git a/applications/main/subghz/scenes/subghz_scene_receiver_info.c b/applications/main/subghz/scenes/subghz_scene_receiver_info.c index 87cdefcd2..5e1008d85 100644 --- a/applications/main/subghz/scenes/subghz_scene_receiver_info.c +++ b/applications/main/subghz/scenes/subghz_scene_receiver_info.c @@ -40,8 +40,8 @@ static bool subghz_scene_receiver_info_update_parser(void* context) { subghz->txrx, furi_string_get_cstr(preset->name), preset->frequency, - 0, - 0, + NAN, + NAN, preset->data, preset->data_size);