diff --git a/applications/main/subghz/scenes/subghz_scene_receiver.c b/applications/main/subghz/scenes/subghz_scene_receiver.c index 29809147b..95a5fb06d 100644 --- a/applications/main/subghz/scenes/subghz_scene_receiver.c +++ b/applications/main/subghz/scenes/subghz_scene_receiver.c @@ -122,7 +122,7 @@ static void subghz_scene_add_to_history_callback( subghz->state_notifications = SubGhzNotificationStateRxDone; - if(subghz->ignore_duplicates) { + if(subghz->remove_duplicates) { // Look in history for signal hash uint8_t hash_data = subghz_protocol_decoder_base_get_hash_data(decoder_base); uint16_t menu_idx = subghz_view_receiver_get_idx_menu(subghz->subghz_receiver); diff --git a/applications/main/subghz/scenes/subghz_scene_receiver_config.c b/applications/main/subghz/scenes/subghz_scene_receiver_config.c index 3d396b7a0..9f54a3e69 100644 --- a/applications/main/subghz/scenes/subghz_scene_receiver_config.c +++ b/applications/main/subghz/scenes/subghz_scene_receiver_config.c @@ -10,7 +10,7 @@ enum SubGhzSettingIndex { SubGhzSettingIndexRAWSound = SubGhzSettingIndexHopping, SubGhzSettingIndexBinRAW, SubGhzSettingIndexRAWRSSIThreshold = SubGhzSettingIndexBinRAW, - SubGhzSettingIndexIgnoreDuplicates, + SubGhzSettingIndexRemoveDuplicates, SubGhzSettingIndexIgnoreStarline, SubGhzSettingIndexIgnoreCars, SubGhzSettingIndexIgnoreMagellan, @@ -274,7 +274,7 @@ static void subghz_scene_receiver_config_set_duplicates(VariableItem* item) { variable_item_set_current_value_text(item, combobox_text[index]); - subghz->last_settings->ignore_duplicates = subghz->ignore_duplicates = index; + subghz->last_settings->remove_duplicates = subghz->remove_duplicates = index; } static inline bool subghz_scene_receiver_config_ignore_filter_get_index( @@ -338,9 +338,9 @@ static void subghz_scene_receiver_config_var_list_enter_callback(void* context, subghz_threshold_rssi_set(subghz->threshold_rssi, raw_threshold_rssi_value[default_index]); subghz->filter = bin_raw_value[0]; subghz->ignore_filter = 0x00; - subghz->ignore_duplicates = false; + subghz->remove_duplicates = false; subghz_txrx_receiver_set_filter(subghz->txrx, subghz->filter); - subghz->last_settings->ignore_duplicates = subghz->ignore_duplicates; + subghz->last_settings->remove_duplicates = subghz->remove_duplicates; subghz->last_settings->ignore_filter = subghz->ignore_filter; subghz->last_settings->filter = subghz->filter; @@ -433,12 +433,12 @@ void subghz_scene_receiver_config_on_enter(void* context) { SubGhzCustomEventManagerSet) { item = variable_item_list_add( subghz->variable_item_list, - "Ignore Duplicates", + "Remove Duplicates", COMBO_BOX_COUNT, subghz_scene_receiver_config_set_duplicates, subghz); - value_index = subghz->ignore_duplicates; + value_index = subghz->remove_duplicates; variable_item_set_current_value_index(item, value_index); variable_item_set_current_value_text(item, combobox_text[value_index]); diff --git a/applications/main/subghz/subghz.c b/applications/main/subghz/subghz.c index bf835c83c..a972d05b5 100644 --- a/applications/main/subghz/subghz.c +++ b/applications/main/subghz/subghz.c @@ -223,13 +223,13 @@ SubGhz* subghz_alloc(bool alloc_for_tx_only) { subghz->secure_data = malloc(sizeof(SecureData)); if(!alloc_for_tx_only) { - subghz->ignore_duplicates = subghz->last_settings->ignore_duplicates; + subghz->remove_duplicates = subghz->last_settings->remove_duplicates; subghz->ignore_filter = subghz->last_settings->ignore_filter; subghz->filter = subghz->last_settings->filter; } else { subghz->filter = SubGhzProtocolFlag_Decodable; subghz->ignore_filter = 0x0; - subghz->ignore_duplicates = false; + subghz->remove_duplicates = false; } subghz_txrx_receiver_set_filter(subghz->txrx, subghz->filter); subghz_txrx_set_need_save_callback(subghz->txrx, subghz_save_to_file, subghz); diff --git a/applications/main/subghz/subghz_i.h b/applications/main/subghz/subghz_i.h index e032d3294..5357808d4 100644 --- a/applications/main/subghz/subghz_i.h +++ b/applications/main/subghz/subghz_i.h @@ -84,7 +84,7 @@ struct SubGhz { SubGhzProtocolFlag filter; SubGhzProtocolFilter ignore_filter; - bool ignore_duplicates; + bool remove_duplicates; FuriString* error_str; SubGhzLock lock; diff --git a/applications/main/subghz/subghz_last_settings.c b/applications/main/subghz/subghz_last_settings.c index 6c4e1638a..08929af7b 100644 --- a/applications/main/subghz/subghz_last_settings.c +++ b/applications/main/subghz/subghz_last_settings.c @@ -17,7 +17,7 @@ #define SUBGHZ_LAST_SETTING_FIELD_EXTERNAL_MODULE_POWER_AMP "ExtPowerAmp" #define SUBGHZ_LAST_SETTING_FIELD_GPS "Gps" #define SUBGHZ_LAST_SETTING_FIELD_HOPPING_ENABLE "Hopping" -#define SUBGHZ_LAST_SETTING_FIELD_IGNORE_DUPLICATES "IgnoreDuplicates" +#define SUBGHZ_LAST_SETTING_FIELD_REMOVE_DUPLICATES "RemoveDuplicates" #define SUBGHZ_LAST_SETTING_FIELD_IGNORE_FILTER "IgnoreFilter" #define SUBGHZ_LAST_SETTING_FIELD_FILTER "Filter" #define SUBGHZ_LAST_SETTING_FIELD_RSSI_THRESHOLD "RSSI" @@ -46,7 +46,7 @@ void subghz_last_settings_load(SubGhzLastSettings* instance, size_t preset_count bool temp_external_module_power_amp = false; bool temp_timestamp_file_names = false; bool temp_enable_hopping = false; - bool temp_ignore_duplicates = false; + bool temp_remove_duplicates = false; uint32_t temp_ignore_filter = 0; uint32_t temp_filter = 0; float temp_rssi = 0; @@ -56,7 +56,7 @@ void subghz_last_settings_load(SubGhzLastSettings* instance, size_t preset_count bool rssi_was_read = false; bool filter_was_read = false; bool ignore_filter_was_read = false; - bool ignore_duplicates_was_read = false; + bool remove_duplicates_was_read = false; bool frequency_analyzer_feedback_level_was_read = false; bool frequency_analyzer_trigger_was_read = false; uint32_t temp_gps_baudrate = 0; @@ -106,10 +106,10 @@ void subghz_last_settings_load(SubGhzLastSettings* instance, size_t preset_count 1); rssi_was_read = flipper_format_read_float( fff_data_file, SUBGHZ_LAST_SETTING_FIELD_RSSI_THRESHOLD, (float*)&temp_rssi, 1); - ignore_duplicates_was_read = flipper_format_read_bool( + remove_duplicates_was_read = flipper_format_read_bool( fff_data_file, - SUBGHZ_LAST_SETTING_FIELD_IGNORE_DUPLICATES, - (bool*)&temp_ignore_duplicates, + SUBGHZ_LAST_SETTING_FIELD_REMOVE_DUPLICATES, + (bool*)&temp_remove_duplicates, 1); ignore_filter_was_read = flipper_format_read_uint32( fff_data_file, @@ -135,7 +135,7 @@ void subghz_last_settings_load(SubGhzLastSettings* instance, size_t preset_count instance->external_module_power_amp = false; instance->gps_baudrate = 0; instance->enable_hopping = false; - instance->ignore_duplicates = false; + instance->remove_duplicates = false; instance->ignore_filter = 0x00; // See bin_raw_value in applications/main/subghz/scenes/subghz_scene_receiver_config.c instance->filter = SubGhzProtocolFlag_Decodable; @@ -175,7 +175,7 @@ void subghz_last_settings_load(SubGhzLastSettings* instance, size_t preset_count instance->rssi = rssi_was_read ? temp_rssi : SUBGHZ_RAW_THRESHOLD_MIN; instance->enable_hopping = temp_enable_hopping; - instance->ignore_duplicates = ignore_duplicates_was_read ? temp_ignore_duplicates : false; + instance->remove_duplicates = remove_duplicates_was_read ? temp_remove_duplicates : false; instance->ignore_filter = ignore_filter_was_read ? temp_ignore_filter : 0x00; #if SUBGHZ_LAST_SETTING_SAVE_BIN_RAW instance->filter = filter_was_read ? temp_filter : SubGhzProtocolFlag_Decodable; @@ -285,8 +285,8 @@ bool subghz_last_settings_save(SubGhzLastSettings* instance) { } if(!flipper_format_insert_or_update_bool( file, - SUBGHZ_LAST_SETTING_FIELD_IGNORE_DUPLICATES, - &instance->ignore_duplicates, + SUBGHZ_LAST_SETTING_FIELD_REMOVE_DUPLICATES, + &instance->remove_duplicates, 1)) { break; } @@ -345,7 +345,7 @@ void subghz_last_settings_log(SubGhzLastSettings* instance) { instance->preset_index, (double)instance->rssi, subghz_last_settings_log_filter_get_index(instance->filter, SubGhzProtocolFlag_BinRAW), - instance->ignore_duplicates ? LOG_ON : LOG_OFF, + instance->remove_duplicates ? LOG_ON : LOG_OFF, subghz_last_settings_log_filter_get_index( instance->ignore_filter, SubGhzProtocolFilter_StarLine), subghz_last_settings_log_filter_get_index( diff --git a/applications/main/subghz/subghz_last_settings.h b/applications/main/subghz/subghz_last_settings.h index b91e2cd87..7ec241158 100644 --- a/applications/main/subghz/subghz_last_settings.h +++ b/applications/main/subghz/subghz_last_settings.h @@ -28,7 +28,7 @@ typedef struct { bool timestamp_file_names; uint32_t gps_baudrate; bool enable_hopping; - bool ignore_duplicates; + bool remove_duplicates; uint32_t ignore_filter; uint32_t filter; float rssi;