neil/Flipper
1
0
Fork 0
mirror of https://github.com/UberGuidoZ/Flipper.git synced 2024-12-22 06:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Marauder Flasher to v2.0

Browse Source
This commit is contained in:
UberGuidoZ 2022-12-22 20:54:19 -08:00
parent 265e3f6c92
commit 4893acaaf0
5 changed files with 265 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Wifi_DevBoard/FZ_Marauder_Flasher/FZ_Marauder_v2.0.zip Normal file
View File

Binary file not shown.

132
Wifi_DevBoard/FZ_Marauder_Flasher/Flash-v2.0.bat Normal file
View File

@ -0,0 +1,132 @@
@echo off
setlocal enabledelayedexpansion
cls
echo.
echo #########################################
echo # Marauder Flasher Script v2.00 #
echo # By Frog, tweaked by UberGuidoZ #
echo # and by ImprovingRigmarole #
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
echo ESP32S2 DevBoard not found (make sure to hold BOOT when plugging in USB.)
echo Otherwise please check or reconnect the USB connection with the DevBoard.
GOTO ERREXIT
:CHOOSE_FW
echo.
echo Which action would you like to perform?
echo.
echo 1. Flash Marauder
echo 2. Update Marauder (v0.10.0 included)
echo 3. Save Flipper Blackmagic WiFi settings
echo 4. Flash Flipper Blackmagic
echo.
set choice_fw=
set /p choice_fw= Type choice and hit enter:
if '%choice_fw%'=='1' GOTO MARAUDER
if '%choice_fw%'=='2' GOTO UPDATE
if '%choice_fw%'=='3' GOTO BACKUP
if '%choice_fw%'=='4' GOTO FLIPPERBM
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.00 #
echo # By Frog, tweaked by UberGuidoZ #
echo # and by ImprovingRigmarole #
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
:UPDATE
cls
echo.
echo #########################################
echo # Marauder Flasher Script v2.00 #
echo # By Frog, tweaked by UberGuidoZ #
echo # and by ImprovingRigmarole #
echo #########################################
echo.
echo Please download flipper 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
:BACKUP
cls
echo.
echo #########################################
echo # Marauder Flasher Script v2.00 #
echo # By Frog, tweaked by UberGuidoZ #
echo # and by ImprovingRigmarole #
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.00 #
echo # By Frog, tweaked by UberGuidoZ #
echo # and by ImprovingRigmarole #
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
:DONE
echo.
echo -----------------------------------------------------------------------------------------------
echo Process has completed! Please disconnect your Wifi Devboard and connect it to your Flipper Zero.
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

BIN
Wifi_DevBoard/FZ_Marauder_Flasher/FZ_Marauder_v1.9.zip → Wifi_DevBoard/FZ_Marauder_Flasher/Old_Versions/FZ_Marauder_v1.9.zip
View File

Binary file not shown.

262
Wifi_DevBoard/FZ_Marauder_Flasher/Flash-v1.9.bat → Wifi_DevBoard/FZ_Marauder_Flasher/Old_Versions/Flash-v1.9.bat
View File

@ -1,132 +1,132 @@
@echo off @echo off
setlocal enabledelayedexpansion setlocal enabledelayedexpansion
cls cls
echo. echo.
echo ######################################### echo #########################################
echo # Marauder Flasher Script v1.90 # echo # Marauder Flasher Script v1.90 #
echo # By Frog, tweaked by UberGuidoZ # echo # By Frog, tweaked by UberGuidoZ #
echo # and by ImprovingRigmarole # echo # and by ImprovingRigmarole #
echo ######################################### echo #########################################
echo. echo.
:: Basic error checks :: Basic error checks
IF NOT EXIST esptool.exe GOTO ESPERROR IF NOT EXIST esptool.exe GOTO ESPERROR
set BR=921600 set BR=921600
for /f "tokens=1" %%A in ('wmic path Win32_SerialPort get DeviceID^,PNPDeviceID^|findstr /i VID_303A') do set "_com=%%A" 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 if not [!_com!]==[] echo Attempting to use serial port: !_com! & GOTO CHOOSE_FW
echo ESP32S2 DevBoard not found (make sure to hold BOOT when plugging in USB.) echo ESP32S2 DevBoard not found (make sure to hold BOOT when plugging in USB.)
echo Otherwise please check or reconnect the USB connection with the DevBoard. echo Otherwise please check or reconnect the USB connection with the DevBoard.
GOTO ERREXIT GOTO ERREXIT
:CHOOSE_FW :CHOOSE_FW
echo. echo.
echo Which action would you like to perform? echo Which action would you like to perform?
echo. echo.
echo 1. Flash Marauder echo 1. Flash Marauder
echo 2. Update Marauder (v0.9.20 included) echo 2. Update Marauder (v0.9.20 included)
echo 3. Save Flipper Blackmagic WiFi settings echo 3. Save Flipper Blackmagic WiFi settings
echo 4. Flash Flipper Blackmagic echo 4. Flash Flipper Blackmagic
echo. echo.
set choice_fw= set choice_fw=
set /p choice_fw= Type choice and hit enter: set /p choice_fw= Type choice and hit enter:
if '%choice_fw%'=='1' GOTO MARAUDER if '%choice_fw%'=='1' GOTO MARAUDER
if '%choice_fw%'=='2' GOTO UPDATE if '%choice_fw%'=='2' GOTO UPDATE
if '%choice_fw%'=='3' GOTO BACKUP if '%choice_fw%'=='3' GOTO BACKUP
if '%choice_fw%'=='4' GOTO FLIPPERBM if '%choice_fw%'=='4' GOTO FLIPPERBM
echo Please choose 1, or 2! echo Please choose 1, or 2!
ping 127.0.0.1 -n 5 ping 127.0.0.1 -n 5
cls cls
GOTO CHOOSE_FW GOTO CHOOSE_FW
:MARAUDER :MARAUDER
cls cls
echo. echo.
echo ######################################### echo #########################################
echo # Marauder Flasher Script v1.90 # echo # Marauder Flasher Script v1.90 #
echo # By Frog, tweaked by UberGuidoZ # echo # By Frog, tweaked by UberGuidoZ #
echo # and by ImprovingRigmarole # echo # and by ImprovingRigmarole #
echo ######################################### echo #########################################
echo. echo.
set last_firmware= set last_firmware=
for /f "tokens=1" %%F in ('dir Marauder\esp32_marauder*flipper.bin /b /o-n') do set last_firmware=%%F 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 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 esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset erase_region 0x9000 0x6000
echo Firmware Erased, preparing write... echo Firmware Erased, preparing write...
ping 127.0.0.1 -n 5 > NUL 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! 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 GOTO DONE
:UPDATE :UPDATE
cls cls
echo. echo.
echo ######################################### echo #########################################
echo # Marauder Flasher Script v1.90 # echo # Marauder Flasher Script v1.90 #
echo # By Frog, tweaked by UberGuidoZ # echo # By Frog, tweaked by UberGuidoZ #
echo # and by ImprovingRigmarole # echo # and by ImprovingRigmarole #
echo ######################################### echo #########################################
echo. echo.
echo Please download flipper BIN file to Marauder folder and rerun Flasher. echo Please download flipper BIN file to Marauder folder and rerun Flasher.
echo. echo.
echo Press any key to open Marauder download location in default browser... echo Press any key to open Marauder download location in default browser...
pause>NUL pause>NUL
start https://github.com/justcallmekoko/ESP32Marauder/releases/latest start https://github.com/justcallmekoko/ESP32Marauder/releases/latest
GOTO ERREXIT GOTO ERREXIT
:BACKUP :BACKUP
cls cls
echo. echo.
echo ######################################### echo #########################################
echo # Marauder Flasher Script v1.90 # echo # Marauder Flasher Script v1.90 #
echo # By Frog, tweaked by UberGuidoZ # echo # By Frog, tweaked by UberGuidoZ #
echo # and by ImprovingRigmarole # echo # and by ImprovingRigmarole #
echo ######################################### echo #########################################
echo. echo.
echo Saving Flipper Blackmagic WiFi Settings to "FlipperBlackmagic\nvs.bin" 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 esptool.exe -p !_com! -b %BR% -c esp32s2 -a no_reset read_flash 0x9000 0x6000 FlipperBlackmagic\nvs.bin
GOTO DONE GOTO DONE
:FLIPPERBM :FLIPPERBM
cls cls
echo. echo.
echo ######################################### echo #########################################
echo # Marauder Flasher Script v1.90 # echo # Marauder Flasher Script v1.90 #
echo # By Frog, tweaked by UberGuidoZ # echo # By Frog, tweaked by UberGuidoZ #
echo # and by ImprovingRigmarole # echo # and by ImprovingRigmarole #
echo ######################################### echo #########################################
echo. echo.
IF EXIST FlipperBlackmagic\nvs.bin ( IF EXIST FlipperBlackmagic\nvs.bin (
echo Flashing Flipper Blackmagic with WiFi Settings restore 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 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 ( ) ELSE (
echo Flashing Flipper Blackmagic without WiFi Settings restore 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 esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset erase_region 0x9000 0x6000
echo Firmware Erased, preparing write... echo Firmware Erased, preparing write...
ping 127.0.0.1 -n 5 > NUL 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 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 GOTO DONE
:DONE :DONE
echo. echo.
echo ----------------------------------------------------------------------------------------------- echo -----------------------------------------------------------------------------------------------
echo Process has completed! Please disconnect your Wifi Devboard and connect it to your Flipper Zero. echo Process has completed! Please disconnect your Wifi Devboard and connect it to your Flipper Zero.
echo. echo.
echo ========================================================================== echo ==========================================================================
echo ERRORS ABOVE MAY BE NORMAL - Please ignore them for now and give it a try. echo ERRORS ABOVE MAY BE NORMAL - Please ignore them for now and give it a try.
echo ========================================================================== echo ==========================================================================
echo. echo.
echo (You may now close this window or press any key to exit.) echo (You may now close this window or press any key to exit.)
pause>nul pause>nul
exit exit
:ESPERROR :ESPERROR
echo esptool.exe is missing. Please download and extract the full package. echo esptool.exe is missing. Please download and extract the full package.
GOTO ERREXIT GOTO ERREXIT
:ERREXIT :ERREXIT
echo. echo.
echo (You may now close this window or press any key to exit.) echo (You may now close this window or press any key to exit.)
pause>nul pause>nul
exit exit

4
Wifi_DevBoard/FZ_Marauder_Flasher/ReadMe.md
View File

@ -8,7 +8,7 @@ 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. ## 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.9.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> 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`. 3. Double-click `flash.bat` from the extracted files then choose `Flash` or `Update`.
@ -18,7 +18,7 @@ Looking for a quick video walkthrough on how to use this flasher? [Thanks to Lab
* If you choose `Save Flipper Blackmagic WiFi settings` your current Blackmagic configuration will be saved.<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. * 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.19.20221210 (current release as of Dec 10, 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!** **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!**