From 8a291bea6169a9462d8c97677efede7e30ca2af9 Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 21 Jul 2024 14:42:22 +0200 Subject: [PATCH 1/4] add comment --- platformio.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 6d94f96be..05fd80548 100644 --- a/platformio.ini +++ b/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 From 452b3be953175de6617506c4c5116785d8aa0065 Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 21 Jul 2024 14:42:31 +0200 Subject: [PATCH 2/4] add comment --- src/web/WebStatusService.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/web/WebStatusService.cpp b/src/web/WebStatusService.cpp index 119ec7291..929ec0f97 100644 --- a/src/web/WebStatusService.cpp +++ b/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(); From 217d2703f50efca1a7ed1af89843c7ade04da867 Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 21 Jul 2024 14:42:47 +0200 Subject: [PATCH 3/4] fix downloading of 16M builds --- .github/workflows/pre_release.yml | 6 +++--- .github/workflows/tagged_release.yml | 7 +++++-- .github/workflows/test_release.yml | 14 +++++--------- interface/src/framework/system/UploadDownload.tsx | 12 ++++++++++-- 4 files changed, 23 insertions(+), 16 deletions(-) diff --git a/.github/workflows/pre_release.yml b/.github/workflows/pre_release.yml index dc4a2dc1b..e4f480041 100644 --- a/.github/workflows/pre_release.yml +++ b/.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 diff --git a/.github/workflows/tagged_release.yml b/.github/workflows/tagged_release.yml index 93eb8d5af..6602a717b 100644 --- a/.github/workflows/tagged_release.yml +++ b/.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: diff --git a/.github/workflows/test_release.yml b/.github/workflows/test_release.yml index 8f1be2863..39db0da86 100644 --- a/.github/workflows/test_release.yml +++ b/.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' diff --git a/interface/src/framework/system/UploadDownload.tsx b/interface/src/framework/system/UploadDownload.tsx index d8e7389b0..2c84c53a0 100644 --- a/interface/src/framework/system/UploadDownload.tsx +++ b/interface/src/framework/system/UploadDownload.tsx @@ -16,6 +16,7 @@ import { } from 'components'; import { useI18nContext } from 'i18n/i18n-react'; import type { APIcall } from 'project/types'; +import type { ESPSystemStatus } from 'types'; import RestartMonitor from './RestartMonitor'; @@ -81,9 +82,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 +202,7 @@ const UploadDownload: FC = () => { {LL.VERSION_ON() + ' '} - {data.emsesp_version} ({data.esp_platform}) + {data.emsesp_version} ({getPlatform()}) {latestVersion && ( From 7ef99f3dc00afba5b9f70ee2c3d9382dec3a92bb Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 21 Jul 2024 14:44:10 +0200 Subject: [PATCH 4/4] remove obsolete include --- interface/src/framework/system/UploadDownload.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/interface/src/framework/system/UploadDownload.tsx b/interface/src/framework/system/UploadDownload.tsx index 2c84c53a0..8c159ef4e 100644 --- a/interface/src/framework/system/UploadDownload.tsx +++ b/interface/src/framework/system/UploadDownload.tsx @@ -16,7 +16,6 @@ import { } from 'components'; import { useI18nContext } from 'i18n/i18n-react'; import type { APIcall } from 'project/types'; -import type { ESPSystemStatus } from 'types'; import RestartMonitor from './RestartMonitor';