Merge pull request #1880 from proddy/dev

fix downloading of 16M firmware bins

.github/workflows/pre_release.yml

@@ -38,13 +38,13 @@ jobs:
           sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts
           yarn build
           yarn webUI
-      - name: Build 4M firmware
+      - name: Build ESP32 4M firmware
         run: |
           platformio run -e ci
-      - name: Build S3 firmware
+      - name: Build ESP32-S3 16M firmware
         run: |
           platformio run -e ci_s3
-      - name: Build 16M firmware
+      - name: Build ESP32 16M firmware
         run: |
           platformio run -e ci_16M
       - name: Create GitHub Release

.github/workflows/tagged_release.yml

@@ -35,12 +35,15 @@ jobs:
           sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts
           yarn build
           yarn webUI
-      - name: Build 4M firmware
+      - name: Build ESP32 4M firmware
         run: |
           platformio run -e ci
-      - name: Build S3 firmware
+      - name: Build ESP32-S3 16M firmware
         run: |
           platformio run -e ci_s3
+      - name: Build ESP32 16M firmware
+        run: |
+          platformio run -e ci_16M
       - name: Release
         uses: 'marvinpinto/action-automatic-releases@latest'
         with:

.github/workflows/test_release.yml

@@ -10,7 +10,6 @@ jobs:
   pre-release:
     name: 'Automatic test-release build'
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v4
       - name: Enable Corepack
@@ -22,18 +21,15 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: '20.x'
-
       - name: Get EMS-ESP source code and version
         id: build_info
         run: |
           version=`grep -E '^#define EMSESP_APP_VERSION' ./src/version.h | awk -F'"' '{print $2}'`
           echo "VERSION=$version" >> $GITHUB_OUTPUT
-
       - name: Install PlatformIO
         run: |
           python -m pip install --upgrade pip
           pip install -U platformio
-
       - name: Build WebUI
         run: |
           cd interface
@@ -42,15 +38,15 @@ jobs:
           sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts
           yarn build
           yarn webUI
-
-      - name: Build firmware
+      - name: Build ESP32 4M firmware
         run: |
           platformio run -e ci
-
-      - name: Build S3 firmware
+      - name: Build ESP32-S3 16M firmware
         run: |
           platformio run -e ci_s3
-
+      - name: Build ESP32 16M firmware
+        run: |
+          platformio run -e ci_16M
       - name: Create a GH Release
         id: 'automatic_releases'
         uses: 'marvinpinto/action-automatic-releases@latest'

interface/src/framework/system/UploadDownload.tsx

@@ -81,9 +81,16 @@ const UploadDownload: FC = () => {
     'EMS-ESP-' +
     v.replaceAll('.', '_') +
     '-' +
-    data.esp_platform.replaceAll('-', '_') +
+    getPlatform().replaceAll('-', '_') +
     '.bin';
 
+  const getPlatform = () => {
+    if (data.flash_chip_size === 16384) {
+      return data.esp_platform + '-16M';
+    }
+    return data.esp_platform;
+  };
+
   const {
     loading: isUploading,
     uploading: progress,
@@ -194,7 +201,7 @@ const UploadDownload: FC = () => {
         </Typography>
         <Box p={2} border="2px solid grey" borderRadius={2}>
           {LL.VERSION_ON() + ' '}
-          <b>{data.emsesp_version}</b>&nbsp;({data.esp_platform})
+          <b>{data.emsesp_version}</b>&nbsp;({getPlatform()})
           <Divider />
           {latestVersion && (
             <Box mt={2}>

platformio.ini

@@ -50,7 +50,8 @@ extra_scripts =
   scripts/rename_fw.py
 
 [espressi32_base_tasmota]
-;  use Tasmota's library which removes some unused libs (like mbedtsl, so no WiFi_secure.h) and increases available heap
+;  use Tasmota's library for 4MB variants
+;  it removes some unused libs (like mbedtsl, so no WiFi_secure.h) and increases available heap
 ;  Tasmota Arduino Core 2.0.17 with IPv6 support, based on IDF 4.4.7
 ; platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.05.00/platform-espressif32.zip
 ;  Tasmota Arduino Core 2.0.18 with IPv6 support, based on IDF 4.4.8

src/web/WebStatusService.cpp

@@ -45,7 +45,7 @@ void WebStatusService::systemStatus(AsyncWebServerRequest * request) {
 #endif
 #endif
 
-    root["esp_platform"] = EMSESP_PLATFORM;
+    root["esp_platform"] = EMSESP_PLATFORM;      // from default_settings.h: ESP32, ESP32-C3, ESP32-S2, ESP32-S3
     root["status"]       = EMSESP::bus_status(); // 0, 1 or 2
     root["bus_uptime"]   = EMSbus::bus_uptime();
     root["num_devices"]  = EMSESP::count_devices();