Merge branch 'Eng1n33r:dev' into 420

RogueMaster · Oct 5, 2022 · 25aeafc · 25aeafc
2 parents cf144ea + baf5034
commit 25aeafc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/applications/plugins/subbrute/subbrute.c b/applications/plugins/subbrute/subbrute.c
@@ -21,6 +21,7 @@
 #define TAG "SubBruteApp"
 
 static const char* subbrute_menu_names[] = {
+    [SubBruteAttackCAME12bit303] = "CAME 12bit 303MHz",
     [SubBruteAttackCAME12bit307] = "CAME 12bit 307MHz",
     [SubBruteAttackCAME12bit433] = "CAME 12bit 433MHz",
     [SubBruteAttackCAME12bit868] = "CAME 12bit 868MHz",
@@ -36,6 +37,7 @@ static const char* subbrute_menu_names[] = {
 };
 
 static const char* subbrute_menu_names_small[] = {
+    [SubBruteAttackCAME12bit303] = "CAME 303MHz",
     [SubBruteAttackCAME12bit307] = "CAME 307MHz",
     [SubBruteAttackCAME12bit433] = "CAME 433MHz",
     [SubBruteAttackCAME12bit868] = "CAME 868MHz",

diff --git a/applications/plugins/subbrute/subbrute_device.c b/applications/plugins/subbrute/subbrute_device.c
@@ -292,10 +292,13 @@ SubBruteFileResult subbrute_device_attack_set(SubBruteDevice* instance, SubBrute
         //            return file_result; // RETURN
         //        }
         break;
+    case SubBruteAttackCAME12bit303:
     case SubBruteAttackCAME12bit307:
     case SubBruteAttackCAME12bit433:
     case SubBruteAttackCAME12bit868:
-        if(type == SubBruteAttackCAME12bit307) {
+        if(type == SubBruteAttackCAME12bit303) {
+            instance->frequency = 303875000;
+        } else if(type == SubBruteAttackCAME12bit307) {
             instance->frequency = 307800000;
         } else if(type == SubBruteAttackCAME12bit433) {
             instance->frequency = 433920000;

diff --git a/applications/plugins/subbrute/subbrute_device.h b/applications/plugins/subbrute/subbrute_device.h
@@ -17,6 +17,7 @@
 #define SUBBRUTE_PAYLOAD_SIZE 16
 
 typedef enum {
+    SubBruteAttackCAME12bit303,
     SubBruteAttackCAME12bit307,
     SubBruteAttackCAME12bit433,
     SubBruteAttackCAME12bit868,