Merge branch 'bugfix/fixes_from_kconfiglib_update' into 'master'

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

See merge request espressif/esp-idf!6255

components/esp_common/Kconfig

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

examples/protocols/websocket/main/Kconfig.projbuild

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

tools/cmake/targets.cmake

@@ -37,7 +37,7 @@ function(__target_check)
     idf_build_get_property(idf_target IDF_TARGET)
     if(NOT ${idf_target} STREQUAL ${CONFIG_IDF_TARGET})
         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.")
     endif()
 endfunction()
@@ -66,4 +66,4 @@ macro(__target_set_toolchain)
                     "checked ${toolchain_file_global} and ${toolchain_file_component}")
         endif()
     endif()
-endmacro()
+endmacro()

tools/idf.py

@@ -1529,13 +1529,18 @@ if __name__ == "__main__":
         if ("MSYSTEM" in os.environ) and (
             not os.environ.get("_", "").endswith(WINPTY_EXE) and WINPTY_VAR not in os.environ
         ):
-            os.environ[WINPTY_VAR] = "1"  # the value is of no interest to us
+
-            # idf.py calls itself with "winpty" and WINPTY global variable set
+            if 'menuconfig' in sys.argv:
-            ret = subprocess.call(
+                # don't use winpty for menuconfig because it will print weird characters
-                [WINPTY_EXE, sys.executable] + sys.argv, env=os.environ
+                main()
-            )
+            else:
-            if ret:
+                os.environ[WINPTY_VAR] = "1"  # the value is of no interest to us
-                raise SystemExit(ret)
+                # idf.py calls itself with "winpty" and WINPTY global variable set
+                ret = subprocess.call(
+                    [WINPTY_EXE, sys.executable] + sys.argv, env=os.environ
+                )
+                if ret:
+                    raise SystemExit(ret)
 
         elif os.name == "posix" and not _valid_unicode_config():
             # Trying to find best utf-8 locale available on the system and restart python with it