mirror of
https://github.com/emsesp/EMS-ESP32.git
synced 2025-12-06 07:49:52 +03:00
fix typos
This commit is contained in:
4
.vscode/settings.json
vendored
4
.vscode/settings.json
vendored
@@ -89,7 +89,9 @@
|
|||||||
"**/ArduinoJson/**"
|
"**/ArduinoJson/**"
|
||||||
],
|
],
|
||||||
"cSpell.enableFiletypes": [
|
"cSpell.enableFiletypes": [
|
||||||
"!typescript"
|
"!typescript",
|
||||||
|
"ini",
|
||||||
|
"makefile"
|
||||||
],
|
],
|
||||||
"typescript.preferences.preferTypeOnlyAutoImports": true
|
"typescript.preferences.preferTypeOnlyAutoImports": true
|
||||||
}
|
}
|
||||||
@@ -37,7 +37,7 @@ build_flags =
|
|||||||
unbuild_flags =
|
unbuild_flags =
|
||||||
${common.core_unbuild_flags}
|
${common.core_unbuild_flags}
|
||||||
|
|
||||||
[espressi32_base]
|
[espressif32_base]
|
||||||
platform = espressif32@6.8.1
|
platform = espressif32@6.8.1
|
||||||
framework = arduino
|
framework = arduino
|
||||||
board_build.filesystem = littlefs
|
board_build.filesystem = littlefs
|
||||||
@@ -49,7 +49,7 @@ extra_scripts =
|
|||||||
pre:scripts/build_interface.py
|
pre:scripts/build_interface.py
|
||||||
scripts/rename_fw.py
|
scripts/rename_fw.py
|
||||||
|
|
||||||
[espressi32_base_tasmota]
|
[espressif32_base_tasmota]
|
||||||
; use Tasmota's library for 4MB variants
|
; use Tasmota's library for 4MB variants
|
||||||
; it removes some unused libs (like mbedtsl, so no WiFi_secure.h) and increases available heap
|
; it removes some unused libs (like mbedtsl, so no WiFi_secure.h) and increases available heap
|
||||||
; Tasmota Arduino Core 2.0.18 with IPv6 support, based on IDF 4.4.8
|
; Tasmota Arduino Core 2.0.18 with IPv6 support, based on IDF 4.4.8
|
||||||
@@ -86,7 +86,7 @@ lib_deps =
|
|||||||
;
|
;
|
||||||
[env:ci_s_4M]
|
[env:ci_s_4M]
|
||||||
; 4MB ESP32 - using Tasmota - no SSL, no PSRAM - like the BBQKees older S32 models
|
; 4MB ESP32 - using Tasmota - no SSL, no PSRAM - like the BBQKees older S32 models
|
||||||
extends = espressi32_base_tasmota
|
extends = espressif32_base_tasmota
|
||||||
extra_scripts = scripts/rename_fw.py
|
extra_scripts = scripts/rename_fw.py
|
||||||
board = esp32dev
|
board = esp32dev
|
||||||
board_upload.flash_size = 4MB
|
board_upload.flash_size = 4MB
|
||||||
@@ -95,7 +95,7 @@ board_build.extra_flags = '-DEMSESP_DEFAULT_BOARD_PROFILE="S32"'
|
|||||||
|
|
||||||
[env:ci_s_16M]
|
[env:ci_s_16M]
|
||||||
; 16MB ESP32 - using Tasmota - no SSL, no PSRAM - like the BBQKees older S32 models
|
; 16MB ESP32 - using Tasmota - no SSL, no PSRAM - like the BBQKees older S32 models
|
||||||
extends = espressi32_base_tasmota
|
extends = espressif32_base_tasmota
|
||||||
extra_scripts = scripts/rename_fw.py
|
extra_scripts = scripts/rename_fw.py
|
||||||
board = esp32dev
|
board = esp32dev
|
||||||
board_upload.flash_size = 16MB
|
board_upload.flash_size = 16MB
|
||||||
@@ -104,7 +104,7 @@ board_build.extra_flags = '-DEMSESP_DEFAULT_BOARD_PROFILE="S32"'
|
|||||||
|
|
||||||
[env:ci_s_16M_P]
|
[env:ci_s_16M_P]
|
||||||
; 16MB ESP32 - with PSRAM - like BBQKees E32V2
|
; 16MB ESP32 - with PSRAM - like BBQKees E32V2
|
||||||
extends = espressi32_base
|
extends = espressif32_base
|
||||||
extra_scripts = scripts/rename_fw.py
|
extra_scripts = scripts/rename_fw.py
|
||||||
board = esp32dev
|
board = esp32dev
|
||||||
board_upload.flash_size = 16MB
|
board_upload.flash_size = 16MB
|
||||||
@@ -113,7 +113,7 @@ board_build.extra_flags = -DBOARD_HAS_PSRAM '-DEMSESP_DEFAULT_BOARD_PROFILE="E32
|
|||||||
|
|
||||||
[env:ci_s3_16M_P]
|
[env:ci_s3_16M_P]
|
||||||
; 16MB ESP32-S3 - with PSRAM - like BBQKees S3
|
; 16MB ESP32-S3 - with PSRAM - like BBQKees S3
|
||||||
extends = espressi32_base
|
extends = espressif32_base
|
||||||
extra_scripts = scripts/rename_fw.py
|
extra_scripts = scripts/rename_fw.py
|
||||||
board = lolin_s3
|
board = lolin_s3
|
||||||
board_build.f_cpu = 240000000L
|
board_build.f_cpu = 240000000L
|
||||||
@@ -128,28 +128,28 @@ board_build.extra_flags = -DBOARD_HAS_PSRAM '-DEMSESP_DEFAULT_BOARD_PROFILE="S32
|
|||||||
;
|
;
|
||||||
|
|
||||||
[env:s_4M]
|
[env:s_4M]
|
||||||
extends = espressi32_base_tasmota
|
extends = espressif32_base_tasmota
|
||||||
board = esp32dev
|
board = esp32dev
|
||||||
board_upload.flash_size = 4MB
|
board_upload.flash_size = 4MB
|
||||||
board_build.partitions = esp32_partition_4M.csv
|
board_build.partitions = esp32_partition_4M.csv
|
||||||
board_build.extra_flags = '-DEMSESP_DEFAULT_BOARD_PROFILE="S32"'
|
board_build.extra_flags = '-DEMSESP_DEFAULT_BOARD_PROFILE="S32"'
|
||||||
|
|
||||||
[env:s_asym_4M]
|
[env:s_asym_4M]
|
||||||
extends = espressi32_base_tasmota
|
extends = espressif32_base_tasmota
|
||||||
board = esp32dev
|
board = esp32dev
|
||||||
board_upload.flash_size = 4MB
|
board_upload.flash_size = 4MB
|
||||||
board_build.partitions = esp32_asym_partition_4M.csv
|
board_build.partitions = esp32_asym_partition_4M.csv
|
||||||
board_build.extra_flags = '-DEMSESP_DEFAULT_BOARD_PROFILE="S32"'
|
board_build.extra_flags = '-DEMSESP_DEFAULT_BOARD_PROFILE="S32"'
|
||||||
|
|
||||||
[env:s_16M_P]
|
[env:s_16M_P]
|
||||||
extends = espressi32_base
|
extends = espressif32_base
|
||||||
board = esp32dev
|
board = esp32dev
|
||||||
board_upload.flash_size = 16MB
|
board_upload.flash_size = 16MB
|
||||||
board_build.partitions = esp32_partition_16M.csv
|
board_build.partitions = esp32_partition_16M.csv
|
||||||
board_build.extra_flags = -DBOARD_HAS_PSRAM '-DEMSESP_DEFAULT_BOARD_PROFILE="E32V2"'
|
board_build.extra_flags = -DBOARD_HAS_PSRAM '-DEMSESP_DEFAULT_BOARD_PROFILE="E32V2"'
|
||||||
|
|
||||||
[env:c3_mini_4M]
|
[env:c3_mini_4M]
|
||||||
extends = espressi32_base_tasmota
|
extends = espressif32_base_tasmota
|
||||||
board = lolin_c3_mini
|
board = lolin_c3_mini
|
||||||
board_upload.flash_size = 4MB
|
board_upload.flash_size = 4MB
|
||||||
board_build.partitions = esp32_partition_4M.csv
|
board_build.partitions = esp32_partition_4M.csv
|
||||||
@@ -158,14 +158,14 @@ board_build.extra_flags = '-DEMSESP_DEFAULT_BOARD_PROFILE="C3MINI"'
|
|||||||
; lolin C3 mini v1 needs special wifi init.
|
; lolin C3 mini v1 needs special wifi init.
|
||||||
; https://www.wemos.cc/en/latest/c3/c3_mini_1_0_0.html#about-wifi
|
; https://www.wemos.cc/en/latest/c3/c3_mini_1_0_0.html#about-wifi
|
||||||
[env:c3_miniv1_4M]
|
[env:c3_miniv1_4M]
|
||||||
extends = espressi32_base_tasmota
|
extends = espressif32_base_tasmota
|
||||||
board = lolin_c3_mini
|
board = lolin_c3_mini
|
||||||
board_upload.flash_size = 4MB
|
board_upload.flash_size = 4MB
|
||||||
board_build.partitions = esp32_partition_4M.csv
|
board_build.partitions = esp32_partition_4M.csv
|
||||||
board_build.extra_flags = -DBOARD_C3_MINI_V1 '-DEMSESP_DEFAULT_BOARD_PROFILE="C3MINI"'
|
board_build.extra_flags = -DBOARD_C3_MINI_V1 '-DEMSESP_DEFAULT_BOARD_PROFILE="C3MINI"'
|
||||||
|
|
||||||
[env:s2_4M]
|
[env:s2_4M]
|
||||||
extends = espressi32_base_tasmota
|
extends = espressif32_base_tasmota
|
||||||
board = lolin_s2_mini
|
board = lolin_s2_mini
|
||||||
board_upload.flash_size = 4MB
|
board_upload.flash_size = 4MB
|
||||||
board_build.partitions = esp32_partition_4M.csv
|
board_build.partitions = esp32_partition_4M.csv
|
||||||
@@ -173,7 +173,7 @@ board_build.extra_flags = '-DEMSESP_DEFAULT_BOARD_PROFILE="S2MINI"'
|
|||||||
|
|
||||||
; https://github.com/platformio/platform-espressif32/blob/master/boards/lolin_s3.json
|
; https://github.com/platformio/platform-espressif32/blob/master/boards/lolin_s3.json
|
||||||
[env:s3_16M_P]
|
[env:s3_16M_P]
|
||||||
extends = espressi32_base
|
extends = espressif32_base
|
||||||
board = lolin_s3
|
board = lolin_s3
|
||||||
board_upload.use_1200bps_touch = false
|
board_upload.use_1200bps_touch = false
|
||||||
board_upload.wait_for_upload_port = false
|
board_upload.wait_for_upload_port = false
|
||||||
@@ -182,7 +182,7 @@ board_build.partitions = esp32_partition_16M.csv
|
|||||||
board_build.extra_flags = -DBOARD_HAS_PSRAM '-DEMSESP_DEFAULT_BOARD_PROFILE="S32S3"'
|
board_build.extra_flags = -DBOARD_HAS_PSRAM '-DEMSESP_DEFAULT_BOARD_PROFILE="S32S3"'
|
||||||
|
|
||||||
[env:s3_32M_P]
|
[env:s3_32M_P]
|
||||||
extends = espressi32_base
|
extends = espressif32_base
|
||||||
board = lolin_s3
|
board = lolin_s3
|
||||||
board_build.arduino.memory_type: opi_opi
|
board_build.arduino.memory_type: opi_opi
|
||||||
board_build.flash_mode = opi
|
board_build.flash_mode = opi
|
||||||
@@ -194,7 +194,7 @@ board_build.extra_flags = -DBOARD_HAS_PSRAM '-DEMSESP_DEFAULT_BOARD_PROFILE="S32
|
|||||||
; Building and testing natively, standalone without an ESP32.
|
; Building and testing natively, standalone without an ESP32.
|
||||||
; See https://docs.platformio.org/en/latest/platforms/native.html
|
; See https://docs.platformio.org/en/latest/platforms/native.html
|
||||||
;
|
;
|
||||||
; It will generate an executbale which when run will show the EMS-ESP Console where you can run tests using the `test` command.
|
; It will generate an executable which when run will show the EMS-ESP Console where you can run tests using the `test` command.
|
||||||
;
|
;
|
||||||
; See https://docs.platformio.org/en/latest/core/installation/shell-commands.html#piocore-install-shell-commands
|
; See https://docs.platformio.org/en/latest/core/installation/shell-commands.html#piocore-install-shell-commands
|
||||||
;
|
;
|
||||||
@@ -203,8 +203,8 @@ board_build.extra_flags = -DBOARD_HAS_PSRAM '-DEMSESP_DEFAULT_BOARD_PROFILE="S32
|
|||||||
; to build and run on Windows, it needs winsock for the console input so:
|
; to build and run on Windows, it needs winsock for the console input so:
|
||||||
; - For the first time, install Msys2 (https://www.msys2.org/) and the GCC compiler with `run pacman -S mingw-w64-ucrt-x86_64-gcc`
|
; - For the first time, install Msys2 (https://www.msys2.org/) and the GCC compiler with `run pacman -S mingw-w64-ucrt-x86_64-gcc`
|
||||||
; - Then, build with `pio run -e native` to create the program.exe file
|
; - Then, build with `pio run -e native` to create the program.exe file
|
||||||
; - run by calling the executable from the Mysys shell e.g. `C:/msys64/msys2_shell.cmd -defterm -here -no-start -ucrt64 -c /d/dev/proddy/EMS-ESP32/.pio/build/native/program.exe`
|
; - run by calling the executable from the Mysys shell e.g. `C:/msys64/msys2_shell.cmd -defterm -here -no-start -ucrt64 -c <location>/.pio/build/native/program.exe`
|
||||||
; - or integrate into Windows Terminal https://www.msys2.org/docs/terminals/
|
; - or use with Windows Terminal https://www.msys2.org/docs/terminals/
|
||||||
;
|
;
|
||||||
[env:native]
|
[env:native]
|
||||||
platform = native
|
platform = native
|
||||||
@@ -243,7 +243,7 @@ lib_ignore = Module EMS-ESP-Modules
|
|||||||
; unit tests
|
; unit tests
|
||||||
; pio run -e native-test -t exec
|
; pio run -e native-test -t exec
|
||||||
; works on Linux, Windows, and MacOS
|
; works on Linux, Windows, and MacOS
|
||||||
; to auto generate the API exepected test results, compile with -DEMSESP_UNITY_CREATE and capture the output, and paste into the test_api.cpp file
|
; to update the test results, compile with -DEMSESP_UNITY_CREATE, run and capture the output and then paste this into the test_api.cpp file
|
||||||
[env:native-test]
|
[env:native-test]
|
||||||
platform = native
|
platform = native
|
||||||
test_build_src = true
|
test_build_src = true
|
||||||
|
|||||||
@@ -211,7 +211,7 @@ void Shower::set_shower_state(bool state, bool force) {
|
|||||||
ha_configdone_ = Mqtt::queue_ha(topic, doc.as<JsonObject>()); // publish the config payload with retain flag
|
ha_configdone_ = Mqtt::queue_ha(topic, doc.as<JsonObject>()); // publish the config payload with retain flag
|
||||||
|
|
||||||
//
|
//
|
||||||
// shower duaration
|
// shower duration
|
||||||
//
|
//
|
||||||
doc.clear();
|
doc.clear();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user