From d44ceac0159866a30d684638332ee1463800add8 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 13 Oct 2021 11:20:03 +0200 Subject: [PATCH] Cam compile opti (#242) (#243) --- .github/workflows/CI_github_ESP32.yml | 20 ++++++++++++ .../workflows/Tasmota_build_development.yml | 18 +++++++++++ .github/workflows/Tasmota_build_master.yml | 18 +++++++++++ platformio_tasmota_cenv_sample.ini | 31 ------------------- platformio_tasmota_env32.ini | 31 +++++++++++++++++++ 5 files changed, 87 insertions(+), 31 deletions(-) diff --git a/.github/workflows/CI_github_ESP32.yml b/.github/workflows/CI_github_ESP32.yml index b01c6af2c..19404c804 100644 --- a/.github/workflows/CI_github_ESP32.yml +++ b/.github/workflows/CI_github_ESP32.yml @@ -184,6 +184,26 @@ jobs: name: firmware path: ./build_output + tasmota32c3: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Python + uses: actions/setup-python@v1 + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -U platformio + platformio upgrade --dev + platformio update + - name: Run PlatformIO + run: | + platformio run -e tasmota32c3 + - uses: actions/upload-artifact@v2 + with: + name: firmware + path: ./build_output + tasmota32-AF: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/Tasmota_build_development.yml b/.github/workflows/Tasmota_build_development.yml index 63114faf0..2ff5e0544 100644 --- a/.github/workflows/Tasmota_build_development.yml +++ b/.github/workflows/Tasmota_build_development.yml @@ -826,6 +826,23 @@ jobs: name: firmware path: ./build_output + tasmota32c3: + runs-on: ubuntu-latest + continue-on-error: true + steps: + - uses: actions/checkout@v2 + - name: Set up Python + uses: actions/setup-python@v1 + - name: Install dependencies + run: | + pip install -U platformio + - name: Run PlatformIO + run: | + platformio run -e tasmota32c3 + - uses: actions/upload-artifact@v2 + with: + name: firmware + path: ./build_output tasmota32-AF: runs-on: ubuntu-latest @@ -1338,6 +1355,7 @@ jobs: [ ! -f ./mv_firmware/firmware/tasmota32-odroidgo.* ] || mv ./mv_firmware/firmware/tasmota32-odroidgo.* ./firmware/tasmota32/ [ ! -f ./mv_firmware/firmware/tasmota32-core2.* ] || mv ./mv_firmware/firmware/tasmota32-core2.* ./firmware/tasmota32/ [ ! -f ./mv_firmware/firmware/tasmota32-bluetooth.* ] || mv ./mv_firmware/firmware/tasmota32-bluetooth.* ./firmware/tasmota32/ + [ ! -f ./mv_firmware/firmware/tasmota32c3*.* ] || mv ./mv_firmware/firmware/tasmota32c3*.* ./firmware/tasmota32/ [ ! -f ./mv_firmware/firmware/tasmota32* ] || mv ./mv_firmware/firmware/tasmota32* ./firmware/tasmota32/languages/ [ ! -f ./mv_firmware/firmware/* ] || mv ./mv_firmware/firmware/* ./firmware/tasmota/languages/ - name: Display files to transfer diff --git a/.github/workflows/Tasmota_build_master.yml b/.github/workflows/Tasmota_build_master.yml index 0e13d2d63..7efcfdde0 100644 --- a/.github/workflows/Tasmota_build_master.yml +++ b/.github/workflows/Tasmota_build_master.yml @@ -824,6 +824,23 @@ jobs: name: firmware path: ./build_output + tasmota32c3: + runs-on: ubuntu-latest + continue-on-error: true + steps: + - uses: actions/checkout@v2 + - name: Set up Python + uses: actions/setup-python@v1 + - name: Install dependencies + run: | + pip install -U platformio + - name: Run PlatformIO + run: | + platformio run -e tasmota32c3 + - uses: actions/upload-artifact@v2 + with: + name: firmware + path: ./build_output tasmota32-AF: runs-on: ubuntu-latest @@ -1345,6 +1362,7 @@ jobs: [ ! -f ./mv_firmware/firmware/tasmota32-odroidgo.* ] || mv ./mv_firmware/firmware/tasmota32-odroidgo.* ./release-firmware/tasmota32/ [ ! -f ./mv_firmware/firmware/tasmota32-core2.* ] || mv ./mv_firmware/firmware/tasmota32-core2.* ./release-firmware/tasmota32/ [ ! -f ./mv_firmware/firmware/tasmota32-bluetooth.* ] || mv ./mv_firmware/firmware/tasmota32-bluetooth.* ./release-firmware/tasmota32/ + [ ! -f ./mv_firmware/firmware/tasmota32c3*.* ] || mv ./mv_firmware/firmware/tasmota32c3*.* ./release-firmware/tasmota32/ [ ! -f ./mv_firmware/firmware/tasmota32* ] || mv ./mv_firmware/firmware/tasmota32* ./release-firmware/tasmota32/languages/ [ ! -f ./mv_firmware/firmware/* ] || mv ./mv_firmware/firmware/* ./release-firmware/tasmota/languages/ - name: Display files diff --git a/platformio_tasmota_cenv_sample.ini b/platformio_tasmota_cenv_sample.ini index 6c3766549..b8b966d1c 100644 --- a/platformio_tasmota_cenv_sample.ini +++ b/platformio_tasmota_cenv_sample.ini @@ -70,37 +70,6 @@ lib_ignore = ESP32-HomeKit Micro-RTSP -; *** EXPERIMENTAL Tasmota version for ESP32-C3 -[env:tasmota32c3] -extends = env:tasmota32_base -board = esp32c3 -platform = https://github.com/platformio/platform-espressif32.git#feature/arduino-idf-master -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/464/framework-arduinoespressif32-master-3dde75d58.tar.gz - platformio/tool-mklittlefs @ ~1.203.200522 -build_unflags = ${env:tasmota32_base.build_unflags} - -Wswitch-unreachable - -Wstringop-overflow - -Wincompatible-pointer-types - -mtarget-align - -DNDEBUG -build_flags = ${env:tasmota32_base.build_flags} - -Wno-switch-unreachable - -Wno-stringop-overflow -; *** Comment next two lines to disable BLE - -DUSE_BLE_ESP32 - -DUSE_MI_ESP32 - ;-DESP32_STAGE=true -lib_extra_dirs = lib/libesp32 - lib/libesp32_div - lib/libesp32_lvgl - lib/lib_basic - lib/lib_i2c - lib/lib_ssl - lib/lib_display -lib_ignore = - TTGO TWatch Library - ESP32-HomeKit - Micro-RTSP ; *** EXPERIMENTAL Tasmota version for ESP32 IDF4.4. [env:tasmota32idf4] diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini index 2b77d3d1a..42225bdc9 100644 --- a/platformio_tasmota_env32.ini +++ b/platformio_tasmota_env32.ini @@ -94,6 +94,37 @@ extends = env:tasmota32_base build_flags = ${env:tasmota32_base.build_flags} -DUSE_IR_REMOTE_FULL -DFIRMWARE_IR lib_extra_dirs = lib/libesp32, lib/lib_basic +[env:tasmota32c3] +extends = env:tasmota32_base +board = esp32c3 +platform = https://github.com/platformio/platform-espressif32.git#feature/arduino-idf-master +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/464/framework-arduinoespressif32-master-3dde75d58.tar.gz + platformio/tool-mklittlefs @ ~1.203.200522 +build_unflags = ${env:tasmota32_base.build_unflags} + -Wswitch-unreachable + -Wstringop-overflow + -Wincompatible-pointer-types + -mtarget-align + -DNDEBUG +build_flags = ${env:tasmota32_base.build_flags} + -Wno-switch-unreachable + -Wno-stringop-overflow +; *** Comment next two lines to disable BLE +; -DUSE_BLE_ESP32 +; -DUSE_MI_ESP32 + ;-DESP32_STAGE=true +lib_extra_dirs = lib/libesp32 + lib/libesp32_div + lib/libesp32_lvgl + lib/lib_basic + lib/lib_i2c + lib/lib_ssl + lib/lib_display +lib_ignore = + TTGO TWatch Library + ESP32-HomeKit + Micro-RTSP + [env:tasmota32-AF] extends = env:tasmota32_base build_flags = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=af_AF -DFIRMWARE_TASMOTA32