Merge upstream v10.2.dev with ESP32-S3 port

.github/workflows/compile-common-image.yml

@@ -0,0 +1,77 @@
+name: 🔋 Compile Common Images
+
+on:
+  # The workflow is run when a commit is pushed or for a
+  # Pull Request.
+  - push
+  - pull_request
+
+# This is the list of jobs that will be run concurrently.
+jobs:
+  # This pre-job is run to skip workflows in case a workflow is already run, i.e. because the workflow is triggered by both push and pull_request
+  skip-duplicate-actions:
+    runs-on: ubuntu-latest
+    # Map a step output to a job output
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@v5
+        with:
+          concurrent_skipping: 'never'
+          skip_after_successful_duplicate: 'true'
+          do_not_skip: '["pull_request", "workflow_dispatch", "schedule"]'
+
+  build:
+    needs: skip-duplicate-actions
+    if: needs.skip-duplicate-actions.outputs.should_skip != 'true'
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        include:
+          - board_name: "LilygoT-CAN485"
+            pio_env: "lilygo_330"
+            artifact_name: "battery-emulator-lilygo-t-can485"
+          - board_name: "Stark CMR"
+            pio_env: "stark_330"
+            artifact_name: "battery-emulator-stark"
+          - board_name: "LilygoT-2CAN"
+            pio_env: "lilygo_2CAN_330"
+            artifact_name: "battery-emulator-lilygo-t-2can"
+          - board_name: "ESP32 DevKit V1"
+            pio_env: "esp32devkit_330"
+            artifact_name: "battery-emulator-esp32devkit"
+          - board_name: "BECom"
+            pio_env: "BECom_330"
+            artifact_name: "battery-emulator-becom"
+          - board_name: "Compiler warning check"
+            pio_env: "compiler_warning_check"
+            artifact_name: "battery-dummy-check"
+
+    steps:
+    - uses: actions/checkout@v6
+      name: Checkout code
+
+    - uses: actions/cache@v5
+      with:
+        path: |
+          ~/.cache/pip
+          ~/.platformio/.cache
+        key: ${{ runner.os }}-pio
+
+    - uses: actions/setup-python@v6
+      with:
+        python-version: '3.11'
+
+    - name: Install PlatformIO Core
+      run: pip install --upgrade platformio
+
+    - name: Build image for ${{ matrix.board_name }}
+      run: pio run -e ${{ matrix.pio_env }}
+
+    - name: Upload artifact for ${{ matrix.board_name }}
+      uses: actions/upload-artifact@v6
+      with:
+        name: ${{ matrix.artifact_name }}.bin
+        path: .pio/build/${{ matrix.pio_env }}/firmware.bin

.github/workflows/release-assets.yml

@@ -25,7 +25,7 @@ jobs:
         fi
 
     - name: Checkout code at tag
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         ref: refs/tags/${{ steps.vars.outputs.tag }}
 
@@ -34,7 +34,7 @@ jobs:
         mkdir output
         echo "Built for tag ${{ steps.vars.outputs.tag }}" > output/info.txt
 
-    - uses: actions/cache@v4
+    - uses: actions/cache@v5
       with:
         path: |
           ~/.cache/pip
@@ -45,7 +45,7 @@ jobs:
       with:
         python-version: '3.11'
     - name: Install PlatformIO Core
-      run: pip install --upgrade platformio
+      run: pip install --upgrade platformio esptool
 
     - name: 🛠 Build ota image for Lilygo T-CAN
       run: |
@@ -54,7 +54,7 @@ jobs:
 
     - name: 🛠 Build factory image for Lilygo T-CAN
       run: |
-        esptool --chip esp32 merge-bin -o .pio/build/lilygo_330/factory.bin --flash-mode dio --flash-freq 40m --flash-size 4MB 0x1000 .pio/build/lilygo_330/bootloader.bin 0x8000 .pio/build/lilygo_330/partitions.bin 0xe000 ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin 0x10000 .pio/build/lilygo_330/firmware.bin
+        esptool --chip esp32 merge-bin -o .pio/build/lilygo_330/factory.bin --flash-mode dio --flash-freq 80m --flash-size 4MB 0x1000 .pio/build/lilygo_330/bootloader.bin 0x8000 .pio/build/lilygo_330/partitions.bin 0xe000 ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin 0x10000 .pio/build/lilygo_330/firmware.bin
         mv .pio/build/lilygo_330/factory.bin output/BE_${{ steps.vars.outputs.tag }}_LilygoT-CAN485.factory.bin
 
     - name: 🛠 Build ota image for Lilygo 2-CAN
@@ -64,7 +64,7 @@ jobs:
 
     - name: 🛠 Build factory image for Lilygo 2-CAN
       run: |
-        esptool --chip esp32s3 merge-bin -o .pio/build/lilygo_2CAN_330/factory.bin --flash-mode dio --flash-freq 40m --flash-size 16MB 0x0000 .pio/build/lilygo_2CAN_330/bootloader.bin 0x8000 .pio/build/lilygo_2CAN_330/partitions.bin 0xe000 ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin 0x10000 .pio/build/lilygo_2CAN_330/firmware.bin
+        esptool --chip esp32s3 merge-bin -o .pio/build/lilygo_2CAN_330/factory.bin --flash-mode dio --flash-freq 80m --flash-size 16MB 0x0000 .pio/build/lilygo_2CAN_330/bootloader.bin 0x8000 .pio/build/lilygo_2CAN_330/partitions.bin 0xe000 ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin 0x10000 .pio/build/lilygo_2CAN_330/firmware.bin
         mv .pio/build/lilygo_2CAN_330/factory.bin output/BE_${{ steps.vars.outputs.tag }}_LilygoT-2CAN.factory.bin
 
     - name: 🛠 Build ota image for Stark
@@ -74,7 +74,7 @@ jobs:
 
     - name: 🛠 Build factory image for Stark
       run: |
-        esptool --chip esp32 merge-bin -o .pio/build/stark_330/factory.bin --flash-mode dio --flash-freq 40m --flash-size 4MB 0x1000 .pio/build/stark_330/bootloader.bin 0x8000 .pio/build/stark_330/partitions.bin 0xe000 ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin 0x10000 .pio/build/stark_330/firmware.bin
+        esptool --chip esp32 merge-bin -o .pio/build/stark_330/factory.bin --flash-mode dio --flash-freq 80m --flash-size 8MB 0x1000 .pio/build/stark_330/bootloader.bin 0x8000 .pio/build/stark_330/partitions.bin 0xe000 ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin 0x10000 .pio/build/stark_330/firmware.bin
         mv .pio/build/stark_330/factory.bin output/BE_${{ steps.vars.outputs.tag }}_StarkCMR.factory.bin
 
     - name: 🌐 Deploy to Web Installer repo
@@ -87,7 +87,7 @@ jobs:
         git config --global user.name "github-actions[bot]"
         git config --global user.email "github-actions[bot]@users.noreply.github.com"
         mkdir -p images/${{ steps.vars.outputs.tag }}
-        cp ../output/*.factory.bin images/${{ steps.vars.outputs.tag }}/
+        cp ../output/*.factory.bin ../output/*.ota.bin images/${{ steps.vars.outputs.tag }}/
         git add images
         git commit -m "Deploy from GitHub Actions"
         git push origin main

.github/workflows/run-pre-commit.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Run pre-commit
       uses: pre-commit/action@v3.0.1

.github/workflows/unit-tests.yml

@@ -9,7 +9,7 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Configure and build with CMake
       run: |

.pre-commit-config.yaml

@@ -10,7 +10,7 @@ ci:
 
 repos:
 - repo: https://github.com/pre-commit/mirrors-clang-format
-  rev: v21.1.2
+  rev: v21.1.8
   hooks:
   - id: clang-format
     args: [-Werror]  # change formatting warnings to errors, hook includes -i (Inplace edit) by default

CONTRIBUTING.md

@@ -108,18 +108,27 @@ sudo make
 ```
 
 ## Downloading a pull request build to test locally 🛜
-If you want to help test a new feature that is only available in an open pull request, you can download the precompiled binaries from the build system. To do this,start by clicking on the "**Checks**" tab
+If you want to help test a new feature that is only available in an open pull request, you can download the precompiled binaries from the build system. 
 
-<img width="779" height="312" alt="image" src="https://github.com/user-attachments/assets/fc7783c1-ba61-440e-ab09-b53d2b49f1bb" />
+First, login to Github. If you don't have an account already, create one.
 
-Then select which hardware you need the binaries for. Currently we build for these hardwares:
+Start by clicking on the "**Checks**" tab
+
+<img alt="image" src="https://github.com/user-attachments/assets/fc7783c1-ba61-440e-ab09-b53d2b49f1bb" />
+
+Then click the down arrow next to the "Compile Common Images" selection, and then click on the hardware you need the binaries for. Currently we build for these hardwares:
 - LilyGo T-CAN485
 - Stark CMR
 - LilyGo T-2CAN
+- ESP32 Devkit
+- BECom
+
+<img alt="image" src="https://github.com/user-attachments/assets/e38f5c2c-098a-47d0-97be-10494b9ef5b2" />
+
+After selecting the hardware you need, click the "**Upload Artifact**", and there will be a download link. Download the file!
 
-<img width="647" height="476" alt="image" src="https://github.com/user-attachments/assets/fbb97719-0155-4792-9d91-c51e6052fa57" />
+<img alt="image" src="https://github.com/user-attachments/assets/68f10c73-772f-499b-a14c-6b84d11c0ef2" />
 
-After selecting the hardware you need, click the "**Upload Artifact**", and there will be a download link. Download the file, and [OTA Update](https://github.com/dalathegreat/Battery-Emulator/wiki/OTA-Update) your device with this file!
+After downloading the .zip file, extract the .bin file from it. Then [OTA Update](https://github.com/dalathegreat/Battery-Emulator/wiki/OTA-Update) your device with this .bin file!
 
-<img width="1714" height="697" alt="image" src="https://github.com/user-attachments/assets/2e17f90f-cc7d-4265-b7bc-7aa5cc6b6ec8" />