mirror of
https://github.com/arendst/Tasmota.git
synced 2025-07-28 13:16:32 +00:00
Merge pull request #10920 from Jason2866/patch-5
Tasmota32 bluetooth variant
This commit is contained in:
commit
11d51f922d
20
.github/workflows/CI_github_ESP32.yml
vendored
20
.github/workflows/CI_github_ESP32.yml
vendored
@ -84,6 +84,26 @@ jobs:
|
|||||||
name: firmware
|
name: firmware
|
||||||
path: ./build_output
|
path: ./build_output
|
||||||
|
|
||||||
|
tasmota32-bluetooth:
|
||||||
|
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-bluetooth
|
||||||
|
- uses: actions/upload-artifact@v2
|
||||||
|
with:
|
||||||
|
name: firmware
|
||||||
|
path: ./build_output
|
||||||
|
|
||||||
tasmota32-minimal:
|
tasmota32-minimal:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
|
20
.github/workflows/Tasmota_build.yml
vendored
20
.github/workflows/Tasmota_build.yml
vendored
@ -824,6 +824,26 @@ jobs:
|
|||||||
path: ./build_output
|
path: ./build_output
|
||||||
|
|
||||||
|
|
||||||
|
tasmota32-bluetooth:
|
||||||
|
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-bluetooth
|
||||||
|
- uses: actions/upload-artifact@v2
|
||||||
|
with:
|
||||||
|
name: firmware
|
||||||
|
path: ./build_output
|
||||||
|
|
||||||
|
|
||||||
tasmota32-knx:
|
tasmota32-knx:
|
||||||
needs: tasmota_pull
|
needs: tasmota_pull
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
20
.github/workflows/Tasmota_build_master.yml
vendored
20
.github/workflows/Tasmota_build_master.yml
vendored
@ -824,6 +824,26 @@ jobs:
|
|||||||
path: ./build_output
|
path: ./build_output
|
||||||
|
|
||||||
|
|
||||||
|
tasmota32-bluetooth:
|
||||||
|
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-bluetooth
|
||||||
|
- uses: actions/upload-artifact@v2
|
||||||
|
with:
|
||||||
|
name: firmware
|
||||||
|
path: ./build_output
|
||||||
|
|
||||||
|
|
||||||
tasmota32-knx:
|
tasmota32-knx:
|
||||||
needs: tasmota_pull
|
needs: tasmota_pull
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
@ -27,6 +27,7 @@ default_envs =
|
|||||||
; tasmota-zbbridge
|
; tasmota-zbbridge
|
||||||
; tasmota-ir
|
; tasmota-ir
|
||||||
; tasmota32
|
; tasmota32
|
||||||
|
; tasmota32-bluetooth
|
||||||
; tasmota32-webcam
|
; tasmota32-webcam
|
||||||
; tasmota32-minimal
|
; tasmota32-minimal
|
||||||
; tasmota32-lite
|
; tasmota32-lite
|
||||||
|
@ -58,6 +58,11 @@ board_build.partitions = esp32_partition_app1984k_spiffs12M.csv
|
|||||||
build_flags = ${common32.build_flags} -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -DFIRMWARE_M5STACK_CORE2
|
build_flags = ${common32.build_flags} -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -DFIRMWARE_M5STACK_CORE2
|
||||||
lib_extra_dirs = lib/libesp32, lib/lib_basic, lib/lib_i2c, lib/lib_rf, lib/lib_div, lib/lib_ssl, lib/lib_display, lib/lib_audio
|
lib_extra_dirs = lib/libesp32, lib/lib_basic, lib/lib_i2c, lib/lib_rf, lib/lib_div, lib/lib_ssl, lib/lib_display, lib/lib_audio
|
||||||
|
|
||||||
|
[env:tasmota32-bluetooth]
|
||||||
|
extends = env:tasmota32
|
||||||
|
build_flags = ${common32.build_flags} -DFIRMWARE_BLUETOOTH
|
||||||
|
lib_extra_dirs = lib/libesp32, lib/lib_basic, lib/lib_i2c, lib/lib_ssl
|
||||||
|
|
||||||
[env:tasmota32-minimal]
|
[env:tasmota32-minimal]
|
||||||
extends = env:tasmota32
|
extends = env:tasmota32
|
||||||
build_flags = ${common32.build_flags} -DFIRMWARE_MINIMAL
|
build_flags = ${common32.build_flags} -DFIRMWARE_MINIMAL
|
||||||
|
@ -117,6 +117,29 @@
|
|||||||
#endif // USE_SCRIPT
|
#endif // USE_SCRIPT
|
||||||
#endif // FIRMWARE_M5STACK_CORE2
|
#endif // FIRMWARE_M5STACK_CORE2
|
||||||
|
|
||||||
|
/*********************************************************************************************\
|
||||||
|
* [tasmota32-bluetooth.bin]
|
||||||
|
* Provide an image with BLE support
|
||||||
|
\*********************************************************************************************/
|
||||||
|
|
||||||
|
#ifdef FIRMWARE_BLUETOOTH
|
||||||
|
|
||||||
|
#undef CODE_IMAGE_STR
|
||||||
|
#define CODE_IMAGE_STR "bluetooth"
|
||||||
|
|
||||||
|
#undef MODULE
|
||||||
|
#define MODULE WEMOS // [Module] Select default module from tasmota_template.h
|
||||||
|
#undef FALLBACK_MODULE
|
||||||
|
#define FALLBACK_MODULE WEMOS // [Module2] Select default module on fast reboot where USER_MODULE is user template
|
||||||
|
|
||||||
|
#define USE_UFILESYS
|
||||||
|
#define USE_SDCARD
|
||||||
|
#define GUI_TRASH_FILE
|
||||||
|
#define USE_ADC
|
||||||
|
#define USE_BLE_ESP32 // Enable new BLE driver
|
||||||
|
#define USE_MI_ESP32 // (ESP32 only) Add support for ESP32 as a BLE-bridge (+9k2 mem, +292k flash)
|
||||||
|
#endif // FIRMWARE_BLUETOOTH
|
||||||
|
|
||||||
#endif // ESP32
|
#endif // ESP32
|
||||||
|
|
||||||
#endif // _TASMOTA_CONFIGURATIONS_ESP32_H_
|
#endif // _TASMOTA_CONFIGURATIONS_ESP32_H_
|
||||||
|
Loading…
x
Reference in New Issue
Block a user