From 28ed16d50b2e4a68bfe367de79960e99af7fbd58 Mon Sep 17 00:00:00 2001
From: jLynx <admin@jlynx.net>
Date: Sun, 21 May 2023 14:59:50 +1200
Subject: [PATCH] Updated flashing folder layout (#1020)

* Updated layout

* Moved normal hackRF flashing to utils as should not normally be needed
---
 flashing/README.txt                       |   4 +++-
 flashing/flash_portapack_mayhem.bat       |   2 +-
 flashing/{ => utils}/dfu-util-static.exe  | Bin
 flashing/{ => utils}/flash_hackrf_one.bat |   2 +-
 flashing/{ => utils}/hackrf_one_usb.bin   | Bin
 flashing/{ => utils}/hackrf_one_usb.dfu   | Bin
 flashing/{ => utils}/hackrf_update.exe    | Bin
 flashing/{ => utils}/msvcp120.dll         | Bin
 flashing/{ => utils}/msvcr120.dll         | Bin
 9 files changed, 5 insertions(+), 3 deletions(-)
 rename flashing/{ => utils}/dfu-util-static.exe (100%)
 rename flashing/{ => utils}/flash_hackrf_one.bat (80%)
 rename flashing/{ => utils}/hackrf_one_usb.bin (100%)
 mode change 100755 => 100644
 rename flashing/{ => utils}/hackrf_one_usb.dfu (100%)
 rename flashing/{ => utils}/hackrf_update.exe (100%)
 rename flashing/{ => utils}/msvcp120.dll (100%)
 rename flashing/{ => utils}/msvcr120.dll (100%)

diff --git a/flashing/README.txt b/flashing/README.txt
index f22ea845..2f36eb4d 100644
--- a/flashing/README.txt
+++ b/flashing/README.txt
@@ -1 +1,3 @@
-Plug HackRF+Portapack, set it in HackRF mode, launch flash_portapack_mayhem.bat
\ No newline at end of file
+Plug HackRF+Portapack, set it in HackRF mode, launch flash_portapack_mayhem.bat
+
+Read https://github.com/eried/portapack-mayhem/wiki/Update-firmware for more detailed information
\ No newline at end of file
diff --git a/flashing/flash_portapack_mayhem.bat b/flashing/flash_portapack_mayhem.bat
index bdb4304a..6227fec9 100644
--- a/flashing/flash_portapack_mayhem.bat
+++ b/flashing/flash_portapack_mayhem.bat
@@ -21,7 +21,7 @@ if not exist portapack-h1_h2-mayhem.bin (
     exit /b
 )
 
-hackrf_update.exe portapack-h1_h2-mayhem.bin
+"utils/hackrf_update.exe" portapack-h1_h2-mayhem.bin
 echo.
 echo If your device never boot after flashing, please refer to https://github.com/eried/portapack-mayhem/wiki/Won't-boot
 echo.
diff --git a/flashing/dfu-util-static.exe b/flashing/utils/dfu-util-static.exe
similarity index 100%
rename from flashing/dfu-util-static.exe
rename to flashing/utils/dfu-util-static.exe
diff --git a/flashing/flash_hackrf_one.bat b/flashing/utils/flash_hackrf_one.bat
similarity index 80%
rename from flashing/flash_hackrf_one.bat
rename to flashing/utils/flash_hackrf_one.bat
index b18bafff..26e27068 100644
--- a/flashing/flash_hackrf_one.bat
+++ b/flashing/utils/flash_hackrf_one.bat
@@ -10,6 +10,6 @@ echo.
 pause
 
 echo.
-hackrf_update.exe hackrf_one_usb.bin
+"utils/hackrf_update.exe" "utils/hackrf_one_usb.bin"
 echo.
 pause
diff --git a/flashing/hackrf_one_usb.bin b/flashing/utils/hackrf_one_usb.bin
old mode 100755
new mode 100644
similarity index 100%
rename from flashing/hackrf_one_usb.bin
rename to flashing/utils/hackrf_one_usb.bin
diff --git a/flashing/hackrf_one_usb.dfu b/flashing/utils/hackrf_one_usb.dfu
similarity index 100%
rename from flashing/hackrf_one_usb.dfu
rename to flashing/utils/hackrf_one_usb.dfu
diff --git a/flashing/hackrf_update.exe b/flashing/utils/hackrf_update.exe
similarity index 100%
rename from flashing/hackrf_update.exe
rename to flashing/utils/hackrf_update.exe
diff --git a/flashing/msvcp120.dll b/flashing/utils/msvcp120.dll
similarity index 100%
rename from flashing/msvcp120.dll
rename to flashing/utils/msvcp120.dll
diff --git a/flashing/msvcr120.dll b/flashing/utils/msvcr120.dll
similarity index 100%
rename from flashing/msvcr120.dll
rename to flashing/utils/msvcr120.dll