Merge branch 'master' into small-fixes-in-access-control-event-logging

.github/.wordlist.txt

@@ -117,6 +117,7 @@ BDX
 BDXDownloader
 BeagleBone
 befc
+betaprogram
 BinaryInputBasic
 bitbake
 bld
@@ -279,6 +280,7 @@ CQM
 crypto
 cryptographic
 CSA
+csrrequest
 csu
 csv
 ctl
@@ -294,6 +296,7 @@ CY
 CYW
 DAC
 DAP
+DAPLINK
 DataFrame
 DataModelRevision
 dataset
@@ -808,6 +811,7 @@ NitrogenDioxideConcentrationMeasurement
 nl
 NLUnitTest
 NLUnitTests
+noc
 NodeId
 nongnu
 nordicsemi
@@ -854,6 +858,7 @@ optionsOverride
 orgs
 OTA
 OTADownloader
+otaDownloadPath
 otaImageList
 OTAImageProcessorDriver
 OTAImageProcessorInterface
@@ -903,6 +908,7 @@ pickString
 PID
 Pigweed
 PinCode
+pinrequest
 pkgconfig
 plaintext
 PlatformManager
@@ -1056,6 +1062,7 @@ SetDns
 SetImageProcessorDelegate
 SetOtaRequestorDriver
 setpin
+setpoint
 SetpointRaiseLower
 SetRequestorInstance
 SetUpPINCode
@@ -1170,6 +1177,7 @@ ThermostatUserInterfaceConfiguration
 ThIsIsNoTMyReAlGiThUbToKeNSoDoNoTtRy
 ThreadNetworkDiagnostics
 threadOperationalDataset
+threadnetworkdiagnostics
 ThreadStackManager
 ThreadStackManagerImpl
 ths
@@ -1210,6 +1218,7 @@ TurbidityConcentrationMeasurement
 TXD
 txt
 UART
+uargument
 udc
 udcport
 udhcpc
@@ -1233,7 +1242,9 @@ updateAvailable
 updateNotAvailable
 UpdateTokens
 upstreamed
+ureverse
 URI
+urlrequest
 usbmodem
 USBtoUART
 uscif

.gitmodules

@@ -181,6 +181,9 @@
 [submodule "cyw30739_sdk/tools"]
 	path = third_party/cyw30739_sdk/repos/btsdk-tools
 	url = https://github.com/Infineon/btsdk-tools.git
+[submodule "third_party/p6/p6_sdk/libs/anycloud-ota"]
+	path = third_party/p6/p6_sdk/libs/anycloud-ota
+	url = https://github.com/Infineon/anycloud-ota
 [submodule "third_party/mbed-mcu-boot/repo"]
 	path = third_party/mbed-mcu-boot/repo
 	url = https://github.com/ATmobica/mcuboot.git

build/config/BUILDCONFIG.gn

@@ -99,6 +99,13 @@ if (_chip_defaults.custom_toolchain != "") {
 } else if (target_os == "tizen") {
   _default_toolchain =
       "${_build_overrides.build_root}/toolchain/tizen:tizen_${target_cpu}"
+} else if (target_os == "webos") {
+  if (target_cpu == "arm" || target_cpu == "arm64") {
+    _default_toolchain = "//build/toolchain/webos"
+  } else {
+    assert(false,
+           "Unsupported target_cpu: ${current_cpu}. Shall be arm for webOS")
+  }
 } else {
   assert(false, "No toolchain specified, please specify custom_toolchain")
 }

build/config/compiler/BUILD.gn

@@ -23,6 +23,15 @@ if (current_os == "mac") {
   import("${build_root}/config/mac/mac_sdk.gni")
 }
 
+if (current_os == "webos") {
+  import("${build_root}/config/webos/webos_sdk.gni")
+  target_defines += []
+  target_cflags += [ "--sysroot=" + sysroot_webos ]
+  target_cflags_cc += []
+  target_cflags_c += []
+  target_ldflags += [ "--sysroot=" + sysroot_webos ]
+}
+
 declare_args() {
   # Enable -Werror. This can be disabled if using a different compiler
   # with unfixed or unsupported wanings.
@@ -191,7 +200,7 @@ config("warnings_common") {
   }
 
   if (current_os != "mac" && current_os != "ios" && current_os != "linux" &&
-      current_os != "win" && current_os != "tizen") {
+      current_os != "win" && current_os != "tizen" && current_os != "webos") {
     cflags += [ "-Wstack-usage=8192" ]
   }
 }
@@ -207,6 +216,13 @@ config("strict_warnings") {
     "-Wformat-security",
   ]
 
+  if (current_os == "webos") {
+    cflags -= [
+      "-Wshadow",
+      "-Wvla",
+    ]
+  }
+
   cflags_cc = [ "-Wnon-virtual-dtor" ]
 
   ldflags = []
@@ -271,7 +287,7 @@ config("runtime_default") {
       "$dir_pw_toolchain/host_clang:xcode_sysroot",
     ]
   }
-  if (current_os == "linux" || current_os == "tizen") {
+  if (current_os == "linux" || current_os == "tizen" || current_os == "webos") {
     libs = [
       "dl",
       "pthread",

build/config/webos/webos_sdk.gni

@@ -0,0 +1,17 @@
+# 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.
+
+declare_args() {
+  sysroot_webos = ""
+}

build/toolchain/gcc_toolchain.gni

@@ -41,7 +41,8 @@ template("gcc_toolchain") {
     }
 
     is_host_toolchain = invoker_toolchain_args.current_os == host_os
-    link_group = invoker_toolchain_args.current_os != "mac"
+    link_group = invoker_toolchain_args.current_os != "mac" &&
+                 invoker_toolchain_args.current_os != "ios"
 
     defaults = {
       forward_variables_from(invoker_toolchain_args, "*")

build/toolchain/webos/BUILD.gn

@@ -0,0 +1,23 @@
+# Copyright 2020 The Pigweed Authors
+# Copyright (c) 2020 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("webos_toolchain.gni")
+
+webos_toolchain("webos") {
+  toolchain_args = {
+    target_os = "webos"
+    target_cpu = "${current_cpu}"
+  }
+}

build/toolchain/webos/webos_toolchain.gni

@@ -0,0 +1,36 @@
+# Copyright (c) 2020 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.
+
+declare_args() {
+  cc_webos = ""
+  cxx_webos = ""
+  ar_webos = ""
+  ld_webos = ""
+}
+
+import("//build/toolchain/gcc_toolchain.gni")
+
+template("webos_toolchain") {
+  gcc_toolchain(target_name) {
+    ar = ar_webos
+    cc = cc_webos
+    cxx = cxx_webos
+    toolchain_args = {
+      current_cpu = "${current_cpu}"
+      current_os = invoker.current_os
+      is_clang = false
+      forward_variables_from(invoker.toolchain_args, "*")
+    }
+  }
+}

config/esp32/components/chip/CMakeLists.txt

@@ -68,7 +68,7 @@ chip_gn_arg_append("esp32_cxx"             "\"${CMAKE_CXX_COMPILER}\"")
 chip_gn_arg_append("esp32_cpu"             "\"esp32\"")
 chip_gn_arg_bool("is_debug"                ${is_debug})
 
-if(CONFIG_BT_ENABLED)
+if(CONFIG_ENABLE_CHIPOBLE)
 chip_gn_arg_append("chip_config_network_layer_ble"           "true")
 else()
 chip_gn_arg_append("chip_config_network_layer_ble"           "false")

examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

@@ -1459,7 +1459,7 @@ server cluster GeneralDiagnostics = 51 {
 server cluster GroupKeyManagement = 63 {
   enum GroupKeySecurityPolicy : ENUM8 {
     kStandard = 0;
-    kLowLatency = 1;
+    kTrustFirst = 1;
   }
 
   struct GroupKeyMapStruct {
@@ -2261,6 +2261,10 @@ server cluster OnOff = 6 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
+  bitmap OnOffFeature : BITMAP32 {
+    kLighting = 0x1;
+  }
+
   readonly attribute boolean onOff = 0;
   readonly attribute boolean globalSceneControl = 16384;
   attribute int16u onTime = 16385;
@@ -2488,6 +2492,10 @@ server cluster PowerSourceConfiguration = 46 {
 }
 
 server cluster PressureMeasurement = 1027 {
+  bitmap PressureFeature : BITMAP32 {
+    kExt = 0x1;
+  }
+
   readonly attribute nullable int16s measuredValue = 0;
   readonly attribute nullable int16s minMeasuredValue = 1;
   readonly attribute nullable int16s maxMeasuredValue = 2;