diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d891a86b..d557ccc6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -98,17 +98,15 @@ jobs: - name: Rename Firmware run: mv .pio/build/${{ matrix.environment }}/firmware.bin .pio/build/${{ matrix.environment }}/opendtu-${{ matrix.environment }}.bin - - name: Copy boot_app0.bin - run: cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin .pio/build/${{ matrix.environment }}/boot_app0.bin + - name: Rename Factory Firmware + run: mv .pio/build/${{ matrix.environment }}/firmware.factory.bin .pio/build/${{ matrix.environment }}/opendtu-${{ matrix.environment }}.factory.bin - uses: actions/upload-artifact@v3 with: name: opendtu-${{ matrix.environment }} path: | .pio/build/${{ matrix.environment }}/opendtu-${{ matrix.environment }}.bin - .pio/build/${{ matrix.environment }}/partitions.bin - .pio/build/${{ matrix.environment }}/bootloader.bin - .pio/build/${{ matrix.environment }}/boot_app0.bin + .pio/build/${{ matrix.environment }}/opendtu-${{ matrix.environment }}.factory.bin release: name: Create Release @@ -133,12 +131,10 @@ jobs: with: path: artifacts/ - - name: Create ZIPs + - name: Move all files to the same location run: | ls -R - sudo apt install zip cd artifacts - for i in */; do zip -r "${i%/}.zip" "$i"; done for i in */; do cp ${i}opendtu-*.bin ./; done - name: Create release diff --git a/README.md b/README.md index 5dbc8a24..005fd28f 100644 --- a/README.md +++ b/README.md @@ -210,14 +210,7 @@ It is recommended to make all changes only in the 'platformio_override.ini', th ### using the pre-compiled .bin files -The pre-compiled binary files can be found here on the [github page behind "Releases"](https://github.com/tbnobody/OpenDTU/releases) (look at the right column). For a first installation on an ESP32, download `opendtu-generic.zip`, unpack and use a ESP32 flash tool of your choice (see next chapter) to flash the `.bin` files to the right addresses: - -| Address | File | -| ---------| ---------------------- | -| 0x1000 | bootloader.bin | -| 0x8000 | partitions.bin | -| 0xe000 | boot_app0.bin | -| 0x10000 | opendtu-*.bin | +The pre-compiled binary files can be found here on the [github page behind "Releases"](https://github.com/tbnobody/OpenDTU/releases) (look at the right column). For a first installation on an ESP32, download `opendtu-generic.factory.bin` and use a ESP32 flash tool of your choice to flash the `.bin` file to the address `0x0`. (The previous method with different .bin files is no more necessary.) For further updates download `opendtu-generic.bin` and use the over-the-air firmware update in OpenDTU's web interface. @@ -226,10 +219,7 @@ For further updates download `opendtu-generic.bin` and use the over-the-air firm ```bash esptool.py --port /dev/ttyUSB0 --chip esp32 --before default_reset --after hard_reset \ write_flash --flash_mode dout --flash_freq 40m --flash_size detect \ - 0x1000 bootloader.bin \ - 0x8000 partitions.bin \ - 0xe000 boot_app0.bin \ - 0x10000 opendtu-generic.bin + 0x0 opendtu-generic.factory.bin ``` #### Flash with Espressif Flash Download Tool (Windows) diff --git a/docs/esp32_flash_download_tool.png b/docs/esp32_flash_download_tool.png index 3f970e63..7114d4c9 100644 Binary files a/docs/esp32_flash_download_tool.png and b/docs/esp32_flash_download_tool.png differ