From d36ae88284301528801096e0895effb7a7e4e83c Mon Sep 17 00:00:00 2001 From: gullradriel <3157857+gullradriel@users.noreply.github.com> Date: Sun, 24 Nov 2024 16:24:14 +0100 Subject: [PATCH] Changed portapack-h1_h2-mayhem to portapack-mayhem-firmware (#2390) Co-authored-by: gullradriel --- .github/workflows/create_nightly_release.yml | 6 +++--- .github/workflows/create_stable_release.yml | 6 +++--- firmware/CMakeLists.txt | 2 +- firmware/application/usb_serial_shell.cpp | 2 +- flashing/flash_portapack_mayhem.bat | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/create_nightly_release.yml b/.github/workflows/create_nightly_release.yml index 0d2e88e31..ef6b50139 100644 --- a/.github/workflows/create_nightly_release.yml +++ b/.github/workflows/create_nightly_release.yml @@ -54,7 +54,7 @@ jobs: run: docker run -e VERSION_STRING=${{ steps.version_date.outputs.date }} -i -v ${{ github.workspace }}:/havoc portapack-dev - name: Create Small SD Card ZIP - No World Map run: | - mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-h1_h2-mayhem.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version_date.outputs.date }}.bin && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard-no-map.zip . && cd .. + mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-mayhem-firmware.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version_date.outputs.date }}.bin && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard-no-map.zip . && cd .. - name: Download world map run: | wget https://github.com/portapack-mayhem/mayhem-firmware/releases/download/world_map/world_map.zip @@ -63,10 +63,10 @@ jobs: unzip world_map.zip -d sdcard/ADSB - name: Create Firmware ZIP run: | - zip -j firmware.zip build/firmware/portapack-h1_h2-mayhem.bin && cd flashing && zip -r ../firmware.zip * + zip -j firmware.zip build/firmware/portapack-mayhem-firmware.bin && cd flashing && zip -r ../firmware.zip * - name: Create SD Card ZIP run: | - mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-h1_h2-mayhem.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version_date.outputs.date }}.bin && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard.zip . && cd .. + mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-mayhem-firmware.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version_date.outputs.date }}.bin && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard.zip . && cd .. - name: Create changelog env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/create_stable_release.yml b/.github/workflows/create_stable_release.yml index ca99b66f7..e8ff04005 100644 --- a/.github/workflows/create_stable_release.yml +++ b/.github/workflows/create_stable_release.yml @@ -38,7 +38,7 @@ jobs: run: docker run -e VERSION_STRING=${{ steps.version.outputs.version }} -i -v ${{ github.workspace }}:/havoc portapack-dev - name: Create Small SD Card ZIP - No World Map run: | - mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-h1_h2-mayhem.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version.outputs.version }}.bin && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard-no-map.zip . && cd .. + mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-mayhem-firmware.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version.outputs.version }}.bin && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard-no-map.zip . && cd .. - name: Download world map run: | wget https://github.com/portapack-mayhem/mayhem-firmware/releases/download/world_map/world_map.zip @@ -47,10 +47,10 @@ jobs: unzip world_map.zip -d sdcard/ADSB - name: Create Firmware ZIP run: | - zip -j firmware.zip build/firmware/portapack-h1_h2-mayhem.bin && cd flashing && zip -r ../firmware.zip * + zip -j firmware.zip build/firmware/portapack-mayhem-firmware.bin && cd flashing && zip -r ../firmware.zip * - name: Create SD Card ZIP run: | - mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-h1_h2-mayhem.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version.outputs.version }}.bin && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard.zip . && cd .. + mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-mayhem-firmware.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version.outputs.version }}.bin && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard.zip . && cd .. - name: Create changelog env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/firmware/CMakeLists.txt b/firmware/CMakeLists.txt index 0097ec591..1042f2da4 100644 --- a/firmware/CMakeLists.txt +++ b/firmware/CMakeLists.txt @@ -33,7 +33,7 @@ set(MAKE_SPI_IMAGE ${PROJECT_SOURCE_DIR}/tools/make_spi_image.py) set(MAKE_IMAGE_CHUNK ${PROJECT_SOURCE_DIR}/tools/make_image_chunk.py) set(LZ4 lz4) -set(FIRMWARE_NAME portapack-h1_h2-mayhem) +set(FIRMWARE_NAME portapack-mayhem-firmware) set(FIRMWARE_FILENAME ${FIRMWARE_NAME}.bin) set(PPFW_FILENAME "portapack-mayhem_OCI.ppfw.tar") diff --git a/firmware/application/usb_serial_shell.cpp b/firmware/application/usb_serial_shell.cpp index 5dcd010c6..80678d93a 100644 --- a/firmware/application/usb_serial_shell.cpp +++ b/firmware/application/usb_serial_shell.cpp @@ -138,7 +138,7 @@ bool strEndsWith(const std::u16string& str, const std::u16string& suffix) { static void cmd_flash(BaseSequentialStream* chp, int argc, char* argv[]) { if (argc != 1) { - chprintf(chp, "Usage: flash /FIRMWARE/portapack-h1_h2-mayhem.bin\r\n"); + chprintf(chp, "Usage: flash /FIRMWARE/portapack-mayhem-firmware.bin\r\n"); return; } diff --git a/flashing/flash_portapack_mayhem.bat b/flashing/flash_portapack_mayhem.bat index 6ab9cfb4f..83f63b06a 100644 --- a/flashing/flash_portapack_mayhem.bat +++ b/flashing/flash_portapack_mayhem.bat @@ -12,8 +12,8 @@ pause echo. REM Check if the firmware file exists -if not exist portapack-h1_h2-mayhem.bin ( - echo The firmware file "portapack-h1_h2-mayhem.bin" does not exist. +if not exist portapack-mayhem-firmware.bin ( + echo The firmware file "portapack-mayhem-firmware.bin" does not exist. echo Please ensure that you have downloaded the latest release from: echo https://github.com/portapack-mayhem/mayhem-firmware/releases/ echo. @@ -21,7 +21,7 @@ if not exist portapack-h1_h2-mayhem.bin ( exit /b ) -"utils/hackrf_update.exe" portapack-h1_h2-mayhem.bin +"utils/hackrf_update.exe" portapack-mayhem-firmware.bin echo. echo If your device never boot after flashing, please refer to https://github.com/portapack-mayhem/mayhem-firmware/wiki/Won't-boot echo.