From 8e3378b7b9db96f901ed3ea5174988768367d14f Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Mon, 16 Oct 2023 05:06:40 +0300
Subject: [PATCH] SubGHz: add manually fixes

---
 .../main/subghz/helpers/subghz_custom_event.h     |  6 +++---
 .../main/subghz/scenes/subghz_scene_set_type.c    | 15 ++++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/applications/main/subghz/helpers/subghz_custom_event.h b/applications/main/subghz/helpers/subghz_custom_event.h
index 5f1a02673..b0c324f97 100644
--- a/applications/main/subghz/helpers/subghz_custom_event.h
+++ b/applications/main/subghz/helpers/subghz_custom_event.h
@@ -51,9 +51,9 @@ typedef enum {
     SubmenuIndexGateTX,
     SubmenuIndexDoorHan_315_00,
     SubmenuIndexDoorHan_433_92,
-    SubmenuIndexLiftMaster_315_00,
-    SubmenuIndexLiftMaster_390_00,
-    SubmenuIndexLiftMaster_433_00,
+    SubmenuIndexSecPlus_v1_315_00,
+    SubmenuIndexSecPlus_v1_390_00,
+    SubmenuIndexSecPlus_v1_433_00,
     SubmenuIndexSecPlus_v2_310_00,
     SubmenuIndexSecPlus_v2_315_00,
     SubmenuIndexSecPlus_v2_390_00,
diff --git a/applications/main/subghz/scenes/subghz_scene_set_type.c b/applications/main/subghz/scenes/subghz_scene_set_type.c
index d31978015..a778ae8ab 100644
--- a/applications/main/subghz/scenes/subghz_scene_set_type.c
+++ b/applications/main/subghz/scenes/subghz_scene_set_type.c
@@ -278,19 +278,19 @@ void subghz_scene_set_type_on_enter(void* context) {
     submenu_add_item(
         subghz->submenu,
         "Security+1.0 315MHz",
-        SubmenuIndexLiftMaster_315_00,
+        SubmenuIndexSecPlus_v1_315_00,
         subghz_scene_set_type_submenu_callback,
         subghz);
     submenu_add_item(
         subghz->submenu,
         "Security+1.0 390MHz",
-        SubmenuIndexLiftMaster_390_00,
+        SubmenuIndexSecPlus_v1_390_00,
         subghz_scene_set_type_submenu_callback,
         subghz);
     submenu_add_item(
         subghz->submenu,
         "Security+1.0 433MHz",
-        SubmenuIndexLiftMaster_433_00,
+        SubmenuIndexSecPlus_v1_433_00,
         subghz_scene_set_type_submenu_callback,
         subghz);
     submenu_add_item(
@@ -371,7 +371,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
                 subghz->txrx, "AM650", 433920000, SUBGHZ_PROTOCOL_CAME_NAME, key, 24);
             break;
         case SubmenuIndexCAME12bit868:
-            key = (key & 0x0000FFF0) | 0x1; //btn 0x1, 0x2, 0x4
+            key = (key & 0x00000FF0) | 0x1; //btn 0x1, 0x2, 0x4
             generated_protocol = subghz_txrx_gen_data_protocol(
                 subghz->txrx, "AM650", 868350000, SUBGHZ_PROTOCOL_CAME_NAME, key, 12);
             break;
@@ -702,15 +702,15 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
                 scene_manager_next_scene(subghz->scene_manager, SubGhzSceneShowError);
             }
             break;
-        case SubmenuIndexLiftMaster_315_00:
+        case SubmenuIndexSecPlus_v1_315_00:
             generated_protocol =
                 subghz_txrx_gen_secplus_v1_protocol(subghz->txrx, "AM650", 315000000);
             break;
-        case SubmenuIndexLiftMaster_390_00:
+        case SubmenuIndexSecPlus_v1_390_00:
             generated_protocol =
                 subghz_txrx_gen_secplus_v1_protocol(subghz->txrx, "AM650", 390000000);
             break;
-        case SubmenuIndexLiftMaster_433_00:
+        case SubmenuIndexSecPlus_v1_433_00:
             generated_protocol =
                 subghz_txrx_gen_secplus_v1_protocol(subghz->txrx, "AM650", 433920000);
             break;
@@ -730,6 +730,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
                 subghz->txrx, "AM650", 390000000, key, 0x68, 0xE500000);
             break;
         case SubmenuIndexSecPlus_v2_433_00:
+            key = (key & 0x7FFFF3FC); // 850LM pairing
             generated_protocol = subghz_txrx_gen_secplus_v2_protocol(
                 subghz->txrx, "AM650", 433920000, key, 0x68, 0xE500000);
             break;