Skip to content

Commit c7e42b1

Browse files
s07641069s07641069
authored
Merge branch 'master' into master_test_lzma_ci
2 parents 33f2758 + 73fe30c commit c7e42b1

File tree

27 files changed

+674
-1036
lines changed

27 files changed

+674
-1036
lines changed

‎.gemini/config.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
have_fun: false
2+
code_review:
3+
# Disabled until we have clarity/guidance at a CSA level
4+
disable: true
5+
comment_severity_threshold: MEDIUM
6+
max_review_comments: -1
7+
pull_request_opened:
8+
help: false
9+
summary: false
10+
code_review: true

‎config/ameba/chip.cmake

-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ endif (matter_enable_persistentstorage_audit)
117117

118118
# Build RPC
119119
if (matter_enable_rpc)
120-
#string(APPEND CHIP_GN_ARGS "remove_default_configs = [\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_build:cpp17\"]\n")
121120
string(APPEND CHIP_GN_ARGS "chip_build_pw_rpc_lib = true\n")
122121
string(APPEND CHIP_GN_ARGS "pw_log_BACKEND = \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_log_basic\"\n")
123122
string(APPEND CHIP_GN_ARGS "pw_assert_BACKEND = \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_assert_log:check_backend\"\n")

‎examples/chef/devices/rootnode_rainsensor_a7aa5d7738.matter

-3
Original file line numberDiff line numberDiff line change
@@ -1759,9 +1759,6 @@ endpoint 0 {
17591759
handle command UpdateFabricLabel;
17601760
handle command RemoveFabric;
17611761
handle command AddTrustedRootCertificate;
1762-
handle command SetVidVerificationStatement;
1763-
handle command SignVidVerificationRequest;
1764-
handle command SignVidVerificationResponse;
17651762
}
17661763

17671764
server cluster GroupKeyManagement {

‎examples/chef/devices/rootnode_rainsensor_a7aa5d7738.zap

+1-25
Original file line numberDiff line numberDiff line change
@@ -1584,30 +1584,6 @@
15841584
"source": "client",
15851585
"isIncoming": 1,
15861586
"isEnabled": 1
1587-
},
1588-
{
1589-
"name": "SetVidVerificationStatement",
1590-
"code": 12,
1591-
"mfgCode": null,
1592-
"source": "client",
1593-
"isIncoming": 1,
1594-
"isEnabled": 1
1595-
},
1596-
{
1597-
"name": "SignVidVerificationRequest",
1598-
"code": 13,
1599-
"mfgCode": null,
1600-
"source": "client",
1601-
"isIncoming": 1,
1602-
"isEnabled": 1
1603-
},
1604-
{
1605-
"name": "SignVidVerificationResponse",
1606-
"code": 14,
1607-
"mfgCode": null,
1608-
"source": "server",
1609-
"isIncoming": 0,
1610-
"isEnabled": 1
16111587
}
16121588
],
16131589
"attributes": [
@@ -2762,4 +2738,4 @@
27622738
"parentEndpointIdentifier": 0
27632739
}
27642740
]
2765-
}
2741+
}

‎examples/energy-management-app/esp32/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,4 @@ add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo)
8080
add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo)
8181
add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io)
8282

83-
get_target_property(_target_cxx_flags pw_build.cpp17._public_config INTERFACE_COMPILE_OPTIONS)
84-
list(REMOVE_ITEM _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>)
85-
list(APPEND _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>)
86-
set_target_properties(pw_build.cpp17._public_config PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}")
8783
endif(CONFIG_ENABLE_PW_RPC)

‎examples/lighting-app/esp32/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,4 @@ add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo)
8080
add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo)
8181
add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io)
8282

83-
get_target_property(_target_cxx_flags pw_build.cpp17._public_config INTERFACE_COMPILE_OPTIONS)
84-
list(REMOVE_ITEM _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>)
85-
list(APPEND _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>)
86-
set_target_properties(pw_build.cpp17._public_config PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}")
8783
endif(CONFIG_ENABLE_PW_RPC)

‎examples/lit-icd-app/silabs/build_for_wifi_args.gni

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ silabs_sdk_target = get_label_info(":sdk", "label_no_toolchain")
2020
chip_enable_openthread = false
2121
import("${chip_root}/src/platform/silabs/wifi/args.gni")
2222

23-
chip_enable_ota_requestor = true
2423
app_data_model = "${chip_root}/examples/lit-icd-app/lit-icd-common"
2524

2625
sl_enable_test_event_trigger = true

‎examples/lit-icd-app/silabs/openthread.gni

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import("${chip_root}/src/platform/silabs/efr32/args.gni")
2020
silabs_sdk_target = get_label_info(":sdk", "label_no_toolchain")
2121

2222
app_data_model = "${chip_root}/examples/lit-icd-app/lit-icd-common"
23-
chip_enable_ota_requestor = true
2423
chip_enable_openthread = true
2524

2625
openthread_external_platform =

‎examples/lock-app/esp32/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,6 @@ add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo)
6161
add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo)
6262
add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io)
6363

64-
get_target_property(_target_cxx_flags pw_build.cpp17._public_config INTERFACE_COMPILE_OPTIONS)
65-
list(REMOVE_ITEM _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>)
66-
list(APPEND _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>)
67-
set_target_properties(pw_build.cpp17._public_config PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}")
6864
endif(CONFIG_ENABLE_PW_RPC)
6965

7066
flashing_script()

‎examples/ota-requestor-app/esp32/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,6 @@ add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo)
6161
add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo)
6262
add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io)
6363

64-
get_target_property(_target_cxx_flags pw_build.cpp17._public_config INTERFACE_COMPILE_OPTIONS)
65-
list(REMOVE_ITEM _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>)
66-
list(APPEND _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>)
67-
set_target_properties(pw_build.cpp17._public_config PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}")
6864
endif(CONFIG_ENABLE_PW_RPC)
6965

7066

‎examples/pigweed-app/esp32/CMakeLists.txt

-5
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,4 @@ add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo)
6262
add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo)
6363
add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io)
6464

65-
get_target_property(_target_cxx_flags pw_build.cpp17._public_config INTERFACE_COMPILE_OPTIONS)
66-
list(REMOVE_ITEM _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>)
67-
list(APPEND _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>)
68-
set_target_properties(pw_build.cpp17._public_config PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}")
69-
7065
flashing_script(DEPENDS "${CMAKE_CURRENT_LIST_DIR}/echo_test_config.yml" "${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/pigweed-app/mobly_tests/echo_test.py")

‎examples/platform/qpg/project_include/OpenThreadConfig.h

+10
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,16 @@
8282

8383
#define OPENTHREAD_PLATFORM_NEXUS 0
8484

85+
#if !defined(OPENTHREAD_FTD) && !defined(OPENTHREAD_MTD)
86+
#if defined(CHIP_DEVICE_CONFIG_THREAD_FTD) && CHIP_DEVICE_CONFIG_THREAD_FTD
87+
#define OPENTHREAD_FTD 1
88+
#define OPENTHREAD_MTD 0
89+
#else
90+
#define OPENTHREAD_FTD 0
91+
#define OPENTHREAD_MTD 1
92+
#endif
93+
#endif
94+
8595
// Use the Qorvo-supplied default platform configuration for remainder
8696
// of OpenThread config options.
8797
//

‎examples/temperature-measurement-app/esp32/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,4 @@ add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo)
6363
add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo)
6464
add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io)
6565

66-
get_target_property(_target_cxx_flags pw_build.cpp17._public_config INTERFACE_COMPILE_OPTIONS)
67-
list(REMOVE_ITEM _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>)
68-
list(APPEND _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>)
69-
set_target_properties(pw_build.cpp17._public_config PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}")
7066
endif(CONFIG_ENABLE_PW_RPC)

‎integrations/docker/images/base/chip-build/version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
117 : [TI] Update java version for chip-build-vscode
1+
118 : [Telink] Update Docker image (Zephyr update)

‎integrations/docker/images/stage-2/chip-build-telink/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN set -x \
1818
&& : # last line
1919

2020
# Setup Zephyr
21-
ARG ZEPHYR_REVISION=ce4027fc0768b8509758af2e43f74e3fd2c7d58d
21+
ARG ZEPHYR_REVISION=fdccaba1ebc147908e9cca653e6c6743def3332b
2222
WORKDIR /opt/telink/zephyrproject
2323
RUN set -x \
2424
&& python3 -m pip install --break-system-packages -U --no-cache-dir west \

0 commit comments

Comments
 (0)