Revert flipper macro

Packet transmission via serial

.github/workflows/build_push.yml

@@ -2,6 +2,8 @@ name: Build and Push
 
 on:
   workflow_dispatch:
+  pull_request:
+    types: [opened, reopened]
 
 jobs:
   # This workflow contains a single job called "build"
@@ -129,6 +131,27 @@ jobs:
         run: |
           mv ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.flipper.bin
           
+      - name: Configure SD Serial for Flipper Zero SD Serial
+        run: |
+          pwd
+          sed -i 's/^  \/\/#define WRITE_PACKETS_SERIAL/  #define MARAUDER_DEV_BOARD_PRO/' esp32_marauder/configs.h
+          
+      - name: Build Marauder SD Serial for Flipper Zero WiFi Dev Board
+        uses: ArminJo/arduino-test-compile@v3.2.0
+        with:
+          sketch-names: esp32_marauder.ino
+          arduino-board-fqbn: esp32:esp32:esp32s2:PartitionScheme=min_spiffs,FlashSize=4M,PSRAM=enabled
+          extra-arduino-cli-args: "--warnings none"
+          
+      - name: Rename Marauder Flipper SD Serial bin
+        run: |
+          mv ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.flipper_sd_serial.bin
+          
+      - name: Remove SD Serial
+        run: |
+          pwd
+          sed -i 's/^  #define WRITE_PACKETS_SERIAL/  \/\/#define MARAUDER_DEV_BOARD_PRO/' esp32_marauder/configs.h
+          
       - name: Build Marauder for Flipper Zero Multi Board
         uses: ArminJo/arduino-test-compile@v3.2.0
         with:
@@ -152,6 +175,8 @@ jobs:
           sed -i 's/^  #define MARAUDER_KIT/  \/\/#define MARAUDER_KIT/' esp32_marauder/configs.h
           sed -i 's/^  #define GENERIC_ESP32/  \/\/#define GENERIC_ESP32/' esp32_marauder/configs.h
           sed -i 's/^  #define MARAUDER_FLIPPER/  \/\/#define MARAUDER_FLIPPER/' esp32_marauder/configs.h
+          sed -i 's/^  #define ESP32_LDDB/  \/\/#define ESP32_LDDB/' esp32_marauder/configs.h
+          sed -i 's/^  #define MARAUDER_DEV_BOARD_PRO/  \/\/#define MARAUDER_DEV_BOARD_PRO/' esp32_marauder/configs.h
           
       - name: Build Marauder for OG Marauder
         uses: ArminJo/arduino-test-compile@v3.2.0
@@ -174,6 +199,8 @@ jobs:
           sed -i 's/^  #define MARAUDER_KIT/  \/\/#define MARAUDER_KIT/' esp32_marauder/configs.h
           sed -i 's/^  #define GENERIC_ESP32/  \/\/#define GENERIC_ESP32/' esp32_marauder/configs.h
           sed -i 's/^  #define MARAUDER_FLIPPER/  \/\/#define MARAUDER_FLIPPER/' esp32_marauder/configs.h
+          sed -i 's/^  #define ESP32_LDDB/  \/\/#define ESP32_LDDB/' esp32_marauder/configs.h
+          sed -i 's/^  #define MARAUDER_DEV_BOARD_PRO/  \/\/#define MARAUDER_DEV_BOARD_PRO/' esp32_marauder/configs.h
           
       - name: Build Marauder for v6 Marauder
         uses: ArminJo/arduino-test-compile@v3.2.0
@@ -196,6 +223,8 @@ jobs:
           sed -i 's/^  \/\/#define MARAUDER_KIT/  #define MARAUDER_KIT/' esp32_marauder/configs.h
           sed -i 's/^  #define GENERIC_ESP32/  \/\/#define GENERIC_ESP32/' esp32_marauder/configs.h
           sed -i 's/^  #define MARAUDER_FLIPPER/  \/\/#define MARAUDER_FLIPPER/' esp32_marauder/configs.h
+          sed -i 's/^  #define ESP32_LDDB/  \/\/#define ESP32_LDDB/' esp32_marauder/configs.h
+          sed -i 's/^  #define MARAUDER_DEV_BOARD_PRO/  \/\/#define MARAUDER_DEV_BOARD_PRO/' esp32_marauder/configs.h
           
       - name: Build Marauder for Marauder Kit
         uses: ArminJo/arduino-test-compile@v3.2.0
@@ -218,6 +247,8 @@ jobs:
           sed -i 's/^  #define MARAUDER_KIT/  \/\/#define MARAUDER_KIT/' esp32_marauder/configs.h
           sed -i 's/^  #define GENERIC_ESP32/  \/\/#define GENERIC_ESP32/' esp32_marauder/configs.h
           sed -i 's/^  #define MARAUDER_FLIPPER/  \/\/#define MARAUDER_FLIPPER/' esp32_marauder/configs.h
+          sed -i 's/^  #define ESP32_LDDB/  \/\/#define ESP32_LDDB/' esp32_marauder/configs.h
+          sed -i 's/^  #define MARAUDER_DEV_BOARD_PRO/  \/\/#define MARAUDER_DEV_BOARD_PRO/' esp32_marauder/configs.h
           
       - name: Build Marauder for Marauder Mini
         uses: ArminJo/arduino-test-compile@v3.2.0
@@ -229,6 +260,50 @@ jobs:
       - name: Rename Marauder Mini bin
         run: |
           mv ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.mini.bin
+          
+      - name: Configure TFT_eSPI and configs.h for ESP32 LDDB
+        run: |
+          sed -i 's/^  #define MARAUDER_MINI/  \/\/#define MARAUDER_MINI/' esp32_marauder/configs.h
+          sed -i 's/^  #define MARAUDER_V4/  \/\/#define MARAUDER_V4/' esp32_marauder/configs.h
+          sed -i 's/^  #define MARAUDER_V6/  \/\/#define MARAUDER_V6/' esp32_marauder/configs.h
+          sed -i 's/^  #define MARAUDER_KIT/  \/\/#define MARAUDER_KIT/' esp32_marauder/configs.h
+          sed -i 's/^  #define GENERIC_ESP32/  \/\/#define GENERIC_ESP32/' esp32_marauder/configs.h
+          sed -i 's/^  #define MARAUDER_FLIPPER/  \/\/#define MARAUDER_FLIPPER/' esp32_marauder/configs.h
+          sed -i 's/^  \/\/#define ESP32_LDDB/  #define ESP32_LDDB/' esp32_marauder/configs.h
+          sed -i 's/^  #define MARAUDER_DEV_BOARD_PRO/  \/\/#define MARAUDER_DEV_BOARD_PRO/' esp32_marauder/configs.h
+          
+      - name: Build Marauder for ESP32 LDDB
+        uses: ArminJo/arduino-test-compile@v3.2.0
+        with:
+          sketch-names: esp32_marauder.ino
+          arduino-board-fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs
+          extra-arduino-cli-args: "--warnings none"
+          
+      - name: Rename Marauder ESP32 LDDB bin
+        run: |
+          mv ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.esp32_lddb.bin
+
+      - name: Configure TFT_eSPI and configs.h for Marauder Dev Board Pro
+        run: |
+          sed -i 's/^  #define MARAUDER_MINI/  \/\/#define MARAUDER_MINI/' esp32_marauder/configs.h
+          sed -i 's/^  #define MARAUDER_V4/  \/\/#define MARAUDER_V4/' esp32_marauder/configs.h
+          sed -i 's/^  #define MARAUDER_V6/  \/\/#define MARAUDER_V6/' esp32_marauder/configs.h
+          sed -i 's/^  #define MARAUDER_KIT/  \/\/#define MARAUDER_KIT/' esp32_marauder/configs.h
+          sed -i 's/^  #define GENERIC_ESP32/  \/\/#define GENERIC_ESP32/' esp32_marauder/configs.h
+          sed -i 's/^  #define MARAUDER_FLIPPER/  \/\/#define MARAUDER_FLIPPER/' esp32_marauder/configs.h
+          sed -i 's/^  #define ESP32_LDDB/  \/\/#define ESP32_LDDB/' esp32_marauder/configs.h
+          sed -i 's/^  \/\/#define MARAUDER_DEV_BOARD_PRO/  #define MARAUDER_DEV_BOARD_PRO/' esp32_marauder/configs.h
+          
+      - name: Build Marauder for Marauder Dev Board Pro
+        uses: ArminJo/arduino-test-compile@v3.2.0
+        with:
+          sketch-names: esp32_marauder.ino
+          arduino-board-fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs
+          extra-arduino-cli-args: "--warnings none"
+          
+      - name: Rename Marauder for Marauder Dev Board Pro
+        run: |
+          mv ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.marauder_dev_board_pro.bin
 
       - name: Display finished bins
         run: |
@@ -241,6 +316,13 @@ jobs:
           path: ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.flipper.bin
           retention-days: 5
           
+      - name: 'Upload Flipper SD Serial Artifact'
+        uses: actions/upload-artifact@v3
+        with:
+          name: esp32_marauder.flipper_sd_serial.bin
+          path: ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.flipper_sd_serial.bin
+          retention-days: 5
+          
       - name: 'Upload MultiboardS3 Artifact'
         uses: actions/upload-artifact@v3
         with:
@@ -276,6 +358,20 @@ jobs:
           path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.mini.bin
           retention-days: 5
           
+      - name: 'Upload ESP32 LDDB Artifact'
+        uses: actions/upload-artifact@v3
+        with:
+          name: esp32_marauder.mini.bin
+          path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.esp32_lddb.bin
+          retention-days: 5
+          
+      - name: 'Upload Marauder Dev Board Pro Artifact'
+        uses: actions/upload-artifact@v3
+        with:
+          name: esp32_marauder.marauder_dev_board_pro.bin
+          path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.marauder_dev_board_pro.bin
+          retention-days: 5
+          
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
@@ -298,6 +394,17 @@ jobs:
           asset_name: esp32_marauder.flipper.bin
           asset_content_type: application/bin
           
+      - name: Upload Flipper SD Serial Asset
+        id: upload-flipper-sd-serial-release-asset 
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.flipper_sd_serial.bin
+          asset_name: esp32_marauder.flipper_sd_serial.bin
+          asset_content_type: application/bin
+          
       - name: Upload MultiboardS3 Asset
         id: upload-mutliboardS3-release-asset 
         uses: actions/upload-release-asset@v1
@@ -352,3 +459,25 @@ jobs:
           asset_path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.mini.bin
           asset_name: esp32_marauder.mini.bin
           asset_content_type: application/bin
+          
+      - name: Upload ESP32 LDDB Asset
+        id: upload-esp32-lddb-release-asset 
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.esp32_lddb.bin
+          asset_name: esp32_marauder.esp32_lddb.bin
+          asset_content_type: application/bin
+          
+      - name: Upload Marauder Dev Board Pro Asset
+        id: upload-marauder-dev-board-pro-release-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.marauder_dev_board_pro.bin
+          asset_name: esp32_marauder.marauder_dev_board_pro.bin
+          asset_content_type: application/bin

.gitignore

@@ -1,3 +1,4 @@
 
 .vscode/arduino.json
 .vscode/c_cpp_properties.json
+esp32_marauder/.vscode/settings.json

PCBs/FlipperZero/WiFi-Devboard-Pro/Manufacturing/Gerber and Drill/WiFi-Devboard-Pro-B_Mask.gbr

@@ -0,0 +1,76 @@
+%TF.GenerationSoftware,KiCad,Pcbnew,(6.0.8)*%
+%TF.CreationDate,2023-01-02T13:08:22-05:00*%
+%TF.ProjectId,WiFi-Devboard-Pro,57694669-2d44-4657-9662-6f6172642d50,rev?*%
+%TF.SameCoordinates,Original*%
+%TF.FileFunction,Soldermask,Bot*%
+%TF.FilePolarity,Negative*%
+%FSLAX46Y46*%
+G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
+G04 Created by KiCad (PCBNEW (6.0.8)) date 2023-01-02 13:08:22*
+%MOMM*%
+%LPD*%
+G01*
+G04 APERTURE LIST*
+%ADD10C,1.700000*%
+%ADD11O,1.700000X1.700000*%
+%ADD12C,2.200000*%
+%ADD13R,0.960000X5.440000*%
+G04 APERTURE END LIST*
+D10*
+%TO.C,J4*%
+X129370000Y-109940000D03*
+D11*
+X131910000Y-109940000D03*
+X134450000Y-109940000D03*
+X136990000Y-109940000D03*
+X139530000Y-109940000D03*
+X142070000Y-109940000D03*
+X144610000Y-109940000D03*
+X147150000Y-109940000D03*
+X149690000Y-109940000D03*
+X152230000Y-109940000D03*
+X154770000Y-109940000D03*
+%TD*%
+D12*
+%TO.C,*%
+X187100000Y-99900000D03*
+%TD*%
+D10*
+%TO.C,J5*%
+X129370000Y-89840000D03*
+D11*
+X131910000Y-89840000D03*
+X134450000Y-89840000D03*
+X136990000Y-89840000D03*
+X139530000Y-89840000D03*
+X142070000Y-89840000D03*
+X144610000Y-89840000D03*
+X147150000Y-89840000D03*
+X149690000Y-89840000D03*
+X152230000Y-89840000D03*
+X154770000Y-89840000D03*
+%TD*%
+D13*
+%TO.C,J3*%
+X153970000Y-103140000D03*
+X156510000Y-101060000D03*
+X159050000Y-103140000D03*
+X161590000Y-101060000D03*
+X164130000Y-103140000D03*
+X166670000Y-101060000D03*
+X169210000Y-103140000D03*
+X171750000Y-101060000D03*
+X174290000Y-103140000D03*
+X176830000Y-101060000D03*
+%TD*%
+%TO.C,J2*%
+X118410000Y-103140000D03*
+X120950000Y-101060000D03*
+X123490000Y-103140000D03*
+X126030000Y-101060000D03*
+X128570000Y-103140000D03*
+X131110000Y-101060000D03*
+X133650000Y-103140000D03*
+X136190000Y-101060000D03*
+%TD*%
+M02*

PCBs/FlipperZero/WiFi-Devboard-Pro/Manufacturing/Gerber and Drill/WiFi-Devboard-Pro-B_Paste.gbr

@@ -0,0 +1,39 @@
+%TF.GenerationSoftware,KiCad,Pcbnew,(6.0.8)*%
+%TF.CreationDate,2023-01-02T13:08:22-05:00*%
+%TF.ProjectId,WiFi-Devboard-Pro,57694669-2d44-4657-9662-6f6172642d50,rev?*%
+%TF.SameCoordinates,Original*%
+%TF.FileFunction,Paste,Bot*%
+%TF.FilePolarity,Positive*%
+%FSLAX46Y46*%
+G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
+G04 Created by KiCad (PCBNEW (6.0.8)) date 2023-01-02 13:08:22*
+%MOMM*%
+%LPD*%
+G01*
+G04 APERTURE LIST*
+%ADD10R,0.960000X5.440000*%
+G04 APERTURE END LIST*
+D10*
+%TO.C,J3*%
+X153970000Y-103140000D03*
+X156510000Y-101060000D03*
+X159050000Y-103140000D03*
+X161590000Y-101060000D03*
+X164130000Y-103140000D03*
+X166670000Y-101060000D03*
+X169210000Y-103140000D03*
+X171750000Y-101060000D03*
+X174290000Y-103140000D03*
+X176830000Y-101060000D03*
+%TD*%
+%TO.C,J2*%
+X118410000Y-103140000D03*
+X120950000Y-101060000D03*
+X123490000Y-103140000D03*
+X126030000Y-101060000D03*
+X128570000Y-103140000D03*
+X131110000Y-101060000D03*
+X133650000Y-103140000D03*
+X136190000Y-101060000D03*
+%TD*%
+M02*

PCBs/FlipperZero/WiFi-Devboard-Pro/Manufacturing/Gerber and Drill/WiFi-Devboard-Pro-B_Silkscreen.gbr

@@ -0,0 +1,647 @@
+%TF.GenerationSoftware,KiCad,Pcbnew,(6.0.8)*%
+%TF.CreationDate,2023-01-02T13:08:22-05:00*%
+%TF.ProjectId,WiFi-Devboard-Pro,57694669-2d44-4657-9662-6f6172642d50,rev?*%
+%TF.SameCoordinates,Original*%
+%TF.FileFunction,Legend,Bot*%
+%TF.FilePolarity,Positive*%
+%FSLAX46Y46*%
+G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
+G04 Created by KiCad (PCBNEW (6.0.8)) date 2023-01-02 13:08:22*
+%MOMM*%
+%LPD*%
+G01*
+G04 APERTURE LIST*
+%ADD10C,0.100000*%
+%ADD11C,0.200000*%
+G04 APERTURE END LIST*
+D10*
+X183027857Y-91754857D02*
+X183294523Y-91754857D01*
+X183294523Y-92173904D02*
+X183294523Y-91373904D01*
+X182913571Y-91373904D01*
+X182494523Y-92173904D02*
+X182570714Y-92135809D01*
+X182608809Y-92059619D01*
+X182608809Y-91373904D01*
+X182189761Y-92173904D02*
+X182189761Y-91640571D01*
+X182189761Y-91373904D02*
+X182227857Y-91412000D01*
+X182189761Y-91450095D01*
+X182151666Y-91412000D01*
+X182189761Y-91373904D01*
+X182189761Y-91450095D01*
+X181808809Y-91640571D02*
+X181808809Y-92440571D01*
+X181808809Y-91678666D02*
+X181732619Y-91640571D01*
+X181580238Y-91640571D01*
+X181504047Y-91678666D01*
+X181465952Y-91716761D01*
+X181427857Y-91792952D01*
+X181427857Y-92021523D01*
+X181465952Y-92097714D01*
+X181504047Y-92135809D01*
+X181580238Y-92173904D01*
+X181732619Y-92173904D01*
+X181808809Y-92135809D01*
+X181085000Y-91640571D02*
+X181085000Y-92440571D01*
+X181085000Y-91678666D02*
+X181008809Y-91640571D01*
+X180856428Y-91640571D01*
+X180780238Y-91678666D01*
+X180742142Y-91716761D01*
+X180704047Y-91792952D01*
+X180704047Y-92021523D01*
+X180742142Y-92097714D01*
+X180780238Y-92135809D01*
+X180856428Y-92173904D01*
+X181008809Y-92173904D01*
+X181085000Y-92135809D01*
+X180056428Y-92135809D02*
+X180132619Y-92173904D01*
+X180285000Y-92173904D01*
+X180361190Y-92135809D01*
+X180399285Y-92059619D01*
+X180399285Y-91754857D01*
+X180361190Y-91678666D01*
+X180285000Y-91640571D01*
+X180132619Y-91640571D01*
+X180056428Y-91678666D01*
+X180018333Y-91754857D01*
+X180018333Y-91831047D01*
+X180399285Y-91907238D01*
+X179675476Y-92173904D02*
+X179675476Y-91640571D01*
+X179675476Y-91792952D02*
+X179637380Y-91716761D01*
+X179599285Y-91678666D01*
+X179523095Y-91640571D01*
+X179446904Y-91640571D01*
+X178646904Y-91373904D02*
+X178113571Y-91373904D01*
+X178646904Y-92173904D01*
+X178113571Y-92173904D01*
+X177504047Y-92135809D02*
+X177580238Y-92173904D01*
+X177732619Y-92173904D01*
+X177808809Y-92135809D01*
+X177846904Y-92059619D01*
+X177846904Y-91754857D01*
+X177808809Y-91678666D01*
+X177732619Y-91640571D01*
+X177580238Y-91640571D01*
+X177504047Y-91678666D01*
+X177465952Y-91754857D01*
+X177465952Y-91831047D01*
+X177846904Y-91907238D01*
+X177123095Y-92173904D02*
+X177123095Y-91640571D01*
+X177123095Y-91792952D02*
+X177085000Y-91716761D01*
+X177046904Y-91678666D01*
+X176970714Y-91640571D01*
+X176894523Y-91640571D01*
+X176513571Y-92173904D02*
+X176589761Y-92135809D01*
+X176627857Y-92097714D01*
+X176665952Y-92021523D01*
+X176665952Y-91792952D01*
+X176627857Y-91716761D01*
+X176589761Y-91678666D01*
+X176513571Y-91640571D01*
+X176399285Y-91640571D01*
+X176323095Y-91678666D01*
+X176285000Y-91716761D01*
+X176246904Y-91792952D01*
+X176246904Y-92021523D01*
+X176285000Y-92097714D01*
+X176323095Y-92135809D01*
+X176399285Y-92173904D01*
+X176513571Y-92173904D01*
+X175370714Y-91373904D02*
+X175180238Y-92173904D01*
+X175027857Y-91602476D01*
+X174875476Y-92173904D01*
+X174685000Y-91373904D01*
+X174380238Y-92173904D02*
+X174380238Y-91640571D01*
+X174380238Y-91373904D02*
+X174418333Y-91412000D01*
+X174380238Y-91450095D01*
+X174342142Y-91412000D01*
+X174380238Y-91373904D01*
+X174380238Y-91450095D01*
+X173732619Y-91754857D02*
+X173999285Y-91754857D01*
+X173999285Y-92173904D02*
+X173999285Y-91373904D01*
+X173618333Y-91373904D01*
+X173313571Y-92173904D02*
+X173313571Y-91640571D01*
+X173313571Y-91373904D02*
+X173351666Y-91412000D01*
+X173313571Y-91450095D01*
+X173275476Y-91412000D01*
+X173313571Y-91373904D01*
+X173313571Y-91450095D01*
+X172323095Y-92173904D02*
+X172323095Y-91373904D01*
+X172132619Y-91373904D01*
+X172018333Y-91412000D01*
+X171942142Y-91488190D01*
+X171904047Y-91564380D01*
+X171865952Y-91716761D01*
+X171865952Y-91831047D01*
+X171904047Y-91983428D01*
+X171942142Y-92059619D01*
+X172018333Y-92135809D01*
+X172132619Y-92173904D01*
+X172323095Y-92173904D01*
+X171218333Y-92135809D02*
+X171294523Y-92173904D01*
+X171446904Y-92173904D01*
+X171523095Y-92135809D01*
+X171561190Y-92059619D01*
+X171561190Y-91754857D01*
+X171523095Y-91678666D01*
+X171446904Y-91640571D01*
+X171294523Y-91640571D01*
+X171218333Y-91678666D01*
+X171180238Y-91754857D01*
+X171180238Y-91831047D01*
+X171561190Y-91907238D01*
+X170913571Y-91640571D02*
+X170723095Y-92173904D01*
+X170532619Y-91640571D01*
+X170227857Y-92173904D02*
+X170227857Y-91373904D01*
+X170227857Y-91678666D02*
+X170151666Y-91640571D01*
+X169999285Y-91640571D01*
+X169923095Y-91678666D01*
+X169885000Y-91716761D01*
+X169846904Y-91792952D01*
+X169846904Y-92021523D01*
+X169885000Y-92097714D01*
+X169923095Y-92135809D01*
+X169999285Y-92173904D01*
+X170151666Y-92173904D01*
+X170227857Y-92135809D01*
+X169389761Y-92173904D02*
+X169465952Y-92135809D01*
+X169504047Y-92097714D01*
+X169542142Y-92021523D01*
+X169542142Y-91792952D01*
+X169504047Y-91716761D01*
+X169465952Y-91678666D01*
+X169389761Y-91640571D01*
+X169275476Y-91640571D01*
+X169199285Y-91678666D01*
+X169161190Y-91716761D01*
+X169123095Y-91792952D01*
+X169123095Y-92021523D01*
+X169161190Y-92097714D01*
+X169199285Y-92135809D01*
+X169275476Y-92173904D01*
+X169389761Y-92173904D01*
+X168437380Y-92173904D02*
+X168437380Y-91754857D01*
+X168475476Y-91678666D01*
+X168551666Y-91640571D01*
+X168704047Y-91640571D01*
+X168780238Y-91678666D01*
+X168437380Y-92135809D02*
+X168513571Y-92173904D01*
+X168704047Y-92173904D01*
+X168780238Y-92135809D01*
+X168818333Y-92059619D01*
+X168818333Y-91983428D01*
+X168780238Y-91907238D01*
+X168704047Y-91869142D01*
+X168513571Y-91869142D01*
+X168437380Y-91831047D01*
+X168056428Y-92173904D02*
+X168056428Y-91640571D01*
+X168056428Y-91792952D02*
+X168018333Y-91716761D01*
+X167980238Y-91678666D01*
+X167904047Y-91640571D01*
+X167827857Y-91640571D01*
+X167218333Y-92173904D02*
+X167218333Y-91373904D01*
+X167218333Y-92135809D02*
+X167294523Y-92173904D01*
+X167446904Y-92173904D01*
+X167523095Y-92135809D01*
+X167561190Y-92097714D01*
+X167599285Y-92021523D01*
+X167599285Y-91792952D01*
+X167561190Y-91716761D01*
+X167523095Y-91678666D01*
+X167446904Y-91640571D01*
+X167294523Y-91640571D01*
+X167218333Y-91678666D01*
+X166227857Y-92173904D02*
+X166227857Y-91373904D01*
+X165923095Y-91373904D01*
+X165846904Y-91412000D01*
+X165808809Y-91450095D01*
+X165770714Y-91526285D01*
+X165770714Y-91640571D01*
+X165808809Y-91716761D01*
+X165846904Y-91754857D01*
+X165923095Y-91792952D01*
+X166227857Y-91792952D01*
+X165427857Y-92173904D02*
+X165427857Y-91640571D01*
+X165427857Y-91792952D02*
+X165389761Y-91716761D01*
+X165351666Y-91678666D01*
+X165275476Y-91640571D01*
+X165199285Y-91640571D01*
+X164818333Y-92173904D02*
+X164894523Y-92135809D01*
+X164932619Y-92097714D01*
+X164970714Y-92021523D01*
+X164970714Y-91792952D01*
+X164932619Y-91716761D01*
+X164894523Y-91678666D01*
+X164818333Y-91640571D01*
+X164704047Y-91640571D01*
+X164627857Y-91678666D01*
+X164589761Y-91716761D01*
+X164551666Y-91792952D01*
+X164551666Y-92021523D01*
+X164589761Y-92097714D01*
+X164627857Y-92135809D01*
+X164704047Y-92173904D01*
+X164818333Y-92173904D01*
+X182837380Y-93461904D02*
+X183104047Y-93080952D01*
+X183294523Y-93461904D02*
+X183294523Y-92661904D01*
+X182989761Y-92661904D01*
+X182913571Y-92700000D01*
+X182875476Y-92738095D01*
+X182837380Y-92814285D01*
+X182837380Y-92928571D01*
+X182875476Y-93004761D01*
+X182913571Y-93042857D01*
+X182989761Y-93080952D01*
+X183294523Y-93080952D01*
+X182189761Y-93423809D02*
+X182265952Y-93461904D01*
+X182418333Y-93461904D01*
+X182494523Y-93423809D01*
+X182532619Y-93347619D01*
+X182532619Y-93042857D01*
+X182494523Y-92966666D01*
+X182418333Y-92928571D01*
+X182265952Y-92928571D01*
+X182189761Y-92966666D01*
+X182151666Y-93042857D01*
+X182151666Y-93119047D01*
+X182532619Y-93195238D01*
+X181885000Y-92928571D02*
+X181694523Y-93461904D01*
+X181504047Y-92928571D01*
+X180704047Y-92661904D02*
+X180437380Y-93461904D01*
+X180170714Y-92661904D01*
+X179751666Y-92661904D02*
+X179675476Y-92661904D01*
+X179599285Y-92700000D01*
+X179561190Y-92738095D01*
+X179523095Y-92814285D01*
+X179485000Y-92966666D01*
+X179485000Y-93157142D01*
+X179523095Y-93309523D01*
+X179561190Y-93385714D01*
+X179599285Y-93423809D01*
+X179675476Y-93461904D01*
+X179751666Y-93461904D01*
+X179827857Y-93423809D01*
+X179865952Y-93385714D01*
+X179904047Y-93309523D01*
+X179942142Y-93157142D01*
+X179942142Y-92966666D01*
+X179904047Y-92814285D01*
+X179865952Y-92738095D01*
+X179827857Y-92700000D01*
+X179751666Y-92661904D01*
+X179142142Y-93385714D02*
+X179104047Y-93423809D01*
+X179142142Y-93461904D01*
+X179180238Y-93423809D01*
+X179142142Y-93385714D01*
+X179142142Y-93461904D01*
+X178342142Y-93461904D02*
+X178799285Y-93461904D01*
+X178570714Y-93461904D02*
+X178570714Y-92661904D01*
+X178646904Y-92776190D01*
+X178723095Y-92852380D01*
+X178799285Y-92890476D01*
+X177999285Y-93385714D02*
+X177961190Y-93423809D01*
+X177999285Y-93461904D01*
+X178037380Y-93423809D01*
+X177999285Y-93385714D01*
+X177999285Y-93461904D01*
+X177465952Y-92661904D02*
+X177389761Y-92661904D01*
+X177313571Y-92700000D01*
+X177275476Y-92738095D01*
+X177237380Y-92814285D01*
+X177199285Y-92966666D01*
+X177199285Y-93157142D01*
+X177237380Y-93309523D01*
+X177275476Y-93385714D01*
+X177313571Y-93423809D01*
+X177389761Y-93461904D01*
+X177465952Y-93461904D01*
+X177542142Y-93423809D01*
+X177580238Y-93385714D01*
+X177618333Y-93309523D01*
+X177656428Y-93157142D01*
+X177656428Y-92966666D01*
+X177618333Y-92814285D01*
+X177580238Y-92738095D01*
+X177542142Y-92700000D01*
+X177465952Y-92661904D01*
+X183065952Y-93949904D02*
+X183065952Y-94521333D01*
+X183104047Y-94635619D01*
+X183180238Y-94711809D01*
+X183294523Y-94749904D01*
+X183370714Y-94749904D01*
+X182342142Y-94216571D02*
+X182342142Y-94749904D01*
+X182685000Y-94216571D02*
+X182685000Y-94635619D01*
+X182646904Y-94711809D01*
+X182570714Y-94749904D01*
+X182456428Y-94749904D01*
+X182380238Y-94711809D01*
+X182342142Y-94673714D01*
+X181999285Y-94711809D02*
+X181923095Y-94749904D01*
+X181770714Y-94749904D01*
+X181694523Y-94711809D01*
+X181656428Y-94635619D01*
+X181656428Y-94597523D01*
+X181694523Y-94521333D01*
+X181770714Y-94483238D01*
+X181885000Y-94483238D01*
+X181961190Y-94445142D01*
+X181999285Y-94368952D01*
+X181999285Y-94330857D01*
+X181961190Y-94254666D01*
+X181885000Y-94216571D01*
+X181770714Y-94216571D01*
+X181694523Y-94254666D01*
+X181427857Y-94216571D02*
+X181123095Y-94216571D01*
+X181313571Y-93949904D02*
+X181313571Y-94635619D01*
+X181275476Y-94711809D01*
+X181199285Y-94749904D01*
+X181123095Y-94749904D01*
+X180399285Y-94673714D02*
+X180437380Y-94711809D01*
+X180551666Y-94749904D01*
+X180627857Y-94749904D01*
+X180742142Y-94711809D01*
+X180818333Y-94635619D01*
+X180856428Y-94559428D01*
+X180894523Y-94407047D01*
+X180894523Y-94292761D01*
+X180856428Y-94140380D01*
+X180818333Y-94064190D01*
+X180742142Y-93988000D01*
+X180627857Y-93949904D01*
+X180551666Y-93949904D01*
+X180437380Y-93988000D01*
+X180399285Y-94026095D01*
+X179713571Y-94749904D02*
+X179713571Y-94330857D01*
+X179751666Y-94254666D01*
+X179827857Y-94216571D01*
+X179980238Y-94216571D01*
+X180056428Y-94254666D01*
+X179713571Y-94711809D02*
+X179789761Y-94749904D01*
+X179980238Y-94749904D01*
+X180056428Y-94711809D01*
+X180094523Y-94635619D01*
+X180094523Y-94559428D01*
+X180056428Y-94483238D01*
+X179980238Y-94445142D01*
+X179789761Y-94445142D01*
+X179713571Y-94407047D01*
+X179218333Y-94749904D02*
+X179294523Y-94711809D01*
+X179332619Y-94635619D01*
+X179332619Y-93949904D01*
+X178799285Y-94749904D02*
+X178875476Y-94711809D01*
+X178913571Y-94635619D01*
+X178913571Y-93949904D01*
+X178494523Y-94749904D02*
+X178494523Y-93949904D01*
+X178227857Y-94521333D01*
+X177961190Y-93949904D01*
+X177961190Y-94749904D01*
+X177275476Y-94711809D02*
+X177351666Y-94749904D01*
+X177504047Y-94749904D01*
+X177580238Y-94711809D01*
+X177618333Y-94635619D01*
+X177618333Y-94330857D01*
+X177580238Y-94254666D01*
+X177504047Y-94216571D01*
+X177351666Y-94216571D01*
+X177275476Y-94254666D01*
+X177237380Y-94330857D01*
+X177237380Y-94407047D01*
+X177618333Y-94483238D01*
+X176894523Y-94749904D02*
+X176894523Y-93949904D01*
+X176437380Y-94749904D02*
+X176780238Y-94292761D01*
+X176437380Y-93949904D02*
+X176894523Y-94407047D01*
+X175980238Y-94749904D02*
+X176056428Y-94711809D01*
+X176094523Y-94673714D01*
+X176132619Y-94597523D01*
+X176132619Y-94368952D01*
+X176094523Y-94292761D01*
+X176056428Y-94254666D01*
+X175980238Y-94216571D01*
+X175865952Y-94216571D01*
+X175789761Y-94254666D01*
+X175751666Y-94292761D01*
+X175713571Y-94368952D01*
+X175713571Y-94597523D01*
+X175751666Y-94673714D01*
+X175789761Y-94711809D01*
+X175865952Y-94749904D01*
+X175980238Y-94749904D01*
+X175370714Y-94749904D02*
+X175370714Y-93949904D01*
+X175294523Y-94445142D02*
+X175065952Y-94749904D01*
+X175065952Y-94216571D02*
+X175370714Y-94521333D01*
+X174608809Y-94749904D02*
+X174685000Y-94711809D01*
+X174723095Y-94673714D01*
+X174761190Y-94597523D01*
+X174761190Y-94368952D01*
+X174723095Y-94292761D01*
+X174685000Y-94254666D01*
+X174608809Y-94216571D01*
+X174494523Y-94216571D01*
+X174418333Y-94254666D01*
+X174380238Y-94292761D01*
+X174342142Y-94368952D01*
+X174342142Y-94597523D01*
+X174380238Y-94673714D01*
+X174418333Y-94711809D01*
+X174494523Y-94749904D01*
+X174608809Y-94749904D01*
+X172742142Y-94749904D02*
+X172780238Y-94749904D01*
+X172856428Y-94711809D01*
+X172970714Y-94597523D01*
+X173161190Y-94368952D01*
+X173237380Y-94254666D01*
+X173275476Y-94140380D01*
+X173275476Y-94064190D01*
+X173237380Y-93988000D01*
+X173161190Y-93949904D01*
+X173123095Y-93949904D01*
+X173046904Y-93988000D01*
+X173008809Y-94064190D01*
+X173008809Y-94102285D01*
+X173046904Y-94178476D01*
+X173085000Y-94216571D01*
+X173313571Y-94368952D01*
+X173351666Y-94407047D01*
+X173389761Y-94483238D01*
+X173389761Y-94597523D01*
+X173351666Y-94673714D01*
+X173313571Y-94711809D01*
+X173237380Y-94749904D01*
+X173123095Y-94749904D01*
+X173046904Y-94711809D01*
+X173008809Y-94673714D01*
+X172894523Y-94521333D01*
+X172856428Y-94407047D01*
+X172856428Y-94330857D01*
+X171904047Y-94216571D02*
+X171599285Y-94216571D01*
+X171789761Y-93949904D02*
+X171789761Y-94635619D01*
+X171751666Y-94711809D01*
+X171675476Y-94749904D01*
+X171599285Y-94749904D01*
+X171332619Y-94749904D02*
+X171332619Y-94216571D01*
+X171332619Y-94368952D02*
+X171294523Y-94292761D01*
+X171256428Y-94254666D01*
+X171180238Y-94216571D01*
+X171104047Y-94216571D01*
+X170837380Y-94749904D02*
+X170837380Y-94216571D01*
+X170837380Y-93949904D02*
+X170875476Y-93988000D01*
+X170837380Y-94026095D01*
+X170799285Y-93988000D01*
+X170837380Y-93949904D01*
+X170837380Y-94026095D01*
+X170494523Y-94711809D02*
+X170418333Y-94749904D01*
+X170265952Y-94749904D01*
+X170189761Y-94711809D01*
+X170151666Y-94635619D01*
+X170151666Y-94597523D01*
+X170189761Y-94521333D01*
+X170265952Y-94483238D01*
+X170380238Y-94483238D01*
+X170456428Y-94445142D01*
+X170494523Y-94368952D01*
+X170494523Y-94330857D01*
+X170456428Y-94254666D01*
+X170380238Y-94216571D01*
+X170265952Y-94216571D01*
+X170189761Y-94254666D01*
+X169808809Y-94216571D02*
+X169808809Y-95016571D01*
+X169808809Y-94254666D02*
+X169732619Y-94216571D01*
+X169580238Y-94216571D01*
+X169504047Y-94254666D01*
+X169465952Y-94292761D01*
+X169427857Y-94368952D01*
+X169427857Y-94597523D01*
+X169465952Y-94673714D01*
+X169504047Y-94711809D01*
+X169580238Y-94749904D01*
+X169732619Y-94749904D01*
+X169808809Y-94711809D01*
+X169161190Y-93949904D02*
+X168665952Y-93949904D01*
+X168932619Y-94254666D01*
+X168818333Y-94254666D01*
+X168742142Y-94292761D01*
+X168704047Y-94330857D01*
+X168665952Y-94407047D01*
+X168665952Y-94597523D01*
+X168704047Y-94673714D01*
+X168742142Y-94711809D01*
+X168818333Y-94749904D01*
+X169046904Y-94749904D01*
+X169123095Y-94711809D01*
+X169161190Y-94673714D01*
+X167980238Y-94749904D02*
+X167980238Y-94330857D01*
+X168018333Y-94254666D01*
+X168094523Y-94216571D01*
+X168246904Y-94216571D01*
+X168323095Y-94254666D01*
+X167980238Y-94711809D02*
+X168056428Y-94749904D01*
+X168246904Y-94749904D01*
+X168323095Y-94711809D01*
+X168361190Y-94635619D01*
+X168361190Y-94559428D01*
+X168323095Y-94483238D01*
+X168246904Y-94445142D01*
+X168056428Y-94445142D01*
+X167980238Y-94407047D01*
+X167599285Y-94749904D02*
+X167599285Y-94216571D01*
+X167599285Y-94368952D02*
+X167561190Y-94292761D01*
+X167523095Y-94254666D01*
+X167446904Y-94216571D01*
+X167370714Y-94216571D01*
+D11*
+%TO.C,J3*%
+X177900000Y-100850000D02*
+X177900000Y-103350000D01*
+X152900000Y-100850000D02*
+X152900000Y-105860000D01*
+%TO.C,J2*%
+X137300000Y-100850000D02*
+X137300000Y-103350000D01*
+X117300000Y-100850000D02*
+X117300000Y-105860000D01*
+%TD*%
+M02*

PCBs/FlipperZero/WiFi-Devboard-Pro/Manufacturing/Gerber and Drill/WiFi-Devboard-Pro-Edge_Cuts.gbr

@@ -0,0 +1,65 @@
+%TF.GenerationSoftware,KiCad,Pcbnew,(6.0.8)*%
+%TF.CreationDate,2023-01-02T13:08:22-05:00*%
+%TF.ProjectId,WiFi-Devboard-Pro,57694669-2d44-4657-9662-6f6172642d50,rev?*%
+%TF.SameCoordinates,Original*%
+%TF.FileFunction,Profile,NP*%
+%FSLAX46Y46*%
+G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
+G04 Created by KiCad (PCBNEW (6.0.8)) date 2023-01-02 13:08:22*
+%MOMM*%
+%LPD*%
+G01*
+G04 APERTURE LIST*
+%TA.AperFunction,Profile*%
+%ADD10C,0.100000*%
+%TD*%
+G04 APERTURE END LIST*
+D10*
+X111130000Y-108940000D02*
+G75*
+G03*
+X112130000Y-109940000I1000000J0D01*
+G01*
+X184090000Y-108940000D02*
+X184090000Y-102390000D01*
+X184090000Y-97390000D02*
+X184090000Y-90840000D01*
+X128365000Y-89840000D02*
+X112130000Y-89840000D01*
+X183090000Y-109940000D02*
+G75*
+G03*
+X184090000Y-108940000I0J1000000D01*
+G01*
+X183090000Y-89840000D02*
+X155765000Y-89840000D01*
+X128365000Y-109940000D02*
+X155765000Y-109940000D01*
+X112130000Y-89840000D02*
+G75*
+G03*
+X111130000Y-90840000I0J-1000000D01*
+G01*
+X111130000Y-90840000D02*
+X111130000Y-108940000D01*
+X187090000Y-102390000D02*
+G75*
+G03*
+X187090000Y-97390000I0J2500000D01*
+G01*
+X184090000Y-90840000D02*
+G75*
+G03*
+X183090000Y-89840000I-1000000J0D01*
+G01*
+X184090000Y-102390000D02*
+X187090000Y-102390000D01*
+X128385000Y-89840000D02*
+X155765000Y-89840000D01*
+X155765000Y-109940000D02*
+X183090000Y-109940000D01*
+X187090000Y-97390000D02*
+X184090000Y-97390000D01*
+X112130000Y-109940000D02*
+X128365000Y-109940000D01*
+M02*

PCBs/FlipperZero/WiFi-Devboard-Pro/Manufacturing/Gerber and Drill/WiFi-Devboard-Pro-F_Mask.gbr

@@ -0,0 +1,381 @@
+%TF.GenerationSoftware,KiCad,Pcbnew,(6.0.8)*%
+%TF.CreationDate,2023-01-02T13:08:22-05:00*%
+%TF.ProjectId,WiFi-Devboard-Pro,57694669-2d44-4657-9662-6f6172642d50,rev?*%
+%TF.SameCoordinates,Original*%
+%TF.FileFunction,Soldermask,Top*%
+%TF.FilePolarity,Negative*%
+%FSLAX46Y46*%
+G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
+G04 Created by KiCad (PCBNEW (6.0.8)) date 2023-01-02 13:08:22*
+%MOMM*%
+%LPD*%
+G01*
+G04 APERTURE LIST*
+%ADD10R,0.600000X0.750000*%
+%ADD11R,0.750000X0.600000*%
+%ADD12R,0.600000X0.620000*%
+%ADD13R,0.650000X1.200000*%
+%ADD14C,1.700000*%
+%ADD15O,1.700000X1.700000*%
+%ADD16R,0.620000X0.600000*%
+%ADD17R,0.690000X0.720000*%
+%ADD18R,1.100000X0.700000*%
+%ADD19R,0.930000X0.900000*%
+%ADD20R,0.780000X1.050000*%
+%ADD21R,3.330000X0.700000*%
+%ADD22R,2.800000X0.860000*%
+%ADD23R,1.830000X1.140000*%
+%ADD24R,0.700000X0.700000*%
+%ADD25R,0.720000X0.690000*%
+%ADD26R,0.900000X1.500000*%
+%ADD27R,1.500000X0.900000*%
+%ADD28R,0.900000X0.900000*%
+%ADD29R,0.500000X0.900000*%
+%ADD30R,0.650000X2.770000*%
+%ADD31R,0.950000X0.800000*%
+%ADD32R,1.050000X0.650000*%
+%ADD33R,1.850000X0.900000*%
+%ADD34R,1.850000X3.200000*%
+%ADD35C,2.200000*%
+%ADD36R,0.400000X1.000000*%
+%ADD37R,0.620000X0.640000*%
+G04 APERTURE END LIST*
+D10*
+%TO.C,R10*%
+X134960000Y-97140000D03*
+X134960000Y-96040000D03*
+%TD*%
+D11*
+%TO.C,R15*%
+X126500000Y-96950000D03*
+X127600000Y-96950000D03*
+%TD*%
+%TO.C,R6*%
+X150660000Y-104890000D03*
+X149560000Y-104890000D03*
+%TD*%
+D12*
+%TO.C,C7*%
+X117000000Y-92270000D03*
+X116080000Y-92270000D03*
+%TD*%
+D10*
+%TO.C,R5*%
+X115300000Y-91350000D03*
+X115300000Y-92450000D03*
+%TD*%
+D13*
+%TO.C,IC2*%
+X128460000Y-92600000D03*
+X126540000Y-92600000D03*
+X127500000Y-94700000D03*
+%TD*%
+%TO.C,IC4*%
+X138210000Y-102375000D03*
+X136290000Y-102375000D03*
+X137250000Y-104475000D03*
+%TD*%
+D14*
+%TO.C,J4*%
+X129370000Y-109940000D03*
+D15*
+X131910000Y-109940000D03*
+X134450000Y-109940000D03*
+X136990000Y-109940000D03*
+X139530000Y-109940000D03*
+X142070000Y-109940000D03*
+X144610000Y-109940000D03*
+X147150000Y-109940000D03*
+X149690000Y-109940000D03*
+X152230000Y-109940000D03*
+X154770000Y-109940000D03*
+%TD*%
+D16*
+%TO.C,C11*%
+X136225000Y-97060000D03*
+X136225000Y-96140000D03*
+%TD*%
+D17*
+%TO.C,C2*%
+X181985000Y-90350000D03*
+X181065000Y-90350000D03*
+%TD*%
+D18*
+%TO.C,J6*%
+X112460000Y-102230000D03*
+X112460000Y-101130000D03*
+X112460000Y-100030000D03*
+X112460000Y-98930000D03*
+X112460000Y-97830000D03*
+X112460000Y-96730000D03*
+X112460000Y-95630000D03*
+X112460000Y-94530000D03*
+D19*
+X124925000Y-104020000D03*
+D20*
+X125000000Y-99755000D03*
+D21*
+X123725000Y-93370000D03*
+D22*
+X112960000Y-93450000D03*
+D23*
+X112475000Y-106110000D03*
+D21*
+X123725000Y-106330000D03*
+%TD*%
+D24*
+%TO.C,LED1*%
+X155950000Y-98885000D03*
+X154850000Y-98885000D03*
+X154850000Y-100715000D03*
+X155950000Y-100715000D03*
+%TD*%
+D10*
+%TO.C,R4*%
+X117820000Y-91350000D03*
+X117820000Y-92450000D03*
+%TD*%
+D25*
+%TO.C,C6*%
+X133100000Y-99040000D03*
+X133100000Y-99960000D03*
+%TD*%
+D26*
+%TO.C,IC1*%
+X176560000Y-91100000D03*
+X175290000Y-91100000D03*
+X174020000Y-91100000D03*
+X172750000Y-91100000D03*
+X171480000Y-91100000D03*
+X170210000Y-91100000D03*
+X168940000Y-91100000D03*
+X167670000Y-91100000D03*
+X166400000Y-91100000D03*
+X165130000Y-91100000D03*
+X163860000Y-91100000D03*
+X162590000Y-91100000D03*
+X161320000Y-91100000D03*
+X160050000Y-91100000D03*
+D27*
+X158800000Y-94135000D03*
+X158800000Y-95405000D03*
+X158800000Y-96675000D03*
+X158800000Y-97945000D03*
+X158800000Y-99215000D03*
+X158800000Y-100485000D03*
+X158800000Y-101755000D03*
+X158800000Y-103025000D03*
+X158800000Y-104295000D03*
+X158800000Y-105565000D03*
+D26*
+X160050000Y-108600000D03*
+X161320000Y-108600000D03*
+X162590000Y-108600000D03*
+X163860000Y-108600000D03*
+X165130000Y-108600000D03*
+X166400000Y-108600000D03*
+X167670000Y-108600000D03*
+X168940000Y-108600000D03*
+X170210000Y-108600000D03*
+X171480000Y-108600000D03*
+X172750000Y-108600000D03*
+X174020000Y-108600000D03*
+X175290000Y-108600000D03*
+X176560000Y-108600000D03*
+D28*
+X170240000Y-96950000D03*
+X168840000Y-96950000D03*
+X167440000Y-96950000D03*
+X167440000Y-98350000D03*
+X167440000Y-99750000D03*
+X168840000Y-99750000D03*
+X170240000Y-99750000D03*
+X170240000Y-98350000D03*
+X168840000Y-98350000D03*
+%TD*%
+D29*
+%TO.C,LED4*%
+X127200000Y-99100000D03*
+X128500000Y-99100000D03*
+%TD*%
+D11*
+%TO.C,R2*%
+X155950000Y-97430000D03*
+X154850000Y-97430000D03*
+%TD*%
+D30*
+%TO.C,J1*%
+X143860000Y-101665000D03*
+X143860000Y-98135000D03*
+X145130000Y-101665000D03*
+X145130000Y-98135000D03*
+X146400000Y-101665000D03*
+X146400000Y-98135000D03*
+X147670000Y-101665000D03*
+X147670000Y-98135000D03*
+X148940000Y-101665000D03*
+X148940000Y-98135000D03*
+%TD*%
+D25*
+%TO.C,C5*%
+X126100000Y-101790000D03*
+X126100000Y-102710000D03*
+%TD*%
+D13*
+%TO.C,IC5*%
+X141060000Y-105000000D03*
+X139140000Y-105000000D03*
+X140100000Y-107100000D03*
+%TD*%
+D31*
+%TO.C,LED2*%
+X142800000Y-93050000D03*
+X142800000Y-94650000D03*
+%TD*%
+D32*
+%TO.C,S2*%
+X152075000Y-104875000D03*
+X156225000Y-104875000D03*
+X152075000Y-107025000D03*
+X156225000Y-107025000D03*
+%TD*%
+D12*
+%TO.C,C4*%
+X154930000Y-102150000D03*
+X155850000Y-102150000D03*
+%TD*%
+D33*
+%TO.C,IC3*%
+X134200000Y-106700000D03*
+X134200000Y-104400000D03*
+X134200000Y-102100000D03*
+D34*
+X128000000Y-104400000D03*
+%TD*%
+D12*
+%TO.C,C3*%
+X179065000Y-90300000D03*
+X179985000Y-90300000D03*
+%TD*%
+D35*
+%TO.C,*%
+X187100000Y-99900000D03*
+%TD*%
+D16*
+%TO.C,C8*%
+X129290000Y-97080000D03*
+X129290000Y-96160000D03*
+%TD*%
+D36*
+%TO.C,U3*%
+X138250000Y-92600000D03*
+X137600000Y-92600000D03*
+X136950000Y-92600000D03*
+X136950000Y-94600000D03*
+X137600000Y-94600000D03*
+X138250000Y-94600000D03*
+%TD*%
+D32*
+%TO.C,S1*%
+X152075000Y-92725000D03*
+X156225000Y-92725000D03*
+X152075000Y-94875000D03*
+X156225000Y-94875000D03*
+%TD*%
+D11*
+%TO.C,R1*%
+X149700000Y-93800000D03*
+X150800000Y-93800000D03*
+%TD*%
+D16*
+%TO.C,C9*%
+X134420000Y-99050000D03*
+X134420000Y-99970000D03*
+%TD*%
+D10*
+%TO.C,R8*%
+X131610000Y-97150000D03*
+X131610000Y-96050000D03*
+%TD*%
+D14*
+%TO.C,J5*%
+X129370000Y-89840000D03*
+D15*
+X131910000Y-89840000D03*
+X134450000Y-89840000D03*
+X136990000Y-89840000D03*
+X139530000Y-89840000D03*
+X142070000Y-89840000D03*
+X144610000Y-89840000D03*
+X147150000Y-89840000D03*
+X149690000Y-89840000D03*
+X152230000Y-89840000D03*
+X154770000Y-89840000D03*
+%TD*%
+D10*
+%TO.C,R12*%
+X138400000Y-97150000D03*
+X138400000Y-96050000D03*
+%TD*%
+D37*
+%TO.C,C1*%
+X150690000Y-94690000D03*
+X149770000Y-94690000D03*
+%TD*%
+D10*
+%TO.C,R11*%
+X137200000Y-97150000D03*
+X137200000Y-96050000D03*
+%TD*%
+D16*
+%TO.C,C10*%
+X133000000Y-97085000D03*
+X133000000Y-96165000D03*
+%TD*%
+D10*
+%TO.C,R13*%
+X144350000Y-93300000D03*
+X144350000Y-94400000D03*
+%TD*%
+%TO.C,R14*%
+X147400000Y-93250000D03*
+X147400000Y-94350000D03*
+%TD*%
+D36*
+%TO.C,U2*%
+X134800000Y-92600000D03*
+X134150000Y-92600000D03*
+X133500000Y-92600000D03*
+X133500000Y-94600000D03*
+X134150000Y-94600000D03*
+X134800000Y-94600000D03*
+%TD*%
+D10*
+%TO.C,R9*%
+X133790000Y-97140000D03*
+X133790000Y-96040000D03*
+%TD*%
+D36*
+%TO.C,U1*%
+X131450000Y-92610000D03*
+X130800000Y-92610000D03*
+X130150000Y-92610000D03*
+X130150000Y-94610000D03*
+X130800000Y-94610000D03*
+X131450000Y-94610000D03*
+%TD*%
+D10*
+%TO.C,R3*%
+X119900000Y-91360000D03*
+X119900000Y-92460000D03*
+%TD*%
+%TO.C,R7*%
+X130410000Y-97160000D03*
+X130410000Y-96060000D03*
+%TD*%
+D31*
+%TO.C,LED3*%
+X145900000Y-93050000D03*
+X145900000Y-94650000D03*
+%TD*%
+M02*

PCBs/FlipperZero/WiFi-Devboard-Pro/Manufacturing/Gerber and Drill/WiFi-Devboard-Pro-F_Paste.gbr

@@ -0,0 +1,343 @@
+%TF.GenerationSoftware,KiCad,Pcbnew,(6.0.8)*%
+%TF.CreationDate,2023-01-02T13:08:22-05:00*%
+%TF.ProjectId,WiFi-Devboard-Pro,57694669-2d44-4657-9662-6f6172642d50,rev?*%
+%TF.SameCoordinates,Original*%
+%TF.FileFunction,Paste,Top*%
+%TF.FilePolarity,Positive*%
+%FSLAX46Y46*%
+G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
+G04 Created by KiCad (PCBNEW (6.0.8)) date 2023-01-02 13:08:22*
+%MOMM*%
+%LPD*%
+G01*
+G04 APERTURE LIST*
+%ADD10R,0.600000X0.750000*%
+%ADD11R,0.750000X0.600000*%
+%ADD12R,0.600000X0.620000*%
+%ADD13R,0.650000X1.200000*%
+%ADD14R,0.620000X0.600000*%
+%ADD15R,0.690000X0.720000*%
+%ADD16R,1.100000X0.700000*%
+%ADD17R,0.930000X0.900000*%
+%ADD18R,0.780000X1.050000*%
+%ADD19R,3.330000X0.700000*%
+%ADD20R,2.800000X0.860000*%
+%ADD21R,1.830000X1.140000*%
+%ADD22R,0.700000X0.700000*%
+%ADD23R,0.720000X0.690000*%
+%ADD24R,0.900000X1.500000*%
+%ADD25R,1.500000X0.900000*%
+%ADD26R,0.900000X0.900000*%
+%ADD27R,0.500000X0.900000*%
+%ADD28R,0.650000X2.770000*%
+%ADD29R,0.950000X0.800000*%
+%ADD30R,1.050000X0.650000*%
+%ADD31R,1.850000X0.900000*%
+%ADD32R,1.850000X3.200000*%
+%ADD33R,0.400000X1.000000*%
+%ADD34R,0.620000X0.640000*%
+G04 APERTURE END LIST*
+D10*
+%TO.C,R10*%
+X134960000Y-97140000D03*
+X134960000Y-96040000D03*
+%TD*%
+D11*
+%TO.C,R15*%
+X126500000Y-96950000D03*
+X127600000Y-96950000D03*
+%TD*%
+%TO.C,R6*%
+X150660000Y-104890000D03*
+X149560000Y-104890000D03*
+%TD*%
+D12*
+%TO.C,C7*%
+X117000000Y-92270000D03*
+X116080000Y-92270000D03*
+%TD*%
+D10*
+%TO.C,R5*%
+X115300000Y-91350000D03*
+X115300000Y-92450000D03*
+%TD*%
+D13*
+%TO.C,IC2*%
+X128460000Y-92600000D03*
+X126540000Y-92600000D03*
+X127500000Y-94700000D03*
+%TD*%
+%TO.C,IC4*%
+X138210000Y-102375000D03*
+X136290000Y-102375000D03*
+X137250000Y-104475000D03*
+%TD*%
+D14*
+%TO.C,C11*%
+X136225000Y-97060000D03*
+X136225000Y-96140000D03*
+%TD*%
+D15*
+%TO.C,C2*%
+X181985000Y-90350000D03*
+X181065000Y-90350000D03*
+%TD*%
+D16*
+%TO.C,J6*%
+X112460000Y-102230000D03*
+X112460000Y-101130000D03*
+X112460000Y-100030000D03*
+X112460000Y-98930000D03*
+X112460000Y-97830000D03*
+X112460000Y-96730000D03*
+X112460000Y-95630000D03*
+X112460000Y-94530000D03*
+D17*
+X124925000Y-104020000D03*
+D18*
+X125000000Y-99755000D03*
+D19*
+X123725000Y-93370000D03*
+D20*
+X112960000Y-93450000D03*
+D21*
+X112475000Y-106110000D03*
+D19*
+X123725000Y-106330000D03*
+%TD*%
+D22*
+%TO.C,LED1*%
+X155950000Y-98885000D03*
+X154850000Y-98885000D03*
+X154850000Y-100715000D03*
+X155950000Y-100715000D03*
+%TD*%
+D10*
+%TO.C,R4*%
+X117820000Y-91350000D03*
+X117820000Y-92450000D03*
+%TD*%
+D23*
+%TO.C,C6*%
+X133100000Y-99040000D03*
+X133100000Y-99960000D03*
+%TD*%
+D24*
+%TO.C,IC1*%
+X176560000Y-91100000D03*
+X175290000Y-91100000D03*
+X174020000Y-91100000D03*
+X172750000Y-91100000D03*
+X171480000Y-91100000D03*
+X170210000Y-91100000D03*
+X168940000Y-91100000D03*
+X167670000Y-91100000D03*
+X166400000Y-91100000D03*
+X165130000Y-91100000D03*
+X163860000Y-91100000D03*
+X162590000Y-91100000D03*
+X161320000Y-91100000D03*
+X160050000Y-91100000D03*
+D25*
+X158800000Y-94135000D03*
+X158800000Y-95405000D03*
+X158800000Y-96675000D03*
+X158800000Y-97945000D03*
+X158800000Y-99215000D03*
+X158800000Y-100485000D03*
+X158800000Y-101755000D03*
+X158800000Y-103025000D03*
+X158800000Y-104295000D03*
+X158800000Y-105565000D03*
+D24*
+X160050000Y-108600000D03*
+X161320000Y-108600000D03*
+X162590000Y-108600000D03*
+X163860000Y-108600000D03*
+X165130000Y-108600000D03*
+X166400000Y-108600000D03*
+X167670000Y-108600000D03*
+X168940000Y-108600000D03*
+X170210000Y-108600000D03*
+X171480000Y-108600000D03*
+X172750000Y-108600000D03*
+X174020000Y-108600000D03*
+X175290000Y-108600000D03*
+X176560000Y-108600000D03*
+D26*
+X170240000Y-96950000D03*
+X168840000Y-96950000D03*
+X167440000Y-96950000D03*
+X167440000Y-98350000D03*
+X167440000Y-99750000D03*
+X168840000Y-99750000D03*
+X170240000Y-99750000D03*
+X170240000Y-98350000D03*
+X168840000Y-98350000D03*
+%TD*%
+D27*
+%TO.C,LED4*%
+X127200000Y-99100000D03*
+X128500000Y-99100000D03*
+%TD*%
+D11*
+%TO.C,R2*%
+X155950000Y-97430000D03*
+X154850000Y-97430000D03*
+%TD*%
+D28*
+%TO.C,J1*%
+X143860000Y-101665000D03*
+X143860000Y-98135000D03*
+X145130000Y-101665000D03*
+X145130000Y-98135000D03*
+X146400000Y-101665000D03*
+X146400000Y-98135000D03*
+X147670000Y-101665000D03*
+X147670000Y-98135000D03*
+X148940000Y-101665000D03*
+X148940000Y-98135000D03*
+%TD*%
+D23*
+%TO.C,C5*%
+X126100000Y-101790000D03*
+X126100000Y-102710000D03*
+%TD*%
+D13*
+%TO.C,IC5*%
+X141060000Y-105000000D03*
+X139140000Y-105000000D03*
+X140100000Y-107100000D03*
+%TD*%
+D29*
+%TO.C,LED2*%
+X142800000Y-93050000D03*
+X142800000Y-94650000D03*
+%TD*%
+D30*
+%TO.C,S2*%
+X152075000Y-104875000D03*
+X156225000Y-104875000D03*
+X152075000Y-107025000D03*
+X156225000Y-107025000D03*
+%TD*%
+D12*
+%TO.C,C4*%
+X154930000Y-102150000D03*
+X155850000Y-102150000D03*
+%TD*%
+D31*
+%TO.C,IC3*%
+X134200000Y-106700000D03*
+X134200000Y-104400000D03*
+X134200000Y-102100000D03*
+D32*
+X128000000Y-104400000D03*
+%TD*%
+D12*
+%TO.C,C3*%
+X179065000Y-90300000D03*
+X179985000Y-90300000D03*
+%TD*%
+D14*
+%TO.C,C8*%
+X129290000Y-97080000D03*
+X129290000Y-96160000D03*
+%TD*%
+D33*
+%TO.C,U3*%
+X138250000Y-92600000D03*
+X137600000Y-92600000D03*
+X136950000Y-92600000D03*
+X136950000Y-94600000D03*
+X137600000Y-94600000D03*
+X138250000Y-94600000D03*
+%TD*%
+D30*
+%TO.C,S1*%
+X152075000Y-92725000D03*
+X156225000Y-92725000D03*
+X152075000Y-94875000D03*
+X156225000Y-94875000D03*
+%TD*%
+D11*
+%TO.C,R1*%
+X149700000Y-93800000D03*
+X150800000Y-93800000D03*
+%TD*%
+D14*
+%TO.C,C9*%
+X134420000Y-99050000D03*
+X134420000Y-99970000D03*
+%TD*%
+D10*
+%TO.C,R8*%
+X131610000Y-97150000D03*
+X131610000Y-96050000D03*
+%TD*%
+%TO.C,R12*%
+X138400000Y-97150000D03*
+X138400000Y-96050000D03*
+%TD*%
+D34*
+%TO.C,C1*%
+X150690000Y-94690000D03*
+X149770000Y-94690000D03*
+%TD*%
+D10*
+%TO.C,R11*%
+X137200000Y-97150000D03*
+X137200000Y-96050000D03*
+%TD*%
+D14*
+%TO.C,C10*%
+X133000000Y-97085000D03*
+X133000000Y-96165000D03*
+%TD*%
+D10*
+%TO.C,R13*%
+X144350000Y-93300000D03*
+X144350000Y-94400000D03*
+%TD*%
+%TO.C,R14*%
+X147400000Y-93250000D03*
+X147400000Y-94350000D03*
+%TD*%
+D33*
+%TO.C,U2*%
+X134800000Y-92600000D03*
+X134150000Y-92600000D03*
+X133500000Y-92600000D03*
+X133500000Y-94600000D03*
+X134150000Y-94600000D03*
+X134800000Y-94600000D03*
+%TD*%
+D10*
+%TO.C,R9*%
+X133790000Y-97140000D03*
+X133790000Y-96040000D03*
+%TD*%
+D33*
+%TO.C,U1*%
+X131450000Y-92610000D03*
+X130800000Y-92610000D03*
+X130150000Y-92610000D03*
+X130150000Y-94610000D03*
+X130800000Y-94610000D03*
+X131450000Y-94610000D03*
+%TD*%
+D10*
+%TO.C,R3*%
+X119900000Y-91360000D03*
+X119900000Y-92460000D03*
+%TD*%
+%TO.C,R7*%
+X130410000Y-97160000D03*
+X130410000Y-96060000D03*
+%TD*%
+D29*
+%TO.C,LED3*%
+X145900000Y-93050000D03*
+X145900000Y-94650000D03*
+%TD*%
+M02*

PCBs/FlipperZero/WiFi-Devboard-Pro/Manufacturing/Gerber and Drill/WiFi-Devboard-Pro-NPTH.drl

@@ -0,0 +1,17 @@
+M48
+; DRILL file {KiCad (6.0.8)} date Mon Jan  2 13:07:49 2023
+; FORMAT={-:-/ absolute / inch / decimal}
+; #@! TF.CreationDate,2023-01-02T13:07:49-05:00
+; #@! TF.GenerationSoftware,Kicad,Pcbnew,(6.0.8)
+; #@! TF.FileFunction,NonPlated,1,2,NPTH
+FMAT,2
+INCH
+; #@! TA.AperFunction,NonPlated,NPTH,ComponentDrill
+T1C0.0866
+%
+G90
+G05
+T1
+X7.3661Y-3.9331
+T0
+M30

PCBs/FlipperZero/WiFi-Devboard-Pro/Manufacturing/Gerber and Drill/WiFi-Devboard-Pro-PTH.drl

@@ -0,0 +1,111 @@
+M48
+; DRILL file {KiCad (6.0.8)} date Mon Jan  2 13:07:49 2023
+; FORMAT={-:-/ absolute / inch / decimal}
+; #@! TF.CreationDate,2023-01-02T13:07:49-05:00
+; #@! TF.GenerationSoftware,Kicad,Pcbnew,(6.0.8)
+; #@! TF.FileFunction,Plated,1,2,PTH
+FMAT,2
+INCH
+; #@! TA.AperFunction,Plated,PTH,ViaDrill
+T1C0.0118
+; #@! TA.AperFunction,Plated,PTH,ComponentDrill
+T2C0.0394
+%
+G90
+G05
+T1
+X4.4614Y-3.765
+X4.5118Y-3.5965
+X4.5709Y-3.6008
+X4.6618Y-3.9384
+X4.6626Y-3.5972
+X4.7831Y-3.5969
+X4.8949Y-4.1358
+X4.9528Y-3.8169
+X4.9618Y-4.1575
+X5.0913Y-3.6457
+X5.1081Y-3.7541
+X5.1299Y-4.1307
+X5.154Y-4.2442
+X5.1965Y-3.7252
+X5.2102Y-3.6665
+X5.3067Y-3.6839
+X5.3091Y-3.9748
+X5.3248Y-3.9185
+X5.348Y-3.8756
+X5.3622Y-3.7333
+X5.3986Y-3.9892
+X5.4307Y-3.889
+X5.5819Y-4.0693
+X5.5823Y-4.1481
+X5.6075Y-3.8177
+X5.6398Y-4.0679
+X5.6827Y-3.6469
+X5.7224Y-3.7945
+X5.8028Y-3.6441
+X5.8382Y-3.7945
+X5.8528Y-4.1295
+X5.8933Y-3.8638
+X5.9689Y-3.6858
+X6.0043Y-3.6831
+X6.0236Y-3.5787
+X6.0335Y-3.9311
+X6.1004Y-4.0598
+X6.1528Y-3.6961
+X6.187Y-3.8358
+X6.2461Y-4.2352
+X6.2984Y-3.8134
+X6.2984Y-4.0606
+X6.3012Y-3.7535
+X6.3236Y-4.1185
+X6.3248Y-3.7756
+X6.3492Y-3.7091
+X6.3514Y-4.2116
+X6.3516Y-3.6752
+X6.4012Y-3.6277
+X6.4508Y-4.2323
+X6.4512Y-3.6277
+X6.5004Y-4.2106
+X6.5012Y-3.6277
+X6.5512Y-3.6277
+X6.5512Y-4.2323
+X6.6012Y-3.6277
+X6.6014Y-4.2323
+X6.6276Y-4.1134
+X6.6512Y-3.6277
+X6.7008Y-4.2323
+X6.7012Y-3.6277
+X6.7512Y-4.2276
+X6.802Y-4.2268
+X6.8512Y-3.6362
+X6.8512Y-4.2295
+X6.9012Y-4.2303
+X6.9181Y-3.9774
+X6.9882Y-3.5827
+X7.0197Y-3.5551
+X7.1283Y-3.5831
+T2
+X5.0933Y-3.537
+X5.0933Y-4.3283
+X5.1933Y-3.537
+X5.1933Y-4.3283
+X5.2933Y-3.537
+X5.2933Y-4.3283
+X5.3933Y-3.537
+X5.3933Y-4.3283
+X5.4933Y-3.537
+X5.4933Y-4.3283
+X5.5933Y-3.537
+X5.5933Y-4.3283
+X5.6933Y-3.537
+X5.6933Y-4.3283
+X5.7933Y-3.537
+X5.7933Y-4.3283
+X5.8933Y-3.537
+X5.8933Y-4.3283
+X5.9933Y-3.537
+X5.9933Y-4.3283
+X6.0933Y-3.537
+X6.0933Y-4.3283
+T0
+M30

PCBs/FlipperZero/WiFi-Devboard-Pro/Manufacturing/Gerber and Drill/WiFi-Devboard-Pro-job.gbrjob

@@ -0,0 +1,127 @@
+{
+  "Header": {
+    "GenerationSoftware": {
+      "Vendor": "KiCad",
+      "Application": "Pcbnew",
+      "Version": "(6.0.8)"
+    },
+    "CreationDate": "2023-01-02T13:08:22-05:00"
+  },
+  "GeneralSpecs": {
+    "ProjectId": {
+      "Name": "WiFi-Devboard-Pro",
+      "GUID": "57694669-2d44-4657-9662-6f6172642d50",
+      "Revision": "rev?"
+    },
+    "Size": {
+      "X": 78.56,
+      "Y": 20.2
+    },
+    "LayerNumber": 2,
+    "BoardThickness": 1.6,
+    "Finish": "None"
+  },
+  "DesignRules": [
+    {
+      "Layers": "Outer",
+      "PadToPad": 0.127,
+      "PadToTrack": 0.127,
+      "TrackToTrack": 0.127,
+      "MinLineWidth": 0.127,
+      "TrackToRegion": 0.127,
+      "RegionToRegion": 0.127
+    }
+  ],
+  "FilesAttributes": [
+    {
+      "Path": "WiFi-Devboard-Pro-F_Cu.gbr",
+      "FileFunction": "Copper,L1,Top",
+      "FilePolarity": "Positive"
+    },
+    {
+      "Path": "WiFi-Devboard-Pro-B_Cu.gbr",
+      "FileFunction": "Copper,L2,Bot",
+      "FilePolarity": "Positive"
+    },
+    {
+      "Path": "WiFi-Devboard-Pro-F_Paste.gbr",
+      "FileFunction": "SolderPaste,Top",
+      "FilePolarity": "Positive"
+    },
+    {
+      "Path": "WiFi-Devboard-Pro-B_Paste.gbr",
+      "FileFunction": "SolderPaste,Bot",
+      "FilePolarity": "Positive"
+    },
+    {
+      "Path": "WiFi-Devboard-Pro-F_Silkscreen.gbr",
+      "FileFunction": "Legend,Top",
+      "FilePolarity": "Positive"
+    },
+    {
+      "Path": "WiFi-Devboard-Pro-B_Silkscreen.gbr",
+      "FileFunction": "Legend,Bot",
+      "FilePolarity": "Positive"
+    },
+    {
+      "Path": "WiFi-Devboard-Pro-F_Mask.gbr",
+      "FileFunction": "SolderMask,Top",
+      "FilePolarity": "Negative"
+    },
+    {
+      "Path": "WiFi-Devboard-Pro-B_Mask.gbr",
+      "FileFunction": "SolderMask,Bot",
+      "FilePolarity": "Negative"
+    },
+    {
+      "Path": "WiFi-Devboard-Pro-Edge_Cuts.gbr",
+      "FileFunction": "Profile",
+      "FilePolarity": "Positive"
+    }
+  ],
+  "MaterialStackup": [
+    {
+      "Type": "Legend",
+      "Name": "Top Silk Screen"
+    },
+    {
+      "Type": "SolderPaste",
+      "Name": "Top Solder Paste"
+    },
+    {
+      "Type": "SolderMask",
+      "Thickness": 0.01,
+      "Name": "Top Solder Mask"
+    },
+    {
+      "Type": "Copper",
+      "Thickness": 0.035,
+      "Name": "F.Cu"
+    },
+    {
+      "Type": "Dielectric",
+      "Thickness": 1.51,
+      "Material": "FR4",
+      "Name": "F.Cu/B.Cu",
+      "Notes": "Type: dielectric layer 1 (from F.Cu to B.Cu)"
+    },
+    {
+      "Type": "Copper",
+      "Thickness": 0.035,
+      "Name": "B.Cu"
+    },
+    {
+      "Type": "SolderMask",
+      "Thickness": 0.01,
+      "Name": "Bottom Solder Mask"
+    },
+    {
+      "Type": "SolderPaste",
+      "Name": "Bottom Solder Paste"
+    },
+    {
+      "Type": "Legend",
+      "Name": "Bottom Silk Screen"
+    }
+  ]
+}

PCBs/FlipperZero/WiFi-Devboard-Pro/Manufacturing/WiFi-Devboard-Pro-BOM.csv

@@ -0,0 +1,25 @@
+Comment,Designator,Footprint,LCSC
+"1u","C1","0402",""
+"22uF","C2,C5","0402",""
+"100n","C3,C7,C8,C9,C10,C11","0402",""
+"100nF","C4","0402",""
+"10uF","C6","0402",""
+"MountingHole","H1","",""
+"ESP32-WROOM-32E-N4","IC1","SMD-38P,18x25.5x3.1mm",""
+"SI2333CDS-T1-E3","IC2,IC4,IC5","SOT-23",""
+"AZ1117H-3.3TRE1","IC3","SOT-223-3",""
+"3220-10-0300-00","J1","322010030000",""
+"X6511WVS-08H-C60D48R1","J2","SMD,P=2.54mm(交错脚)",""
+"X6511WVS-10H-C60D48R1","J3","HUSRSP10W66P254_2500X250X850P",""
+"Conn_01x11","J4,J5","SMD,P=2.54mm(交错脚)",""
+"503398-1892","J6","SMD",""
+"WS2812B-2020","LED1","WS2812B2020",""
+"TX","LED2","0603",""
+"RX","LED3","0603",""
+"3V3","LED4","0603",""
+"10k","R1,R6","0402",""
+"220","R2","0402",""
+"1K","R3,R4,R5,R13,R14,R15","0402",""
+"100K","R7,R8,R9,R10,R11,R12","0402",""
+"SKRPABE010","S1,S2","SMD",""
+"MMDT2907A-7-F","U1,U2,U3","SOT65P210X110-6N",""

PCBs/FlipperZero/WiFi-Devboard-Pro/Manufacturing/WiFi-Devboard-Pro-all-pos-EDITED.csv

@@ -0,0 +1,48 @@
+Designator,Val,Package,Mid X,Mid Y,Rotation,Layer
+J2,X6511WVS-08H-C60D48R2,HUSRSP8W66P254_2000X250X850P,-127.300000,-102.100000,0.000000,bottom
+J3,DZ254S-11-10-48,HUSRSP10W66P254_2500X250X850P,-165.400000,-102.100000,0.000000,bottom
+,,,187.100000,-99.900000,0.000000,top
+C1,1u,CAPC1005X60N,150.230000,-94.690000,180.000000,top
+C2,22uF,CAPC1005X80N,181.525000,-90.350000,180.000000,top
+C3,100n,CAPC1005X55N,179.525000,-90.300000,0.000000,top
+C4,100nF,CAPC1005X55N,155.390000,-102.150000,0.000000,top
+C5,22uF,CAPC1005X80N,126.100000,-102.250000,-90.000000,top
+C6,10uF,CAPC1005X70N,133.100000,-99.500000,-90.000000,top
+C7,100n,CAPC1005X55N,116.540000,-92.270000,180.000000,top
+C8,100n,CAPC1005X55N,129.290000,-96.620000,90.000000,top
+C9,100n,CAPC1005X55N,134.420000,-99.510000,-90.000000,top
+C10,100n,CAPC1005X55N,133.000000,-96.625000,90.000000,top
+C11,100n,CAPC1005X55N,136.225000,-96.600000,90.000000,top
+IC1,ESP32-WROOM-32E-N4,ESP32WROOM32EN4,171.300000,-99.850000,-90.000000,top
+IC2,DMP1045U-7,SOT96P240X120-3N,127.500000,-93.650000,-90.000000,top
+IC3,AZ1117H-3.3TRE1,SOT230P700X180-4N,131.100000,-104.400000,180.000000,top
+IC4,DMP1045U-7,SOT96P240X120-3N,137.250000,-103.425000,-90.000000,top
+IC5,DMP1045U-7,SOT96P240X120-3N,140.100000,-106.050000,-90.000000,top
+J1,3220-10-0300-00,322010030000,146.400000,-99.900000,0.000000,top
+J4,Conn_01x11,PinHeader_1x11_P2.54mm_Vertical,129.370000,-109.940000,90.000000,top
+J5,Conn_01x11,PinHeader_1x11_P2.54mm_Vertical,129.370000,-89.840000,90.000000,top
+J6,503398-1892,503398-1892,111.060000,-106.400000,90.000000,top
+LED1,WS2812B-2020,WS2812B2020,155.400000,-99.800000,90.000000,top
+LED2,TX,LEDC1608X50N,142.800000,-93.850000,-90.000000,top
+LED3,RX,LEDC1608X50N,145.900000,-93.850000,-90.000000,top
+LED4,3V3,19217R6CAL1M2VY3T,127.850000,-99.100000,180.000000,top
+R1,10k,RESC1005X40N,150.250000,-93.800000,0.000000,top
+R2,220,RESC1005X40N,155.400000,-97.430000,180.000000,top
+R3,1K,RESC1005X40N,119.900000,-91.910000,-90.000000,top
+R4,1K,RESC1005X40N,117.820000,-91.900000,-90.000000,top
+R5,1K,RESC1005X40N,115.300000,-91.900000,-90.000000,top
+R6,10k,RESC1005X40N,150.110000,-104.890000,180.000000,top
+R7,100K,RESC1005X40N,130.410000,-96.610000,90.000000,top
+R8,100K,RESC1005X40N,131.610000,-96.600000,90.000000,top
+R9,100K,RESC1005X40N,133.790000,-96.590000,90.000000,top
+R10,100K,RESC1005X40N,134.960000,-96.590000,90.000000,top
+R11,100K,RESC1005X40N,137.200000,-96.600000,90.000000,top
+R12,100K,RESC1005X40N,138.400000,-96.600000,90.000000,top
+R13,1K,RESC1005X40N,144.350000,-93.850000,-90.000000,top
+R14,1K,RESC1005X40N,147.400000,-93.800000,-90.000000,top
+R15,1K,RESC1005X40N,127.050000,-96.950000,0.000000,top
+S1,SKRPABE010,SKRPABE010,154.150000,-93.800000,0.000000,top
+S2,SKRPABE010,SKRPABE010,154.150000,-105.950000,0.000000,top
+U1,MMDT2907A-7-F,SOT65P210X110-6N,130.800000,-93.610000,-90.000000,top
+U2,MMDT2907A-7-F,SOT65P210X110-6N,134.150000,-93.600000,-90.000000,top
+U3,MMDT2907A-7-F,SOT65P210X110-6N,137.600000,-93.600000,-90.000000,top

PCBs/FlipperZero/WiFi-Devboard-Pro/README.md

@@ -0,0 +1,9 @@
+# Parts
+
+- Header Pin x8: [C2883805](https://www.lcsc.com/product-detail/Pin-Headers_XKB-Connectivity-X6511WVS-08H-C60D48R1_C2883805.html)
+- Header Pin x10: [C2883807](https://www.lcsc.com/product-detail/Pin-Headers_XKB-Connectivity-X6511WVS-10H-C60D48R1_C2883807.html)
+- Alternative Header: [M20-8771246](https://www.mouser.com/ProductDetail/Harwin/M20-8771246?qs=WS5Jv%252B%252Bx1qWzrNY%252Bb2U9JQ%3D%3D&countryCode=US&currencyCode=USD)
+- Light Pipe: [PLP2-188](https://www.digikey.com/en/products/detail/bivar-inc/PLP2-188/5721973?utm_medium=email&utm_source=oce&utm_campaign=4251_OCE23RT&utm_content=productdetail_US&utm_cid=2955578&so=79456987&mkt_tok=MDI4LVNYSy01MDcAAAGJOBaFWa7m6RHsJZT6mWcYRd9LRyXmqis92EV7j5ftyM5NuNOSOPqUp292m0P5E3FKrEWCFuvb9fObSzuSvVMsopuOMPjO46ylCAR1IzCL)
+- M2x6mm Round Top Screw: [97763A407](https://www.mcmaster.com/97763A407/)
+- M2x8mm Countersunk Screw: [91294A005](https://www.mcmaster.com/91294A005/)
+- M2 Threaded Insert: [94180A307](https://www.mcmaster.com/94180A307/)

PCBs/FlipperZero/WiFi-Devboard-Pro/WiFi-Devboard-Pro.kicad_prl

@@ -1,9 +1,11 @@
 {
   "board": {
-    "active_layer": 0,
+    "active_layer": 44,
     "active_layer_preset": "",
     "auto_track_width": false,
-    "hidden_nets": [],
+    "hidden_nets": [
+      "+ext_3V3"
+    ],
     "high_contrast_mode": 0,
     "net_color_mode": 1,
     "opacity": {
@@ -18,7 +20,7 @@
       "footprints": true,
       "graphics": true,
       "keepouts": true,
-      "lockedItems": false,
+      "lockedItems": true,
       "otherItems": true,
       "pads": true,
       "text": true,
@@ -33,16 +35,15 @@
       3,
       4,
       5,
-      8,
       9,
       10,
+      11,
       12,
       13,
       14,
       15,
       16,
       17,
-      18,
       19,
       20,
       21,
@@ -61,8 +62,8 @@
       35,
       36
     ],
-    "visible_layers": "ffebeaa_7fffffff",
-    "zone_display_mode": 0
+    "visible_layers": "8001130_ffffffff",
+    "zone_display_mode": 1
   },
   "meta": {
     "filename": "WiFi-Devboard-Pro.kicad_prl",

PCBs/FlipperZero/WiFi-Devboard-Pro/WiFi-Devboard-Pro.kicad_pro

@@ -33,9 +33,9 @@
         "other_text_thickness": 0.15,
         "other_text_upright": false,
         "pads": {
-          "drill": 1.0,
-          "height": 1.7,
-          "width": 1.7
+          "drill": 2.2,
+          "height": 2.2,
+          "width": 2.2
         },
         "silk_line_width": 0.15,
         "silk_text_italic": false,
@@ -45,10 +45,16 @@
         "silk_text_upright": false,
         "zones": {
           "45_degree_only": false,
-          "min_clearance": 0.508
+          "min_clearance": 0.09999999999999999
         }
       },
-      "diff_pair_dimensions": [],
+      "diff_pair_dimensions": [
+        {
+          "gap": 0.0,
+          "via_gap": 0.0,
+          "width": 0.0
+        }
+      ],
       "drc_exclusions": [],
       "meta": {
         "version": 2
@@ -56,8 +62,8 @@
       "rule_severities": {
         "annular_width": "error",
         "clearance": "error",
-        "copper_edge_clearance": "error",
-        "courtyards_overlap": "error",
+        "copper_edge_clearance": "ignore",
+        "courtyards_overlap": "ignore",
         "diff_pair_gap_out_of_range": "error",
         "diff_pair_uncoupled_length_too_long": "error",
         "drill_out_of_range": "error",
@@ -79,12 +85,12 @@
         "padstack": "error",
         "pth_inside_courtyard": "ignore",
         "shorting_items": "error",
-        "silk_over_copper": "warning",
-        "silk_overlap": "warning",
+        "silk_over_copper": "ignore",
+        "silk_overlap": "ignore",
         "skew_out_of_range": "error",
         "through_hole_pad_without_hole": "error",
         "too_many_vias": "error",
-        "track_dangling": "warning",
+        "track_dangling": "ignore",
         "track_width": "error",
         "tracks_crossing": "error",
         "unconnected_items": "error",
@@ -97,23 +103,51 @@
         "allow_blind_buried_vias": false,
         "allow_microvias": false,
         "max_error": 0.005,
-        "min_clearance": 0.0,
-        "min_copper_edge_clearance": 0.0,
-        "min_hole_clearance": 0.25,
-        "min_hole_to_hole": 0.25,
+        "min_clearance": 0.127,
+        "min_copper_edge_clearance": 0.19999999999999998,
+        "min_hole_clearance": 0.254,
+        "min_hole_to_hole": 0.5,
         "min_microvia_diameter": 0.19999999999999998,
         "min_microvia_drill": 0.09999999999999999,
         "min_silk_clearance": 0.0,
-        "min_through_hole_diameter": 0.3,
-        "min_track_width": 0.19999999999999998,
+        "min_through_hole_diameter": 0.19999999999999998,
+        "min_track_width": 0.127,
         "min_via_annular_width": 0.049999999999999996,
-        "min_via_diameter": 0.39999999999999997,
+        "min_via_diameter": 0.5,
         "solder_mask_clearance": 0.0,
         "solder_mask_min_width": 0.0,
         "use_height_for_length_calcs": true
       },
-      "track_widths": [],
-      "via_dimensions": [],
+      "track_widths": [
+        0.0,
+        0.127,
+        0.2,
+        0.3,
+        0.5,
+        1.0
+      ],
+      "via_dimensions": [
+        {
+          "diameter": 0.0,
+          "drill": 0.0
+        },
+        {
+          "diameter": 0.4,
+          "drill": 0.2
+        },
+        {
+          "diameter": 0.5,
+          "drill": 0.3
+        },
+        {
+          "diameter": 1.0,
+          "drill": 0.5
+        },
+        {
+          "diameter": 2.0,
+          "drill": 1.0
+        }
+      ],
       "zones_allow_external_fillets": false,
       "zones_use_no_outline": true
     },
@@ -340,7 +374,7 @@
     "classes": [
       {
         "bus_width": 12.0,
-        "clearance": 0.2,
+        "clearance": 0.127,
         "diff_pair_gap": 0.25,
         "diff_pair_via_gap": 0.25,
         "diff_pair_width": 0.2,
@@ -350,9 +384,53 @@
         "name": "Default",
         "pcb_color": "rgba(0, 0, 0, 0.000)",
         "schematic_color": "rgba(0, 0, 0, 0.000)",
-        "track_width": 0.25,
-        "via_diameter": 0.8,
-        "via_drill": 0.4,
+        "track_width": 0.127,
+        "via_diameter": 0.5,
+        "via_drill": 0.3,
+        "wire_width": 6.0
+      },
+      {
+        "bus_width": 12.0,
+        "clearance": 0.127,
+        "diff_pair_gap": 0.25,
+        "diff_pair_via_gap": 0.25,
+        "diff_pair_width": 0.2,
+        "line_style": 0,
+        "microvia_diameter": 0.3,
+        "microvia_drill": 0.1,
+        "name": "GND",
+        "nets": [
+          "GND"
+        ],
+        "pcb_color": "rgba(0, 0, 0, 0.000)",
+        "schematic_color": "rgba(0, 0, 0, 0.000)",
+        "track_width": 0.2,
+        "via_diameter": 0.5,
+        "via_drill": 0.3,
+        "wire_width": 6.0
+      },
+      {
+        "bus_width": 12.0,
+        "clearance": 0.127,
+        "diff_pair_gap": 0.25,
+        "diff_pair_via_gap": 0.25,
+        "diff_pair_width": 0.2,
+        "line_style": 0,
+        "microvia_diameter": 0.3,
+        "microvia_drill": 0.1,
+        "name": "Supply",
+        "nets": [
+          "+3V3",
+          "+5V",
+          "+LDO_3V3",
+          "+ext_3V3",
+          "+ext_5V"
+        ],
+        "pcb_color": "rgba(0, 0, 0, 0.000)",
+        "schematic_color": "rgba(0, 0, 0, 0.000)",
+        "track_width": 0.2,
+        "via_diameter": 0.5,
+        "via_drill": 0.3,
         "wire_width": 6.0
       }
     ],

PCBs/FlipperZero/WiFi-Devboard-Pro/bom2grouped_csv_jlcpcb.xsl

@@ -0,0 +1,104 @@
+<!--XSL style sheet to convert EESCHEMA XML Partlist Format to grouped CSV BOM Format
+    Copyright (C) 2014, Wolf Walter.
+    Copyright (C) 2013, Stefan Helmert.
+    Copyright (C) 2018, Kicad developers.
+    Copyright (C) 2019, arturo182.
+    GPL v2.
+
+	Functionality:
+		Generation of JLCPCB PCBA compatible BOM
+
+    How to use this is explained in eeschema.pdf chapter 14.  You enter a command line into the
+    netlist exporter using a new (custom) tab in the netlist export dialog.
+    The command line is
+        xsltproc -o "%O.csv" "FullPathToFile/bom2grouped_csv_jlcpcb.xsl" "%I"
+-->
+<!--
+    @package
+    Generates a JLCPCB PCBA service compatible BOM
+
+	Functionality:
+    * Generate a comma separated value BOM list (csv file type).
+    * Components are sorted by ref and grouped by same value+footprint
+    One value per line
+    Fields are
+    Comment,Designator,Footprint,LCSC
+
+    The command line is
+        xsltproc -o "%O.csv" "full_path/bom2grouped_csv_jlcpcb.xsl" "%I"
+-->
+
+
+<!DOCTYPE xsl:stylesheet [
+  <!ENTITY nl  "&#xd;&#xa;">    <!--new line CR, LF, or LF, your choice -->
+]>
+
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+	<xsl:output method="text"/>
+
+	<xsl:variable name="digits" select="'1234567890'" />
+
+	<!-- for matching grouping of footprint and value combination -->
+	<xsl:key name="partTypeByValueAndFootprint" match="comp" use="concat(footprint, '-', value)" />
+
+	<!-- for table head and empty table fields-->
+	<xsl:key name="headentr" match="field" use="@name"/>
+
+	    <!-- main part -->
+	<xsl:template match="/export">
+	    <xsl:text>Comment,Designator,Footprint,LCSC</xsl:text>
+	    <!-- all table entries -->
+	    <xsl:apply-templates select="components"/>
+	</xsl:template>
+
+	<xsl:template match="components">
+	    <!-- for Muenchian grouping of footprint and value combination -->
+	    <xsl:for-each select="comp[count(. | key('partTypeByValueAndFootprint', concat(footprint, '-', value))[1]) = 1]">
+		<xsl:sort select="@ref" />
+		<xsl:text>&nl;</xsl:text>
+		<xsl:text>"</xsl:text><xsl:value-of select="value"/><xsl:text>","</xsl:text>
+		<!-- list of all references -->
+		<xsl:for-each select="key('partTypeByValueAndFootprint', concat(footprint, '-', value))">
+			<!-- strip non-digits from reference and sort based on remaining number -->
+			<xsl:sort select="translate(@ref, translate(@ref, $digits, ''), '')" data-type="number" />
+			<xsl:value-of select="@ref"/>
+			<xsl:if test="position() != last()"><xsl:text>,</xsl:text></xsl:if>
+		</xsl:for-each>
+		<xsl:text>","</xsl:text>
+		
+		<xsl:value-of select="footprint"/><xsl:text>","</xsl:text>
+		<xsl:value-of select="fields/field[@name='LCSC']"/><xsl:text>"</xsl:text>
+	    </xsl:for-each>
+	</xsl:template>
+
+	 <!-- table entries with dynamic table head -->
+	<xsl:template match="fields">
+
+	    <!-- remember current fields section -->
+	    <xsl:variable name="fieldvar" select="field"/>
+
+	    <!-- for all existing head entries -->
+	    <xsl:for-each select="/export/components/comp/fields/field[generate-id(.) = generate-id(key('headentr',@name)[1])]">
+		<xsl:variable name="allnames" select="@name"/>
+		<xsl:text>,"</xsl:text>
+
+		<!-- for all field entries in the remembered fields section -->
+		<xsl:for-each select="$fieldvar">
+
+		    <!-- only if this field entry exists in this fields section -->
+		    <xsl:if test="@name=$allnames">
+			<!-- content of the field -->
+			<xsl:value-of select="."/>
+		    </xsl:if>
+		    <!--
+			If it does not exist, use an empty cell in output for this row.
+			Every non-blank entry is assigned to its proper column.
+		    -->
+                </xsl:for-each>
+
+                <xsl:text>"</xsl:text>
+	    </xsl:for-each>
+	</xsl:template>
+
+ </xsl:stylesheet>

README.md

@@ -3,7 +3,7 @@
 <!---[![Build Status](https://travis-ci.com/justcallmekoko/ESP32Marauder.svg?branch=master)](https://travis-ci.com/justcallmekoko/ESP32Marauder)--->
 <!---Shields/Badges https://shields.io/--->
 
-# ESP32 Marauder v0.9.19
+# ESP32 Marauder v0.10.1
 <p align="center"><img alt="Marauder logo" src="https://github.com/justcallmekoko/ESP32Marauder/blob/master/pictures/marauder3L.jpg?raw=true" width="300"></p>
 <p align="center">
   <b>A suite of WiFi/Bluetooth offensive and defensive tools for the ESP32</b>

esp32_marauder/Buffer.cpp

@@ -6,7 +6,7 @@ Buffer::Buffer(){
   bufB = (uint8_t*)malloc(BUF_SIZE);
 }
 
-void Buffer::open(fs::FS* fs, String fn){
+void Buffer::createPcapFile(fs::FS* fs, String fn){
   int i=0;
   do{
     fileName = "/"+fn+"_"+(String)i+".pcap";
@@ -17,12 +17,15 @@ void Buffer::open(fs::FS* fs, String fn){
   
   file = fs->open(fileName, FILE_WRITE);
   file.close();
+}
 
+void Buffer::open(){
   bufSizeA = 0;
   bufSizeB = 0;
-  
+
+  bufSizeB = 0;  
   writing = true;
-  
+
   write(uint32_t(0xa1b2c3d4)); // magic number
   write(uint16_t(2)); // major version number
   write(uint16_t(4)); // minor version number
@@ -30,8 +33,6 @@ void Buffer::open(fs::FS* fs, String fn){
   write(uint32_t(0)); // accuracy of timestamps
   write(uint32_t(SNAP_LEN)); // max length of captured packets, in octets
   write(uint32_t(105)); // data link type
-
-  //useSD = true;
 }
 
 void Buffer::close(fs::FS* fs){
@@ -201,3 +202,34 @@ void Buffer::forceSave(fs::FS* fs){
   saving = false;
   writing = true;
 }
+
+void Buffer::forceSaveSerial() {
+  uint32_t len = bufSizeA + bufSizeB;
+  if(len == 0) return;
+
+  saving = true;
+  writing = false;
+
+  if(useA){
+    if(bufSizeB > 0){
+      Serial1.write(bufB, bufSizeB);
+      bufSizeB = 0;
+    }
+    if(bufSizeA > 0){
+      Serial1.write(bufA, bufSizeA);
+      bufSizeA = 0;
+    }
+  } else {
+    if(bufSizeA > 0){
+      Serial1.write(bufA, bufSizeA);
+      bufSizeA = 0;
+    }
+    if(bufSizeB > 0){
+      Serial1.write(bufB, bufSizeB);
+      bufSizeB = 0;
+    }
+  }
+
+  saving = false;
+  writing = true;
+}

esp32_marauder/Buffer.h

@@ -16,11 +16,13 @@ extern Settings settings_obj;
 class Buffer {
   public:
     Buffer();
-    void open(fs::FS* fs, String fn = "");
+    void createPcapFile(fs::FS* fs, String fn = "");
+    void open();
     void close(fs::FS* fs);
     void addPacket(uint8_t* buf, uint32_t len);
     void save(fs::FS* fs);
     void forceSave(fs::FS* fs);
+    void forceSaveSerial();
   private:
     void write(int32_t n);
     void write(uint32_t n);

esp32_marauder/CommandLine.cpp

@@ -109,13 +109,12 @@ void CommandLine::runCommand(String input) {
     Serial.println(HELP_CH_CMD);
     Serial.println(HELP_SETTINGS_CMD);
     Serial.println(HELP_CLEARAP_CMD_A);
-    Serial.println(HELP_CLEARAP_CMD_B);
     Serial.println(HELP_REBOOT_CMD);
     Serial.println(HELP_UPDATE_CMD_A);
-    Serial.println(HELP_UPDATE_CMD_B);
     
     // WiFi sniff/scan
     Serial.println(HELP_SCANAP_CMD);
+    Serial.println(HELP_SCANSTA_CMD);
     Serial.println(HELP_SNIFF_RAW_CMD);
     Serial.println(HELP_SNIFF_BEACON_CMD);
     Serial.println(HELP_SNIFF_PROBE_CMD);
@@ -131,8 +130,8 @@ void CommandLine::runCommand(String input) {
     // WiFi Aux
     Serial.println(HELP_LIST_AP_CMD_A);
     Serial.println(HELP_LIST_AP_CMD_B);
+    Serial.println(HELP_LIST_AP_CMD_C);
     Serial.println(HELP_SEL_CMD_A);
-    Serial.println(HELP_SEL_CMD_B);
     Serial.println(HELP_SSID_CMD_A);
     Serial.println(HELP_SSID_CMD_B);
     
@@ -183,12 +182,28 @@ void CommandLine::runCommand(String input) {
   else if (cmd_args.get(0) == CLEARAP_CMD) {
     int ap_sw = this->argSearch(&cmd_args, "-a"); // APs
     int ss_sw = this->argSearch(&cmd_args, "-s"); // SSIDs
+    int cl_sw = this->argSearch(&cmd_args, "-c"); // Stations
 
-    if (ap_sw != -1)
+    if (ap_sw != -1) {
+      #ifdef HAS_SCREEN
+        menu_function_obj.changeMenu(&menu_function_obj.clearAPsMenu);
+      #endif
       wifi_scan_obj.RunClearAPs();
+    }
 
-    if (ss_sw != -1)
+    if (ss_sw != -1) {
+      #ifdef HAS_SCREEN
+        menu_function_obj.changeMenu(&menu_function_obj.clearSSIDsMenu);
+      #endif
       wifi_scan_obj.RunClearSSIDs();
+    }
+
+    if (cl_sw != -1) {
+      #ifdef HAS_SCREEN
+        menu_function_obj.changeMenu(&menu_function_obj.clearAPsMenu);
+      #endif
+      wifi_scan_obj.RunClearStations();
+    }
   }
 
   else if (cmd_args.get(0) == SETTINGS_CMD) {
@@ -258,6 +273,15 @@ void CommandLine::runCommand(String input) {
       #endif
       wifi_scan_obj.StartScan(WIFI_SCAN_RAW_CAPTURE, TFT_WHITE);
     }
+    // Scan stations
+    else if (cmd_args.get(0) == SCANSTA_CMD) {    
+      Serial.println("Starting Station scan. Stop with " + (String)STOPSCAN_CMD);  
+      #ifdef HAS_SCREEN
+        display_obj.clearScreen();
+        menu_function_obj.drawStatusBar();
+      #endif
+      wifi_scan_obj.StartScan(WIFI_SCAN_STATION, TFT_ORANGE);
+    }
     // Beacon sniff
     else if (cmd_args.get(0) == SNIFF_BEACON_CMD) {
       Serial.println("Starting Beacon sniff. Stop with " + (String)STOPSCAN_CMD);
@@ -334,6 +358,7 @@ void CommandLine::runCommand(String input) {
       int ap_beacon_sw = this->argSearch(&cmd_args, "-a");
       int src_addr_sw = this->argSearch(&cmd_args, "-s");
       int dst_addr_sw = this->argSearch(&cmd_args, "-d");
+      int targ_sw = this->argSearch(&cmd_args, "-c");
   
       if (attack_type_switch == -1) {
         Serial.println("You must specify an attack type");
@@ -345,14 +370,21 @@ void CommandLine::runCommand(String input) {
         // Branch on attack type
         // Deauth
         if (attack_type == ATTACK_TYPE_DEAUTH) {
-          if (dst_addr_sw == -1) {
+          // Default to broadcast
+          if ((dst_addr_sw == -1) && (targ_sw == -1)) {
             Serial.println("Sending to broadcast...");
             wifi_scan_obj.dst_mac = "ff:ff:ff:ff:ff:ff";
           }
-          else {
+          // Dest addr specified
+          else if (dst_addr_sw != -1) {
             wifi_scan_obj.dst_mac = cmd_args.get(dst_addr_sw + 1);
             Serial.println("Sending to " + wifi_scan_obj.dst_mac + "...");
           }
+          // Station list specified
+          else if (targ_sw != -1)
+            Serial.println("Sending to Station list");
+
+          // Source addr not specified
           if (src_addr_sw == -1) {
             if (!this->apSelected()) {
               Serial.println("You don't have any targets selected. Use " + (String)SEL_CMD);
@@ -363,8 +395,14 @@ void CommandLine::runCommand(String input) {
               menu_function_obj.drawStatusBar();
             #endif
             Serial.println("Starting Deauthentication attack. Stop with " + (String)STOPSCAN_CMD);
-            wifi_scan_obj.StartScan(WIFI_ATTACK_DEAUTH, TFT_RED);
+            // Station list not specified
+            if (targ_sw == -1)
+              wifi_scan_obj.StartScan(WIFI_ATTACK_DEAUTH, TFT_RED);
+            // Station list specified
+            else
+              wifi_scan_obj.StartScan(WIFI_ATTACK_DEAUTH_TARGETED, TFT_ORANGE);
           }
+          // Source addr specified
           else {
             String src_mac_str = cmd_args.get(src_addr_sw + 1);
             sscanf(src_mac_str.c_str(), "%2hhx:%2hhx:%2hhx:%2hhx:%2hhx:%2hhx", 
@@ -482,12 +520,16 @@ void CommandLine::runCommand(String input) {
       }
       // Update via SD
       else if (sd_sw != -1) {
-        if (!sd_obj.supported) {
-          Serial.println("SD card is not connected. Cannot perform SD Update");
-          return;
-        }
-        wifi_scan_obj.currentScanMode = OTA_UPDATE;
-        sd_obj.runUpdate();
+        #ifndef WRITE_PACKETS_SERIAL
+          if (!sd_obj.supported) {
+            Serial.println("SD card is not connected. Cannot perform SD Update");
+            return;
+          }
+          wifi_scan_obj.currentScanMode = OTA_UPDATE;
+          sd_obj.runUpdate();
+        #else
+          Serial.println("SD card not initialized. Cannot perform SD Update");
+        #endif
       }
     }
   }
@@ -498,6 +540,7 @@ void CommandLine::runCommand(String input) {
   if (cmd_args.get(0) == LIST_AP_CMD) {
     int ap_sw = this->argSearch(&cmd_args, "-a");
     int ss_sw = this->argSearch(&cmd_args, "-s");
+    int cl_sw = this->argSearch(&cmd_args, "-c");
 
     // List APs
     if (ap_sw != -1) {
@@ -517,6 +560,25 @@ void CommandLine::runCommand(String input) {
           Serial.println("[" + (String)i + "] " + ssids->get(i).essid);
       }
     }
+    // List Stations
+    else if (cl_sw != -1) {
+      char sta_mac[] = "00:00:00:00:00:00";
+      for (int x = 0; x < access_points->size(); x++) {
+        Serial.println("[" + (String)x + "] " + access_points->get(x).essid + " " + (String)access_points->get(x).rssi + ":");
+        for (int i = 0; i < access_points->get(x).stations->size(); i++) {
+          wifi_scan_obj.getMAC(sta_mac, stations->get(access_points->get(x).stations->get(i)).mac, 0);
+          if (stations->get(access_points->get(x).stations->get(i)).selected) {
+            Serial.print("  [" + (String)access_points->get(x).stations->get(i) + "] ");
+            Serial.print(sta_mac);
+            Serial.println(" (selected)");
+          }
+          else {
+            Serial.print("  [" + (String)access_points->get(x).stations->get(i) + "] ");
+            Serial.println(sta_mac);
+          }
+        }
+      }
+    }
     else {
       Serial.println("You did not specify which list to show");
       return;
@@ -527,6 +589,7 @@ void CommandLine::runCommand(String input) {
     // Get switches
     int ap_sw = this->argSearch(&cmd_args, "-a");
     int ss_sw = this->argSearch(&cmd_args, "-s");
+    int cl_sw = this->argSearch(&cmd_args, "-c");
 
     // select Access points
     if (ap_sw != -1) {
@@ -574,6 +637,50 @@ void CommandLine::runCommand(String input) {
         }
       }
     }
+    else if (cl_sw != -1) {
+      LinkedList<String> sta_index = this->parseCommand(cmd_args.get(cl_sw + 1), ",");
+      
+      // Select all Stations
+      if (cmd_args.get(cl_sw + 1) == "all") {
+        for (int i = 0; i < stations->size(); i++) {
+          if (stations->get(i).selected) {
+            // Unselect "selected" ap
+            Station new_sta = stations->get(i);
+            new_sta.selected = false;
+            stations->set(i, new_sta);
+          }
+          else {
+            // Select "unselected" ap
+            Station new_sta = stations->get(i);
+            new_sta.selected = true;
+            stations->set(i, new_sta);
+          }
+        }
+      }
+      // Select specific Stations
+      else {
+        // Mark Stations as selected
+        for (int i = 0; i < sta_index.size(); i++) {
+          int index = sta_index.get(i).toInt();
+          if (!this->inRange(stations->size(), index)) {
+            Serial.println("Index not in range: " + (String)index);
+            continue;
+          }
+          if (stations->get(index).selected) {
+            // Unselect "selected" ap
+            Station new_sta = stations->get(index);
+            new_sta.selected = false;
+            stations->set(index, new_sta);
+          }
+          else {
+            // Select "unselected" ap
+            Station new_sta = stations->get(index);
+            new_sta.selected = true;
+            stations->set(index, new_sta);
+          }
+        }
+      }
+    }
     // select ssids
     else if (ss_sw != -1) {
       // Get list of indices

esp32_marauder/CommandLine.h

@@ -24,6 +24,7 @@ extern SDInterface sd_obj;
 extern Settings settings_obj;
 extern LinkedList<AccessPoint>* access_points;
 extern LinkedList<ssid>* ssids;
+extern LinkedList<Station>* stations;
 extern const String PROGMEM version_number;
 
 //// Commands
@@ -38,6 +39,7 @@ const char PROGMEM SETTINGS_CMD[] = "settings";
 
 // WiFi sniff/scan
 const char PROGMEM SCANAP_CMD[] = "scanap";
+const char PROGMEM SCANSTA_CMD[] = "scansta";
 const char PROGMEM SNIFF_RAW_CMD[] = "sniffraw";
 const char PROGMEM SNIFF_BEACON_CMD[] = "sniffbeacon";
 const char PROGMEM SNIFF_PROBE_CMD[] = "sniffprobe";
@@ -68,15 +70,14 @@ const char PROGMEM BT_SKIM_CMD[] = "sniffskim";
 // Admin
 const char PROGMEM HELP_HEAD[] = "============ Commands ============";
 const char PROGMEM HELP_CH_CMD[] = "channel [-s <channel>]";
-const char PROGMEM HELP_CLEARAP_CMD_A[] = "clearlist -a";
-const char PROGMEM HELP_CLEARAP_CMD_B[] = "clearlist -s";
+const char PROGMEM HELP_CLEARAP_CMD_A[] = "clearlist -a/-c/-s";
 const char PROGMEM HELP_REBOOT_CMD[] = "reboot";
-const char PROGMEM HELP_UPDATE_CMD_A[] = "update -s";
-const char PROGMEM HELP_UPDATE_CMD_B[] = "update -w";
+const char PROGMEM HELP_UPDATE_CMD_A[] = "update -s/-w";
 const char PROGMEM HELP_SETTINGS_CMD[] = "settings [-s <setting> enable/disable>]/[-r]";
 
 // WiFi sniff/scan
 const char PROGMEM HELP_SCANAP_CMD[] = "scanap";
+const char PROGMEM HELP_SCANSTA_CMD[] = "scansta";
 const char PROGMEM HELP_SNIFF_RAW_CMD[] = "sniffraw";
 const char PROGMEM HELP_SNIFF_BEACON_CMD[] = "sniffbeacon";
 const char PROGMEM HELP_SNIFF_PROBE_CMD[] = "sniffprobe";
@@ -87,13 +88,13 @@ const char PROGMEM HELP_SNIFF_PMKID_CMD[] = "sniffpmkid [-c <channel>]";
 const char PROGMEM HELP_STOPSCAN_CMD[] = "stopscan";
 
 // WiFi attack
-const char PROGMEM HELP_ATTACK_CMD[] = "attack -t <beacon [-l/-r/-a]/deauth [-s <src mac>] [-d <dst mac>]/probe/rickroll>";
+const char PROGMEM HELP_ATTACK_CMD[] = "attack -t <beacon [-l/-r/-a]/deauth [-c]/[-s <src mac>] [-d <dst mac>]/probe/rickroll>";
 
 // WiFi Aux
 const char PROGMEM HELP_LIST_AP_CMD_A[] = "list -s";
 const char PROGMEM HELP_LIST_AP_CMD_B[] = "list -a";
-const char PROGMEM HELP_SEL_CMD_A[] = "select -a <index (comma separated)>";
-const char PROGMEM HELP_SEL_CMD_B[] = "select -s <index (comma separated)>";
+const char PROGMEM HELP_LIST_AP_CMD_C[] = "list -c";
+const char PROGMEM HELP_SEL_CMD_A[] = "select -a/-s/-c <index (comma separated)>";
 const char PROGMEM HELP_SSID_CMD_A[] = "ssid -a [-g <count>/-n <name>]";
 const char PROGMEM HELP_SSID_CMD_B[] = "ssid -r <index>";
 

esp32_marauder/MenuFunctions.cpp

@@ -132,27 +132,29 @@ MenuFunctions::MenuFunctions()
     lv_textarea_set_text(ta1, "");
     lv_textarea_set_placeholder_text(ta1, "Ducky script");
   
-    if (sd_obj.supported) {
-      // Create load button
-      lv_obj_t * label;
-      lv_obj_t * load_btn = lv_btn_create(lv_scr_act(), NULL);
-      lv_obj_set_event_cb(load_btn, load_btn_cb);
-      lv_obj_set_height(load_btn, 35);
-      lv_obj_set_width(load_btn, LV_HOR_RES / 3);
-      lv_obj_align(load_btn, ta1, LV_ALIGN_IN_TOP_RIGHT, NULL, (LV_VER_RES / 2) - 35); // align to text area
-      label = lv_label_create(load_btn, NULL);
-      lv_label_set_text(label, text05);
-    
-      // Create Save As button
-      lv_obj_t * label2;
-      lv_obj_t * save_as_btn = lv_btn_create(lv_scr_act(), NULL);
-      lv_obj_set_event_cb(save_as_btn, load_btn_cb);
-      lv_obj_set_height(save_as_btn, 35);
-      lv_obj_set_width(save_as_btn, LV_HOR_RES / 3);
-      lv_obj_align(save_as_btn, ta1, LV_ALIGN_IN_TOP_MID, NULL, (LV_VER_RES / 2) - 35); // align to text area
-      label2 = lv_label_create(save_as_btn, NULL);
-      lv_label_set_text(label2, text06);
-    }
+    #ifndef WRITE_PACKETS_SERIAL
+      if (sd_obj.supported) {
+        // Create load button
+        lv_obj_t * label;
+        lv_obj_t * load_btn = lv_btn_create(lv_scr_act(), NULL);
+        lv_obj_set_event_cb(load_btn, load_btn_cb);
+        lv_obj_set_height(load_btn, 35);
+        lv_obj_set_width(load_btn, LV_HOR_RES / 3);
+        lv_obj_align(load_btn, ta1, LV_ALIGN_IN_TOP_RIGHT, NULL, (LV_VER_RES / 2) - 35); // align to text area
+        label = lv_label_create(load_btn, NULL);
+        lv_label_set_text(label, text05);
+      
+        // Create Save As button
+        lv_obj_t * label2;
+        lv_obj_t * save_as_btn = lv_btn_create(lv_scr_act(), NULL);
+        lv_obj_set_event_cb(save_as_btn, load_btn_cb);
+        lv_obj_set_height(save_as_btn, 35);
+        lv_obj_set_width(save_as_btn, LV_HOR_RES / 3);
+        lv_obj_align(save_as_btn, ta1, LV_ALIGN_IN_TOP_MID, NULL, (LV_VER_RES / 2) - 35); // align to text area
+        label2 = lv_label_create(save_as_btn, NULL);
+        lv_label_set_text(label2, text06);
+      }
+    #endif
     
     // Focus it on one of the text areas to start
     lv_keyboard_set_textarea(kb, ta1);
@@ -213,34 +215,6 @@ MenuFunctions::MenuFunctions()
         }
       }
     }
-  
-    /*
-    if (event == LV_EVENT_VALUE_CHANGED) {      
-      if (lv_btn_get_state(btn) == LV_BTN_STATE_CHECKED_RELEASED) {
-        //Serial.print("Toggle on: ");
-        //Serial.println(btn_text);
-        for (int i = 0; i < access_points->size(); i++) {
-          if (access_points->get(i).essid == btn_text) {
-            Serial.println("Adding AP: " + (String)access_points->get(i).essid);
-            AccessPoint ap = access_points->get(i);
-            ap.selected = true;
-            access_points->set(i, ap);
-          }
-        }
-      }
-      else {
-        //Serial.print("Toggle off: ");
-        //Serial.println(btn_text);
-        for (int i = 0; i < access_points->size(); i++) {
-          if (access_points->get(i).essid == btn_text) {
-            Serial.println("Removing AP: " + (String)access_points->get(i).essid);
-            AccessPoint ap = access_points->get(i);
-            ap.selected = false;
-            access_points->set(i, ap);
-          }
-        }
-      }
-    }*/
   }
   
   void MenuFunctions::displaySettingsGFX(){
@@ -273,35 +247,119 @@ MenuFunctions::MenuFunctions()
       list_btn = lv_list_add_btn(list1, LV_SYMBOL_WIFI, buf);
       lv_btn_set_checkable(list_btn, false);
       lv_obj_set_event_cb(list_btn, settings_list_cb);
+    }
+  }
+
+  // GFX Function to build a list showing all Stations scanned
+  void MenuFunctions::addStationGFX(){
+    extern LinkedList<Station>* stations;
+    extern LinkedList<AccessPoint>* access_points;
+    extern WiFiScan wifi_scan_obj;
   
-      //lv_list_add_text(list1, buf);
+    lv_obj_t * list1 = lv_list_create(lv_scr_act(), NULL);
+    lv_obj_set_size(list1, 160, 200);
+    lv_obj_set_width(list1, LV_HOR_RES);
+    lv_obj_align(list1, NULL, LV_ALIGN_CENTER, 0, 0);
   
-      // Create the dropdown menu
-      /*lv_obj_t * dd = lv_dropdown_create(list1, NULL);
-      lv_dropdown_set_options(dd, "Apple\n"
-                                  "Banana\n"
-                                  "Orange\n"
-                                  "Cherry\n"
-                                  "Grape\n"
-                                  "Raspberry\n"
-                                  "Melon\n"
-                                  "Orange\n"
-                                  "Lemon\n"
-                                  "Nuts");
+    lv_obj_t * list_btn;
   
-      //lv_obj_align(dd, LV_ALIGN_IN_RIGHT_MID, 0, 20);
-      lv_obj_align(dd, NULL, LV_ALIGN_IN_RIGHT_MID, 0, 0);
-      lv_obj_set_width(dd, LV_HOR_RES / 3);
-      lv_obj_set_event_cb(dd, setting_dropdown_cb);
-      //lv_obj_add_event_cb(dd, setting_dropdown_cb, LV_EVENT_ALL, NULL);*/
+    lv_obj_t * label;
+  
+    list_btn = lv_list_add_btn(list1, LV_SYMBOL_CLOSE, text09);
+    lv_obj_set_event_cb(list_btn, station_list_cb);
+
+    char addr[] = "00:00:00:00:00:00";
+    for (int x = 0; x < access_points->size(); x++) {
+      AccessPoint cur_ap = access_points->get(x);
+
+      // Add non clickable button for AP
+      String full_label = "AP: " + cur_ap.essid;
+      char buf[full_label.length() + 1] = {};
+      full_label.toCharArray(buf, full_label.length() + 1);
+      list_btn = lv_list_add_btn(list1, NULL, buf);
+      lv_btn_set_checkable(list_btn, false);
       
-      //if (access_points->get(i).selected)
-      //  lv_btn_toggle(list_btn);
+      int cur_ap_sta_len = access_points->get(x).stations->size();
+      for (int y = 0; y < cur_ap_sta_len; y++) {
+        Station cur_sta = stations->get(cur_ap.stations->get(y));
+        // Convert uint8_t MAC to char array
+        wifi_scan_obj.getMAC(addr, cur_sta.mac, 0);
+        
+        //char buf[stations->get(i).mac.length() + 1] = {};
+        //stations->get(i).mac.toCharArray(buf, stations->get(i).mac.length() + 1);
+        
+        list_btn = lv_list_add_btn(list1, LV_SYMBOL_WIFI, addr);
+        lv_btn_set_checkable(list_btn, true);
+        lv_obj_set_event_cb(list_btn, station_list_cb);
+    
+        if (cur_sta.selected)
+          lv_btn_toggle(list_btn);
+      }
+    }
+  }
+
+  // Function to work with list of Stations
+  void station_list_cb(lv_obj_t * btn, lv_event_t event) {
+    extern LinkedList<Station>* stations;
+    extern MenuFunctions menu_function_obj;
+    extern WiFiScan wifi_scan_obj;
   
-      //lv_obj_t * btn1 = lv_btn_create(list_btn, NULL);
-      //lv_obj_set_event_cb(btn1, ap_list_cb);
-      //lv_obj_align(btn1, NULL, LV_ALIGN_CENTER, 0, 0);
-      //lv_btn_set_checkable(btn1, true);
+    String btn_text = lv_list_get_btn_text(btn);
+    String display_string = "";
+    char addr[] = "00:00:00:00:00:00";
+    
+    if (event == LV_EVENT_CLICKED) {
+      if (btn_text != text09) {
+        //lv_list_focus_btn(lv_obj_get_parent(lv_obj_get_parent(btn)), btn);
+      }
+      else {
+        Serial.println("Exiting...");
+        lv_obj_del_async(lv_obj_get_parent(lv_obj_get_parent(btn)));
+  
+        for (int i = 0; i < stations->size(); i++) {
+          if (stations->get(i).selected) {
+            wifi_scan_obj.getMAC(addr, stations->get(i).mac, 0);
+            Serial.print("Selected: ");
+            Serial.println(addr);
+          }
+        }
+  
+        printf("LV_EVENT_CANCEL\n");
+        menu_function_obj.deinitLVGL();
+        wifi_scan_obj.StartScan(WIFI_SCAN_OFF);
+        display_obj.exit_draw = true; // set everything back to normal
+      }
+    }
+    
+    if (event == LV_EVENT_VALUE_CHANGED) {     
+      if (lv_btn_get_state(btn) == LV_BTN_STATE_CHECKED_RELEASED) {
+        //Serial.print("Toggle on: ");
+        //Serial.println(btn_text);
+        for (int i = 0; i < stations->size(); i++) {
+          wifi_scan_obj.getMAC(addr, stations->get(i).mac, 0); 
+          if (strcmp(addr, btn_text.c_str()) == 0) {
+            Serial.print("Adding Station: ");
+            Serial.println(addr);
+            Station sta = stations->get(i);
+            sta.selected = true;
+            stations->set(i, sta);
+          }
+        }
+      }
+      else {
+        //Serial.print("Toggle off: ");
+        //Serial.println(btn_text);
+        for (int i = 0; i < stations->size(); i++) {
+          wifi_scan_obj.getMAC(addr, stations->get(i).mac, 0); 
+          if (strcmp(addr, btn_text.c_str()) == 0) {
+            Serial.print("Removing Station: ");
+            Serial.println(addr);
+            Station sta = stations->get(i);
+            sta.selected = false;
+            stations->set(i, sta);
+          }
+        }
+      }
     }
   }
   
@@ -331,14 +389,6 @@ MenuFunctions::MenuFunctions()
   
       if (access_points->get(i).selected)
         lv_btn_toggle(list_btn);
-  
-      //lv_obj_t * btn1 = lv_btn_create(list_btn, NULL);
-      //lv_obj_set_event_cb(btn1, ap_list_cb);
-      //lv_obj_align(btn1, NULL, LV_ALIGN_CENTER, 0, 0);
-      //lv_btn_set_checkable(btn1, true);
-  
-      //label = lv_label_create(btn1, NULL);
-      //lv_label_set_text(label, buf);
     }
   }
   
@@ -841,6 +891,7 @@ void MenuFunctions::main(uint32_t currentTime)
       (wifi_scan_obj.currentScanMode != WIFI_ATTACK_AUTH) &&
       (wifi_scan_obj.currentScanMode != WIFI_ATTACK_DEAUTH) &&
       (wifi_scan_obj.currentScanMode != WIFI_ATTACK_DEAUTH_MANUAL) &&
+      (wifi_scan_obj.currentScanMode != WIFI_ATTACK_DEAUTH_TARGETED) &&
       (wifi_scan_obj.currentScanMode != WIFI_ATTACK_MIMIC) &&
       (wifi_scan_obj.currentScanMode != WIFI_ATTACK_RICK_ROLL))
     display_obj.displayBuffer();
@@ -850,7 +901,6 @@ void MenuFunctions::main(uint32_t currentTime)
   int pre_getTouch = millis();
 
   // getTouch causes a 10ms delay which makes beacon spam less effective
-  //if (wifi_scan_obj.currentScanMode == WIFI_SCAN_OFF)
   #ifndef MARAUDER_MINI
     pressed = display_obj.tft.getTouch(&t_x, &t_y);
   #endif
@@ -867,6 +917,7 @@ void MenuFunctions::main(uint32_t currentTime)
       // Stop the current scan
       if ((wifi_scan_obj.currentScanMode == WIFI_SCAN_PROBE) ||
           (wifi_scan_obj.currentScanMode == WIFI_SCAN_RAW_CAPTURE) ||
+          (wifi_scan_obj.currentScanMode == WIFI_SCAN_STATION) ||
           (wifi_scan_obj.currentScanMode == WIFI_SCAN_AP) ||
           (wifi_scan_obj.currentScanMode == WIFI_SCAN_TARGET_AP) ||
           (wifi_scan_obj.currentScanMode == WIFI_SCAN_TARGET_AP_FULL) ||
@@ -879,13 +930,13 @@ void MenuFunctions::main(uint32_t currentTime)
           (wifi_scan_obj.currentScanMode == WIFI_ATTACK_AUTH) ||
           (wifi_scan_obj.currentScanMode == WIFI_ATTACK_DEAUTH) ||
           (wifi_scan_obj.currentScanMode == WIFI_ATTACK_DEAUTH_MANUAL) ||
+          (wifi_scan_obj.currentScanMode == WIFI_ATTACK_DEAUTH_TARGETED) ||
           (wifi_scan_obj.currentScanMode == WIFI_ATTACK_MIMIC) ||
           (wifi_scan_obj.currentScanMode == WIFI_ATTACK_RICK_ROLL) ||
           (wifi_scan_obj.currentScanMode == WIFI_ATTACK_BEACON_LIST) ||
           (wifi_scan_obj.currentScanMode == BT_SCAN_ALL) ||
           (wifi_scan_obj.currentScanMode == BT_SCAN_SKIMMERS))
       {
-        //Serial.println("Stopping scan...");
         wifi_scan_obj.StartScan(WIFI_SCAN_OFF);
   
         // If we don't do this, the text and button coordinates will be off
@@ -915,6 +966,7 @@ void MenuFunctions::main(uint32_t currentTime)
       // Stop the current scan
       if ((wifi_scan_obj.currentScanMode == WIFI_SCAN_PROBE) ||
           (wifi_scan_obj.currentScanMode == WIFI_SCAN_RAW_CAPTURE) ||
+          (wifi_scan_obj.currentScanMode == WIFI_SCAN_STATION) ||
           (wifi_scan_obj.currentScanMode == WIFI_SCAN_AP) ||
           (wifi_scan_obj.currentScanMode == WIFI_SCAN_TARGET_AP) ||
           (wifi_scan_obj.currentScanMode == WIFI_SCAN_TARGET_AP_FULL) ||
@@ -927,6 +979,7 @@ void MenuFunctions::main(uint32_t currentTime)
           (wifi_scan_obj.currentScanMode == WIFI_ATTACK_AUTH) ||
           (wifi_scan_obj.currentScanMode == WIFI_ATTACK_DEAUTH) ||
           (wifi_scan_obj.currentScanMode == WIFI_ATTACK_DEAUTH_MANUAL) ||
+          (wifi_scan_obj.currentScanMode == WIFI_ATTACK_DEAUTH_TARGETED) ||
           (wifi_scan_obj.currentScanMode == WIFI_ATTACK_MIMIC) ||
           (wifi_scan_obj.currentScanMode == WIFI_ATTACK_RICK_ROLL) ||
           (wifi_scan_obj.currentScanMode == WIFI_ATTACK_BEACON_LIST) ||
@@ -936,7 +989,6 @@ void MenuFunctions::main(uint32_t currentTime)
           (wifi_scan_obj.currentScanMode == WIFI_SCAN_ACTIVE_EAPOL) ||
           (wifi_scan_obj.currentScanMode == WIFI_PACKET_MONITOR))
       {
-        //Serial.println("Stopping scan...");
         wifi_scan_obj.StartScan(WIFI_SCAN_OFF);
   
         // If we don't do this, the text and button coordinates will be off
@@ -963,9 +1015,9 @@ void MenuFunctions::main(uint32_t currentTime)
         (wifi_scan_obj.currentScanMode != WIFI_ATTACK_AUTH) &&
         (wifi_scan_obj.currentScanMode != WIFI_ATTACK_DEAUTH) &&
         (wifi_scan_obj.currentScanMode != WIFI_ATTACK_DEAUTH_MANUAL) &&
+        (wifi_scan_obj.currentScanMode != WIFI_ATTACK_DEAUTH_TARGETED) &&
         (wifi_scan_obj.currentScanMode != WIFI_ATTACK_MIMIC) &&
         (wifi_scan_obj.currentScanMode != WIFI_ATTACK_RICK_ROLL))
-        //(wifi_scan_obj.currentScanMode != WIFI_ATTACK_BEACON_LIST))
     {
       // Need this to set all keys to false
       for (uint8_t b = 0; b < BUTTON_ARRAY_LEN; b++) {
@@ -980,8 +1032,6 @@ void MenuFunctions::main(uint32_t currentTime)
       for (uint8_t b = 0; b < current_menu->list->size(); b++) {
         display_obj.tft.setFreeFont(MENU_FONT);
         if (display_obj.key[b].justPressed()) {
-          //display_obj.key[b].drawButton2(current_menu->list->get(b).name, true);  // draw invert
-          //display_obj.key[b].drawButton(ML_DATUM, BUTTON_PADDING, current_menu->list->get(b).name, true);
           display_obj.key[b].drawButton(true, current_menu->list->get(b).name);
           if (current_menu->list->get(b).name != text09)
             display_obj.tft.drawXBitmap(0,
@@ -992,14 +1042,10 @@ void MenuFunctions::main(uint32_t currentTime)
                                         current_menu->list->get(b).color,
                                         TFT_BLACK);
         }
-        //else if (pressed)
-        //  display_obj.key[b].drawButton(false, current_menu->list->get(b).name);
   
         // If button was just release, execute the button's function
         if ((display_obj.key[b].justReleased()) && (!pressed))
         {
-          //display_obj.key[b].drawButton2(current_menu->list->get(b).name);     // draw normal
-          //display_obj.key[b].drawButton(ML_DATUM, BUTTON_PADDING, current_menu->list->get(b).name);
           display_obj.key[b].drawButton(false, current_menu->list->get(b).name);
           current_menu->list->get(b).callable();
         }
@@ -1230,10 +1276,14 @@ void MenuFunctions::updateStatusBar()
   MenuFunctions::battery(false);
 
   // Draw SD info
-  if (sd_obj.supported)
-    the_color = TFT_GREEN;
-  else
+  #ifndef WRITE_PACKETS_SERIAL
+    if (sd_obj.supported)
+      the_color = TFT_GREEN;
+    else
+      the_color = TFT_RED;
+  #else
     the_color = TFT_RED;
+  #endif
 
   #ifndef MARAUDER_MINI
     display_obj.tft.drawXBitmap(170,
@@ -1316,10 +1366,14 @@ void MenuFunctions::drawStatusBar()
   MenuFunctions::battery2(true);
 
   // Draw SD info
-  if (sd_obj.supported)
-    the_color = TFT_GREEN;
-  else
+  #ifndef WRITE_PACKETS_SERIAL
+    if (sd_obj.supported)
+      the_color = TFT_GREEN;
+    else
+      the_color = TFT_RED;
+  #else
     the_color = TFT_RED;
+  #endif
 
   #ifndef MARAUDER_MINI
     display_obj.tft.drawXBitmap(170,
@@ -1565,11 +1619,11 @@ void MenuFunctions::RunSetup()
     this->drawStatusBar();
     wifi_scan_obj.StartScan(WIFI_SCAN_PWN, TFT_RED);
   });
-  addNodes(&wifiSnifferMenu, text_table1[48], TFT_ORANGE, NULL, ESPRESSIF, [this]() {
+  /*addNodes(&wifiSnifferMenu, text_table1[48], TFT_ORANGE, NULL, ESPRESSIF, [this]() {
     display_obj.clearScreen();
     this->drawStatusBar();
     wifi_scan_obj.StartScan(WIFI_SCAN_ESPRESSIF, TFT_ORANGE);
-  });
+  });*/
   addNodes(&wifiSnifferMenu, text_table1[49], TFT_MAGENTA, NULL, BEACON_SNIFF, [this]() {
     display_obj.clearScreen();
     this->drawStatusBar();
@@ -1580,6 +1634,11 @@ void MenuFunctions::RunSetup()
     this->drawStatusBar();
     wifi_scan_obj.StartScan(WIFI_SCAN_RAW_CAPTURE, TFT_WHITE);
   });
+  addNodes(&wifiSnifferMenu, text_table1[59], TFT_ORANGE, NULL, PACKET_MONITOR, [this]() {
+    display_obj.clearScreen();
+    this->drawStatusBar();
+    wifi_scan_obj.StartScan(WIFI_SCAN_STATION, TFT_WHITE);
+  });
 
   // Build WiFi attack menu
   wifiAttackMenu.parentMenu = &wifiMenu; // Main Menu is second menu parent
@@ -1616,6 +1675,11 @@ void MenuFunctions::RunSetup()
     this->drawStatusBar();
     wifi_scan_obj.StartScan(WIFI_ATTACK_AP_SPAM, TFT_MAGENTA);
   });
+  addNodes(&wifiAttackMenu, text_table1[62], TFT_RED, NULL, DEAUTH_SNIFF, [this]() {
+    display_obj.clearScreen();
+    this->drawStatusBar();
+    wifi_scan_obj.StartScan(WIFI_ATTACK_DEAUTH_TARGETED, TFT_ORANGE);
+  });
   //addNodes(&wifiAttackMenu, "AP Mimic Flood", TFT_PURPLE, NULL, DEAUTH_SNIFF, [this]() {
   //  display_obj.clearScreen();
   //  this->drawStatusBar();
@@ -1659,6 +1723,10 @@ void MenuFunctions::RunSetup()
     changeMenu(&clearAPsMenu);
     wifi_scan_obj.RunClearAPs();
   });
+  addNodes(&wifiGeneralMenu, text_table1[60], TFT_BLUE, NULL, CLEAR_ICO, [this]() {
+    changeMenu(&clearAPsMenu);
+    wifi_scan_obj.RunClearStations();
+  });
   #ifndef MARAUDER_MINI
     // Select APs on OG
     addNodes(&wifiGeneralMenu, text_table1[56], TFT_NAVY, NULL, KEYBOARD_ICO, [this](){
@@ -1667,6 +1735,12 @@ void MenuFunctions::RunSetup()
       wifi_scan_obj.StartScan(LV_ADD_SSID, TFT_RED);  
       addAPGFX();
     });
+    addNodes(&wifiGeneralMenu, text_table1[61], TFT_LIGHTGREY, NULL, KEYBOARD_ICO, [this](){
+      display_obj.clearScreen(); 
+      wifi_scan_obj.currentScanMode = LV_ADD_SSID; 
+      wifi_scan_obj.StartScan(LV_ADD_SSID, TFT_RED);  
+      addStationGFX();
+    });
   #else
     // Select APs on Mini
     addNodes(&wifiGeneralMenu, text_table1[56], TFT_NAVY, NULL, KEYBOARD_ICO, [this](){
@@ -1879,10 +1953,12 @@ void MenuFunctions::RunSetup()
     changeMenu(&updateMenu);
     web_obj.setupOTAupdate();
   });
-  if (sd_obj.supported) addNodes(&whichUpdateMenu, text_table1[40], TFT_MAGENTA, NULL, SD_UPDATE, [this]() {
-    wifi_scan_obj.currentScanMode = OTA_UPDATE;
-    changeMenu(&confirmMenu);
-  });
+  #ifndef WRITE_PACKETS_SERIAL
+    if (sd_obj.supported) addNodes(&whichUpdateMenu, text_table1[40], TFT_MAGENTA, NULL, SD_UPDATE, [this]() {
+      wifi_scan_obj.currentScanMode = OTA_UPDATE;
+      changeMenu(&confirmMenu);
+    });
+  #endif
   addNodes(&whichUpdateMenu, text_table1[41], TFT_RED, NULL, ESP_UPDATE_ICO, [this]() {
     wifi_scan_obj.currentScanMode = ESP_UPDATE;
     changeMenu(&espUpdateMenu);

esp32_marauder/MenuFunctions.h

@@ -93,6 +93,7 @@ PROGMEM static void write_bad_usb_keyboard_event_cb(lv_obj_t * keyboard, lv_even
 PROGMEM static void load_btn_cb(lv_obj_t * load_btn, lv_event_t event);
 PROGMEM static void test_btn_cb(lv_obj_t * load_btn, lv_event_t event);
 PROGMEM static void ap_list_cb(lv_obj_t * btn, lv_event_t event);
+PROGMEM static void station_list_cb(lv_obj_t * btn, lv_event_t event);
 PROGMEM static void setting_dropdown_cb(lv_obj_t * btn, lv_event_t event);
 PROGMEM static void save_as_keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event);
 
@@ -167,8 +168,6 @@ class MenuFunctions
     Menu shutdownWiFiMenu;
     Menu shutdownBLEMenu;
     Menu generateSSIDsMenu;
-    Menu clearSSIDsMenu;
-    Menu clearAPsMenu;
 
     static void lv_tick_handler();
 
@@ -192,6 +191,8 @@ class MenuFunctions
     MenuFunctions();
 
     Menu* current_menu;
+    Menu clearSSIDsMenu;
+    Menu clearAPsMenu;
 
     Ticker tick;
 
@@ -205,6 +206,7 @@ class MenuFunctions
     void joinWiFiGFX();
     void addSSIDGFX();
     void addAPGFX();
+    void addStationGFX();
     void displaySettingsGFX();
     void writeBadUSB();
 

esp32_marauder/SDInterface.cpp

@@ -77,7 +77,8 @@ void SDInterface::addPacket(uint8_t* buf, uint32_t len) {
 
 void SDInterface::openCapture(String file_name) {
   if (this->supported)
-    buffer_obj.open(&SD, file_name);
+    buffer_obj.createPcapFile(&SD, file_name);
+    buffer_obj.open();
 }
 
 void SDInterface::runUpdate() {
@@ -97,7 +98,7 @@ void SDInterface::runUpdate() {
         display_obj.tft.setTextColor(TFT_RED);
         display_obj.tft.println(F(text_table2[0]));
       #endif
-      Serial.println(F("Error, update.bin is not a file"));
+      Serial.println(F("Error, could not find \"update.bin\""));
       #ifdef HAS_SCREEN
         display_obj.tft.setTextColor(TFT_WHITE);
       #endif
@@ -111,7 +112,7 @@ void SDInterface::runUpdate() {
       #ifdef HAS_SCREEN
         display_obj.tft.println(F(text_table2[1]));
       #endif
-      Serial.println(F("Try to start update"));
+      Serial.println(F("Starting update over SD. Please wait..."));
       this->performUpdate(updateBin, updateSize);
     }
     else {

esp32_marauder/WiFiScan.cpp

@@ -8,6 +8,7 @@ int num_eapol = 0;
 
 LinkedList<ssid>* ssids;
 LinkedList<AccessPoint>* access_points;
+LinkedList<Station>* stations;
 
 extern "C" int ieee80211_raw_frame_sanity_check(int32_t arg, int32_t arg2, int32_t arg3){
     if (arg == 31337)
@@ -133,6 +134,7 @@ void WiFiScan::RunSetup() {
     
   ssids = new LinkedList<ssid>();
   access_points = new LinkedList<AccessPoint>();
+  stations = new LinkedList<Station>();
 
   #ifdef HAS_BT
     NimBLEDevice::setScanFilterMode(CONFIG_BTDM_SCAN_DUPL_TYPE_DEVICE);
@@ -147,6 +149,18 @@ void WiFiScan::RunSetup() {
   this->initWiFi(1);
 }
 
+int WiFiScan::clearStations() {
+  int num_cleared = stations->size();
+  stations->clear();
+  Serial.println("stations: " + (String)stations->size());
+
+  // Now clear stations list from APs
+  for (int i = 0; i < access_points->size(); i++)
+    access_points->get(i).stations->clear();
+    
+  return num_cleared;
+}
+
 int WiFiScan::clearAPs() {
   int num_cleared = access_points->size();
   access_points->clear();
@@ -283,6 +297,8 @@ void WiFiScan::StartScan(uint8_t scan_mode, uint16_t color)
     RunBeaconScan(scan_mode, color);
   else if (scan_mode == WIFI_SCAN_RAW_CAPTURE)
     RunRawScan(scan_mode, color);
+  else if (scan_mode == WIFI_SCAN_STATION)
+    RunStationScan(scan_mode, color);
   else if (scan_mode == WIFI_SCAN_TARGET_AP)
     RunAPScan(scan_mode, color);
   else if (scan_mode == WIFI_SCAN_TARGET_AP_FULL)
@@ -308,6 +324,8 @@ void WiFiScan::StartScan(uint8_t scan_mode, uint16_t color)
     this->startWiFiAttacks(scan_mode, color, text_table4[8]);
   else if (scan_mode == WIFI_ATTACK_DEAUTH_MANUAL)
     this->startWiFiAttacks(scan_mode, color, text_table4[8]);
+  else if (scan_mode == WIFI_ATTACK_DEAUTH_TARGETED)
+    this->startWiFiAttacks(scan_mode, color, text_table4[47]);
   else if (scan_mode == WIFI_ATTACK_AP_SPAM)
     this->startWiFiAttacks(scan_mode, color, " AP Beacon Spam ");
   else if (scan_mode == BT_SCAN_ALL) {
@@ -351,10 +369,19 @@ void WiFiScan::startWiFiAttacks(uint8_t scan_mode, uint16_t color, String title_
     display_obj.touchToExit();
     display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK);
   #endif
+
+  //wifi_ap_config_t ap_config;
+  //ap_config.ssid_hidden = 1;
+
+  ap_config.ap.ssid_hidden = 1;
+  ap_config.ap.beacon_interval = 10000;
+  ap_config.ap.ssid_len = 0;
+        
   packets_sent = 0;
   esp_wifi_init(&cfg);
   esp_wifi_set_storage(WIFI_STORAGE_RAM);
-  esp_wifi_set_mode(WIFI_AP_STA);
+  esp_wifi_set_mode(WIFI_MODE_AP);
+  esp_wifi_set_config(WIFI_IF_AP, &ap_config);
   esp_wifi_start();
   esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE);
   
@@ -386,6 +413,7 @@ bool WiFiScan::shutdownWiFi() {
   
     esp_wifi_set_mode(WIFI_MODE_NULL);
     esp_wifi_stop();
+    esp_wifi_restore();
     esp_wifi_deinit();
 
     #ifdef MARAUDER_FLIPPER
@@ -433,6 +461,7 @@ void WiFiScan::StopScan(uint8_t scan_mode)
   if ((currentScanMode == WIFI_SCAN_PROBE) ||
   (currentScanMode == WIFI_SCAN_AP) ||
   (currentScanMode == WIFI_SCAN_RAW_CAPTURE) ||
+  (currentScanMode == WIFI_SCAN_STATION) ||
   (currentScanMode == WIFI_SCAN_TARGET_AP) ||
   (currentScanMode == WIFI_SCAN_TARGET_AP_FULL) ||
   (currentScanMode == WIFI_SCAN_PWN) ||
@@ -446,6 +475,7 @@ void WiFiScan::StopScan(uint8_t scan_mode)
   (currentScanMode == WIFI_ATTACK_AUTH) ||
   (currentScanMode == WIFI_ATTACK_DEAUTH) ||
   (currentScanMode == WIFI_ATTACK_DEAUTH_MANUAL) ||
+  (currentScanMode == WIFI_ATTACK_DEAUTH_TARGETED) ||
   (currentScanMode == WIFI_ATTACK_MIMIC) ||
   (currentScanMode == WIFI_ATTACK_RICK_ROLL) ||
   (currentScanMode == WIFI_PACKET_MONITOR) ||
@@ -533,7 +563,11 @@ String WiFiScan::freeRAM()
 // Function to start running a beacon scan
 void WiFiScan::RunAPScan(uint8_t scan_mode, uint16_t color)
 {
-  sd_obj.openCapture("ap");
+  #ifdef WRITE_PACKETS_SERIAL
+    buffer_obj.open();
+  #else
+    sd_obj.openCapture("ap");
+  #endif
 
   #ifdef MARAUDER_FLIPPER
     flipper_led.sniffLED();
@@ -595,6 +629,21 @@ void WiFiScan::RunAPScan(uint8_t scan_mode, uint16_t color)
   }
 #endif
 
+void WiFiScan::RunClearStations() {
+  #ifdef HAS_SCREEN
+    display_obj.tft.setTextWrap(false);
+    display_obj.tft.setFreeFont(NULL);
+    display_obj.tft.setCursor(0, 100);
+    display_obj.tft.setTextSize(1);
+    display_obj.tft.setTextColor(TFT_CYAN);
+  
+    display_obj.tft.println(F(text_table4[45]));
+    display_obj.tft.println(text_table4[46] + (String)this->clearStations());
+  #else
+    this->clearStations();
+  #endif
+}
+
 void WiFiScan::RunClearAPs() {
   #ifdef HAS_SCREEN
     display_obj.tft.setTextWrap(false);
@@ -605,8 +654,11 @@ void WiFiScan::RunClearAPs() {
   
     display_obj.tft.println(F(text_table4[9]));
     display_obj.tft.println(text_table4[10] + (String)this->clearAPs());
+    display_obj.tft.println(F(text_table4[45]));
+    display_obj.tft.println(text_table4[46] + (String)this->clearStations());
   #else
     this->clearAPs();
+    this->clearStations();
   #endif
 }
 
@@ -736,20 +788,26 @@ void WiFiScan::RunInfo()
     display_obj.tft.println(text_table4[27] + free_ram);
   #endif
 
-  if (sd_obj.supported) {
+  #ifdef WRITE_PACKETS_SERIAL
     #ifdef HAS_SCREEN
-      display_obj.tft.println(text_table4[28]);
-      display_obj.tft.print(text_table4[29]);
-      display_obj.tft.print(sd_obj.card_sz);
-      display_obj.tft.println("MB");
+      display_obj.tft.println(text_table4[48]);
     #endif
-  }
-  else {
-    #ifdef HAS_SCREEN
-      display_obj.tft.println(text_table4[30]);
-      display_obj.tft.println(text_table4[31]);
-    #endif
-  }  
+  #else
+    if (sd_obj.supported) {
+      #ifdef HAS_SCREEN
+        display_obj.tft.println(text_table4[28]);
+        display_obj.tft.print(text_table4[29]);
+        display_obj.tft.print(sd_obj.card_sz);
+        display_obj.tft.println("MB");
+      #endif
+    } else {
+      #ifdef HAS_SCREEN
+        display_obj.tft.println(text_table4[30]);
+        display_obj.tft.println(text_table4[31]);
+      #endif
+    }
+  #endif
+
 
   battery_obj.battery_level = battery_obj.getBatteryLevel();
   if (battery_obj.i2c_supported) {
@@ -770,7 +828,11 @@ void WiFiScan::RunInfo()
 }
 
 void WiFiScan::RunEspressifScan(uint8_t scan_mode, uint16_t color) {
-  sd_obj.openCapture("espressif");
+  #ifdef WRITE_PACKETS_SERIAL
+    buffer_obj.open();
+  #else
+    sd_obj.openCapture("espressif");
+  #endif
 
   #ifdef MARAUDER_FLIPPER
     flipper_led.sniffLED();
@@ -815,7 +877,11 @@ void WiFiScan::RunPacketMonitor(uint8_t scan_mode, uint16_t color)
     led_obj.setMode(MODE_SNIFF);
   #endif
 
-  sd_obj.openCapture("packet_monitor");
+  #ifdef WRITE_PACKETS_SERIAL
+    buffer_obj.open();
+  #else
+    sd_obj.openCapture("packet_monitor");
+  #endif
 
   #ifndef MARAUDER_MINI
     
@@ -899,7 +965,11 @@ void WiFiScan::RunEapolScan(uint8_t scan_mode, uint16_t color)
       display_obj.tft.fillScreen(TFT_BLACK);
     #endif
   
-    sd_obj.openCapture("eapol");
+    #ifdef WRITE_PACKETS_SERIAL
+      buffer_obj.open();
+    #else
+      sd_obj.openCapture("eapol");
+    #endif
   
     #ifdef HAS_SCREEN
       #ifdef TFT_SHIELD
@@ -924,7 +994,11 @@ void WiFiScan::RunEapolScan(uint8_t scan_mode, uint16_t color)
       display_obj.tftDrawExitScaleButtons();
     #endif
   #else
-    sd_obj.openCapture("eapol");
+    #ifdef WRITE_PACKETS_SERIAL
+      buffer_obj.open();
+    #else
+      sd_obj.openCapture("eapol");
+    #endif
     
     #ifdef HAS_SCREEN
       display_obj.TOP_FIXED_AREA_2 = 48;
@@ -1017,7 +1091,11 @@ void WiFiScan::RunMimicFlood(uint8_t scan_mode, uint16_t color) {
 
 void WiFiScan::RunPwnScan(uint8_t scan_mode, uint16_t color)
 {
-  sd_obj.openCapture("pwnagotchi");
+  #ifdef WRITE_PACKETS_SERIAL
+    buffer_obj.open();
+  #else
+    sd_obj.openCapture("pwnagotchi");
+  #endif
 
   #ifdef MARAUDER_FLIPPER
     flipper_led.sniffLED();
@@ -1057,7 +1135,11 @@ void WiFiScan::RunPwnScan(uint8_t scan_mode, uint16_t color)
 // Function to start running a beacon scan
 void WiFiScan::RunBeaconScan(uint8_t scan_mode, uint16_t color)
 {
-  sd_obj.openCapture("beacon");
+  #ifdef WRITE_PACKETS_SERIAL
+    buffer_obj.open();
+  #else
+    sd_obj.openCapture("beacon");
+  #endif
 
   #ifdef MARAUDER_FLIPPER
     flipper_led.sniffLED();
@@ -1094,9 +1176,56 @@ void WiFiScan::RunBeaconScan(uint8_t scan_mode, uint16_t color)
   initTime = millis();
 }
 
+void WiFiScan::RunStationScan(uint8_t scan_mode, uint16_t color)
+{
+  #ifdef WRITE_PACKETS_SERIAL
+    buffer_obj.open();
+  #else
+    sd_obj.openCapture("station");
+  #endif
+
+  #ifdef MARAUDER_FLIPPER
+    flipper_led.sniffLED();
+  #else
+    led_obj.setMode(MODE_SNIFF);
+  #endif
+  
+  #ifdef HAS_SCREEN
+    display_obj.TOP_FIXED_AREA_2 = 48;
+    display_obj.tteBar = true;
+    display_obj.print_delay_1 = 15;
+    display_obj.print_delay_2 = 10;
+    display_obj.initScrollValues(true);
+    display_obj.tft.setTextWrap(false);
+    display_obj.tft.setTextColor(TFT_WHITE, color);
+    #ifndef MARAUDER_MINI
+      display_obj.tft.fillRect(0,16,240,16, color);
+      display_obj.tft.drawCentreString(text_table1[59],120,16,2);
+      display_obj.touchToExit();
+    #endif
+    display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK);
+    display_obj.setupScrollArea(display_obj.TOP_FIXED_AREA_2, BOT_FIXED_AREA);
+  #endif
+  
+  esp_wifi_init(&cfg);
+  esp_wifi_set_storage(WIFI_STORAGE_RAM);
+  esp_wifi_set_mode(WIFI_MODE_NULL);
+  esp_wifi_start();
+  esp_wifi_set_promiscuous(true);
+  esp_wifi_set_promiscuous_filter(&filt);
+  esp_wifi_set_promiscuous_rx_cb(&stationSnifferCallback);
+  esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE);
+  this->wifi_initialized = true;
+  initTime = millis();
+}
+
 void WiFiScan::RunRawScan(uint8_t scan_mode, uint16_t color)
 {
-  sd_obj.openCapture("raw");
+  #ifdef WRITE_PACKETS_SERIAL
+    buffer_obj.open();
+  #else
+    sd_obj.openCapture("raw");
+  #endif
 
   #ifdef MARAUDER_FLIPPER
     flipper_led.sniffLED();
@@ -1135,7 +1264,11 @@ void WiFiScan::RunRawScan(uint8_t scan_mode, uint16_t color)
 
 void WiFiScan::RunDeauthScan(uint8_t scan_mode, uint16_t color)
 {
-  sd_obj.openCapture("deauth");
+  #ifdef WRITE_PACKETS_SERIAL
+    buffer_obj.open();
+  #else
+    sd_obj.openCapture("deauth");
+  #endif
 
   #ifdef MARAUDER_FLIPPER
     flipper_led.sniffLED();
@@ -1176,7 +1309,11 @@ void WiFiScan::RunDeauthScan(uint8_t scan_mode, uint16_t color)
 // Function for running probe request scan
 void WiFiScan::RunProbeScan(uint8_t scan_mode, uint16_t color)
 {
-  sd_obj.openCapture("probe");
+  #ifdef WRITE_PACKETS_SERIAL
+    buffer_obj.open();
+  #else
+    sd_obj.openCapture("probe");
+  #endif
 
   #ifdef MARAUDER_FLIPPER
     flipper_led.sniffLED();
@@ -1281,7 +1418,6 @@ void WiFiScan::RunBluetoothScan(uint8_t scan_mode, uint16_t color)
   } // scanCompleteCB
 #endif
 
-
 // Function to extract MAC addr from a packet at given offset
 void WiFiScan::getMAC(char *addr, uint8_t* data, uint16_t offset) {
   sprintf(addr, "%02x:%02x:%02x:%02x:%02x:%02x", data[offset+0], data[offset+1], data[offset+2], data[offset+3], data[offset+4], data[offset+5]);
@@ -1289,8 +1425,6 @@ void WiFiScan::getMAC(char *addr, uint8_t* data, uint16_t offset) {
 
 void WiFiScan::espressifSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
 {
-  bool save_packet = settings_obj.loadSetting<bool>(text_table4[7]);
-  
   wifi_promiscuous_pkt_t *snifferPacket = (wifi_promiscuous_pkt_t*)buf;
   WifiMgmtHdr *frameControl = (WifiMgmtHdr*)snifferPacket->payload;
   wifi_pkt_rx_ctrl_t ctrl = (wifi_pkt_rx_ctrl_t)snifferPacket->rx_ctrl;
@@ -1356,19 +1490,13 @@ void WiFiScan::espressifSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t t
     display_obj.loading = false;
   #endif
   
-
-  
   Serial.println();
 
-  if (save_packet)
-    sd_obj.addPacket(snifferPacket->payload, len);
-  //}
+  addPacket(snifferPacket, len);
 }
 
 void WiFiScan::pwnSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
-{
-  bool save_packet = settings_obj.loadSetting<bool>(text_table4[7]);
-  
+{ 
   wifi_promiscuous_pkt_t *snifferPacket = (wifi_promiscuous_pkt_t*)buf;
   WifiMgmtHdr *frameControl = (WifiMgmtHdr*)snifferPacket->payload;
   wifi_pkt_rx_ctrl_t ctrl = (wifi_pkt_rx_ctrl_t)snifferPacket->rx_ctrl;
@@ -1461,21 +1589,16 @@ void WiFiScan::pwnSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
             display_obj.loading = false;
           }
         #endif
-        
-  
-        
+
         Serial.println();
 
-        if (save_packet)
-          sd_obj.addPacket(snifferPacket->payload, len);
+        addPacket(snifferPacket, len);
       }
     }
   }
 }
 
-void WiFiScan::apSnifferCallbackFull(void* buf, wifi_promiscuous_pkt_type_t type) {
-  bool save_packet = settings_obj.loadSetting<bool>(text_table4[7]);
-  
+void WiFiScan::apSnifferCallbackFull(void* buf, wifi_promiscuous_pkt_type_t type) {  
   wifi_promiscuous_pkt_t *snifferPacket = (wifi_promiscuous_pkt_t*)buf;
   WifiMgmtHdr *frameControl = (WifiMgmtHdr*)snifferPacket->payload;
   wifi_pkt_rx_ctrl_t ctrl = (wifi_pkt_rx_ctrl_t)snifferPacket->rx_ctrl;
@@ -1595,6 +1718,7 @@ void WiFiScan::apSnifferCallbackFull(void* buf, wifi_promiscuous_pkt_type_t type
         ap.bssid[4] = snifferPacket->payload[14];
         ap.bssid[5] = snifferPacket->payload[15];
         ap.selected = false;
+        ap.stations = new LinkedList<int>();
         
         ap.beacon = new LinkedList<char>();
 
@@ -1624,8 +1748,7 @@ void WiFiScan::apSnifferCallbackFull(void* buf, wifi_promiscuous_pkt_type_t type
 
         Serial.println();
 
-        if (save_packet)
-          sd_obj.addPacket(snifferPacket->payload, len);
+        addPacket(snifferPacket, len);
       }
     }
   }
@@ -1633,8 +1756,6 @@ void WiFiScan::apSnifferCallbackFull(void* buf, wifi_promiscuous_pkt_type_t type
 
 void WiFiScan::apSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
 {
-  bool save_packet = settings_obj.loadSetting<bool>(text_table4[7]);
-  
   wifi_promiscuous_pkt_t *snifferPacket = (wifi_promiscuous_pkt_t*)buf;
   WifiMgmtHdr *frameControl = (WifiMgmtHdr*)snifferPacket->payload;
   wifi_pkt_rx_ctrl_t ctrl = (wifi_pkt_rx_ctrl_t)snifferPacket->rx_ctrl;
@@ -1741,7 +1862,8 @@ void WiFiScan::apSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
                            snifferPacket->payload[15]},
                           false,
                           NULL,
-                          snifferPacket->rx_ctrl.rssi};
+                          snifferPacket->rx_ctrl.rssi,
+                          new LinkedList<int>()};
 
         access_points->add(ap);
 
@@ -1749,8 +1871,7 @@ void WiFiScan::apSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
 
         Serial.println();
 
-        if (save_packet)
-          sd_obj.addPacket(snifferPacket->payload, len);
+        addPacket(snifferPacket, len);
       }
     }
   }
@@ -1758,8 +1879,6 @@ void WiFiScan::apSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
 
 void WiFiScan::beaconSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
 {
-  bool save_packet = settings_obj.loadSetting<bool>(text_table4[7]);
-  
   wifi_promiscuous_pkt_t *snifferPacket = (wifi_promiscuous_pkt_t*)buf;
   WifiMgmtHdr *frameControl = (WifiMgmtHdr*)snifferPacket->payload;
   wifi_pkt_rx_ctrl_t ctrl = (wifi_pkt_rx_ctrl_t)snifferPacket->rx_ctrl;
@@ -1817,21 +1936,174 @@ void WiFiScan::beaconSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type
           display_obj.loading = false;
         }
       #endif
-      
 
-      
       Serial.println();
 
-      if (save_packet)
-        sd_obj.addPacket(snifferPacket->payload, len);
+      addPacket(snifferPacket, len);
     }
   }
 }
 
+void WiFiScan::stationSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type) {
+  wifi_promiscuous_pkt_t *snifferPacket = (wifi_promiscuous_pkt_t*)buf;
+  WifiMgmtHdr *frameControl = (WifiMgmtHdr*)snifferPacket->payload;
+  wifi_pkt_rx_ctrl_t ctrl = (wifi_pkt_rx_ctrl_t)snifferPacket->rx_ctrl;
+  int len = snifferPacket->rx_ctrl.sig_len;
+
+  String display_string = "";
+  String mac = "";
+
+  if (type == WIFI_PKT_MGMT)
+  {
+    len -= 4;
+    int fctl = ntohs(frameControl->fctl);
+    const wifi_ieee80211_packet_t *ipkt = (wifi_ieee80211_packet_t *)snifferPacket->payload;
+    const WifiMgmtHdr *hdr = &ipkt->hdr;
+  }
+
+  char ap_addr[] = "00:00:00:00:00:00";
+  char dst_addr[] = "00:00:00:00:00:00";
+
+  int ap_index = 0;
+
+  // Check if frame has ap in list of APs and determine position
+  uint8_t frame_offset = 0;
+  int offsets[2] = {10, 4};
+  bool matched_ap = false;
+  bool ap_is_src = false;
+
+  bool mac_match = true;
+
+  for (int y = 0; y < 2; y++) {
+    for (int i = 0; i < access_points->size(); i++) {
+      mac_match = true;
+      
+      for (int x = 0; x < 6; x++) {
+        //Serial.println((String)snifferPacket->payload[x + 10] + " | " + (String)access_points->get(i).bssid[x]);
+        if (snifferPacket->payload[x + offsets[y]] != access_points->get(i).bssid[x]) {
+          mac_match = false;
+          break;
+        }
+      }
+      if (mac_match) {
+        matched_ap = true;
+        if (offsets[y] == 10)
+          ap_is_src = true;
+        ap_index = i;
+        getMAC(ap_addr, snifferPacket->payload, offsets[y]);
+        break;
+      }
+    }
+    if (matched_ap)
+      break;
+  }
+
+  // If did not find ap from list in frame, drop frame
+  if (!matched_ap)
+    return;
+  else {
+    if (ap_is_src)
+      frame_offset = 4;
+    else
+      frame_offset = 10;
+  }
+  /*  Stuff to care about now
+   *  ap_is_src
+   *  ap_index
+   */
+  
+
+  // Check if we already have this station
+  bool in_list = false;
+  for (int i = 0; i < stations->size(); i++) {
+    mac_match = true;
+    
+    for (int x = 0; x < 6; x++) {
+      //Serial.println((String)snifferPacket->payload[x + 10] + " | " + (String)access_points->get(i).bssid[x]);
+      if (snifferPacket->payload[x + frame_offset] != stations->get(i).mac[x]) {
+        mac_match = false;
+        //Serial.println("MACs do not match");
+        break;
+      }
+    }
+    if (mac_match) {
+      in_list = true;
+      break;
+    }
+  }
+
+  getMAC(dst_addr, snifferPacket->payload, 4);
+
+  // Check if dest is broadcast
+  if ((in_list) || (strcmp(dst_addr, "ff:ff:ff:ff:ff:ff") == 0))
+    return;
+  
+  // Add to list of stations
+  Station sta = {
+                {snifferPacket->payload[frame_offset],
+                 snifferPacket->payload[frame_offset + 1],
+                 snifferPacket->payload[frame_offset + 2],
+                 snifferPacket->payload[frame_offset + 3],
+                 snifferPacket->payload[frame_offset + 4],
+                 snifferPacket->payload[frame_offset + 5]},
+                false};
+
+  stations->add(sta);
+
+  // Print findings to serial
+  Serial.print((String)stations->size() + ": ");
+  
+  char sta_addr[] = "00:00:00:00:00:00";
+  
+  if (ap_is_src) {
+    Serial.print("ap: ");
+    Serial.print(ap_addr);
+    Serial.print(" -> sta: ");
+    getMAC(sta_addr, snifferPacket->payload, 4);
+    Serial.println(sta_addr);
+  }
+  else {
+    Serial.print("sta: ");
+    getMAC(sta_addr, snifferPacket->payload, 10);
+    Serial.print(sta_addr);
+    Serial.print(" -> ap: ");
+    Serial.println(ap_addr);
+  }
+  display_string.concat(sta_addr);
+  display_string.concat(" -> ");
+  display_string.concat(access_points->get(ap_index).essid);
+
+  int temp_len = display_string.length();
+
+  #ifdef HAS_SCREEN
+    for (int i = 0; i < 40 - temp_len; i++)
+    {
+      display_string.concat(" ");
+    }
+
+    Serial.print(" ");
+
+    if (display_obj.display_buffer->size() == 0)
+    {
+      display_obj.loading = true;
+      display_obj.display_buffer->add(display_string);
+      display_obj.loading = false;
+    }
+  #endif
+
+  // Add station index to AP in list
+  //access_points->get(ap_index).stations->add(stations->size() - 1);
+
+  AccessPoint ap = access_points->get(ap_index);
+  ap.stations->add(stations->size() - 1);
+
+  access_points->set(ap_index, ap);
+
+  addPacket(snifferPacket, len);
+}
+
 void WiFiScan::rawSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
 {
-  bool save_packet = settings_obj.loadSetting<bool>(text_table4[7]);
-  
   wifi_promiscuous_pkt_t *snifferPacket = (wifi_promiscuous_pkt_t*)buf;
   WifiMgmtHdr *frameControl = (WifiMgmtHdr*)snifferPacket->payload;
   wifi_pkt_rx_ctrl_t ctrl = (wifi_pkt_rx_ctrl_t)snifferPacket->rx_ctrl;
@@ -1878,19 +2150,14 @@ void WiFiScan::rawSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
       display_obj.loading = false;
     }
   #endif
-  
 
-  
   Serial.println();
 
-  if (save_packet)
-    sd_obj.addPacket(snifferPacket->payload, len);
+  addPacket(snifferPacket, len);
 }
 
 void WiFiScan::deauthSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
 {
-  bool save_packet = settings_obj.loadSetting<bool>(text_table4[7]);
-  
   wifi_promiscuous_pkt_t *snifferPacket = (wifi_promiscuous_pkt_t*)buf;
   WifiMgmtHdr *frameControl = (WifiMgmtHdr*)snifferPacket->payload;
   wifi_pkt_rx_ctrl_t ctrl = (wifi_pkt_rx_ctrl_t)snifferPacket->rx_ctrl;
@@ -1950,15 +2217,12 @@ void WiFiScan::deauthSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type
       
       Serial.println();
 
-      if (save_packet)
-        sd_obj.addPacket(snifferPacket->payload, len);
+      addPacket(snifferPacket, len);
     }
   }
 }
 
 void WiFiScan::probeSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type) {
-  bool save_packet = settings_obj.loadSetting<bool>(text_table4[7]);
-  
   wifi_promiscuous_pkt_t *snifferPacket = (wifi_promiscuous_pkt_t*)buf;
   WifiMgmtHdr *frameControl = (WifiMgmtHdr*)snifferPacket->payload;
   wifi_pkt_rx_ctrl_t ctrl = (wifi_pkt_rx_ctrl_t)snifferPacket->rx_ctrl;
@@ -2021,15 +2285,12 @@ void WiFiScan::probeSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
       
       Serial.println();    
 
-      if (save_packet)
-        sd_obj.addPacket(snifferPacket->payload, len);
+      addPacket(snifferPacket, len);
     }
   }
 }
 
 void WiFiScan::beaconListSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type) {
-  bool save_packet = settings_obj.loadSetting<bool>(text_table4[7]);
-  
   wifi_promiscuous_pkt_t *snifferPacket = (wifi_promiscuous_pkt_t*)buf;
   WifiMgmtHdr *frameControl = (WifiMgmtHdr*)snifferPacket->payload;
   wifi_pkt_rx_ctrl_t ctrl = (wifi_pkt_rx_ctrl_t)snifferPacket->rx_ctrl;
@@ -2111,30 +2372,11 @@ void WiFiScan::beaconListSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t
       
       Serial.println();    
 
-      if (save_packet)
-        sd_obj.addPacket(snifferPacket->payload, len);
+      addPacket(snifferPacket, len);
     }
   }
 }
 
-/*
-void WiFiScan::broadcastAPBeacon(uint32_t currentTime, AccessPoint custom_ssid) {
-  set_channel = random(1,12); 
-  esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE);
-  delay(1);
-
-  // Randomize SRC MAC
-  packet[10] = packet[16] = custom_ssid.bssid[0];
-  packet[11] = packet[17] = custom_ssid.bssid[1];
-  packet[12] = packet[18] = custom_ssid.bssid[2];
-  packet[13] = packet[19] = custom_ssid.bssid[3];
-  packet[14] = packet[20] = custom_ssid.bssid[4];
-  packet[15] = packet[21] = custom_ssid.bssid[5];
-
-  char ESSID[custom_ssid.essid.length() + 1] = {};
-  custom_ssid.essid.toCharArray(ESSID, custom_ssid.essid.length() + 1);
-}*/
-
 void WiFiScan::broadcastCustomBeacon(uint32_t current_time, AccessPoint custom_ssid) {
   set_channel = random(1,12); 
   esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE);
@@ -2401,6 +2643,70 @@ void WiFiScan::sendProbeAttack(uint32_t currentTime) {
   }
 }
 
+void WiFiScan::sendDeauthFrame(int bssid[6], int channel, uint8_t mac[6]) {
+  WiFiScan::set_channel = channel;
+  esp_wifi_set_channel(channel, WIFI_SECOND_CHAN_NONE);
+  delay(1);
+  
+  // Build AP source packet
+  deauth_frame_default[4] = mac[0];
+  deauth_frame_default[5] = mac[1];
+  deauth_frame_default[6] = mac[2];
+  deauth_frame_default[7] = mac[3];
+  deauth_frame_default[8] = mac[4];
+  deauth_frame_default[9] = mac[5];
+  
+  deauth_frame_default[10] = bssid[0];
+  deauth_frame_default[11] = bssid[1];
+  deauth_frame_default[12] = bssid[2];
+  deauth_frame_default[13] = bssid[3];
+  deauth_frame_default[14] = bssid[4];
+  deauth_frame_default[15] = bssid[5];
+
+  deauth_frame_default[16] = bssid[0];
+  deauth_frame_default[17] = bssid[1];
+  deauth_frame_default[18] = bssid[2];
+  deauth_frame_default[19] = bssid[3];
+  deauth_frame_default[20] = bssid[4];
+  deauth_frame_default[21] = bssid[5];      
+
+  // Send packet
+  esp_wifi_80211_tx(WIFI_IF_AP, deauth_frame_default, sizeof(deauth_frame_default), false);
+  esp_wifi_80211_tx(WIFI_IF_AP, deauth_frame_default, sizeof(deauth_frame_default), false);
+  esp_wifi_80211_tx(WIFI_IF_AP, deauth_frame_default, sizeof(deauth_frame_default), false);
+
+  packets_sent = packets_sent + 3;
+
+  // Build AP dest packet
+  deauth_frame_default[4] = bssid[0];
+  deauth_frame_default[5] = bssid[1];
+  deauth_frame_default[6] = bssid[2];
+  deauth_frame_default[7] = bssid[3];
+  deauth_frame_default[8] = bssid[4];
+  deauth_frame_default[9] = bssid[5];
+  
+  deauth_frame_default[10] = mac[0];
+  deauth_frame_default[11] = mac[1];
+  deauth_frame_default[12] = mac[2];
+  deauth_frame_default[13] = mac[3];
+  deauth_frame_default[14] = mac[4];
+  deauth_frame_default[15] = mac[5];
+
+  deauth_frame_default[16] = mac[0];
+  deauth_frame_default[17] = mac[1];
+  deauth_frame_default[18] = mac[2];
+  deauth_frame_default[19] = mac[3];
+  deauth_frame_default[20] = mac[4];
+  deauth_frame_default[21] = mac[5];      
+
+  // Send packet
+  esp_wifi_80211_tx(WIFI_IF_AP, deauth_frame_default, sizeof(deauth_frame_default), false);
+  esp_wifi_80211_tx(WIFI_IF_AP, deauth_frame_default, sizeof(deauth_frame_default), false);
+  esp_wifi_80211_tx(WIFI_IF_AP, deauth_frame_default, sizeof(deauth_frame_default), false);
+
+  packets_sent = packets_sent + 3;
+}
+
 void WiFiScan::sendDeauthFrame(uint8_t bssid[6], int channel, String dst_mac_str) {
   // Itterate through all access points in list
   // Check if active
@@ -2477,8 +2783,6 @@ void WiFiScan::sendDeauthAttack(uint32_t currentTime, String dst_mac_str) {
 
 void WiFiScan::wifiSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
 {
-  bool save_packet = settings_obj.loadSetting<bool>(text_table4[7]);
-  
   wifi_promiscuous_pkt_t *snifferPacket = (wifi_promiscuous_pkt_t*)buf;
   WifiMgmtHdr *frameControl = (WifiMgmtHdr*)snifferPacket->payload;
   wifi_pkt_rx_ctrl_t ctrl = (wifi_pkt_rx_ctrl_t)snifferPacket->rx_ctrl;
@@ -2539,14 +2843,12 @@ void WiFiScan::wifiSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
       #endif
     #endif
 
-    if (save_packet)
-      sd_obj.addPacket(snifferPacket->payload, len);
+    addPacket(snifferPacket, len);
   }
 }
 
 void WiFiScan::eapolSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
 {
-  bool save_packet = settings_obj.loadSetting<bool>(text_table4[7]);
   bool send_deauth = settings_obj.loadSetting<bool>(text_table4[5]);
   
   wifi_promiscuous_pkt_t *snifferPacket = (wifi_promiscuous_pkt_t*)buf;
@@ -2649,13 +2951,11 @@ void WiFiScan::eapolSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
 //    Serial.print("\n");
   }
 
-  if (save_packet)
-    sd_obj.addPacket(snifferPacket->payload, len);
+  addPacket(snifferPacket, len);
 }
 
 void WiFiScan::activeEapolSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
 {
-  bool save_packet = settings_obj.loadSetting<bool>(text_table4[7]);
   bool send_deauth = settings_obj.loadSetting<bool>(text_table4[5]);
   
   wifi_promiscuous_pkt_t *snifferPacket = (wifi_promiscuous_pkt_t*)buf;
@@ -2727,8 +3027,18 @@ void WiFiScan::activeEapolSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t
 //    Serial.print("\n");
   }
 
-  if (save_packet)
-    sd_obj.addPacket(snifferPacket->payload, len);
+  addPacket(snifferPacket, len);
+}
+
+void WiFiScan::addPacket(wifi_promiscuous_pkt_t *snifferPacket, int len) {
+  bool save_packet = settings_obj.loadSetting<bool>(text_table4[7]);
+  if (save_packet) {
+    #ifdef WRITE_PACKETS_SERIAL
+      buffer_obj.addPacket(snifferPacket->payload, len);
+    #else
+      sd_obj.addPacket(snifferPacket->payload, len);
+    #endif
+  }
 }
 
 #ifdef HAS_SCREEN
@@ -3176,6 +3486,7 @@ void WiFiScan::main(uint32_t currentTime)
   // WiFi operations
   if ((currentScanMode == WIFI_SCAN_PROBE) ||
   (currentScanMode == WIFI_SCAN_AP) ||
+  (currentScanMode == WIFI_SCAN_STATION) ||
   (currentScanMode == WIFI_SCAN_TARGET_AP) ||
   (currentScanMode == WIFI_SCAN_PWN) ||
   (currentScanMode == WIFI_SCAN_ESPRESSIF) ||
@@ -3270,6 +3581,43 @@ void WiFiScan::main(uint32_t currentTime)
       packets_sent = 0;
     }
   }
+  else if (currentScanMode == WIFI_ATTACK_DEAUTH_TARGETED) {
+    // Loop through each AP
+    for (int x = 0; x < access_points->size(); x++) {
+      // Only get selected APs
+      if (access_points->get(x).selected) {
+        AccessPoint cur_ap = access_points->get(x);
+        // Loop through each AP's Station
+        for (int i = 0; i < cur_ap.stations->size(); i++) {
+          // Only get selected Stations
+          if (stations->get(cur_ap.stations->get(i)).selected) {
+            Station cur_sta = stations->get(cur_ap.stations->get(i));
+
+            // Send deauths for each selected AP's selected Station
+            for (int y = 0; y < 25; y++)
+              this->sendDeauthFrame(cur_ap.bssid, cur_ap.channel, cur_sta.mac);
+
+            // Display packets sent on screen
+            if (currentTime - initTime >= 1000) {
+              initTime = millis();
+              String displayString = "";
+              String displayString2 = "";
+              displayString.concat(text18);
+              displayString.concat(packets_sent);
+              for (int x = 0; x < STANDARD_FONT_CHAR_LIMIT; x++)
+                displayString2.concat(" ");
+              #ifdef HAS_SCREEN
+                display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK);
+                display_obj.showCenterText(displayString2, 160);
+                display_obj.showCenterText(displayString, 160);
+              #endif
+              packets_sent = 0;
+            }
+          }
+        }
+      }
+    }
+  }
   else if ((currentScanMode == WIFI_ATTACK_MIMIC)) {
     // Need this for loop because getTouch causes ~10ms delay
     // which makes beacon spam less effective

esp32_marauder/WiFiScan.h

@@ -65,6 +65,8 @@
 #define WIFI_SCAN_ACTIVE_EAPOL 23
 #define WIFI_ATTACK_DEAUTH_MANUAL 24
 #define WIFI_SCAN_RAW_CAPTURE 25
+#define WIFI_SCAN_STATION 26
+#define WIFI_ATTACK_DEAUTH_TARGETED 27
 
 #define GRAPH_REFRESH 100
 
@@ -97,6 +99,12 @@ struct AccessPoint {
   bool selected;
   LinkedList<char>* beacon;
   int rssi;
+  LinkedList<int>* stations;
+};
+
+struct Station {
+  uint8_t mac[6];
+  bool selected;
 };
 
 class WiFiScan
@@ -239,6 +247,7 @@ class WiFiScan
     void sendProbeAttack(uint32_t currentTime);
     void sendDeauthAttack(uint32_t currentTime, String dst_mac_str = "ff:ff:ff:ff:ff:ff");
     void sendDeauthFrame(uint8_t bssid[6], int channel, String dst_mac_str = "ff:ff:ff:ff:ff:ff");
+    void sendDeauthFrame(int bssid[6], int channel, uint8_t mac[6]);
     void broadcastRandomSSID(uint32_t currentTime);
     void broadcastCustomBeacon(uint32_t current_time, ssid custom_ssid);
     void broadcastCustomBeacon(uint32_t current_time, AccessPoint custom_ssid);
@@ -254,6 +263,7 @@ class WiFiScan
     void RunPwnScan(uint8_t scan_mode, uint16_t color);
     void RunBeaconScan(uint8_t scan_mode, uint16_t color);
     void RunRawScan(uint8_t scan_mode, uint16_t color);
+    void RunStationScan(uint8_t scan_mode, uint16_t color);
     void RunDeauthScan(uint8_t scan_mode, uint16_t color);
     void RunEapolScan(uint8_t scan_mode, uint16_t color);
     void RunProbeScan(uint8_t scan_mode, uint16_t color);
@@ -291,11 +301,13 @@ class WiFiScan
     //lv_obj_t * scr = lv_cont_create(NULL, NULL);
 
     wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT(); 
+    wifi_config_t ap_config;
 
     char* stringToChar(String string);
     void RunSetup();
     int clearSSIDs();
     int clearAPs();
+    int clearStations();
     bool addSSID(String essid);
     int generateSSIDs(int count = 20);
     bool shutdownWiFi();
@@ -313,6 +325,7 @@ class WiFiScan
     void RunGenerateSSIDs(int count = 20);
     void RunClearSSIDs();
     void RunClearAPs();
+    void RunClearStations();
     void channelHop();
     uint8_t currentScanMode = 0;
     void main(uint32_t currentTime);
@@ -324,6 +337,7 @@ class WiFiScan
     static void pwnSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type);
     static void beaconSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type);
     static void rawSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type);
+    static void stationSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type);
     static void apSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type);
     static void apSnifferCallbackFull(void* buf, wifi_promiscuous_pkt_type_t type);
     static void deauthSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type);
@@ -332,5 +346,6 @@ class WiFiScan
     static void activeEapolSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type);
     static void eapolSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type);
     static void wifiSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type);
+    static void addPacket(wifi_promiscuous_pkt_t *snifferPacket, int len);
 };
 #endif

esp32_marauder/configs.h

@@ -3,6 +3,10 @@
   #define configs_h
 
   #define POLISH_POTATO
+
+  //Indicates that it must redirect the stream with the captured packets to serial (1)
+  //If not defined, will write packages to SD card if supported
+  //#define WRITE_PACKETS_SERIAL
   
   //#define MARAUDER_MINI
   //#define MARAUDER_V4
@@ -11,8 +15,9 @@
   //#define GENERIC_ESP32
   #define MARAUDER_FLIPPER
   //#define ESP32_LDDB
+  //#define MARAUDER_DEV_BOARD_PRO
 
-  #define MARAUDER_VERSION "v0.9.20"
+  #define MARAUDER_VERSION "v0.10.2"
 
   //// BUTTON DEFINITIONS
   #ifdef MARAUDER_MINI
@@ -358,6 +363,10 @@
   #ifdef ESP32_LDDB
     #define SD_CS 4
   #endif
+
+  #ifdef MARAUDER_DEV_BOARD_PRO
+    #define SD_CS 4
+  #endif
   //// END SD DEFINITIONS
 
   //// SCREEN STUFF
@@ -408,9 +417,11 @@
   #endif
   //// END SCREEN STUFF
 
-  //// NEOPIXEL STUFF
-  #ifdef ESP32_LDDB
+  //// NEOPIXEL STUFF  
+  #if defined(ESP32_LDDB)
     #define PIN 17
+  #elif defined(MARAUDER_DEV_BOARD_PRO)
+    #define PIN 16
   #else
     #define PIN 25
   #endif

esp32_marauder/esp32_marauder.ino

@@ -129,8 +129,11 @@ void setup()
   delay(10);
 
   Serial.begin(115200);
-  
-  //Serial.begin(115200);
+
+  #ifdef WRITE_PACKETS_SERIAL
+    // Starts a second serial channel to stream the captured packets
+    Serial1.begin(115200);
+  #endif
 
   //Serial.println("\n\nHello, World!\n");
 
@@ -205,21 +208,23 @@ void setup()
     display_obj.tft.println(F(text_table0[2]));
   #endif
 
-  // Do some SD stuff
-  if(sd_obj.initSD()) {
-    //Serial.println(F("SD Card supported"));
-    #ifdef HAS_SCREEN
-      display_obj.tft.println(F(text_table0[3]));
-    #endif
-  }
-  else {
-    Serial.println(F("SD Card NOT Supported"));
-    #ifdef HAS_SCREEN
-      display_obj.tft.setTextColor(TFT_RED, TFT_BLACK);
-      display_obj.tft.println(F(text_table0[4]));
-      display_obj.tft.setTextColor(TFT_CYAN, TFT_BLACK);
-    #endif
-  }
+  #ifdef WRITE_PACKETS_SERIAL
+    buffer_obj = Buffer();
+  #else
+    // Do some SD stuff
+    if(sd_obj.initSD()) {
+      #ifdef HAS_SCREEN
+        display_obj.tft.println(F(text_table0[3]));
+      #endif
+    } else {
+      Serial.println(F("SD Card NOT Supported"));
+      #ifdef HAS_SCREEN
+        display_obj.tft.setTextColor(TFT_RED, TFT_BLACK);
+        display_obj.tft.println(F(text_table0[4]));
+        display_obj.tft.setTextColor(TFT_CYAN, TFT_BLACK);
+      #endif
+    }
+  #endif
 
   battery_obj.RunSetup();
 
@@ -303,7 +308,13 @@ void loop()
       display_obj.main(wifi_scan_obj.currentScanMode);
     #endif
     wifi_scan_obj.main(currentTime);
-    sd_obj.main();
+
+    #ifdef WRITE_PACKETS_SERIAL
+      buffer_obj.forceSaveSerial();
+    #else
+      sd_obj.main();
+    #endif
+
     #ifndef MARAUDER_FLIPPER
       battery_obj.main(currentTime);
       temp_obj.main(currentTime);

esp32_marauder/lang_var.h

@@ -97,6 +97,10 @@ PROGMEM const char text1_55[] = "Join WiFi";
 PROGMEM const char text1_56[] = "Select APs";
 PROGMEM const char text1_57[] = "AP Clone Spam";
 PROGMEM const char text1_58[] = "Raw Capture";
+PROGMEM const char text1_59[] = "Station Sniff";
+PROGMEM const char text1_60[] = "Clear Stations";
+PROGMEM const char text1_61[] = "Select Stations";
+PROGMEM const char text1_62[] = "Deauth Targeted";
 
 
 //SDInterface.cpp texts
@@ -170,12 +174,16 @@ PROGMEM const char text4_41[] = " Bluetooth Sniff ";
 PROGMEM const char text4_42[] = " Detect Card Skimmers ";
 PROGMEM const char text4_43[] = "Scanning for\nBluetooth-enabled skimmers\nHC-03, HC-05, and HC-06...";
 PROGMEM const char text4_44[] = " AP Scan ";
+PROGMEM const char text4_45[] = "Clearing Stations...";
+PROGMEM const char text4_46[] = "Stations Cleared: ";
+PROGMEM const char text4_47[] = "Targeted Deauth";
+PROGMEM const char text4_48[] = "Using serial to transmit packets";
 
 //Making tables
 PROGMEM const char *text_table0[] = {text0_0,text0_1, text0_2, text0_3, text0_4, text0_5, text0_6, text0_7, text0_8};
-PROGMEM const char *text_table1[] = {text1_0,text1_1,text1_2,text1_3,text1_4,text1_5,text1_6,text1_7,text1_8,text1_9,text1_10,text1_11,text1_12,text1_13,text1_14,text1_15,text1_16,text1_17,text1_18,text1_19,text1_20,text1_21,text1_22,text1_23,text1_24,text1_25,text1_26,text1_27,text1_28,text1_29,text1_30,text1_31,text1_32,text1_33,text1_34,text1_35,text1_36,text1_37,text1_38,text1_39,text1_40,text1_41,text1_42,text1_43,text1_44,text1_45,text1_46,text1_47,text1_48,text1_49,text1_50,text1_51,text1_52,text1_53,text1_54,text1_55,text1_56,text1_57,text1_58};
+PROGMEM const char *text_table1[] = {text1_0,text1_1,text1_2,text1_3,text1_4,text1_5,text1_6,text1_7,text1_8,text1_9,text1_10,text1_11,text1_12,text1_13,text1_14,text1_15,text1_16,text1_17,text1_18,text1_19,text1_20,text1_21,text1_22,text1_23,text1_24,text1_25,text1_26,text1_27,text1_28,text1_29,text1_30,text1_31,text1_32,text1_33,text1_34,text1_35,text1_36,text1_37,text1_38,text1_39,text1_40,text1_41,text1_42,text1_43,text1_44,text1_45,text1_46,text1_47,text1_48,text1_49,text1_50,text1_51,text1_52,text1_53,text1_54,text1_55,text1_56,text1_57,text1_58,text1_59,text1_60,text1_61,text1_62};
 PROGMEM const char *text_table2[] = {text2_0,text2_1,text2_2,text2_3,text2_4,text2_5,text2_6,text2_7,text2_8,text2_9,text2_10,text2_11,text2_12,text2_13,text2_14};
 PROGMEM const char *text_table3[] = {text3_0,text3_1,text3_2,text3_3,text3_4,text3_5};
-PROGMEM const char *text_table4[] = {text4_0,text4_1,text4_2,text4_3,text4_4,text4_5,text4_6,text4_7,text1_54,text4_9,text4_10,text4_11,text4_12,text4_13,text4_14,text4_15,text4_16,text4_17,text4_18,text4_19,text4_20,text4_21,text4_22,text4_23,text4_24,text4_25,text4_26,text4_27,text4_28,text4_29,text4_30,text4_31,text4_32,text4_33,text4_34,text4_35,text4_36,text4_37,text4_38,text4_39,text4_40,text4_41,text4_42,text4_43,text4_44};
+PROGMEM const char *text_table4[] = {text4_0,text4_1,text4_2,text4_3,text4_4,text4_5,text4_6,text4_7,text1_54,text4_9,text4_10,text4_11,text4_12,text4_13,text4_14,text4_15,text4_16,text4_17,text4_18,text4_19,text4_20,text4_21,text4_22,text4_23,text4_24,text4_25,text4_26,text4_27,text4_28,text4_29,text4_30,text4_31,text4_32,text4_33,text4_34,text4_35,text4_36,text4_37,text4_38,text4_39,text4_40,text4_41,text4_42,text4_43,text4_44,text4_45,text4_46,text4_47, text4_48};
 
 #endif

pictures/jcmk_icon_black.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="926.000000pt" height="825.000000pt" viewBox="0 0 926.000000 825.000000"
+ preserveAspectRatio="xMidYMid meet">
+
+<g transform="translate(0.000000,825.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M4030 7363 c-97 -15 -165 -64 -212 -153 -23 -45 -23 -49 -26 -430
+l-3 -385 -788 -790 c-530 -531 -794 -803 -807 -830 -18 -38 -19 -71 -19 -635
+0 -557 1 -598 19 -645 16 -45 161 -193 1395 -1428 1503 -1505 1431 -1438 1545
+-1437 106 1 191 52 236 143 l30 60 0 243 0 243 919 918 c1014 1012 971 964
+971 1088 -1 104 -58 194 -152 236 -52 24 -58 24 -434 27 l-380 3 -410 410
+-409 409 391 0 390 0 52 26 c59 29 96 69 124 132 17 38 20 68 20 240 0 161 -3
+204 -16 237 -13 30 -296 320 -1133 1157 -1172 1172 -1146 1148 -1243 1160 -19
+2 -46 3 -60 1z m1298 -2423 c-574 -6 -571 -6 -640 -78 -57 -58 -80 -113 -80
+-186 0 -122 -26 -92 740 -859 808 -809 744 -757 931 -757 l116 0 -736 -737
+c-405 -406 -745 -753 -755 -771 l-19 -32 -1092 1092 -1093 1093 0 427 0 427
+784 783 c675 673 788 791 810 838 23 49 26 68 26 170 l0 115 760 -760 760
+-760 -512 -5z"/>
+</g>
+</svg>

pictures/marauder.svg

@@ -0,0 +1,61 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="700.000000pt" height="122.000000pt" viewBox="0 0 700.000000 122.000000"
+ preserveAspectRatio="xMidYMid meet">
+
+<g transform="translate(0.000000,122.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M167 1053 c-2 -5 -1 -33 2 -63 l6 -55 62 -3 62 -3 6 -52 c11 -97 45
+-512 45 -549 l0 -38 -54 0 c-30 0 -57 -4 -60 -9 -3 -4 -3 -31 1 -60 l6 -51
+188 0 c107 0 189 4 189 9 0 5 -13 163 -30 351 -16 188 -30 355 -30 371 0 29 0
+29 60 29 40 0 62 -4 65 -12 4 -13 65 -697 65 -730 0 -16 13 -18 125 -18 l125
+0 0 29 c0 15 -13 183 -30 372 -16 189 -30 347 -30 352 0 4 29 7 64 7 l64 0 6
+-42 c3 -24 17 -185 31 -358 14 -173 28 -325 31 -337 4 -23 6 -23 190 -23 l185
+0 -3 58 -3 57 -65 5 -65 5 -28 325 c-15 179 -32 337 -38 352 -6 15 -28 40 -48
+55 l-36 28 -527 3 c-289 1 -528 -1 -531 -5z"/>
+<path d="M4950 1036 c0 -7 3 -34 6 -59 l7 -46 61 -3 61 -3 3 -62 3 -63 -143 0
+c-158 0 -170 -4 -206 -62 -20 -33 -20 -34 -1 -233 10 -110 18 -210 19 -223 0
+-13 19 -43 44 -70 l45 -47 111 0 112 0 33 38 c18 20 35 37 39 37 3 0 6 -16 6
+-35 l0 -35 190 0 190 0 0 29 c0 16 -3 42 -6 59 -6 30 -8 31 -68 34 l-61 3 -21
+235 c-12 129 -27 299 -34 378 l-13 142 -188 0 c-153 0 -189 -3 -189 -14z m160
+-378 c0 -7 7 -85 15 -173 8 -88 15 -168 15 -177 0 -15 -10 -18 -60 -18 -40 0
+-62 4 -65 13 -4 11 -35 328 -35 356 0 7 23 11 65 11 45 0 65 -4 65 -12z"/>
+<path d="M1550 773 c-17 -14 -35 -36 -40 -48 -8 -20 23 -428 35 -466 3 -8 23
+-33 46 -55 l40 -39 111 0 110 0 33 39 32 39 7 -37 7 -36 189 0 190 0 0 23 c0
+12 -3 39 -6 59 l-7 38 -59 0 c-38 0 -60 4 -63 13 -4 11 -45 452 -45 483 0 12
+-48 14 -274 14 l-274 0 -32 -27z m349 -240 c7 -76 15 -162 18 -190 l6 -53 -67
+0 c-36 0 -66 3 -66 8 0 4 -7 81 -15 172 -8 91 -15 173 -15 183 0 14 10 17 64
+17 l63 0 12 -137z"/>
+<path d="M2310 747 c0 -29 5 -58 12 -65 7 -7 36 -12 64 -12 l53 0 5 -42 c10
+-78 26 -261 26 -300 l0 -38 -61 0 -62 0 7 -46 c3 -26 6 -53 6 -60 0 -12 46
+-14 250 -14 l251 0 -3 58 -3 57 -62 3 c-35 2 -63 6 -63 10 0 4 -7 70 -15 147
+-8 77 -15 159 -15 183 l0 42 119 0 c66 0 122 4 125 8 3 5 2 34 -1 65 l-6 57
+-153 0 -152 0 -35 -40 c-19 -22 -37 -40 -40 -40 -3 0 -7 17 -9 38 l-3 37 -117
+3 -118 3 0 -54z"/>
+<path d="M3020 773 c-17 -14 -35 -36 -40 -48 -8 -20 23 -428 35 -466 3 -8 23
+-33 46 -55 l40 -39 111 0 110 0 33 39 32 39 7 -37 7 -36 189 0 190 0 0 23 c0
+12 -3 39 -6 59 l-7 38 -59 0 c-38 0 -60 4 -63 13 -4 11 -45 452 -45 483 0 12
+-48 14 -274 14 l-274 0 -32 -27z m349 -240 c7 -76 15 -162 18 -190 l6 -53 -67
+0 c-36 0 -66 3 -66 8 0 4 -7 81 -15 172 -8 91 -15 173 -15 183 0 14 10 17 64
+17 l63 0 12 -137z"/>
+<path d="M3780 751 c0 -77 4 -81 71 -81 69 0 61 23 84 -238 14 -158 18 -177
+41 -207 37 -49 79 -65 168 -65 89 0 135 16 155 53 17 32 31 35 31 8 0 -51 -1
+-51 202 -51 l190 0 -7 53 c-4 28 -9 55 -12 59 -2 5 -31 8 -64 8 -54 0 -59 2
+-60 23 0 12 -10 126 -22 252 l-22 230 -119 3 c-66 1 -123 -1 -127 -5 -4 -4 1
+-98 11 -208 11 -110 19 -221 20 -247 l0 -48 -60 0 c-72 0 -64 -23 -85 240 -8
+107 -18 212 -21 233 l-6 37 -184 0 -184 0 0 -49z"/>
+<path d="M5570 773 c-17 -14 -35 -36 -40 -48 -8 -20 23 -428 35 -466 3 -8 23
+-33 46 -55 l40 -39 207 0 207 0 0 60 0 60 -127 3 -126 3 -7 77 c-3 42 -8 89
+-10 103 -6 42 4 41 49 -7 l43 -44 146 0 c128 0 147 2 147 16 0 52 -23 263 -30
+281 -5 12 -28 36 -51 53 l-42 30 -228 0 -227 0 -32 -27z m340 -132 c0 -16 3
+-43 6 -60 l7 -31 -66 0 c-72 0 -77 5 -77 83 l0 37 65 0 c65 0 65 0 65 -29z"/>
+<path d="M6190 747 c0 -29 5 -58 12 -65 7 -7 36 -12 64 -12 l53 0 5 -42 c10
+-78 26 -261 26 -300 l0 -38 -61 0 -62 0 7 -46 c3 -26 6 -53 6 -60 0 -12 46
+-14 250 -14 l251 0 -3 58 -3 57 -62 3 c-35 2 -63 6 -63 10 0 4 -7 70 -15 147
+-8 77 -15 159 -15 183 l0 42 119 0 c66 0 122 4 125 8 3 5 2 34 -1 65 l-6 57
+-153 0 -152 0 -35 -40 c-19 -22 -37 -40 -40 -40 -3 0 -7 17 -9 38 l-3 37 -117
+3 -118 3 0 -54z"/>
+</g>
+</svg>