mirror of
https://github.com/arendst/Tasmota.git
synced 2025-07-21 01:36:31 +00:00
Merge pull request #11310 from Jason2866/patch-1
Phase 1 of new Tasmota32 build variants
This commit is contained in:
commit
130b690d24
20
.github/workflows/CI_github_ESP32.yml
vendored
20
.github/workflows/CI_github_ESP32.yml
vendored
@ -104,26 +104,6 @@ jobs:
|
|||||||
name: firmware
|
name: firmware
|
||||||
path: ./build_output
|
path: ./build_output
|
||||||
|
|
||||||
tasmota32-lite:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- 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 tasmota32-lite
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output
|
|
||||||
|
|
||||||
tasmota32-knx:
|
tasmota32-knx:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
|
21
.github/workflows/Tasmota_build.yml
vendored
21
.github/workflows/Tasmota_build.yml
vendored
@ -724,26 +724,6 @@ jobs:
|
|||||||
path: ./build_output
|
path: ./build_output
|
||||||
|
|
||||||
|
|
||||||
tasmota32-lite:
|
|
||||||
needs: tasmota_pull
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
continue-on-error: true
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
pip install -U platformio
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-lite
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output
|
|
||||||
|
|
||||||
|
|
||||||
tasmota32-webcam:
|
tasmota32-webcam:
|
||||||
needs: tasmota_pull
|
needs: tasmota_pull
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
@ -1455,7 +1435,6 @@ jobs:
|
|||||||
[ ! -f ./mv_firmware/firmware/tasmota-zbbridge.* ] || mv ./mv_firmware/firmware/tasmota-zbbridge.* ./firmware/tasmota/
|
[ ! -f ./mv_firmware/firmware/tasmota-zbbridge.* ] || mv ./mv_firmware/firmware/tasmota-zbbridge.* ./firmware/tasmota/
|
||||||
[ ! -f ./mv_firmware/firmware/tasmota32.* ] || mv ./mv_firmware/firmware/tasmota32.* ./firmware/tasmota32/
|
[ ! -f ./mv_firmware/firmware/tasmota32.* ] || mv ./mv_firmware/firmware/tasmota32.* ./firmware/tasmota32/
|
||||||
[ ! -f ./mv_firmware/firmware/tasmota32-sensors.* ] || mv ./mv_firmware/firmware/tasmota32-sensors.* ./firmware/tasmota32/
|
[ ! -f ./mv_firmware/firmware/tasmota32-sensors.* ] || mv ./mv_firmware/firmware/tasmota32-sensors.* ./firmware/tasmota32/
|
||||||
[ ! -f ./mv_firmware/firmware/tasmota32-lite.* ] || mv ./mv_firmware/firmware/tasmota32-lite.* ./firmware/tasmota32/
|
|
||||||
[ ! -f ./mv_firmware/firmware/tasmota32-ir*.* ] || mv ./mv_firmware/firmware/tasmota32-ir*.* ./firmware/tasmota32/
|
[ ! -f ./mv_firmware/firmware/tasmota32-ir*.* ] || mv ./mv_firmware/firmware/tasmota32-ir*.* ./firmware/tasmota32/
|
||||||
[ ! -f ./mv_firmware/firmware/tasmota32-display.* ] || mv ./mv_firmware/firmware/tasmota32-display.* ./firmware/tasmota32/
|
[ ! -f ./mv_firmware/firmware/tasmota32-display.* ] || mv ./mv_firmware/firmware/tasmota32-display.* ./firmware/tasmota32/
|
||||||
[ ! -f ./mv_firmware/firmware/tasmota32-web*.* ] || mv ./mv_firmware/firmware/tasmota32-web*.* ./firmware/tasmota32/
|
[ ! -f ./mv_firmware/firmware/tasmota32-web*.* ] || mv ./mv_firmware/firmware/tasmota32-web*.* ./firmware/tasmota32/
|
||||||
|
21
.github/workflows/Tasmota_build_master.yml
vendored
21
.github/workflows/Tasmota_build_master.yml
vendored
@ -724,26 +724,6 @@ jobs:
|
|||||||
path: ./build_output
|
path: ./build_output
|
||||||
|
|
||||||
|
|
||||||
tasmota32-lite:
|
|
||||||
needs: tasmota_pull
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
continue-on-error: true
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
pip install -U platformio
|
|
||||||
- name: Run PlatformIO
|
|
||||||
run: |
|
|
||||||
platformio run -e tasmota32-lite
|
|
||||||
- uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: ./build_output
|
|
||||||
|
|
||||||
|
|
||||||
tasmota32-webcam:
|
tasmota32-webcam:
|
||||||
needs: tasmota_pull
|
needs: tasmota_pull
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
@ -1455,7 +1435,6 @@ jobs:
|
|||||||
[ ! -f ./mv_firmware/firmware/tasmota-zbbridge.* ] || mv ./mv_firmware/firmware/tasmota-zbbridge.* ./firmware/tasmota/
|
[ ! -f ./mv_firmware/firmware/tasmota-zbbridge.* ] || mv ./mv_firmware/firmware/tasmota-zbbridge.* ./firmware/tasmota/
|
||||||
[ ! -f ./mv_firmware/firmware/tasmota32.* ] || mv ./mv_firmware/firmware/tasmota32.* ./firmware/tasmota32/
|
[ ! -f ./mv_firmware/firmware/tasmota32.* ] || mv ./mv_firmware/firmware/tasmota32.* ./firmware/tasmota32/
|
||||||
[ ! -f ./mv_firmware/firmware/tasmota32-sensors.* ] || mv ./mv_firmware/firmware/tasmota32-sensors.* ./firmware/tasmota32/
|
[ ! -f ./mv_firmware/firmware/tasmota32-sensors.* ] || mv ./mv_firmware/firmware/tasmota32-sensors.* ./firmware/tasmota32/
|
||||||
[ ! -f ./mv_firmware/firmware/tasmota32-lite.* ] || mv ./mv_firmware/firmware/tasmota32-lite.* ./firmware/tasmota32/
|
|
||||||
[ ! -f ./mv_firmware/firmware/tasmota32-ir*.* ] || mv ./mv_firmware/firmware/tasmota32-ir*.* ./firmware/tasmota32/
|
[ ! -f ./mv_firmware/firmware/tasmota32-ir*.* ] || mv ./mv_firmware/firmware/tasmota32-ir*.* ./firmware/tasmota32/
|
||||||
[ ! -f ./mv_firmware/firmware/tasmota32-display.* ] || mv ./mv_firmware/firmware/tasmota32-display.* ./firmware/tasmota32/
|
[ ! -f ./mv_firmware/firmware/tasmota32-display.* ] || mv ./mv_firmware/firmware/tasmota32-display.* ./firmware/tasmota32/
|
||||||
[ ! -f ./mv_firmware/firmware/tasmota32-web*.* ] || mv ./mv_firmware/firmware/tasmota32-web*.* ./firmware/tasmota32/
|
[ ! -f ./mv_firmware/firmware/tasmota32-web*.* ] || mv ./mv_firmware/firmware/tasmota32-web*.* ./firmware/tasmota32/
|
||||||
|
@ -29,7 +29,6 @@ default_envs =
|
|||||||
; tasmota32
|
; tasmota32
|
||||||
; tasmota32-bluetooth
|
; tasmota32-bluetooth
|
||||||
; tasmota32-webcam
|
; tasmota32-webcam
|
||||||
; tasmota32-lite
|
|
||||||
; tasmota32-knx
|
; tasmota32-knx
|
||||||
; tasmota32-sensors
|
; tasmota32-sensors
|
||||||
; tasmota32-display
|
; tasmota32-display
|
||||||
|
@ -11,7 +11,6 @@ default_envs = ${build_envs.default_envs}
|
|||||||
; tasmota32-webcam
|
; tasmota32-webcam
|
||||||
; tasmota32-odroidgo
|
; tasmota32-odroidgo
|
||||||
; tasmota32-core2
|
; tasmota32-core2
|
||||||
; tasmota32-lite
|
|
||||||
; tasmota32-knx
|
; tasmota32-knx
|
||||||
; tasmota32-sensors
|
; tasmota32-sensors
|
||||||
; tasmota32-display
|
; tasmota32-display
|
||||||
|
@ -66,11 +66,6 @@ extends = env:tasmota32
|
|||||||
build_flags = ${common32.build_flags} -DFIRMWARE_BLUETOOTH
|
build_flags = ${common32.build_flags} -DFIRMWARE_BLUETOOTH
|
||||||
lib_extra_dirs = lib/libesp32, lib/libesp32_div, lib/lib_basic, lib/lib_i2c, lib/lib_ssl
|
lib_extra_dirs = lib/libesp32, lib/libesp32_div, lib/lib_basic, lib/lib_i2c, lib/lib_ssl
|
||||||
|
|
||||||
[env:tasmota32-lite]
|
|
||||||
extends = env:tasmota32
|
|
||||||
build_flags = ${common32.build_flags} -DFIRMWARE_LITE
|
|
||||||
lib_extra_dirs = lib/libesp32
|
|
||||||
|
|
||||||
[env:tasmota32-knx]
|
[env:tasmota32-knx]
|
||||||
extends = env:tasmota32
|
extends = env:tasmota32
|
||||||
build_flags = ${common32.build_flags} -DFIRMWARE_KNX_NO_EMULATION
|
build_flags = ${common32.build_flags} -DFIRMWARE_KNX_NO_EMULATION
|
||||||
|
Loading…
x
Reference in New Issue
Block a user