Merge branch 'master' into remove_disable_thread_scan

joonhaengHeo · Feb 23, 2024 · a2a2d8f · a2a2d8f
2 parents 5efa21d + 6af0d14
commit a2a2d8f
Show file tree

Hide file tree

Showing 116 changed files with 7,040 additions and 400 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -35,6 +35,7 @@ Checks: >
   -clang-analyzer-cplusplus.Move,
   -clang-analyzer-deadcode.DeadStores,
   -clang-analyzer-nullability.NullablePassedToNonnull,
+  -clang-analyzer-optin.core.EnumCastOutOfRange,
   -clang-analyzer-optin.cplusplus.UninitializedObject,
   -clang-analyzer-optin.cplusplus.VirtualCall,
   -clang-analyzer-optin.osx.cocoa.localizability.EmptyLocalizationContextChecker,

diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
@@ -14,29 +14,19 @@ abfb
 ABI
 ABIs
 ables
-AccessControl
-AccessControlEntry
+accesscontrol
 accessor
 Accessors
-AccountLogin
 acdbc
 ack
 ACKed
 ACL
 ACLs
 actdiag
-AdapterAddress
-AdapterName
 adb
 AddNOC
-AddOrUpdateThreadNetwork
-AddOrUpdateWiFiNetwork
 addr
-AddResponse
-AddThreadNetwork
-AddStatus
 adk
-AdministratorCommissioning
 adoc
 adr
 AdvAutonomous
@@ -48,7 +38,6 @@ AE
 aef
 AES
 AIDL
-AlarmCode
 algs
 alloc
 Ameba
@@ -61,15 +50,12 @@ AnnounceOTAProvider
 AnnounceOTAProviderRequest
 APIs
 apk
-AppConfig
 AppImpl
 AppleTV
 appliable
-ApplianceControl
 applianceeventsandalert
 ApplianceIdentification
 appliancestatistics
-ApplicationBasic
 ApplicationId
 ApplicationIdentifier
 ApplicationLauncher
@@ -171,7 +157,6 @@ BRD
 breakpoint
 bredr
 BridgedDeviceBasicInformation
-bridgedLightEndpoint
 bringup
 BroadcastReceiver
 BromateConcentrationMeasurement
@@ -259,9 +244,6 @@ CLIs
 cloudbuild
 CLRF
 clusterAttrs
-clusterId
-clusterList
-clusterListName
 ClusterName
 ClusterObjectTests
 ClusterRevision
@@ -315,7 +297,6 @@ ContentApp's
 ContentAppPlatform
 ContentLaunch
 ContentLauncher
-continuousHinting
 contrib
 controllee
 conv
@@ -382,7 +363,6 @@ DefaultOTARequestor
 DefaultOTARequestorDriver
 DefaultOTARequestorStorage
 DefaultSuccess
-defaultValue
 definedValue
 DehumidificationControl
 DelayedActionTime
@@ -415,9 +395,7 @@ DeviceLayer
 DeviceNetworkProvisioningDelegate
 DeviceNetworkProvisioningDelegateImpl
 DevicePairingDelegate
-deviceSoftwareVersionModel
 DeviceTemperatureConfiguration
-deviceType
 DevKitC
 DevKitM
 devtype
@@ -511,8 +489,6 @@ EnableNetwork
 EnableWiFiNetwork
 endian
 EndpointId
-endpointName
-endsWith
 eno
 entrypoint
 enum
@@ -580,7 +556,6 @@ FlowMeasurement
 FluorideConcentrationMeasurement
 focusable
 forkpty
-formatOnSave
 FOTA
 FreeRTOS
 FreeRTOSConfig
@@ -614,7 +589,6 @@ GetIP
 getManualTests
 GetSafeAttributePersistenceProvider
 getstarted
-getTests
 GH
 ghcr
 ghp
@@ -639,8 +613,6 @@ graphviz
 Groupcast
 GroupId
 GroupKeyManagement
-groupKeySecurityPolicy
-groupKeySetID
 groupsettings
 gsdk
 gtk
@@ -694,8 +666,6 @@ ifconfig
 ifdef
 ifdefs
 IGMP
-ignoreApplyUpdate
-ignoreQueryImage
 ihex
 IlluminanceMeasurement
 IM

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -95,14 +95,11 @@ jobs:
                      --known-failure app/att-storage.h \
                      --known-failure app/CommandHandler.h \
                      --known-failure app/CommandHandlerInterface.h \
-                     --known-failure app/CommandSender.h \
                      --known-failure app/CommandSenderLegacyCallback.h \
                      --known-failure app/CompatEnumNames.h \
                      --known-failure app/data-model/ListLargeSystemExtensions.h \
                      --known-failure app/EventHeader.h \
                      --known-failure app/EventLoggingTypes.h \
-                     --known-failure app/InteractionModelHelper.h \
-                     --known-failure app/ReadClient.h \
                      --known-failure app/ReadHandler.h \
                      --known-failure app/ReadPrepareParams.h \
                      --known-failure app/reporting/tests/MockReportScheduler.cpp \
@@ -132,7 +129,6 @@ jobs:
                      --known-failure app/util/odd-sized-integers.h \
                      --known-failure app/util/util.cpp \
                      --known-failure app/util/util.h \
-                     --known-failure app/WriteClient.h \
                      --known-failure app/WriteHandler.h \
                      --known-failure lib/core/CHIPVendorIdentifiers.hpp \
                      --known-failure platform/DeviceSafeQueue.cpp \

diff --git a/.github/workflows/spell.yml b/.github/workflows/spell.yml
@@ -25,19 +25,20 @@ on:
             - ".github/.wordlist.txt"
 
 jobs:
-    check-reviewdog:
-        name: Check Spelling - reviewdog
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-            - uses: reviewdog/action-misspell@v1
-              with:
-                  github_token: ${{ secrets.GITHUB_TOKEN }}
+#    Seems redundant; removed as pyspelling is customized while this is not
+#    check-reviewdog:
+#        name: Check Spelling - reviewdog
+#        runs-on: ubuntu-latest
+#        steps:
+#            - name: Checkout
+#              uses: actions/checkout@v4
+#            - uses: reviewdog/action-misspell@v1
+#              with:
+#                  github_token: ${{ secrets.GITHUB_TOKEN }}
     check-spellcheck:
         name: Check Spelling - pyspelling
         runs-on: ubuntu-latest
         steps:
             - name: Checkout
               uses: actions/checkout@v4
-            - uses: igsekor/[email protected]
+            - uses: rojopolis/[email protected]
diff --git a/.spellcheck.yml b/.spellcheck.yml
@@ -68,3 +68,4 @@ matrix:
       - '**/*.md|!third_party/**|!examples/common/**/repo/**|!docs/ERROR_CODES.md|!docs/clusters.md|!docs/testing/yaml_schema.md|!docs/testing/yaml_pseudocluster.md'
     aspell:
       ignore-case: true
+      camel-case: true
diff --git a/BUILD.gn b/BUILD.gn
@@ -182,7 +182,9 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
       deps += [
         "${chip_root}/src/app/server/java",
         "${chip_root}/src/controller/java",
+        "${chip_root}/src/controller/java:jsontlv",
         "${chip_root}/src/controller/java:onboarding_payload",
+        "${chip_root}/src/controller/java:tlv",
         "${chip_root}/src/platform/android:java",
       ]
     }

diff --git a/examples/air-purifier-app/air-purifier-common/BUILD.gn b/examples/air-purifier-app/air-purifier-common/BUILD.gn
@@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("air-purifier-common") {
   zap_file = "air-purifier-app.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/air-purifier-app/zap-generated"
   is_server = true
 }
diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/BUILD.gn b/examples/air-quality-sensor-app/air-quality-sensor-common/BUILD.gn
@@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("air-quality-sensor-common") {
   zap_file = "air-quality-sensor-app.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/air-quality-sensor-app/zap-generated"
   is_server = true
 }
diff --git a/examples/all-clusters-app/all-clusters-common/BUILD.gn b/examples/all-clusters-app/all-clusters-common/BUILD.gn
@@ -18,8 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("all-clusters-common") {
   zap_file = "all-clusters-app.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/all-clusters-app/zap-generated"
   is_server = true
 }
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/BUILD.gn b/examples/all-clusters-minimal-app/all-clusters-common/BUILD.gn
@@ -18,8 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("all-clusters-common") {
   zap_file = "all-clusters-minimal-app.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/all-clusters-minimal-app/zap-generated"
   is_server = true
 }
diff --git a/examples/bridge-app/bridge-common/BUILD.gn b/examples/bridge-app/bridge-common/BUILD.gn
@@ -19,7 +19,6 @@ import("${chip_root}/src/app/chip_data_model.gni")
 chip_data_model("bridge-common") {
   zap_file = "bridge-app.zap"
 
-  zap_pregenerated_dir = "${chip_root}/zzz_generated/bridge-app/zap-generated"
   is_server = true
 
   # TODO: the definition of DYNAMIC_ENDPOINT_COUNT needs find a common home!

diff --git a/examples/chef/linux/BUILD.gn b/examples/chef/linux/BUILD.gn
@@ -35,8 +35,6 @@ project_dir = "./.."
 
 chip_data_model("chef-data-model") {
   zap_file = "${project_dir}/devices/${sample_zap_file}"
-  zap_pregenerated_dir =
-      "${chip_root}/examples/chef/out/${sample_name}/zap-generated/"
   is_server = true
 }
 

diff --git a/examples/chef/silabs/BUILD.gn b/examples/chef/silabs/BUILD.gn
@@ -48,8 +48,6 @@ declare_args() {
 
 chip_data_model("chef-common") {
   zap_file = "${chef_project_dir}/devices/${sample_name}.zap"
-
-  zap_pregenerated_dir = "${chef_project_dir}/out/${sample_name}/zap-generated/"
   is_server = true
 }
 

diff --git a/examples/contact-sensor-app/contact-sensor-common/BUILD.gn b/examples/contact-sensor-app/contact-sensor-common/BUILD.gn
@@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
 
 chip_data_model("contact-sensor-common") {
   zap_file = "contact-sensor-app.zap"
-
-  zap_pregenerated_dir =
-      "${chip_root}/zzz_generated/contact-sensor-app/zap-generated"
   is_server = true
 }
diff --git a/examples/contact-sensor-app/nxp/k32w/k32w0/BUILD.gn b/examples/contact-sensor-app/nxp/k32w/k32w0/BUILD.gn
@@ -19,6 +19,7 @@ import("//build_overrides/openthread.gni")
 import("${k32w0_sdk_build_root}/k32w0_executable.gni")
 import("${k32w0_sdk_build_root}/k32w0_sdk.gni")
 
+import("${chip_root}/src/app/icd/icd.gni")
 import("${chip_root}/src/crypto/crypto.gni")
 import("${chip_root}/src/lib/core/core.gni")
 import("${chip_root}/src/platform/device.gni")
@@ -75,6 +76,8 @@ k32w0_sdk("sdk") {
 k32w0_executable("contact_sensor_app") {
   output_name = "chip-k32w0x-contact-example"
 
+  defines = []
+
   sources = [
     "${k32w0_platform_dir}/util/LEDWidget.cpp",
     "${k32w0_platform_dir}/util/include/LEDWidget.h",
@@ -93,13 +96,12 @@ k32w0_executable("contact_sensor_app") {
       "${k32w0_platform_dir}/common/CustomFactoryDataProvider.h",
     ]
 
-    defines = [ "CHIP_DEVICE_CONFIG_USE_CUSTOM_PROVIDER=1" ]
+    defines += [ "CHIP_DEVICE_CONFIG_USE_CUSTOM_PROVIDER=1" ]
   }
 
   deps = [
     ":sdk",
     "${chip_root}/examples/common/QRCode",
-    "${chip_root}/examples/contact-sensor-app/contact-sensor-common",
     "${chip_root}/examples/providers:device_info_provider",
     "${chip_root}/src/lib",
     "${chip_root}/src/platform:syscalls_stub",
@@ -119,6 +121,15 @@ k32w0_executable("contact_sensor_app") {
     ]
   }
 
+  #lit and sit are using different zap files
+  if (chip_enable_icd_lit) {
+    deps += [ "${chip_root}/examples/contact-sensor-app/nxp/zap-lit/" ]
+
+    defines += [ "CHIP_ENABLE_LIT=1" ]
+  } else {
+    deps += [ "${chip_root}/examples/contact-sensor-app/nxp/zap-sit/" ]
+  }
+
   cflags = [ "-Wconversion" ]
 
   output_dir = root_out_dir