From b3523424347c3512c6c6539da05b0c2976c3f178 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Wed, 21 May 2025 17:34:37 +0300
Subject: [PATCH] rename and extend ignore alarms option in subghz

---
 .../main/subghz/scenes/subghz_scene_receiver_config.c     | 8 ++++----
 lib/subghz/protocols/gangqi.c                             | 3 ++-
 lib/subghz/protocols/hollarm.c                            | 3 ++-
 lib/subghz/protocols/kia.c                                | 2 +-
 lib/subghz/protocols/scher_khan.c                         | 2 +-
 lib/subghz/types.h                                        | 2 +-
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/applications/main/subghz/scenes/subghz_scene_receiver_config.c b/applications/main/subghz/scenes/subghz_scene_receiver_config.c
index f82a45976..e3806eac6 100644
--- a/applications/main/subghz/scenes/subghz_scene_receiver_config.c
+++ b/applications/main/subghz/scenes/subghz_scene_receiver_config.c
@@ -9,7 +9,7 @@ enum SubGhzSettingIndex {
     SubGhzSettingIndexModulation,
     SubGhzSettingIndexBinRAW,
     SubGhzSettingIndexIgnoreStarline,
-    SubGhzSettingIndexIgnoreCars,
+    SubGhzSettingIndexIgnoreAlarms,
     SubGhzSettingIndexIgnoreMagellan,
     SubGhzSettingIndexIgnorePrinceton,
     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) {
-    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) {
@@ -459,13 +459,13 @@ void subghz_scene_receiver_config_on_enter(void* context) {
 
         item = variable_item_list_add(
             subghz->variable_item_list,
-            "Ignore Cars",
+            "Ignore Alarms",
             COMBO_BOX_COUNT,
             subghz_scene_receiver_config_set_auto_alarms,
             subghz);
 
         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_text(item, combobox_text[value_index]);
 
diff --git a/lib/subghz/protocols/gangqi.c b/lib/subghz/protocols/gangqi.c
index 720a4d54a..905c22982 100644
--- a/lib/subghz/protocols/gangqi.c
+++ b/lib/subghz/protocols/gangqi.c
@@ -62,7 +62,8 @@ const SubGhzProtocol subghz_protocol_gangqi = {
     .name = SUBGHZ_PROTOCOL_GANGQI_NAME,
     .type = SubGhzProtocolTypeStatic,
     .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,
     .encoder = &subghz_protocol_gangqi_encoder,
diff --git a/lib/subghz/protocols/hollarm.c b/lib/subghz/protocols/hollarm.c
index fc76affa0..a4cb73352 100644
--- a/lib/subghz/protocols/hollarm.c
+++ b/lib/subghz/protocols/hollarm.c
@@ -62,7 +62,8 @@ const SubGhzProtocol subghz_protocol_hollarm = {
     .name = SUBGHZ_PROTOCOL_HOLLARM_NAME,
     .type = SubGhzProtocolTypeStatic,
     .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,
     .encoder = &subghz_protocol_hollarm_encoder,
diff --git a/lib/subghz/protocols/kia.c b/lib/subghz/protocols/kia.c
index 6988a0ef2..1edd367c2 100644
--- a/lib/subghz/protocols/kia.c
+++ b/lib/subghz/protocols/kia.c
@@ -64,7 +64,7 @@ const SubGhzProtocol subghz_protocol_kia = {
     .name = SUBGHZ_PROTOCOL_KIA_NAME,
     .type = SubGhzProtocolTypeDynamic,
     .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_FM | SubGhzProtocolFlag_Decodable |
-            SubGhzProtocolFlag_AutoAlarms,
+            SubGhzProtocolFlag_Alarms,
 
     .decoder = &subghz_protocol_kia_decoder,
     .encoder = &subghz_protocol_kia_encoder,
diff --git a/lib/subghz/protocols/scher_khan.c b/lib/subghz/protocols/scher_khan.c
index 53b7935d6..d1aad4ee6 100644
--- a/lib/subghz/protocols/scher_khan.c
+++ b/lib/subghz/protocols/scher_khan.c
@@ -70,7 +70,7 @@ const SubGhzProtocol subghz_protocol_scher_khan = {
     .name = SUBGHZ_PROTOCOL_SCHER_KHAN_NAME,
     .type = SubGhzProtocolTypeDynamic,
     .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_FM | SubGhzProtocolFlag_Decodable |
-            SubGhzProtocolFlag_Save | SubGhzProtocolFlag_AutoAlarms,
+            SubGhzProtocolFlag_Save | SubGhzProtocolFlag_Alarms,
 
     .decoder = &subghz_protocol_scher_khan_decoder,
     .encoder = &subghz_protocol_scher_khan_encoder,
diff --git a/lib/subghz/types.h b/lib/subghz/types.h
index b133a62bb..31264a0ad 100644
--- a/lib/subghz/types.h
+++ b/lib/subghz/types.h
@@ -126,7 +126,7 @@ typedef enum {
     SubGhzProtocolFlag_Send = (1 << 9),
     SubGhzProtocolFlag_BinRAW = (1 << 10),
     SubGhzProtocolFlag_StarLine = (1 << 11),
-    SubGhzProtocolFlag_AutoAlarms = (1 << 12),
+    SubGhzProtocolFlag_Alarms = (1 << 12),
     SubGhzProtocolFlag_Magellan = (1 << 13),
     SubGhzProtocolFlag_Princeton = (1 << 14),
     SubGhzProtocolFlag_NiceFlorS = (1 << 15),