Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/fixes_from_kconfiglib_update' into 'master'

Browse source 
Fix of menuconfig bug for MSYS2 and a couple of cosmetic changes

See merge request espressif/esp-idf!6255
This commit is contained in:
Angus Gratton 2019-10-10 11:06:29 +08:00
commit 6df8658b5b
4 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
components/esp_common/Kconfig
View file

@ -40,9 +40,10 @@ menu "Common ESP-related"
config ESP_IPC_TASK_STACK_SIZE config ESP_IPC_TASK_STACK_SIZE
int "Inter-Processor Call (IPC) task stack size" int "Inter-Processor Call (IPC) task stack size"
default 1024
range 512 65536 if !ESP32_APPTRACE_ENABLE range 512 65536 if !ESP32_APPTRACE_ENABLE
range 2048 65536 if ESP32_APPTRACE_ENABLE range 2048 65536 if ESP32_APPTRACE_ENABLE
default 2048 if ESP32_APPTRACE_ENABLE
default 1024
help help
Configure the IPC tasks stack size. One IPC task runs on each core Configure the IPC tasks stack size. One IPC task runs on each core
(in dual core mode), and allows for cross-core function calls. (in dual core mode), and allows for cross-core function calls.

2
examples/protocols/websocket/main/Kconfig.projbuild
View file

@ -2,7 +2,7 @@ menu "Example Configuration"
config WEBSOCKET_URI config WEBSOCKET_URI
string "Websocket endpoint URI" string "Websocket endpoint URI"
default "ws://echo.websocket.org"; default "ws://echo.websocket.org"
help help
URL of websocket endpoint this example connects to and sends echo URL of websocket endpoint this example connects to and sends echo

2
tools/cmake/targets.cmake
View file

@ -37,7 +37,7 @@ function(__target_check)
idf_build_get_property(idf_target IDF_TARGET) idf_build_get_property(idf_target IDF_TARGET)
if(NOT ${idf_target} STREQUAL ${CONFIG_IDF_TARGET}) if(NOT ${idf_target} STREQUAL ${CONFIG_IDF_TARGET})
message(FATAL_ERROR "CONFIG_IDF_TARGET in sdkconfig does not match " message(FATAL_ERROR "CONFIG_IDF_TARGET in sdkconfig does not match "
"IDF_TARGET environement variable. To change the target, delete " "IDF_TARGET environment variable. To change the target, delete "
"sdkconfig file and build the project again.") "sdkconfig file and build the project again.")
endif() endif()
endfunction() endfunction()

5
tools/idf.py
View file

@ -1529,6 +1529,11 @@ if __name__ == "__main__":
if ("MSYSTEM" in os.environ) and ( if ("MSYSTEM" in os.environ) and (
not os.environ.get("_", "").endswith(WINPTY_EXE) and WINPTY_VAR not in os.environ not os.environ.get("_", "").endswith(WINPTY_EXE) and WINPTY_VAR not in os.environ
): ):
if 'menuconfig' in sys.argv:
# don't use winpty for menuconfig because it will print weird characters
main()
else:
os.environ[WINPTY_VAR] = "1" # the value is of no interest to us os.environ[WINPTY_VAR] = "1" # the value is of no interest to us
# idf.py calls itself with "winpty" and WINPTY global variable set # idf.py calls itself with "winpty" and WINPTY global variable set
ret = subprocess.call( ret = subprocess.call(