Skip to content

Commit

Permalink
Updating the matter sdk to CSA master (#30)
Browse files Browse the repository at this point in the history
  • Loading branch information
chirag-silabs authored Oct 4, 2024
2 parents 01dadb4 + 982664d commit 4fca887
Show file tree
Hide file tree
Showing 1,388 changed files with 155,042 additions and 183,723 deletions.
4 changes: 3 additions & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Checks: >
-bugprone-multi-level-implicit-pointer-conversion,
-bugprone-narrowing-conversions,
-bugprone-not-null-terminated-result,
-bugprone-pointer-arithmetic-on-polymorphic-object,
-bugprone-reserved-identifier,
-bugprone-signed-char-misuse,
-bugprone-suspicious-include,
Expand All @@ -45,6 +46,7 @@ Checks: >
-clang-analyzer-security.insecureAPI.rand,
-clang-analyzer-security.insecureAPI.strcpy,
-clang-analyzer-unix.Malloc,
-clang-diagnostic-implicit-int-conversion
-clang-diagnostic-implicit-int-conversion,
-clang-diagnostic-missing-template-arg-list-after-template-kw
WarningsAsErrors: '*'
HeaderFilterRegex: '(src|examples|zzz_generated|credentials).*(?<!third_party.*repo)'
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ out/
/examples/virtual-device-app/android/App/buildSrc/build/
/src/test_driver/nrfconnect/build/
/src/darwin/Framework/build/
/src/python_testing/matter_testing_infrastructure/build/

# Pigweed Environment
.environment*/
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@
[submodule "third_party/silabs/wifi_sdk"]
path = third_party/silabs/wifi_sdk
url = https://github.com/SiliconLabs/wiseconnect.git
branch = v3.3.1
branch = v3.3.2
platforms = silabs
[submodule "editline"]
path = third_party/editline/repo
Expand Down
38 changes: 19 additions & 19 deletions .pullapprove.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,79 +84,79 @@ groups:
reviewers:
teams: [reviewers-amazon]
reviews:
request: 10
request: 0 # Do not auto-add
shared-reviewers-apple:
type: optional
conditions:
- files.include('*')
reviewers:
teams: [reviewers-apple]
reviews:
request: 10
request: 0 # Do not auto-add
shared-reviewers-bosch:
type: optional
conditions:
- files.include('*')
reviewers:
teams: [reviewers-bosch]
reviews:
request: 10
request: 0 # Do not auto-add
shared-reviewers-comcast:
type: optional
conditions:
- files.include('*')
reviewers:
teams: [reviewers-comcast]
reviews:
request: 10
request: 0 # Do not auto-add
shared-reviewers-dyson:
type: optional
conditions:
- files.include('*')
reviewers:
teams: [reviewers-dyson]
reviews:
request: 10
request: 0 # Do not auto-add
shared-reviewers-espressif:
type: optional
conditions:
- files.include('*')
reviewers:
teams: [reviewers-espressif]
reviews:
request: 10
request: 0 # Do not auto-add
shared-reviewers-google:
type: optional
conditions:
- files.include('*')
reviewers:
teams: [reviewers-google]
reviews:
request: 10
request: 0 # Do not auto-add
shared-reviewers-grundfos:
type: optional
conditions:
- files.include('*')
reviewers:
teams: [reviewers-grundfos]
reviews:
request: 10
request: 0 # Do not auto-add
shared-reviewers-irobot:
type: optional
conditions:
- files.include('*')
reviewers:
teams: [reviewers-irobot]
reviews:
request: 10
request: 0 # Do not auto-add
shared-reviewers-lg:
type: optional
conditions:
- files.include('*')
reviewers:
teams: [reviewers-lg]
reviews:
request: 10
request: 0 # Do not auto-add
shared-reviewers-logitech:
type: optional
conditions:
Expand All @@ -172,31 +172,31 @@ groups:
reviewers:
teams: [reviewers-nordic]
reviews:
request: 10
request: 0 # Do not auto-add
shared-reviewers-nxp:
type: optional
conditions:
- files.include('*')
reviewers:
teams: [reviewers-nxp]
reviews:
request: 10
request: 0 # Do not auto-add
shared-reviewers-samsung:
type: optional
conditions:
- files.include('*')
reviewers:
teams: [reviewers-samsung]
reviews:
request: 10
request: 0 # Do not auto-add
shared-reviewers-eve:
type: optional
conditions:
- files.include('*')
reviewers:
teams: [reviewers-eve]
reviews:
request: 10
request: 0 # Do not auto-add
# shared-reviewers-signify disabled for now, because the reviewers-signify
# team is empty and pullapprove seems to mis-handle that badly and treats
# _all_ reviewers as being in this group.
Expand All @@ -210,39 +210,39 @@ groups:
# reviewers:
# teams: [reviewers-signify]
# reviews:
# request: 10
# request: 0 # Do not auto-add
shared-reviewers-silabs:
type: optional
conditions:
- files.include('*')
reviewers:
teams: [reviewers-silabs]
reviews:
request: 10
request: 0 # Do not auto-add
shared-reviewers-somfy:
type: optional
conditions:
- files.include('*')
reviewers:
teams: [reviewers-somfy]
reviews:
request: 10
request: 0 # Do not auto-add
shared-reviewers-tcl:
type: optional
conditions:
- files.include('*')
reviewers:
teams: [reviewers-tcl]
reviews:
request: 10
request: 0 # Do not auto-add
shared-reviewers-qorvo:
type: optional
conditions:
- files.include('*')
reviewers:
teams: [reviewers-qorvo]
reviews:
request: 10
request: 0 # Do not auto-add

############################################################
# Base Required Reviewers
Expand Down
6 changes: 3 additions & 3 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
"//examples/common/pigweed/rpc_console/py:chip_rpc",
"//integrations/mobly:chip_mobly",
"//scripts/py_matter_yamltests:matter_yamltests",
"//src/python_testing/matter_testing_infrastructure:metadata_parser",
"//src/python_testing/matter_testing_infrastructure:chip-testing",
]

pw_python_venv("matter_build_venv") {
Expand Down Expand Up @@ -122,7 +122,7 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
deps = [
"${chip_root}/scripts:matter_yamltests_distribution.wheel",
"${chip_root}/src/controller/python:chip-repl",
"${chip_root}/src/python_testing/matter_testing_infrastructure:metadata_parser.wheel",
"${chip_root}/src/python_testing/matter_testing_infrastructure:chip-testing.wheel",
]
}
}
Expand Down Expand Up @@ -249,7 +249,7 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
"//scripts/py_matter_idl:matter_idl.tests",
"//scripts/py_matter_yamltests:matter_yamltests.tests",
"//src:tests_run",
"//src/python_testing/matter_testing_infrastructure:metadata_parser.tests",
"//src/python_testing/matter_testing_infrastructure:chip-testing.tests",
]

if (current_os == "linux" || current_os == "mac") {
Expand Down
71 changes: 71 additions & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
/src/platform/ASR/ @tx2rx
asr/ @tx2rx
chip-build-asr/ @tx2rx

/src/platform/Ameba/ @pankore
ameba/ @pankore
chip-build-ameba/ @pankore

/src/platform/Beken/ @zhengyaohan

*.mm @project-chip/reviewers-apple
darwin/ @project-chip/reviewers-apple
/src/darwin/ @project-chip/reviewers-apple
/src/platform/Darwin/ @project-chip/reviewers-apple
/examples/darwin-framework-tool/ @project-chip/reviewers-apple

/src/platform/ESP32/ @project-chip/reviewers-espressif
esp32/ @project-chip/reviewers-espressif
chip-build-esp32/ @project-chip/reviewers-espressif
chip-build-esp32-qemu/ @project-chip/reviewers-espressif

/src/platform/Infineon/ @ifyall
infineon/ @ifyall
chip-build-infineon/ @ifyall

/src/platform/NuttX/ @zhhyu7
chip-build-nuttx/ @zhhyu7

/src/platform/Tizen/ @arkq
tizen/ @arkq
chip-build-tizen/ @arkq
chip-build-tizen-qemu/ @arkq

*.java @project-chip/reviewers-google
*.kt @project-chip/reviewers-google
android/ @project-chip/reviewers-google
/src/examples/chef/ @project-chip/reviewers-google
/integrations/appengine/ @project-chip/reviewers-google
/integrations/cloudbuild/ @project-chip/reviewers-google
/integrations/compute_engine/ @project-chip/reviewers-google
chip-build-java/ @project-chip/reviewers-google
chip-build-android/ @project-chip/reviewers-google

/src/platform/bouffalolab/ @wy-hh
chip-build-bouffalolab/ @wy-hh

cc13xx_26xx/ @s-jain2022
cc32xx/ @s-jain2022

/src/platform/mt793x/ @pakls
nrfconnect/ @project-chip/reviewers-nordic
chip-build-nrf-platform/ @project-chip/reviewers-nordic
Zephyr/ @project-chip/reviewers-nordic @project-chip/reviewers-nxp @s07641069


nxp/ @project-chip/reviewers-nxp
chip-build-nxp/ @project-chip/reviewers-nxp
chip-build-nxp-zephyr/ @project-chip/reviewers-nxp
chip-build-k32w/ @project-chip/reviewers-nxp

qpg/ @dvdm-qorvo

silabs/ @project-chip/reviewers-silabs
chip-build-efr32/ @project-chip/reviewers-silabs

stm32/ @STYoannZamaron

telink/ @s07641069
chip-build-telink/ @s07641069

webos/ @joonhaengHeo
10 changes: 10 additions & 0 deletions build/chip/esp32/esp32_codegen.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

macro(chip_app_component_codegen IDL_NAME)
include("${CHIP_ROOT}/build/chip/chip_codegen.cmake")
include("${CHIP_ROOT}/src/app/codegen-data-model-provider/model.cmake")

# The IDF build system performs a two-pass expansion to determine
# component expansion. The first pass runs in script-mode
Expand Down Expand Up @@ -71,5 +72,14 @@ macro(chip_app_component_zapgen ZAP_NAME)
add_dependencies(${COMPONENT_LIB} app-zapgen)
target_include_directories(${COMPONENT_LIB} PUBLIC "${APP_TEMPLATE_GEN_DIR}")
target_sources(${COMPONENT_LIB} PRIVATE ${APP_TEMPLATE_GEN_FILES})

# When data model interface is used, provide a default code-generation data model as
# part of zapgen. See `chip_data_model.cmake` for similar logic
set(CHIP_DATA_MODEL_INTERFACE "disabled" CACHE STRING "Data model interface option to use: enabled or disabled")

if ("${CHIP_DATA_MODEL_INTERFACE}" STREQUAL "enabled")
target_sources(${COMPONENT_LIB} PRIVATE ${CODEGEN_DATA_MODEL_SOURCES})
endif()

endif()
endmacro()
Loading

0 comments on commit 4fca887

Please sign in to comment.