Updated for Universal

This commit is contained in:
UberGuidoZ 2023-06-16 19:14:34 -07:00
parent 640f713e0b
commit b1c6b9bff7
3 changed files with 1 additions and 134 deletions

View File

@ -1,108 +0,0 @@
@echo off
setlocal enabledelayedexpansion
cls
echo.
echo #########################################
echo # Marauder WROOM Flasher v1.30 #
echo # By UberGuidoZ and 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_10C4') do set "_com=%%A"
if not [!_com!]==[] echo Attempting to use serial port: !_com! & GOTO CHOOSE
echo Marauder v4.x not found! 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
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.10.7 included).
echo 3. Download USB UART Drivers (Silicon Labs).
echo.
set choice=
set /p choice= Type choice and hit enter:
if '%choice%'=='1' GOTO MARAUDER
if '%choice%'=='2' GOTO UPDATE
if '%choice%'=='3' GOTO DRIVERS
echo Please choose 1, 2, or 3!
ping 127.0.0.1 -n 5
cls
GOTO CHOOSE
:MARAUDER
cls
echo.
echo #########################################
echo # Marauder WROOM Flasher v1.30 #
echo # By UberGuidoZ and 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 DONE
:UPDATE
cls
echo.
echo #########################################
echo # Marauder WROOM Flasher v1.30 #
echo # By UberGuidoZ and SkeletonMan #
echo #########################################
echo.
echo Please download OLD_HARDWARE BIN file to Marauder folder 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 WROOM Flasher v1.30 #
echo # By UberGuidoZ and 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
:DONE
echo.
echo --------------------------------------------------------------------------
echo Process has completed. Marauder should have rebooted to finish the update.
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.)
echo.
pause>nul
exit

View File

@ -4,32 +4,7 @@
Looking for a Linux/OS X version? [Check out SkeletonMan's Python edition!](https://github.com/SkeletonMan03/FZEasyMarauderFlash)
![Flasher_1](https://user-images.githubusercontent.com/57457139/210445500-c0ef079e-6d5e-4157-b61f-2c4f8bc83820.png)
## 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/ESP32-WROOM/Marauder_WROOM_v1.30.zip) above to the same directory.<br>
2. Plug in your ESP32-WROOM or v4 OEM Marauder directly into your PC via USB.<br>
3. Double-click `Flash-WROOM.bat` from the extracted files then choose `Flash` or `Update`.
**NOTE: You may have to hold the boot button while plugging it in or even for the entire duration of the flash!**
* 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 OLD_HARDWARE BIN file, stick it in the WROOM subfolder by the batch file, and delete the old BIN.)<br>
* If you choose `Download USB UART` the script will open the Silicon Labs driver download.
Current Marauder version included in the ZIP: v0.10.7.20230609 (current release as of June 9, 2023)
**Once the install has completed, [head over here](https://github.com/justcallmekoko/ESP32Marauder/wiki) to learn more about what Marauder can do!**
The [batch file](https://github.com/UberGuidoZ/Flipper/blob/main/Wifi_DevBoard/FZ_Marauder_Flasher/ESP32-WROOM/Flash-WROOM.bat) is also included above for review and to track changes.
Acknowledgements:<br>
* [justcallmekoko](https://github.com/justcallmekoko/ESP32Marauder) for the AWESOME work in developing Marauder and porting it to the Flipper.
* [Frog](https://github.com/FroggMaster) For initial scripting under the [Wifi Pentest Tool](https://github.com/FroggMaster/ESP32-Wi-Fi-Penetration-Tool) and inspiring the idea.<br>
* [SkeletonMan](https://github.com/SkeletonMan03/FZEasyMarauderFlash) For initial WROOM scripting and inspiration.<br>
* [UberGuidoZ](https://github.com/UberGuidoZ) Creation of this one, plus tweaking/automating Frog's original, continued scripting, development, and testing.
## ARCHIVED - [USE THE UNIVERSAL INSTEAD](https://github.com/UberGuidoZ/Flipper/tree/main/Wifi_DevBoard/FZ_Marauder_Flasher)
-----