Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ul/dev' into mntm-dev --nobuild

Browse Source
This commit is contained in:
WillyJL
2025-06-29 01:28:52 +01:00
parent 03741da5a8 91a235b395
commit 81048d9a7f
14 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
applications/main/subghz/scenes/subghz_scene_frequency_analyzer.c
View File

@@ -71,7 +71,6 @@ bool subghz_scene_frequency_analyzer_on_event(void* context, SceneManagerEvent e
} else if(event.event == SubGhzCustomEventViewFreqAnalOkLong) {
// Don't need to save, we already saved on short event (and on exit event too)
subghz_rx_key_state_set(subghz, SubGhzRxKeyStateIDLE);
scene_manager_set_scene_state(subghz->scene_manager, SubGhzSceneStart, 10);
scene_manager_previous_scene(subghz->scene_manager); // Stops the worker
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneReceiver);
return true;

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

@@ -14,9 +14,9 @@ enum SubGhzSettingIndex {
SubGhzSettingIndexRemoveDuplicates,
SubGhzSettingIndexDeleteOldSignals,
SubGhzSettingIndexAutosave,
SubGhzSettingIndexIgnoreStarline,
SubGhzSettingIndexIgnoreCars,
SubGhzSettingIndexIgnoreAlarms,
SubGhzSettingIndexIgnoreMagellan,
SubGhzSettingIndexIgnoreSensors,
SubGhzSettingIndexIgnorePrinceton,
SubGhzSettingIndexIgnoreNiceFlorS,
// SubGhzSettingIndexIgnoreWeather,
@@ -411,16 +411,16 @@ static inline bool subghz_scene_receiver_config_ignore_filter_get_index(
return READ_BIT(filter, flag) > 0;
}
static void subghz_scene_receiver_config_set_starline(VariableItem* item) {
subghz_scene_receiver_config_set_ignore_filter(item, SubGhzProtocolFilter_StarLine);
static void subghz_scene_receiver_config_set_cars(VariableItem* item) {
subghz_scene_receiver_config_set_ignore_filter(item, SubGhzProtocolFilter_Cars);
}
static void subghz_scene_receiver_config_set_auto_alarms(VariableItem* item) {
static void subghz_scene_receiver_config_set_alarms(VariableItem* item) {
subghz_scene_receiver_config_set_ignore_filter(item, SubGhzProtocolFilter_Alarms);
}
static void subghz_scene_receiver_config_set_magellan(VariableItem* item) {
subghz_scene_receiver_config_set_ignore_filter(item, SubGhzProtocolFilter_Magellan);
static void subghz_scene_receiver_config_set_Sensors(VariableItem* item) {
subghz_scene_receiver_config_set_ignore_filter(item, SubGhzProtocolFilter_Sensors);
}
static void subghz_scene_receiver_config_set_princeton(VariableItem* item) {
@@ -607,13 +607,13 @@ void subghz_scene_receiver_config_on_enter(void* context) {
item = variable_item_list_add(
subghz->variable_item_list,
"Ignore Starline",
"Ignore Cars",
COMBO_BOX_COUNT,
subghz_scene_receiver_config_set_starline,
subghz_scene_receiver_config_set_cars,
subghz);
value_index = subghz_scene_receiver_config_ignore_filter_get_index(
subghz->ignore_filter, SubGhzProtocolFilter_StarLine);
subghz->ignore_filter, SubGhzProtocolFilter_Cars);
variable_item_set_current_value_index(item, value_index);
variable_item_set_current_value_text(item, combobox_text[value_index]);
@@ -621,7 +621,7 @@ void subghz_scene_receiver_config_on_enter(void* context) {
subghz->variable_item_list,
"Ignore Alarms",
COMBO_BOX_COUNT,
subghz_scene_receiver_config_set_auto_alarms,
subghz_scene_receiver_config_set_alarms,
subghz);
value_index = subghz_scene_receiver_config_ignore_filter_get_index(
@@ -631,13 +631,13 @@ void subghz_scene_receiver_config_on_enter(void* context) {
item = variable_item_list_add(
subghz->variable_item_list,
"Ignore Magellan",
"Ignore Sensors",
COMBO_BOX_COUNT,
subghz_scene_receiver_config_set_magellan,
subghz_scene_receiver_config_set_sensors,
subghz);
value_index = subghz_scene_receiver_config_ignore_filter_get_index(
subghz->ignore_filter, SubGhzProtocolFilter_Magellan);
subghz->ignore_filter, SubGhzProtocolFilter_Sensors);
variable_item_set_current_value_index(item, value_index);
variable_item_set_current_value_text(item, combobox_text[value_index]);

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

@@ -299,6 +299,7 @@ bool subghz_frequency_analyzer_input(InputEvent* event, void* context) {
// If it was a long press also send a second event
if(event->type == InputTypeLong && frequency_to_save > 0) {
// Worker stopped on app thread instead of GUI thread when switching scene in callback
instance->callback(SubGhzCustomEventViewFreqAnalOkLong, instance->context);
}
}