DarkFlippers/unleashed-firmware
1
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2024-12-25 22:32:29 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix-subghz-last-used-settings' into dev

Browse Source
This commit is contained in:
MX 2022-09-16 22:45:43 +03:00
commit d390381d5a
No known key found for this signature in database
GPG Key ID: 6C4C311DFD4B4AB5
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
applications/main/subghz/scenes/subghz_scene_receiver_config.c
View File

@ -2,6 +2,8 @@
#include <lib/subghz/protocols/raw.h> #include <lib/subghz/protocols/raw.h>
#define TAG "SubGhzSceneReceiverConfig"
enum SubGhzSettingIndex { enum SubGhzSettingIndex {
SubGhzSettingIndexFrequency, SubGhzSettingIndexFrequency,
SubGhzSettingIndexHopping, SubGhzSettingIndexHopping,
@ -227,7 +229,8 @@ static void subghz_scene_receiver_config_set_hopping_running(VariableItem* item)
subghz_setting_get_frequency_default_index(subghz->setting)); subghz_setting_get_frequency_default_index(subghz->setting));
} }
subghz->txrx->hopper_state = subghz->last_setting->hopping = hopping_value[index]; subghz->txrx->hopper_state = hopping_value[index];
subghz->last_setting->hopping = hopping_value[index];
} }
static void subghz_scene_receiver_config_var_list_enter_callback(void* context, uint32_t index) { static void subghz_scene_receiver_config_var_list_enter_callback(void* context, uint32_t index) {

2
applications/main/subghz/subghz_history.c
View File

@ -142,7 +142,7 @@ bool subghz_history_add_to_history(
if((instance->code_last_hash_data == if((instance->code_last_hash_data ==
subghz_protocol_decoder_base_get_hash_data(decoder_base)) && subghz_protocol_decoder_base_get_hash_data(decoder_base)) &&
((furi_get_tick() - instance->last_update_timestamp) < 500)) { ((furi_get_tick() - instance->last_update_timestamp) < 500)) {
//FURI_LOG_W(TAG, "Too short period for add"); FURI_LOG_W(TAG, "Too short period for add");
instance->last_update_timestamp = furi_get_tick(); instance->last_update_timestamp = furi_get_tick();
return false; return false;
} }

1
applications/main/subghz/views/receiver.c
View File

@ -340,6 +340,7 @@ bool subghz_view_receiver_input(InputEvent* event, void* context) {
return true; return true;
}); });
} else if(event->key == InputKeyLeft && event->type == InputTypeShort) { } else if(event->key == InputKeyLeft && event->type == InputTypeShort) {
//Config receiver
subghz_receiver->callback(SubGhzCustomEventViewReceiverConfig, subghz_receiver->context); subghz_receiver->callback(SubGhzCustomEventViewReceiverConfig, subghz_receiver->context);
} else if(event->key == InputKeyOk && event->type == InputTypeShort) { } else if(event->key == InputKeyOk && event->type == InputTypeShort) {
with_view_model( with_view_model(