Merge pull request #66 from haisenteck/master

Add Came 12bit 330Mhz
DarkFlippers · Feb 3, 2024 · 2618f45 · 2618f45
2 parents fa5bc63 + 1051cf5
commit 2618f45
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/subbrute_i.h b/subbrute_i.h
@@ -31,7 +31,7 @@
 #include "views/subbrute_attack_view.h"
 #include "views/subbrute_main_view.h"
 
-#define SUBBRUTEFORCER_VER "Sub-GHz BruteForcer 3.A"
+#define SUBBRUTEFORCER_VER "Sub-GHz BruteForcer 3.B"
 
 #ifdef FURI_DEBUG
 //#define SUBBRUTE_FAST_TRACK false

diff --git a/subbrute_protocols.c b/subbrute_protocols.c
@@ -36,6 +36,17 @@ const SubBruteProtocol subbrute_protocol_came_12bit_315 = {
     .preset = FuriHalSubGhzPresetOok650Async,
     .file = CAMEFileProtocol};
 
+/**
+ * CAME 12bit 330MHz
+ */
+const SubBruteProtocol subbrute_protocol_came_12bit_330 = {
+    .frequency = 330000000,
+    .bits = 12,
+    .te = 0,
+    .repeat = 3,
+    .preset = FuriHalSubGhzPresetOok650Async,
+    .file = CAMEFileProtocol};
+
 /**
  * CAME 12bit 433MHz
  */
@@ -409,6 +420,7 @@ static const char* subbrute_protocol_names[] = {
     [SubBruteAttackCAME12bit303] = "CAME 12bit 303MHz",
     [SubBruteAttackCAME12bit307] = "CAME 12bit 307MHz",
     [SubBruteAttackCAME12bit315] = "CAME 12bit 315MHz",
+    [SubBruteAttackCAME12bit330] = "CAME 12bit 330MHz",
     [SubBruteAttackCAME12bit433] = "CAME 12bit 433MHz",
     [SubBruteAttackCAME12bit868] = "CAME 12bit 868MHz",
     [SubBruteAttackNICE12bit433] = "NICE 12bit 433MHz",
@@ -460,6 +472,7 @@ const SubBruteProtocol* subbrute_protocol_registry[] = {
     [SubBruteAttackCAME12bit303] = &subbrute_protocol_came_12bit_303,
     [SubBruteAttackCAME12bit307] = &subbrute_protocol_came_12bit_307,
     [SubBruteAttackCAME12bit315] = &subbrute_protocol_came_12bit_315,
+    [SubBruteAttackCAME12bit330] = &subbrute_protocol_came_12bit_330,
     [SubBruteAttackCAME12bit433] = &subbrute_protocol_came_12bit_433,
     [SubBruteAttackCAME12bit868] = &subbrute_protocol_came_12bit_868,
     [SubBruteAttackNICE12bit433] = &subbrute_protocol_nice_12bit_433,

diff --git a/subbrute_protocols.h b/subbrute_protocols.h
@@ -75,6 +75,7 @@ typedef enum {
  * - `SubBruteAttackCAME12bit303`: CAME 12-bit 303 MHz sub-brute attack.
  * - `SubBruteAttackCAME12bit307`: CAME 12-bit 307 MHz sub-brute attack.
  * - `SubBruteAttackCAME12bit315`: CAME 12-bit 315 MHz sub-brute attack.
+ * - `SubBruteAttackCAME12bit315`: CAME 12-bit 330 MHz sub-brute attack.
  * - `SubBruteAttackCAME12bit433`: CAME 12-bit 433 MHz sub-brute attack.
  * - `SubBruteAttackCAME12bit868`: CAME 12-bit 868 MHz sub-brute attack.
  * - `SubBruteAttackNICE12bit433`: NICE 12-bit 433 MHz sub-brute attack.
@@ -115,6 +116,7 @@ typedef enum {
     SubBruteAttackCAME12bit303,
     SubBruteAttackCAME12bit307,
     SubBruteAttackCAME12bit315,
+    SubBruteAttackCAME12bit330,
     SubBruteAttackCAME12bit433,
     SubBruteAttackCAME12bit868,
     SubBruteAttackNICE12bit433,