From 835e4ce102f5aadc16bec1ea30b68054290c9e3b Mon Sep 17 00:00:00 2001 From: adabreuti <76965454+adabreuti@users.noreply.github.com> Date: Thu, 14 Jul 2022 18:41:16 -0500 Subject: [PATCH] Reenable logging for lock-app by converting to Thread MTD (#20679) * Reenable logging for lock-app by converting to Thread MTD * Update CI --- examples/lock-app/cc13x2x7_26x2x7/args.gni | 4 ++-- scripts/build/builders/cc13x2x7_26x2x7.py | 1 + scripts/build/testdata/build_all_except_host.txt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/lock-app/cc13x2x7_26x2x7/args.gni b/examples/lock-app/cc13x2x7_26x2x7/args.gni index b3d35184fb3edb..c93d04bc8901e0 100644 --- a/examples/lock-app/cc13x2x7_26x2x7/args.gni +++ b/examples/lock-app/cc13x2x7_26x2x7/args.gni @@ -29,7 +29,7 @@ lwip_debug = false chip_enable_ota_requestor = true # Disable CHIP Logging -chip_progress_logging = false +#chip_progress_logging = false chip_detail_logging = false chip_automation_logging = false @@ -40,7 +40,7 @@ chip_config_network_layer_ble = true # INCLUDE_xSemaphoreGetMutexHolder chip_stack_lock_tracking = "none" -chip_openthread_ftd = true +chip_openthread_ftd = false matter_device_vid = "0xFFF1" matter_device_pid = "0x8006" diff --git a/scripts/build/builders/cc13x2x7_26x2x7.py b/scripts/build/builders/cc13x2x7_26x2x7.py index 99e3ae1d6da320..713a5ca7bc913b 100644 --- a/scripts/build/builders/cc13x2x7_26x2x7.py +++ b/scripts/build/builders/cc13x2x7_26x2x7.py @@ -85,6 +85,7 @@ def GnBuildArgs(self): pass elif self.openthread_ftd: args.append('chip_openthread_ftd=true') + args.append('chip_progress_logging=false') else: args.append('chip_openthread_ftd=false') diff --git a/scripts/build/testdata/build_all_except_host.txt b/scripts/build/testdata/build_all_except_host.txt index 032696d366a38b..6974fb6a155975 100644 --- a/scripts/build/testdata/build_all_except_host.txt +++ b/scripts/build/testdata/build_all_except_host.txt @@ -158,7 +158,7 @@ gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/exa gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-minimal-app/cc13x2x7_26x2x7 '--args=ti_sysconfig_root="TEST_TI_SYSCONFIG_ROOT"' {out}/cc13x2x7_26x2x7-all-clusters-minimal # Generating cc13x2x7_26x2x7-lock-ftd -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/cc13x2x7_26x2x7 '--args=ti_sysconfig_root="TEST_TI_SYSCONFIG_ROOT" chip_openthread_ftd=true' {out}/cc13x2x7_26x2x7-lock-ftd +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/cc13x2x7_26x2x7 '--args=ti_sysconfig_root="TEST_TI_SYSCONFIG_ROOT" chip_openthread_ftd=true chip_progress_logging=false' {out}/cc13x2x7_26x2x7-lock-ftd # Generating cc13x2x7_26x2x7-lock-mtd gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/cc13x2x7_26x2x7 '--args=ti_sysconfig_root="TEST_TI_SYSCONFIG_ROOT" chip_openthread_ftd=false' {out}/cc13x2x7_26x2x7-lock-mtd