Happy New Year update

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "subghz/Restaurant_Pagers/LRS_Pagers/thanks_jimilinuxguy/lrs-pager-systems-bruteforce"]
-	path = subghz/Restaurant_Pagers/LRS_Pagers/thanks_jimilinuxguy/lrs-pager-systems-bruteforce
-	url = https://github.com/jimilinuxguy/lrs-pager-systems-bruteforce

Wifi_DevBoard/FZ_Marauder_Flasher/ReadMe.md

@@ -8,21 +8,21 @@ Looking for a quick video walkthrough on how to use this flasher? [Thanks to Lab
 
 ## Now it's as easy as 1, 2, 3 to install or update Marauder on Windows.
 
-1. Download and extract [the ZIP file](https://github.com/UberGuidoZ/Flipper/raw/main/Wifi_DevBoard/FZ_Marauder_Flasher/FZ_Marauder_v1.6.zip) above to the same directory.<br>
+1. Download and extract [the ZIP file](https://github.com/UberGuidoZ/Flipper/raw/main/Wifi_DevBoard/FZ_Marauder_Flasher/FZ_Marauder_v2.0.zip) above to the same directory.<br>
 2. Hold `BOOT` on the devboard and plug it into your PC directly via USB.<br>
 3. Double-click `flash.bat` from the extracted files then choose `Flash` or `Update`.
 
 * If you choose `Flash Marauder` the script will locate your board and flash Marauder automatically!<br>
 * If you choose `Update Marauder` you'll be taken to the Marauder download location to grab a new version.<br>
-(Simply download the BIN file as stated and stick it in the Marauder subfolder of the batch file.)<br>
+(Simply download the Flipper BIN file, stick it in the Marauder subfolder by the batch file, and delete the old BIN.)<br>
 * If you choose `Save Flipper Blackmagic WiFi settings` your current Blackmagic configuration will be saved.<br>
 * If you choose `Flash Flipper Blackmagic` the script will flash the original Blackmagic firmware it shipped with.
 
-Current Marauder version included in the ZIP: v0.9.17.20221019 (current release as of Oct 19, 2022)
+Current Marauder version included in the ZIP: v0.10.0.20221222 (current release as of Dec 22, 2022)
 
 **Once the install has completed, [head over here](https://github.com/UberGuidoZ/Flipper/tree/main/Wifi_DevBoard#marauder-install-information) to learn more about what Marauder can do!**
 
-The [batch file](https://github.com/UberGuidoZ/Flipper/blob/main/Wifi_DevBoard/FZ_Marauder_Flasher/Flash-v1.6.bat) is also included above for review and to track coming changes.
+The [batch file](https://github.com/UberGuidoZ/Flipper/blob/main/Wifi_DevBoard/FZ_Marauder_Flasher/Flash-v1.9.bat) is also included above for review and to track coming changes.
 
 Acknowledgements:<br>
 * [justcallmekoko](https://github.com/justcallmekoko/ESP32Marauder) for the AWESOME work in developing Marauder and porting it to the Flipper.

Wifi_DevBoard/ReadMe.md

@@ -30,11 +30,9 @@ Sequoia has been kind enough to create a [web flasher](https://sequoiasan.github
 
 Another deauther option can be found at [HEX0DAYS repo over here](https://github.com/HEX0DAYS/FlipperZero-PWNDTOOLS)! (Full instructions included.)
 
-# [Marauder](https://github.com/justcallmekoko/ESP32Marauder) install information<br>
+# [Marauder](https://github.com/justcallmekoko/ESP32Marauder) install information (easy flash for Windows: [HERE](https://github.com/UberGuidoZ/Flipper/tree/main/Wifi_DevBoard/FZ_Marauder_Flasher))
 
-## New easy flash tool for Windows now available! [CLICK HERE](https://github.com/UberGuidoZ/Flipper/tree/main/Wifi_DevBoard/FZ_Marauder_Flasher)
-
-Direct from the dev WillStunForFood on Discord - check out [his video walkthrough](https://www.youtube.com/watch?v=_YLTpNo5xa0) too!:
+Direct from the dev WillStunForFood (aka JustCallMeKoko) on Discord - check out [his video walkthrough](https://www.youtube.com/watch?v=_YLTpNo5xa0) too!:
 
 - Plug the WiFi dev board directly into your PC
 - Upload the MarauderOTA firmware from source via Arduino IDE
@@ -136,6 +134,12 @@ Start with the Official firmware, test, then move to a unlocked one if desired.
 
 -----
 
+## Donation Information
+
+Nothing is ever expected for the hoarding of digital files, creations I have made, or the people I may have helped.
+
+## Ordering from Lab401? [USE THIS LINK FOR 5% OFF!](https://lab401.com/r?id=vsmgoc) (Or code `UberGuidoZ` at checkout.)
+
 I've had so many asking for me to add this.<br>
 ![Flipper_Blush](https://user-images.githubusercontent.com/57457139/183561666-4424a3cc-679b-4016-a368-24f7e7ad0a88.jpg) ![Flipper_Love](https://user-images.githubusercontent.com/57457139/183561692-381d37bd-264f-4c88-8877-e58d60d9be6e.jpg)
 

nfc/NFC-Trolls/README.md

@@ -1,7 +1,7 @@
 # F0-NFC-Trolls
 
 `Version: 0.7`
-  `Total: 63 Files`
+  `Total: 65 Files`
 
 **!! I DO NOT OWN ANY OF THESE LINKS/VIDEOS !!**
 
@@ -75,6 +75,7 @@ Here i will show you, how you can create your own NFC Tags like this. I will jus
 | `Awesome-Flipper` | `DolphinDP` | FlipperZero collection of many other repos and stuff for FLipperZero. | [https://github.com/djsime1/awesome-flipperzero](https://github.com/djsime1/awesome-flipperzero) |
 | `Unleashed` | `DolphinFW` | Unleashed firmware for FlipperZero. | [https://github.com/DarkFlippers/unleashed-firmware](https://github.com/DarkFlippers/unleashed-firmware) |
 | `RougeMaster` | `DolphinFW` | Unleashed firmware fork, just with more games and animations. | [https://github.com/RogueMaster/flipperzero-firmware-wPlugins](https://github.com/RogueMaster/flipperzero-firmware-wPlugins) |
+| `Flipper_TalkingSasquatch` | `Dolphin` | GitHub Repo with animations for Flipper Zero. | [https://github.com/skizzophrenic/Talking-Sasquach](https://github.com/skizzophrenic/Talking-Sasquach) |
 
 ## NFC_Files
 
@@ -91,6 +92,7 @@ Here i will show you, how you can create your own NFC Tags like this. I will jus
 | `Akinator_EN` | `Game` | Guy that tries to guess the object you think of. | [https://en.akinator.com/](https://en.akinator.com/) |
 | `Akinator_DE` | `Game` | German guy :) | [https://de.akinator.com/](https://de.akinator.com/) |
 | `*Ascii` | `Helpful` | Generator for ASCII artworks. | [https://www.ascii-art-generator.org/](https://www.ascii-art-generator.org/) |
+| `*Ascii_Archive` | `Helpful` | An archive with a lot of ASCII artworks. | [https://www.asciiart.eu/](https://www.asciiart.eu/) |
 | `Emkei_Email` | `Helpful` | Send anonymous emails. | [https://emkei.cz/](https://emkei.cz/) |
 | `Google Eastereggs` | `Helpful` | Collection of Google Easter eggs. | [https://elgoog.im/](https://elgoog.im/) |
 | `RevShells` | `Helpful` | ReverseShell generator. | [https://www.revshells.com/](https://www.revshells.com/) |

nfc/mf_classic_dict/mf_classic_dict_user.nfc

@@ -1,4 +1,4 @@
-# Last update Nov 30, 2022
+# Last update Dec 22, 2022
 # -----------------------
 # MIFARE DEFAULT KEYS
 #   -- ICEMAN FORK VERSION --
@@ -2318,6 +2318,37 @@ A00003000057
 #
 # Random Hotel A key sec 0 blk 3 - Hoist Group lock
 A2CA48CA4C05
+#
 # Chelsea Harbour Hotel London by Cazagen
 485242F22BE0
 2A2C13CC242A
+#
+# Transport system Uruguay - STM
+# Shared key - sec 0 blk 3
+D144BD193063
+#
+# Data from http://www.proxmark.org/forum/viewtopic.php?pid=45659#p45659
+3515AE068CAD
+#
+# Keys Catering
+6A0D531DA1A7
+4BB29463DC29
+#
+# Keys Swim
+8627C10A7014
+453857395635
+#
+# 8668/RevKillj0y
+164EE10EFFFF
+193DFE0FA18E
+3D6F823FFFFF
+48C8852D15F9
+4E4F584D2105
+7213B13D02E0
+7ADD3D735725
+7F796F60FFFF
+8AC04C1A4E15
+9089B668FFFF
+AEF617B3D004
+AEF617B3D040
+C1F6C7B55F5E

subghz/Gas_Sign/ReadMe.md

@@ -1,6 +1,6 @@
-# Gas Station Price Sign
+# Gas Station Price Sign captures by [0day](https://github.com/0dayCTF)
 
-## Captures by [0day](https://github.com/0dayCTF) (from [Discord](https://discord.com/channels/740930220399525928/954422680969445377/1001983366205284452))
+## REMINDER: This is likely illegal unless you own the sign!
 
 Captured remote is [GL-OIL-RF](https://olympianled.com/product/gas-price-changer-rf-remote-control-gl-oil-rf/). The [PDF manual](https://github.com/UberGuidoZ/Flipper/blob/main/Sub-GHz/Gas_Sign/Manual_GL-OIL-RF.pdf) is also available and contains programming instructions.
 

subghz/flipperzero-bruteforce/README.md

@@ -62,7 +62,9 @@ The `debruijn.sub` files are there just for reference I have not really been abl
 | NICE        | 868.35       | 12   | 628 sec   | Untested      |
 | PT-2240     | 433.92       | 24   | 800 hours | Untested      |
 
-More info about them can be found [here](https://phreakerclub.com/447)
+### Currently supported Pagers
+
+Pagers for the Italian restaurant "Spacca", listed as *Spacca_pager*
 
 ### Adding a protocol
 

subghz/flipperzero-bruteforce/flipperzero-bruteforce.py

@@ -13,6 +13,7 @@ class Protocol:
         - stop_bit: APPENDED to each key in sub format, empty by default
         - frequency: protocol's frequency in Hz, 433920000 by default
         - repetition: number of times to repeat each key, 3 by default
+        - key_range: range of keys to generate, None by default
     """
 
     def __init__(
@@ -24,13 +25,15 @@ def __init__(
         stop_bit="",
         frequency=433920000,
         repetition=3,
+        key_range=None,
     ):
         self.name = name
         self.n_bits = n_bits
         self.transposition_table = transposition_table
         self.pilot_period = pilot_period
         self.stop_bit = stop_bit
         self.repetition = repetition
+        self.key_range = key_range
         self.file_header = (
             "Filetype: Flipper SubGhz RAW File\n"
             + "Version: 1\n"
@@ -96,11 +99,19 @@ def generate_sub_files(self, n_folders=6):
                   folder [1..n_folders] will contain [2^1..2^n_folders] files,
                   each file containing [2^n_bits/2^1..2^n_bits/2^n_folders] keys.
         """
-        if self.n_bits > 12:  # take up too much space for github
+        if self.n_bits > 12 and self.key_range is None:  # take up too much space for github
             print(f"Skipping {self.name}, takes up too much space for github")
             return
         base_dir = f"sub_files/{self.name}"
         os.makedirs(base_dir, exist_ok=True)
+        # If key_range is defined, generate those keys only
+        if self.key_range is not None:
+            filename = f"{base_dir}/bf_{self.key_range[0]}-{self.key_range[-1]}.sub"
+            with open(filename, "w") as f:
+                f.write(self.file_header)
+                for key in self.key_range:
+                    f.write("RAW_Data: " + self.key_to_sub(key) * self.repetition + "\n")
+            return
         # Create debruijn.sub
         filename = f"{base_dir}/debruijn.sub"
         with open(filename, "w") as f:
@@ -206,8 +217,17 @@ def generate_sub_files(self, n_folders=6):
         transposition_table={"0": "450 -1350 ", "1": "1350 -450 "},
         pilot_period="450 -13950 ",
     ),
+    Protocol(
+        name="Spacca_pager",
+        n_bits=24,
+        transposition_table={"0": "320 -960 ", "1": "960 -320 "},
+        pilot_period="320 -9920 ",
+        frequency=433650000,
+        key_range=range(0x11A01C, 0x11A0E4),  # 300 keys
+    ),
 ]
 
 for p in protocols:
+    # TODO multithread this
     p.generate_sub_files()
     print(f"{p.name} done")