Просмотр исходного кода

Merge subghz_bruteforcer from https://github.com/DarkFlippers/flipperzero-subbrute

Willy-JL 1 год назад
Родитель
Сommit
058ed591b5

+ 12 - 0
subghz_bruteforcer/.github/dependabot.yml

@@ -0,0 +1,12 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

+ 2 - 2
subghz_bruteforcer/.github/workflows/build-with-firmware.yml

@@ -51,7 +51,7 @@ jobs:
             src-included: 0
     steps:
       - name: Copy Firmware Files
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ matrix.url }}
           clean: true
@@ -60,7 +60,7 @@ jobs:
 
       - name: Copy Repo Files
         if: ${{ matrix.src-included == 0 }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ vars.REPO_SELF }}
           clean: true

+ 2 - 2
subghz_bruteforcer/.github/workflows/changelog.yml

@@ -20,13 +20,13 @@ jobs:
     runs-on: "ubuntu-latest"
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           fetch-tags: true
 
       - name: "✏️ Generate release changelog"
-        uses: heinrichreimer/github-changelog-generator-action@v2.3
+        uses: heinrichreimer/github-changelog-generator-action@v2.4
         with:
           token: ${{ secrets.FLIPPER_TOKEN }}
           user: ${{ github.repository_owner }}

+ 6 - 6
subghz_bruteforcer/.github/workflows/codeql.yml

@@ -55,7 +55,7 @@ jobs:
 
     steps:
       - name: Checkout Firmware Files
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: "${{ vars.REPO_UNLEASHED }}"
           clean: "true"
@@ -64,7 +64,7 @@ jobs:
           fetch-depth: "0"
 
       - name: Checkout Repo Files
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: "${{ vars.REPO_SELF }}"
           clean: "true"
@@ -90,7 +90,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           setup-python-dependencies: true
@@ -152,12 +152,12 @@ jobs:
       #     ./fbt
       # uses: github/codeql-action/autobuild@v2
       - name: Resolve CodeQL Build Env
-        uses: github/codeql-action/resolve-environment@v2
+        uses: github/codeql-action/resolve-environment@v3
         with:
           language: ${{ matrix.language }}
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         env:
           REF_NAME: ${{ env.REF_NAME }}
           CHECKOUT_PATH: ${{ env.OFW_PATH }}
@@ -174,7 +174,7 @@ jobs:
           checkout_path: "${{ github.workspace }}/${{ env.CHECKOUT_PATH }}"
 
       - name: Upload CodeQL SARIF
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         env:
           REF_NAME: ${{ env.REF_NAME }}
           CHECKOUT_PATH: ${{ env.OFW_PATH }}

+ 1 - 1
subghz_bruteforcer/.github/workflows/stale.yml

@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         with:
           days-before-stale: -1
           days-before-close: -1

+ 1 - 1
subghz_bruteforcer/.github/workflows/version-check.yml

@@ -29,7 +29,7 @@ jobs:
       RELEASE_TYPE: 0
     steps:
       - name: Copy Repo Files
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: "${{ env.REPO_SELF }}"
           clean: "true"

+ 1 - 0
subghz_bruteforcer/README.md

@@ -61,6 +61,7 @@ The negative side of increasing the number of repetitions will be a longer key f
 - CAME 12bit 303MHz
 - CAME 12bit 307MHz
 - CAME 12bit 315MHz
+- CAME 12bit 330MHz
 - CAME 12bit 433MHz
 - CAME 12bit 868MHz
 

+ 1 - 1
subghz_bruteforcer/subbrute_i.h

@@ -33,7 +33,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

+ 13 - 0
subghz_bruteforcer/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,

+ 2 - 0
subghz_bruteforcer/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,