Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/ClusterM/flipperzero-firmware.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorあく <alleteam@gmail.com>2022-04-15 19:31:25 +0300
committerGitHub <noreply@github.com>2022-04-15 19:31:25 +0300
commitc209ec56fc0b5efe6c91d44a8663206b15f15b09 (patch)
treefddd2e6e5c3dc8763109487ec2b26b20c4ffdea8 /applications/subghz/scenes
parent9b654332113629f24b04b48b61e2c43c91a66fa8 (diff)
Release Candidate Bug Fixes and Improvements (#1121)
* Notification: use all input for backlight, otherwise it is causing issues on repeat. Dolphin: rework debug tools. * Notification: remove unused variable * Applications: fix incorrect count in system apps list * SubGhz: fix memory leak in settings * SubGhz: fix incorrect frequency in newly created keys * Loader: make cli command parallel safe
Diffstat (limited to 'applications/subghz/scenes')
-rw-r--r--applications/subghz/scenes/subghz_scene_read_raw.c3
-rw-r--r--applications/subghz/scenes/subghz_scene_receiver.c3
-rw-r--r--applications/subghz/scenes/subghz_scene_receiver_config.c12
-rw-r--r--applications/subghz/scenes/subghz_scene_set_type.c4
4 files changed, 7 insertions, 15 deletions
diff --git a/applications/subghz/scenes/subghz_scene_read_raw.c b/applications/subghz/scenes/subghz_scene_read_raw.c
index cbd64f8f..10248c35 100644
--- a/applications/subghz/scenes/subghz_scene_read_raw.c
+++ b/applications/subghz/scenes/subghz_scene_read_raw.c
@@ -127,8 +127,7 @@ bool subghz_scene_read_raw_on_event(void* context, SceneManagerEvent event) {
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneNeedSaving);
} else {
//Restore default setting
- subghz->txrx->frequency = subghz_setting_get_frequency(
- subghz->setting, subghz_setting_get_frequency_default_index(subghz->setting));
+ subghz->txrx->frequency = subghz_setting_get_default_frequency(subghz->setting);
subghz->txrx->preset = FuriHalSubGhzPresetOok650Async;
if(!scene_manager_search_and_switch_to_previous_scene(
subghz->scene_manager, SubGhzSceneSaved)) {
diff --git a/applications/subghz/scenes/subghz_scene_receiver.c b/applications/subghz/scenes/subghz_scene_receiver.c
index 8a5ee921..7183410b 100644
--- a/applications/subghz/scenes/subghz_scene_receiver.c
+++ b/applications/subghz/scenes/subghz_scene_receiver.c
@@ -120,8 +120,7 @@ bool subghz_scene_receiver_on_event(void* context, SceneManagerEvent event) {
subghz_sleep(subghz);
};
subghz->txrx->hopper_state = SubGhzHopperStateOFF;
- subghz->txrx->frequency = subghz_setting_get_frequency(
- subghz->setting, subghz_setting_get_frequency_default_index(subghz->setting));
+ subghz->txrx->frequency = subghz_setting_get_default_frequency(subghz->setting);
subghz->txrx->preset = FuriHalSubGhzPresetOok650Async;
subghz->txrx->idx_menu_chosen = 0;
subghz_receiver_set_rx_callback(subghz->txrx->receiver, NULL, subghz);
diff --git a/applications/subghz/scenes/subghz_scene_receiver_config.c b/applications/subghz/scenes/subghz_scene_receiver_config.c
index f2ae749f..d98f45af 100644
--- a/applications/subghz/scenes/subghz_scene_receiver_config.c
+++ b/applications/subghz/scenes/subghz_scene_receiver_config.c
@@ -111,19 +111,13 @@ static void subghz_scene_receiver_config_set_hopping_runing(VariableItem* item)
sprintf(
text_buf,
"%lu.%02lu",
- subghz_setting_get_frequency(
- subghz->setting, subghz_setting_get_frequency_default_index(subghz->setting)) /
- 1000000,
- (subghz_setting_get_frequency(
- subghz->setting, subghz_setting_get_frequency_default_index(subghz->setting)) %
- 1000000) /
- 10000);
+ subghz_setting_get_default_frequency(subghz->setting) / 1000000,
+ (subghz_setting_get_default_frequency(subghz->setting) % 1000000) / 10000);
variable_item_set_current_value_text(
(VariableItem*)scene_manager_get_scene_state(
subghz->scene_manager, SubGhzSceneReceiverConfig),
text_buf);
- subghz->txrx->frequency = subghz_setting_get_frequency(
- subghz->setting, subghz_setting_get_frequency_default_index(subghz->setting));
+ subghz->txrx->frequency = subghz_setting_get_default_frequency(subghz->setting);
variable_item_set_current_value_index(
(VariableItem*)scene_manager_get_scene_state(
subghz->scene_manager, SubGhzSceneReceiverConfig),
diff --git a/applications/subghz/scenes/subghz_scene_set_type.c b/applications/subghz/scenes/subghz_scene_set_type.c
index 4fb36467..22a15143 100644
--- a/applications/subghz/scenes/subghz_scene_set_type.c
+++ b/applications/subghz/scenes/subghz_scene_set_type.c
@@ -46,7 +46,7 @@ bool subghz_scene_set_type_submenu_gen_data_protocol(
if(!subghz_protocol_decoder_base_serialize(
subghz->txrx->decoder_result,
subghz->txrx->fff_data,
- subghz_setting_get_frequency_default_index(subghz->setting),
+ subghz_setting_get_default_frequency(subghz->setting),
FuriHalSubGhzPresetOok650Async)) {
FURI_LOG_E(TAG, "Unable to serialize");
break;
@@ -213,7 +213,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
0x2,
0x0003,
"DoorHan",
- subghz_setting_get_frequency_default_index(subghz->setting),
+ subghz_setting_get_default_frequency(subghz->setting),
FuriHalSubGhzPresetOok650Async);
generated_protocol = true;
} else {