From 589eccaece7a82ae51f20c7cf740d03141d57db7 Mon Sep 17 00:00:00 2001
From: Stuart Pittaway <1201909+stuartpittaway@users.noreply.github.com>
Date: Fri, 2 Aug 2024 14:01:00 +0100
Subject: [PATCH] Update main.yml

---
 .github/workflows/main.yml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0fa8998..010a322 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,7 +27,7 @@ jobs:
 
       - name: Install PlatformIO
         run: pip install --upgrade platformio
-          
+
       - name: Create folders
         run: |
           mkdir -p ./ESPController/data/avr
@@ -54,13 +54,6 @@ jobs:
         run: |
             cp ./STM32All-In-One/.pio/build/V*/*.bin ~/OUTPUT/Modules/BIN/
   
-      - name: Get latest esptool
-        run: |
-          git clone https://github.com/espressif/esptool.git
-          cd esptool
-          pip install --user -e .
-          cd ~
-          python -m esptool version
 
       - name: Build code for ESP32 controller
         run: pio run --project-dir=/home/runner/work/diyBMSv4ESP32/diyBMSv4ESP32/ESPController --environment esp32-devkitc --project-conf=/home/runner/work/diyBMSv4ESP32/diyBMSv4ESP32/ESPController/platformio.ini
@@ -81,8 +74,12 @@ jobs:
         run: |
           cp ./ESPController/.pio/build/esp32-devkitc/diybms_controller_filesystemimage_espressif32_esp32-devkitc.bin ~/OUTPUT/Controller/
 
-      - name: Build single ESP32 image
+      - name: Get latest esptool / Build single ESP32 image
         run: |
+          git clone https://github.com/espressif/esptool.git
+          cd esptool
+          pip install --user -e .
+          cd ~
           python -m esptool --chip esp32 merge_bin -o ~/OUTPUT/Controller/esp32-controller-firmware-complete.bin --flash_mode=keep --flash_size 4MB 0x1000 ~/OUTPUT/Controller/bootloader.bin 0x8000 ~/OUTPUT/Controller/partitions.bin 0xe000 ~/OUTPUT/Controller/boot_app0.bin 0x10000 ~/OUTPUT/Controller/diybms_controller_firmware_espressif32_esp32-devkitc.bin 0x1C0000 ~/OUTPUT/Controller/diybms_controller_firmware_espressif32_esp32-devkitc.bin 0x370000 ~/OUTPUT/Controller/diybms_controller_filesystemimage_espressif32_esp32-devkitc.bin
 
       - name: Board test code for ESP32 controller