subghz better ignore lists

2026-04-24 03:29:57 -07:00 · 2025-05-24 19:49:31 +03:00
parent 4c00313157
commit 3aa3098d47
10 changed files with 26 additions and 24 deletions
--- a/applications/main/subghz/scenes/subghz_scene_receiver_config.c
+++ b/applications/main/subghz/scenes/subghz_scene_receiver_config.c
@@ -8,9 +8,9 @@ enum SubGhzSettingIndex {
    SubGhzSettingIndexHopping,
    SubGhzSettingIndexModulation,
    SubGhzSettingIndexBinRAW,
-    SubGhzSettingIndexIgnoreStarline,
+    SubGhzSettingIndexIgnoreCars,
    SubGhzSettingIndexIgnoreAlarms,
-    SubGhzSettingIndexIgnoreMagellan,
+    SubGhzSettingIndexIgnoreSensors,
    SubGhzSettingIndexIgnorePrinceton,
    SubGhzSettingIndexIgnoreNiceFlorS,
    SubGhzSettingIndexDeleteOldSignals,
@@ -301,16 +301,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, SubGhzProtocolFlag_StarLine);
+static void subghz_scene_receiver_config_set_cars(VariableItem* item) {
+    subghz_scene_receiver_config_set_ignore_filter(item, SubGhzProtocolFlag_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, SubGhzProtocolFlag_Alarms);
 }

-static void subghz_scene_receiver_config_set_magellan(VariableItem* item) {
-    subghz_scene_receiver_config_set_ignore_filter(item, SubGhzProtocolFlag_Magellan);
+static void subghz_scene_receiver_config_set_sensors(VariableItem* item) {
+    subghz_scene_receiver_config_set_ignore_filter(item, SubGhzProtocolFlag_Sensors);
 }

 static void subghz_scene_receiver_config_set_princeton(VariableItem* item) {
@@ -447,13 +447,13 @@ void subghz_scene_receiver_config_on_enter(void* context) {
       SubGhzCustomEventManagerSet) {
        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, SubGhzProtocolFlag_StarLine);
+            subghz->ignore_filter, SubGhzProtocolFlag_Cars);
        variable_item_set_current_value_index(item, value_index);
        variable_item_set_current_value_text(item, combobox_text[value_index]);

@@ -461,7 +461,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(
@@ -471,13 +471,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, SubGhzProtocolFlag_Magellan);
+            subghz->ignore_filter, SubGhzProtocolFlag_Sensors);
        variable_item_set_current_value_index(item, value_index);
        variable_item_set_current_value_text(item, combobox_text[value_index]);

--- a/lib/subghz/protocols/feron.c
+++ b/lib/subghz/protocols/feron.c
@@ -60,7 +60,8 @@ const SubGhzProtocol subghz_protocol_feron = {
    .name = SUBGHZ_PROTOCOL_FERON_NAME,
    .type = SubGhzProtocolTypeStatic,
    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable |
-            SubGhzProtocolFlag_Load | SubGhzProtocolFlag_Save | SubGhzProtocolFlag_Send,
+            SubGhzProtocolFlag_Load | SubGhzProtocolFlag_Save | SubGhzProtocolFlag_Send |
+            SubGhzProtocolFlag_Sensors,

    .decoder = &subghz_protocol_feron_decoder,
    .encoder = &subghz_protocol_feron_encoder,
--- a/lib/subghz/protocols/honeywell.c
+++ b/lib/subghz/protocols/honeywell.c
@@ -364,7 +364,7 @@ const SubGhzProtocol subghz_protocol_honeywell = {
    .type = SubGhzProtocolTypeStatic,
    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_315 | SubGhzProtocolFlag_868 |
            SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable | SubGhzProtocolFlag_Load |
-            SubGhzProtocolFlag_Save | SubGhzProtocolFlag_Send,
+            SubGhzProtocolFlag_Save | SubGhzProtocolFlag_Send | SubGhzProtocolFlag_Sensors,
    .encoder = &subghz_protocol_honeywell_encoder,
    .decoder = &subghz_protocol_honeywell_decoder,

--- a/lib/subghz/protocols/honeywell_wdb.c
+++ b/lib/subghz/protocols/honeywell_wdb.c
@@ -74,7 +74,7 @@ const SubGhzProtocol subghz_protocol_honeywell_wdb = {
    .type = SubGhzProtocolTypeStatic,
    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_315 | SubGhzProtocolFlag_AM |
            SubGhzProtocolFlag_Decodable | SubGhzProtocolFlag_Load | SubGhzProtocolFlag_Save |
-            SubGhzProtocolFlag_Send,
+            SubGhzProtocolFlag_Send | SubGhzProtocolFlag_Sensors,

    .decoder = &subghz_protocol_honeywell_wdb_decoder,
    .encoder = &subghz_protocol_honeywell_wdb_encoder,
--- 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_Alarms,
+            SubGhzProtocolFlag_Cars,

    .decoder = &subghz_protocol_kia_decoder,
    .encoder = &subghz_protocol_kia_encoder,
--- a/lib/subghz/protocols/legrand.c
+++ b/lib/subghz/protocols/legrand.c
@@ -67,7 +67,8 @@ const SubGhzProtocol subghz_protocol_legrand = {
    .name = SUBGHZ_PROTOCOL_LEGRAND_NAME,
    .type = SubGhzProtocolTypeStatic,
    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable |
-            SubGhzProtocolFlag_Load | SubGhzProtocolFlag_Save | SubGhzProtocolFlag_Send,
+            SubGhzProtocolFlag_Load | SubGhzProtocolFlag_Save | SubGhzProtocolFlag_Send |
+            SubGhzProtocolFlag_Sensors,

    .decoder = &subghz_protocol_legrand_decoder,
    .encoder = &subghz_protocol_legrand_encoder,
--- a/lib/subghz/protocols/magellan.c
+++ b/lib/subghz/protocols/magellan.c
@@ -65,7 +65,7 @@ const SubGhzProtocol subghz_protocol_magellan = {
    .type = SubGhzProtocolTypeStatic,
    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable |
            SubGhzProtocolFlag_Load | SubGhzProtocolFlag_Save | SubGhzProtocolFlag_Send |
-            SubGhzProtocolFlag_Magellan,
+            SubGhzProtocolFlag_Sensors,

    .decoder = &subghz_protocol_magellan_decoder,
    .encoder = &subghz_protocol_magellan_encoder,
--- 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_Alarms,
+            SubGhzProtocolFlag_Save | SubGhzProtocolFlag_Cars,

    .decoder = &subghz_protocol_scher_khan_decoder,
    .encoder = &subghz_protocol_scher_khan_encoder,
--- a/lib/subghz/protocols/star_line.c
+++ b/lib/subghz/protocols/star_line.c
@@ -80,7 +80,7 @@ const SubGhzProtocol subghz_protocol_star_line = {
    .type = SubGhzProtocolTypeDynamic,
    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable |
            SubGhzProtocolFlag_Load | SubGhzProtocolFlag_Save | SubGhzProtocolFlag_Send |
-            SubGhzProtocolFlag_StarLine,
+            SubGhzProtocolFlag_Cars,

    .decoder = &subghz_protocol_star_line_decoder,
    .encoder = &subghz_protocol_star_line_encoder,
--- a/lib/subghz/types.h
+++ b/lib/subghz/types.h
@@ -125,9 +125,9 @@ typedef enum {
    SubGhzProtocolFlag_Load = (1 << 8),
    SubGhzProtocolFlag_Send = (1 << 9),
    SubGhzProtocolFlag_BinRAW = (1 << 10),
-    SubGhzProtocolFlag_StarLine = (1 << 11),
+    SubGhzProtocolFlag_Cars = (1 << 11),
    SubGhzProtocolFlag_Alarms = (1 << 12),
-    SubGhzProtocolFlag_Magellan = (1 << 13),
+    SubGhzProtocolFlag_Sensors = (1 << 13),
    SubGhzProtocolFlag_Princeton = (1 << 14),
    SubGhzProtocolFlag_NiceFlorS = (1 << 15),
 } SubGhzProtocolFlag;