Skip to content

Commit ab88dc4

Browse files
authored
Merge branch 'master' into feature/basic-app-install-flow
2 parents 18750a0 + 56bebef commit ab88dc4

File tree

5 files changed

+201
-46
lines changed

5 files changed

+201
-46
lines changed

.github/workflows/examples-linux-tv-casting-app.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
run: |
6868
./scripts/run_in_build_env.sh \
6969
"python3 ./scripts/tests/run_tv_casting_test.py"
70-
timeout-minutes: 1
70+
timeout-minutes: 2 # Comment this out to debug if GitHub Action times out.
7171

7272
- name: Uploading Size Reports
7373
uses: ./.github/actions/upload-size-reports

examples/chef/chef.py

+13-4
Original file line numberDiff line numberDiff line change
@@ -696,11 +696,20 @@ def main() -> int:
696696
if options.build_target == "esp32":
697697
shell.run_cmd(f"cd {_CHEF_SCRIPT_PATH}/esp32")
698698
if options.enable_ipv4:
699-
shell.run_cmd(
700-
"sed -i 's/CONFIG_DISABLE_IPV4=y/#\\ CONFIG_DISABLE_IPV4\\ is\\ not\\ set/g' sdkconfig ")
699+
if sys.platform == "darwin":
700+
shell.run_cmd(
701+
"sed -i '' 's/CONFIG_DISABLE_IPV4=y/#\\ CONFIG_DISABLE_IPV4\\ is\\ not\\ set/g' sdkconfig ")
702+
else:
703+
shell.run_cmd(
704+
"sed -i 's/CONFIG_DISABLE_IPV4=y/#\\ CONFIG_DISABLE_IPV4\\ is\\ not\\ set/g' sdkconfig ")
701705
else:
702-
shell.run_cmd(
703-
"sed -i 's/#\\ CONFIG_DISABLE_IPV4\\ is\\ not\\ set/CONFIG_DISABLE_IPV4=y/g' sdkconfig ")
706+
if sys.platform == "darwin":
707+
shell.run_cmd(
708+
"sed -i '' 's/#\\ CONFIG_DISABLE_IPV4\\ is\\ not\\ set/CONFIG_DISABLE_IPV4=y/g' sdkconfig ")
709+
else:
710+
shell.run_cmd(
711+
"sed -i 's/#\\ CONFIG_DISABLE_IPV4\\ is\\ not\\ set/CONFIG_DISABLE_IPV4=y/g' sdkconfig ")
712+
704713
shell.run_cmd("idf.py build")
705714
shell.run_cmd("idf.py build flashing_script")
706715
shell.run_cmd(

examples/chef/esp32/sdkconfig.defaults

+1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ CONFIG_MBEDTLS_HKDF_C=y
6262

6363
# IRAM optimizations
6464
CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
65+
CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y
6566

6667
# Increase LwIP IPv6 address number
6768
CONFIG_LWIP_IPV6_NUM_ADDRESSES=6

examples/chef/esp32/sdkconfig_rpc.defaults

+1
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,6 @@ CONFIG_MBEDTLS_HKDF_C=y
6161

6262
# IRAM optimizations
6363
CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
64+
CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y
6465

6566
CONFIG_DIAG_USE_EXTERNAL_LOG_WRAP=y

0 commit comments

Comments
 (0)