-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into dac_fixup_for_pid…
…_vid_change
- Loading branch information
Showing
287 changed files
with
18,904 additions
and
25,466 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| # | ||
| # Copyright (c) 2022 Project CHIP Authors | ||
| # | ||
| # 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. | ||
| # | ||
|
|
||
| find_package(Python3 REQUIRED) | ||
|
|
||
| # | ||
| # Create CMake target for building Matter OTA (Over-the-air update) image. | ||
| # Required arguments: | ||
| # INPUT_FILES file1, [file2...] - binary files which Matter OTA image will be composed of | ||
| # OUTPUT_FILE file - where to store newly created Matter OTA image | ||
| # | ||
| function(chip_ota_image TARGET_NAME) | ||
| cmake_parse_arguments(ARG "" "OUTPUT_FILE" "INPUT_FILES" ${ARGN}) | ||
|
|
||
| if (NOT ARG_INPUT_FILES OR NOT ARG_OUTPUT_FILE) | ||
| message(FATAL_ERROR "Both INPUT_FILES and OUTPUT_FILE arguments must be specified") | ||
| endif() | ||
|
|
||
| # Prepare ota_image_tool.py argument list | ||
| set(OTA_ARGS | ||
| "--vendor-id" | ||
| ${CONFIG_DEVICE_VENDOR_ID} | ||
| "--product-id" | ||
| ${CONFIG_DEVICE_PRODUCT_ID} | ||
| "--version" | ||
| ${CONFIG_DEVICE_SOFTWARE_VERSION_NUMBER} | ||
| "--version-str" | ||
| ${CONFIG_DEVICE_SOFTWARE_VERSION} | ||
| "--digest-algorithm" | ||
| "sha256" | ||
| ) | ||
|
|
||
| separate_arguments(OTA_EXTRA_ARGS NATIVE_COMMAND "${CHIP_OTA_IMAGE_EXTRA_ARGS}") | ||
|
|
||
| list(APPEND OTA_ARGS ${OTA_EXTRA_ARGS}) | ||
| list(APPEND OTA_ARGS ${ARG_INPUT_FILES}) | ||
| list(APPEND OTA_ARGS ${ARG_OUTPUT_FILE}) | ||
|
|
||
| # Convert the argument list to multi-line string | ||
| string(REPLACE ";" "\n" OTA_ARGS "${OTA_ARGS}") | ||
|
|
||
| # Pass the argument list via file to avoid hitting Windows command-line length limit | ||
| file(GENERATE | ||
| OUTPUT ${BUILD_DIR}/args-ota-image.tmp | ||
| CONTENT ${OTA_ARGS} | ||
| ) | ||
|
|
||
| add_custom_target(${TARGET_NAME} ALL | ||
| COMMAND ${Python3_EXECUTABLE} ${CHIP_ROOT}/src/app/ota_image_tool.py create @${BUILD_DIR}/args-ota-image.tmp | ||
| COMMAND ${CMAKE_COMMAND} -E remove ${BUILD_DIR}/args-ota-image.tmp | ||
| ) | ||
| endfunction() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| # Copyright (c) 2021 Project CHIP Authors | ||
| # | ||
| # 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. | ||
|
|
||
| import("//build_overrides/chip.gni") | ||
| import("//build_overrides/pigweed.gni") | ||
| import("$dir_pw_build/target_types.gni") | ||
|
|
||
| config("cpp17") { | ||
| cflags_cc = [ "-std=gnu++17" ] | ||
| cflags_c = [ "-std=gnu11" ] | ||
| cflags_objc = [ "-std=gnu11" ] | ||
| cflags_objcc = [ "-std=gnu++17" ] | ||
| } | ||
|
|
||
| config("std_cpp17") { | ||
| configs = [ ":cpp17" ] | ||
| } | ||
|
|
||
| static_library("pw_rpc") { | ||
| output_name = "libPwRpc" | ||
|
|
||
| public_configs = [ "${dir_pigweed}/pw_hdlc:default_config" ] | ||
|
|
||
| public_deps = [ | ||
| "$dir_pw_rpc:server", | ||
| "$dir_pw_rpc/nanopb:echo_service", | ||
| "${chip_root}/examples/platform/qpg/pw_sys_io:pw_sys_io_qpg", | ||
| "${dir_pigweed}/pw_hdlc:pw_rpc", | ||
| dir_pw_assert, | ||
| dir_pw_checksum, | ||
| dir_pw_hdlc, | ||
| dir_pw_log, | ||
| ] | ||
|
|
||
| output_dir = "${root_out_dir}/lib" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| # Copyright (c) 2021 Project CHIP Authors | ||
| # | ||
| # 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. | ||
|
|
||
| import("//build_overrides/chip.gni") | ||
| import("//build_overrides/pigweed.gni") | ||
|
|
||
| pw_log_BACKEND = "$dir_pw_log_basic" | ||
| pw_assert_BACKEND = "$dir_pw_assert_log" | ||
| pw_sys_io_BACKEND = "${chip_root}/examples/platform/qpg/pw_sys_io:pw_sys_io_qpg" | ||
|
|
||
| pw_build_LINK_DEPS = [ | ||
| "$dir_pw_assert:impl", | ||
| "$dir_pw_log:impl", | ||
| ] | ||
|
|
||
| dir_pw_third_party_nanopb = "${chip_root}/third_party/nanopb/repo" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.