Skip to content

Commit

Permalink
Happy New Year update
Browse files Browse the repository at this point in the history
  • Loading branch information
@RocketGod-git
RocketGod-git committed Jan 2, 2023
1 parent c3c6829 commit 7fe9b3f
Show file tree
Hide file tree
Showing 13,017 changed files with 213,463 additions and 2,769 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
Binary file added Wifi_DevBoard/FZ_Marauder_Flasher/FZ_Marauder_v1.7.zip
View file
Binary file not shown.
Binary file added Wifi_DevBoard/FZ_Marauder_Flasher/FZ_Marauder_v2.0.zip
View file
Binary file not shown.
132 changes: 132 additions & 0 deletions Wifi_DevBoard/FZ_Marauder_Flasher/Flash-v1.7.bat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
@echo off
setlocal enabledelayedexpansion
cls
echo.
echo #########################################
echo # Marauder Flasher Script v1.70 #
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.9.18 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 v1.70 #
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 v1.70 #
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 v1.70 #
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 v1.70 #
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
132 changes: 132 additions & 0 deletions Wifi_DevBoard/FZ_Marauder_Flasher/Flash-v2.0.bat
View file
Original file line number Diff line number Diff line change
@@ -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
Binary file added Wifi_DevBoard/FZ_Marauder_Flasher/Old_Versions/FZ_Marauder_v1.6.zip
View file
Binary file not shown.
Binary file added Wifi_DevBoard/FZ_Marauder_Flasher/Old_Versions/FZ_Marauder_v1.7.zip
View file
Binary file not shown.
Binary file added Wifi_DevBoard/FZ_Marauder_Flasher/Old_Versions/FZ_Marauder_v1.8.zip
View file
Binary file not shown.
Binary file added Wifi_DevBoard/FZ_Marauder_Flasher/Old_Versions/FZ_Marauder_v1.9.zip
View file
Binary file not shown.
Loading

0 comments on commit 7fe9b3f

Please sign in to comment.