From 37d6208da1e323b0904867612533e82d717deb01 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Thu, 17 Feb 2022 15:53:48 -0500 Subject: [PATCH] Revert "[QPG] Fix shell app (#15094)" (#15321) ToT QPG buiulds failed with `AttributePathExpandIterator.cpp` link errors after this commit (even though PR checks were green). This reverts commit 2a826f90c980e663c69a269f96af265091339c39. --- .github/workflows/examples-qpg.yaml | 8 - config/qpg/chip-gn/args.gni | 5 +- examples/lighting-app/qpg/BUILD.gn | 5 +- .../qpg/include/CHIPProjectConfig.h | 188 ----------------- examples/lock-app/qpg/BUILD.gn | 5 +- .../lock-app/qpg/include/CHIPProjectConfig.h | 186 ----------------- examples/persistent-storage/qpg/BUILD.gn | 7 +- .../qpg/project_include}/CHIPProjectConfig.h | 8 +- examples/shell/qpg/BUILD.gn | 3 +- examples/shell/qpg/args.gni | 4 - .../shell/qpg/include/CHIPProjectConfig.h | 190 ------------------ third_party/qpg_sdk/repo | 2 +- 12 files changed, 20 insertions(+), 591 deletions(-) delete mode 100755 examples/lighting-app/qpg/include/CHIPProjectConfig.h delete mode 100755 examples/lock-app/qpg/include/CHIPProjectConfig.h rename examples/{persistent-storage/qpg/include => platform/qpg/project_include}/CHIPProjectConfig.h (97%) mode change 100755 => 100644 delete mode 100755 examples/shell/qpg/include/CHIPProjectConfig.h diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml index a0a6be53ef898b..27850d30b852fb 100644 --- a/.github/workflows/examples-qpg.yaml +++ b/.github/workflows/examples-qpg.yaml @@ -76,14 +76,6 @@ jobs: qpg qpg6105+debug lighting-app \ out/lighting_app_debug/chip-qpg6105-lighting-example.out \ /tmp/bloat_reports/ - - name: Build example QPG6105 Shell App - timeout-minutes: 5 - run: | - scripts/examples/gn_build_example.sh examples/shell/qpg out/shell_app_debug qpg_target_ic=\"qpg6105\" - .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \ - qpg qpg6105+debug shell-app \ - out/shell_app_debug/chip-qpg6105-shell-example.out \ - /tmp/bloat_reports/ - name: Build example QPG6105 persistent-storage timeout-minutes: 5 run: | diff --git a/config/qpg/chip-gn/args.gni b/config/qpg/chip-gn/args.gni index 5c0b2b0d8e58ab..bbaa8868de6df9 100644 --- a/config/qpg/chip-gn/args.gni +++ b/config/qpg/chip-gn/args.gni @@ -36,9 +36,8 @@ chip_mdns = "platform" # INCLUDE_xSemaphoreGetMutexHolder chip_stack_lock_tracking = "none" -# Using lighting-app as template config -# Application specific override to be done as cmd line arg -chip_project_config_include_dirs = [ "//examples/lighting-app/qpg/include" ] +chip_project_config_include_dirs = + [ "//examples/platform/qpg/project_include/" ] chip_project_config_include = "" chip_system_project_config_include = "" chip_ble_project_config_include = "" diff --git a/examples/lighting-app/qpg/BUILD.gn b/examples/lighting-app/qpg/BUILD.gn index df8c75d5245f64..18b4b3342ffdb1 100644 --- a/examples/lighting-app/qpg/BUILD.gn +++ b/examples/lighting-app/qpg/BUILD.gn @@ -34,14 +34,15 @@ if (chip_enable_pw_rpc) { assert(current_os == "freertos") -qpg_project_dir = "${chip_root}/examples/lighting-app/qpg" examples_plat_dir = "${chip_root}/examples/platform/qpg" qpg_sdk("sdk") { + sources = [ "${examples_plat_dir}/project_include/CHIPProjectConfig.h" ] + include_dirs = [ "${chip_root}/src/platform/qpg", "${examples_plat_dir}", - "${qpg_project_dir}/include", + "${examples_plat_dir}/project_include", ] if (chip_enable_pw_rpc) { diff --git a/examples/lighting-app/qpg/include/CHIPProjectConfig.h b/examples/lighting-app/qpg/include/CHIPProjectConfig.h deleted file mode 100755 index ebcb7b2053d393..00000000000000 --- a/examples/lighting-app/qpg/include/CHIPProjectConfig.h +++ /dev/null @@ -1,188 +0,0 @@ -/* - * - * Copyright (c) 2020 Project CHIP Authors - * Copyright (c) 2019 Google LLC. - * All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @file - * Example project configuration file for CHIP. - * - * This is a place to put application or project-specific overrides - * to the default configuration values for general CHIP features. - * - */ - -#pragma once - -// Use a default setup PIN code if one hasn't been provisioned in flash. -#ifndef CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE -#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021 -#endif -#ifndef CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR -#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00 -#endif - -// Use a default pairing code if one hasn't been provisioned in flash. -#define CHIP_DEVICE_CONFIG_USE_TEST_PAIRING_CODE "CHIPUS" - -// For convenience, enable Chip Security Test Mode and disable the requirement for -// authentication in various protocols. -// -// WARNING: These options make it possible to circumvent basic Chip security functionality, -// including message encryption. Because of this they MUST NEVER BE ENABLED IN PRODUCTION BUILDS. -// -#define CHIP_CONFIG_SECURITY_TEST_MODE 0 -#define CHIP_CONFIG_REQUIRE_AUTH 1 - -/** - * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID - * - * 0xFFF1: Test vendor - */ -#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0xFFF1 - -/** - * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID - * - * 0x8005: example lighting app - */ -#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8005 - -/** - * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION - * - * The hardware version number assigned to device or product by the device vendor. This - * number is scoped to the device product id, and typically corresponds to a revision of the - * physical device, a change to its packaging, and/or a change to its marketing presentation. - * This value is generally *not* incremented for device software versions. - */ -#define CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION 1 - -/** - * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING - * - * A string identifying the software version running on the device. - * CHIP service currently expects the software version to be in the format - * {MAJOR_VERSION}.0d{MINOR_VERSION} - */ -#ifndef CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING -#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING "0.1ALPHA" -#endif -/** - * CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE - * - * Enable support for Chip-over-BLE (CHIPoBLE). - */ -#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1 - -/** - * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC - * - * Enables synchronizing the device's real time clock with a remote Chip Time service - * using the Chip Time Sync protocol. - */ -#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0 - -/** - * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER - * - * Enables the use of a hard-coded default serial number if none - * is found in Chip NV storage. - */ -#define CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER "TEST_SN" - -/** - * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE - * - * A size, in bytes, of the individual debug event logging buffer. - */ -#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512) - -/** - * CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI - * - * Enable Thread CLI interface at initialisation. - */ -#define CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI 1 - -/** - * @def CHIP_CONFIG_MAX_FABRICS - * - * @brief - * Maximum number of fabrics the device can participate in. Each fabric can - * provision the device with its unique operational credentials and manage - * its own access control lists. - */ -#define CHIP_CONFIG_MAX_FABRICS 4 // 3 fabrics + 1 for rotation slack - -/** - * @name Interaction Model object pool configuration. - * - * @brief - * The following definitions sets the maximum number of corresponding interaction model object pool size. - * - * * #CHIP_IM_MAX_NUM_COMMAND_HANDLER - * * #CHIP_IM_MAX_NUM_READ_HANDLER - * * #CHIP_IM_MAX_REPORTS_IN_FLIGHT - * * #CHIP_IM_SERVER_MAX_NUM_PATH_GROUPS - * * #CHIP_IM_MAX_NUM_WRITE_HANDLER - * * #CHIP_IM_MAX_NUM_WRITE_CLIENT - * - * @{ - */ - -/** - * @def CHIP_IM_MAX_NUM_COMMAND_HANDLER - * - * @brief Defines the maximum number of CommandHandler, limits the number of active commands transactions on server. - */ -#define CHIP_IM_MAX_NUM_COMMAND_HANDLER 2 - -/** - * @def CHIP_IM_MAX_NUM_READ_HANDLER - * - * @brief Defines the maximum number of ReadHandler, limits the number of active read transactions on server. - */ -#define CHIP_IM_MAX_NUM_READ_HANDLER 3 - -/** - * @def CHIP_IM_MAX_REPORTS_IN_FLIGHT - * - * @brief Defines the maximum number of Reports, limits the traffic of read and subscription transactions. - */ -#define CHIP_IM_MAX_REPORTS_IN_FLIGHT 2 - -/** - * @def CHIP_IM_SERVER_MAX_NUM_PATH_GROUPS - * - * @brief Defines the maximum number of path objects, limits the number of attributes being read or subscribed at the same time. - */ -#define CHIP_IM_SERVER_MAX_NUM_PATH_GROUPS 9 - -/** - * @def CHIP_IM_MAX_NUM_WRITE_HANDLER - * - * @brief Defines the maximum number of WriteHandler, limits the number of active write transactions on server. - */ -#define CHIP_IM_MAX_NUM_WRITE_HANDLER 2 - -/** - * @def CHIP_IM_MAX_NUM_WRITE_CLIENT - * - * @brief Defines the maximum number of WriteClient, limits the number of active write transactions on client. - */ -#define CHIP_IM_MAX_NUM_WRITE_CLIENT 2 diff --git a/examples/lock-app/qpg/BUILD.gn b/examples/lock-app/qpg/BUILD.gn index 01ad495b722385..1b48902770e143 100644 --- a/examples/lock-app/qpg/BUILD.gn +++ b/examples/lock-app/qpg/BUILD.gn @@ -34,14 +34,15 @@ if (chip_enable_pw_rpc) { assert(current_os == "freertos") -qpg_project_dir = "${chip_root}/examples/lock-app/qpg" examples_plat_dir = "${chip_root}/examples/platform/qpg" qpg_sdk("sdk") { + sources = [ "${examples_plat_dir}/project_include/CHIPProjectConfig.h" ] + include_dirs = [ "${chip_root}/src/platform/qpg", "${examples_plat_dir}", - "${qpg_project_dir}/include", + "${examples_plat_dir}/project_include", ] if (chip_enable_pw_rpc) { diff --git a/examples/lock-app/qpg/include/CHIPProjectConfig.h b/examples/lock-app/qpg/include/CHIPProjectConfig.h deleted file mode 100755 index 1599d1737c2e46..00000000000000 --- a/examples/lock-app/qpg/include/CHIPProjectConfig.h +++ /dev/null @@ -1,186 +0,0 @@ -/* - * - * Copyright (c) 2020 Project CHIP Authors - * Copyright (c) 2019 Google LLC. - * All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @file - * Example project configuration file for CHIP. - * - * This is a place to put application or project-specific overrides - * to the default configuration values for general CHIP features. - * - */ - -#pragma once - -// Use a default setup PIN code if one hasn't been provisioned in flash. -#ifndef CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE -#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021 -#endif -#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00 - -// Use a default pairing code if one hasn't been provisioned in flash. -#define CHIP_DEVICE_CONFIG_USE_TEST_PAIRING_CODE "CHIPUS" - -// For convenience, enable Chip Security Test Mode and disable the requirement for -// authentication in various protocols. -// -// WARNING: These options make it possible to circumvent basic Chip security functionality, -// including message encryption. Because of this they MUST NEVER BE ENABLED IN PRODUCTION BUILDS. -// -#define CHIP_CONFIG_SECURITY_TEST_MODE 0 -#define CHIP_CONFIG_REQUIRE_AUTH 1 - -/** - * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID - * - * 0xFFF1: Test vendor. - */ -#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0xFFF1 - -/** - * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID - * - * 0x8006: example lock-app - */ -#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8006 - -/** - * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION - * - * The hardware version number assigned to device or product by the device vendor. This - * number is scoped to the device product id, and typically corresponds to a revision of the - * physical device, a change to its packaging, and/or a change to its marketing presentation. - * This value is generally *not* incremented for device software versions. - */ -#define CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION 1 - -/** - * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING - * - * A string identifying the software version running on the device. - * CHIP service currently expects the software version to be in the format - * {MAJOR_VERSION}.0d{MINOR_VERSION} - */ -#ifndef CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING -#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING "0.1ALPHA" -#endif -/** - * CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE - * - * Enable support for Chip-over-BLE (CHIPoBLE). - */ -#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1 - -/** - * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC - * - * Enables synchronizing the device's real time clock with a remote Chip Time service - * using the Chip Time Sync protocol. - */ -#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0 - -/** - * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER - * - * Enables the use of a hard-coded default serial number if none - * is found in Chip NV storage. - */ -#define CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER "TEST_SN" - -/** - * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE - * - * A size, in bytes, of the individual debug event logging buffer. - */ -#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512) - -/** - * CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI - * - * Enable Thread CLI interface at initialisation. - */ -#define CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI 1 - -/** - * @def CHIP_CONFIG_MAX_FABRICS - * - * @brief - * Maximum number of fabrics the device can participate in. Each fabric can - * provision the device with its unique operational credentials and manage - * its own access control lists. - */ -#define CHIP_CONFIG_MAX_FABRICS 4 // 3 fabrics + 1 for rotation slack - -/** - * @name Interaction Model object pool configuration. - * - * @brief - * The following definitions sets the maximum number of corresponding interaction model object pool size. - * - * * #CHIP_IM_MAX_NUM_COMMAND_HANDLER - * * #CHIP_IM_MAX_NUM_READ_HANDLER - * * #CHIP_IM_MAX_REPORTS_IN_FLIGHT - * * #CHIP_IM_SERVER_MAX_NUM_PATH_GROUPS - * * #CHIP_IM_MAX_NUM_WRITE_HANDLER - * * #CHIP_IM_MAX_NUM_WRITE_CLIENT - * - * @{ - */ - -/** - * @def CHIP_IM_MAX_NUM_COMMAND_HANDLER - * - * @brief Defines the maximum number of CommandHandler, limits the number of active commands transactions on server. - */ -#define CHIP_IM_MAX_NUM_COMMAND_HANDLER 2 - -/** - * @def CHIP_IM_MAX_NUM_READ_HANDLER - * - * @brief Defines the maximum number of ReadHandler, limits the number of active read transactions on server. - */ -#define CHIP_IM_MAX_NUM_READ_HANDLER 3 - -/** - * @def CHIP_IM_MAX_REPORTS_IN_FLIGHT - * - * @brief Defines the maximum number of Reports, limits the traffic of read and subscription transactions. - */ -#define CHIP_IM_MAX_REPORTS_IN_FLIGHT 2 - -/** - * @def CHIP_IM_SERVER_MAX_NUM_PATH_GROUPS - * - * @brief Defines the maximum number of path objects, limits the number of attributes being read or subscribed at the same time. - */ -#define CHIP_IM_SERVER_MAX_NUM_PATH_GROUPS 9 - -/** - * @def CHIP_IM_MAX_NUM_WRITE_HANDLER - * - * @brief Defines the maximum number of WriteHandler, limits the number of active write transactions on server. - */ -#define CHIP_IM_MAX_NUM_WRITE_HANDLER 2 - -/** - * @def CHIP_IM_MAX_NUM_WRITE_CLIENT - * - * @brief Defines the maximum number of WriteClient, limits the number of active write transactions on client. - */ -#define CHIP_IM_MAX_NUM_WRITE_CLIENT 2 diff --git a/examples/persistent-storage/qpg/BUILD.gn b/examples/persistent-storage/qpg/BUILD.gn index 2e63bd99f33f11..242c0cda14f9d8 100644 --- a/examples/persistent-storage/qpg/BUILD.gn +++ b/examples/persistent-storage/qpg/BUILD.gn @@ -29,12 +29,17 @@ examples_plat_dir = "${chip_root}/examples/platform/qpg" qpg_sdk("sdk") { include_dirs = [ "${chip_root}/src/platform/qpg", - "${qpg_project_dir}/include", + "${examples_plat_dir}/project_include", ] + + sources = [ "${examples_plat_dir}/project_include/CHIPProjectConfig.h" ] + + defines = [] } qpg_executable("persistent_storage") { include_dirs = [ "${qpg_project_dir}/.." ] + defines = [] output_name = "chip-${qpg_target_ic}-persistent_storage-example.out" deps = [] diff --git a/examples/persistent-storage/qpg/include/CHIPProjectConfig.h b/examples/platform/qpg/project_include/CHIPProjectConfig.h old mode 100755 new mode 100644 similarity index 97% rename from examples/persistent-storage/qpg/include/CHIPProjectConfig.h rename to examples/platform/qpg/project_include/CHIPProjectConfig.h index 2e9853761704f7..884f2fc834f1ac --- a/examples/persistent-storage/qpg/include/CHIPProjectConfig.h +++ b/examples/platform/qpg/project_include/CHIPProjectConfig.h @@ -42,21 +42,21 @@ // including message encryption. Because of this they MUST NEVER BE ENABLED IN PRODUCTION BUILDS. // #define CHIP_CONFIG_SECURITY_TEST_MODE 0 -#define CHIP_CONFIG_REQUIRE_AUTH 1 +#define CHIP_CONFIG_REQUIRE_AUTH 0 /** * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID * - * 0xFFF1: Test vendor. + * 0xFFF1: Test vendor */ #define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0xFFF1 /** * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID * - * 0x8009: example persistent-storage + * 0x8005: example lighting-app */ -#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8009 +#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8005 /** * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION diff --git a/examples/shell/qpg/BUILD.gn b/examples/shell/qpg/BUILD.gn index ac7231733ae2eb..0d2bf5d5671e4c 100644 --- a/examples/shell/qpg/BUILD.gn +++ b/examples/shell/qpg/BUILD.gn @@ -24,13 +24,12 @@ import("${qpg_sdk_build_root}/qpg_sdk.gni") assert(current_os == "freertos") -qpg_project_dir = "${chip_root}/examples/shell/qpg" examples_plat_dir = "${chip_root}/examples/platform/qpg" qpg_sdk("sdk") { include_dirs = [ "${chip_root}/src/platform/qpg", - "${qpg_project_dir}/include", + "${examples_plat_dir}/project_include", "${examples_plat_dir}", ] diff --git a/examples/shell/qpg/args.gni b/examples/shell/qpg/args.gni index 0548eccffd74e6..ac717d5dfe9920 100644 --- a/examples/shell/qpg/args.gni +++ b/examples/shell/qpg/args.gni @@ -21,7 +21,3 @@ qpg_sdk_target = get_label_info(":sdk", "label_no_toolchain") pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" pw_assert_BACKEND = "$dir_pw_assert_log" chip_build_libshell = true - -# Disable lock tracking, since our FreeRTOS configuration does not set -# INCLUDE_xSemaphoreGetMutexHolder -chip_stack_lock_tracking = "none" diff --git a/examples/shell/qpg/include/CHIPProjectConfig.h b/examples/shell/qpg/include/CHIPProjectConfig.h deleted file mode 100755 index 8857beab0faf13..00000000000000 --- a/examples/shell/qpg/include/CHIPProjectConfig.h +++ /dev/null @@ -1,190 +0,0 @@ -/* - * - * Copyright (c) 2020 Project CHIP Authors - * Copyright (c) 2019 Google LLC. - * All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @file - * Example project configuration file for CHIP. - * - * This is a place to put application or project-specific overrides - * to the default configuration values for general CHIP features. - * - */ - -#pragma once - -// Use a default setup PIN code if one hasn't been provisioned in flash. -#ifndef CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE -#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021 -#endif -#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00 - -// shell app uses openthread but does not have the NETWORK_COMMISSIONING cluster or zap config -// Do not instantiate the NETWORK_COMMISSIONING thread driver -#define _NO_NETWORK_COMMISSIONING_DRIVER_ - -// Use a default pairing code if one hasn't been provisioned in flash. -#define CHIP_DEVICE_CONFIG_USE_TEST_PAIRING_CODE "CHIPUS" - -// For convenience, enable Chip Security Test Mode and disable the requirement for -// authentication in various protocols. -// -// WARNING: These options make it possible to circumvent basic Chip security functionality, -// including message encryption. Because of this they MUST NEVER BE ENABLED IN PRODUCTION BUILDS. -// -#define CHIP_CONFIG_SECURITY_TEST_MODE 0 -#define CHIP_CONFIG_REQUIRE_AUTH 1 - -/** - * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID - * - * 0xFFF1: Test vendor. - */ -#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0xFFF1 - -/** - * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID - * - * 0x8009: example shell - */ -#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8012 - -/** - * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION - * - * The hardware version number assigned to device or product by the device vendor. This - * number is scoped to the device product id, and typically corresponds to a revision of the - * physical device, a change to its packaging, and/or a change to its marketing presentation. - * This value is generally *not* incremented for device software versions. - */ -#define CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION 1 - -/** - * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING - * - * A string identifying the software version running on the device. - * CHIP service currently expects the software version to be in the format - * {MAJOR_VERSION}.0d{MINOR_VERSION} - */ -#ifndef CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING -#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING "0.1ALPHA" -#endif -/** - * CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE - * - * Enable support for Chip-over-BLE (CHIPoBLE). - */ -#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1 - -/** - * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC - * - * Enables synchronizing the device's real time clock with a remote Chip Time service - * using the Chip Time Sync protocol. - */ -#define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0 - -/** - * CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER - * - * Enables the use of a hard-coded default serial number if none - * is found in Chip NV storage. - */ -#define CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER "TEST_SN" - -/** - * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE - * - * A size, in bytes, of the individual debug event logging buffer. - */ -#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512) - -/** - * CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI - * - * Enable Thread CLI interface at initialisation. - */ -#define CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI 1 - -/** - * @def CHIP_CONFIG_MAX_FABRICS - * - * @brief - * Maximum number of fabrics the device can participate in. Each fabric can - * provision the device with its unique operational credentials and manage - * its own access control lists. - */ -#define CHIP_CONFIG_MAX_FABRICS 4 // 3 fabrics + 1 for rotation slack - -/** - * @name Interaction Model object pool configuration. - * - * @brief - * The following definitions sets the maximum number of corresponding interaction model object pool size. - * - * * #CHIP_IM_MAX_NUM_COMMAND_HANDLER - * * #CHIP_IM_MAX_NUM_READ_HANDLER - * * #CHIP_IM_MAX_REPORTS_IN_FLIGHT - * * #CHIP_IM_SERVER_MAX_NUM_PATH_GROUPS - * * #CHIP_IM_MAX_NUM_WRITE_HANDLER - * * #CHIP_IM_MAX_NUM_WRITE_CLIENT - * - * @{ - */ - -/** - * @def CHIP_IM_MAX_NUM_COMMAND_HANDLER - * - * @brief Defines the maximum number of CommandHandler, limits the number of active commands transactions on server. - */ -#define CHIP_IM_MAX_NUM_COMMAND_HANDLER 2 - -/** - * @def CHIP_IM_MAX_NUM_READ_HANDLER - * - * @brief Defines the maximum number of ReadHandler, limits the number of active read transactions on server. - */ -#define CHIP_IM_MAX_NUM_READ_HANDLER 3 - -/** - * @def CHIP_IM_MAX_REPORTS_IN_FLIGHT - * - * @brief Defines the maximum number of Reports, limits the traffic of read and subscription transactions. - */ -#define CHIP_IM_MAX_REPORTS_IN_FLIGHT 2 - -/** - * @def CHIP_IM_SERVER_MAX_NUM_PATH_GROUPS - * - * @brief Defines the maximum number of path objects, limits the number of attributes being read or subscribed at the same time. - */ -#define CHIP_IM_SERVER_MAX_NUM_PATH_GROUPS 9 - -/** - * @def CHIP_IM_MAX_NUM_WRITE_HANDLER - * - * @brief Defines the maximum number of WriteHandler, limits the number of active write transactions on server. - */ -#define CHIP_IM_MAX_NUM_WRITE_HANDLER 2 - -/** - * @def CHIP_IM_MAX_NUM_WRITE_CLIENT - * - * @brief Defines the maximum number of WriteClient, limits the number of active write transactions on client. - */ -#define CHIP_IM_MAX_NUM_WRITE_CLIENT 2 diff --git a/third_party/qpg_sdk/repo b/third_party/qpg_sdk/repo index 92655e99e9f98b..e8b208b64acd70 160000 --- a/third_party/qpg_sdk/repo +++ b/third_party/qpg_sdk/repo @@ -1 +1 @@ -Subproject commit 92655e99e9f98bc3ec9188e8951ef614dc3e5691 +Subproject commit e8b208b64acd70da01780215164a270ca21935d2