mirrors/unleashed-firmware
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-12 04:34:43 +04:00
Code Issues Activity

rename and extend ignore alarms option in subghz

Browse Source
This commit is contained in:
MX
2025-05-21 17:34:37 +03:00
parent 82c7231c57
commit b352342434
6 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@ enum SubGhzSettingIndex {
SubGhzSettingIndexModulation, SubGhzSettingIndexModulation,
SubGhzSettingIndexBinRAW, SubGhzSettingIndexBinRAW,
SubGhzSettingIndexIgnoreStarline, SubGhzSettingIndexIgnoreStarline,
SubGhzSettingIndexIgnoreCars, SubGhzSettingIndexIgnoreAlarms,
SubGhzSettingIndexIgnoreMagellan, SubGhzSettingIndexIgnoreMagellan,
SubGhzSettingIndexIgnorePrinceton, SubGhzSettingIndexIgnorePrinceton,
SubGhzSettingIndexIgnoreNiceFlorS, SubGhzSettingIndexIgnoreNiceFlorS,
@@ -306,7 +306,7 @@ static void subghz_scene_receiver_config_set_starline(VariableItem* item) {
} }
static void subghz_scene_receiver_config_set_auto_alarms(VariableItem* item) { static void subghz_scene_receiver_config_set_auto_alarms(VariableItem* item) {
subghz_scene_receiver_config_set_ignore_filter(item, SubGhzProtocolFlag_AutoAlarms); subghz_scene_receiver_config_set_ignore_filter(item, SubGhzProtocolFlag_Alarms);
} }
static void subghz_scene_receiver_config_set_magellan(VariableItem* item) { static void subghz_scene_receiver_config_set_magellan(VariableItem* item) {
@@ -459,13 +459,13 @@ void subghz_scene_receiver_config_on_enter(void* context) {
item = variable_item_list_add( item = variable_item_list_add(
subghz->variable_item_list, subghz->variable_item_list,
"Ignore Cars", "Ignore Alarms",
COMBO_BOX_COUNT, COMBO_BOX_COUNT,
subghz_scene_receiver_config_set_auto_alarms, subghz_scene_receiver_config_set_auto_alarms,
subghz); subghz);
value_index = subghz_scene_receiver_config_ignore_filter_get_index( value_index = subghz_scene_receiver_config_ignore_filter_get_index(
subghz->ignore_filter, SubGhzProtocolFlag_AutoAlarms); subghz->ignore_filter, SubGhzProtocolFlag_Alarms);
variable_item_set_current_value_index(item, value_index); variable_item_set_current_value_index(item, value_index);
variable_item_set_current_value_text(item, combobox_text[value_index]); variable_item_set_current_value_text(item, combobox_text[value_index]);

3
lib/subghz/protocols/gangqi.c
View File

@@ -62,7 +62,8 @@ const SubGhzProtocol subghz_protocol_gangqi = {
.name = SUBGHZ_PROTOCOL_GANGQI_NAME, .name = SUBGHZ_PROTOCOL_GANGQI_NAME,
.type = SubGhzProtocolTypeStatic, .type = SubGhzProtocolTypeStatic,
.flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable | .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable |
SubGhzProtocolFlag_Load | SubGhzProtocolFlag_Save | SubGhzProtocolFlag_Send, SubGhzProtocolFlag_Load | SubGhzProtocolFlag_Save | SubGhzProtocolFlag_Send |
SubGhzProtocolFlag_Alarms,
.decoder = &subghz_protocol_gangqi_decoder, .decoder = &subghz_protocol_gangqi_decoder,
.encoder = &subghz_protocol_gangqi_encoder, .encoder = &subghz_protocol_gangqi_encoder,

3
lib/subghz/protocols/hollarm.c
View File

@@ -62,7 +62,8 @@ const SubGhzProtocol subghz_protocol_hollarm = {
.name = SUBGHZ_PROTOCOL_HOLLARM_NAME, .name = SUBGHZ_PROTOCOL_HOLLARM_NAME,
.type = SubGhzProtocolTypeStatic, .type = SubGhzProtocolTypeStatic,
.flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable | .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable |
SubGhzProtocolFlag_Load | SubGhzProtocolFlag_Save | SubGhzProtocolFlag_Send, SubGhzProtocolFlag_Load | SubGhzProtocolFlag_Save | SubGhzProtocolFlag_Send |
SubGhzProtocolFlag_Alarms,
.decoder = &subghz_protocol_hollarm_decoder, .decoder = &subghz_protocol_hollarm_decoder,
.encoder = &subghz_protocol_hollarm_encoder, .encoder = &subghz_protocol_hollarm_encoder,

2
lib/subghz/protocols/kia.c
View File

@@ -64,7 +64,7 @@ const SubGhzProtocol subghz_protocol_kia = {
.name = SUBGHZ_PROTOCOL_KIA_NAME, .name = SUBGHZ_PROTOCOL_KIA_NAME,
.type = SubGhzProtocolTypeDynamic, .type = SubGhzProtocolTypeDynamic,
.flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_FM | SubGhzProtocolFlag_Decodable | .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_FM | SubGhzProtocolFlag_Decodable |
SubGhzProtocolFlag_AutoAlarms, SubGhzProtocolFlag_Alarms,
.decoder = &subghz_protocol_kia_decoder, .decoder = &subghz_protocol_kia_decoder,
.encoder = &subghz_protocol_kia_encoder, .encoder = &subghz_protocol_kia_encoder,

2
lib/subghz/protocols/scher_khan.c
View File

@@ -70,7 +70,7 @@ const SubGhzProtocol subghz_protocol_scher_khan = {
.name = SUBGHZ_PROTOCOL_SCHER_KHAN_NAME, .name = SUBGHZ_PROTOCOL_SCHER_KHAN_NAME,
.type = SubGhzProtocolTypeDynamic, .type = SubGhzProtocolTypeDynamic,
.flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_FM | SubGhzProtocolFlag_Decodable | .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_FM | SubGhzProtocolFlag_Decodable |
SubGhzProtocolFlag_Save | SubGhzProtocolFlag_AutoAlarms, SubGhzProtocolFlag_Save | SubGhzProtocolFlag_Alarms,
.decoder = &subghz_protocol_scher_khan_decoder, .decoder = &subghz_protocol_scher_khan_decoder,
.encoder = &subghz_protocol_scher_khan_encoder, .encoder = &subghz_protocol_scher_khan_encoder,

2
lib/subghz/types.h
View File

@@ -126,7 +126,7 @@ typedef enum {
SubGhzProtocolFlag_Send = (1 << 9), SubGhzProtocolFlag_Send = (1 << 9),
SubGhzProtocolFlag_BinRAW = (1 << 10), SubGhzProtocolFlag_BinRAW = (1 << 10),
SubGhzProtocolFlag_StarLine = (1 << 11), SubGhzProtocolFlag_StarLine = (1 << 11),
SubGhzProtocolFlag_AutoAlarms = (1 << 12), SubGhzProtocolFlag_Alarms = (1 << 12),
SubGhzProtocolFlag_Magellan = (1 << 13), SubGhzProtocolFlag_Magellan = (1 << 13),
SubGhzProtocolFlag_Princeton = (1 << 14), SubGhzProtocolFlag_Princeton = (1 << 14),
SubGhzProtocolFlag_NiceFlorS = (1 << 15), SubGhzProtocolFlag_NiceFlorS = (1 << 15),