Merge remote-tracking branch 'gh/master' into connectedhomeip-next

.github/config.yml

@@ -0,0 +1,7 @@
+todo:
+  keyword: ["@todo", "TODO", "TODO:"]     # string|string[]
+  bodyKeyword: ["@body", "BODY", "BODY:"] # string|string[]
+  blobLines: 10                           # number|boolean, 0 or false to disable
+  autoAssign: true                        # string|string[]|boolean
+  label: ["todo"]                         # boolean|string|string[]
+  reopenClosed: true                      # boolean

.github/workflows/release_artifacts.yaml

@@ -25,7 +25,7 @@ jobs:
     esp32:
         name: ESP32
         env:
-            BUILD_TYPE: esp32
+            BUILD_DIRECTORY: examples/all-clusters-app/esp32/build
         runs-on: ubuntu-latest
 
         container:
@@ -36,6 +36,7 @@ jobs:
               uses: actions/checkout@v2
               with:
                   submodules: true
+                  ref: "${{ github.event.inputs.releaseTag }}"
             - name: Build
               run: scripts/examples/esp_echo_app.sh
 
@@ -45,14 +46,15 @@ jobs:
                     --github-repository project-chip/connectedhomeip      \
                     --github-api-token "${{ secrets.GITHUB_TOKEN }}"      \
                     --release-tag "${{ github.event.inputs.releaseTag }}" \
-                    --asset-path examples/all-clusters-app/esp32/build/m5stack-chip-all-clusters-app.elf \
-                    --asset-name esp32-m5stack-chip-all-clusters-app.elf
+                    --bundle-files $BUILD_DIRECTORY/chip-all-clusters-app.flashbundle.txt \
+                    --working-directory $BUILD_DIRECTORY                  \
+                    --bundle-name esp32-chip-all-clusters-app
+
     efr32:
         name: EFR32
         env:
             EFR32_BOARD: BRD4161A
-            BUILD_TYPE: gn_efr32
-            BUILD_VERSION: 0.2.14
+            BUILD_DIRECTORY: out/lock_app_debug/BRD4161A
 
         runs-on: ubuntu-latest
 
@@ -63,15 +65,17 @@ jobs:
               uses: actions/checkout@v2
               with:
                   submodules: true
-            - name: Build example EFR32 Lock App for BRD4161A
+                  ref: "${{ github.event.inputs.releaseTag }}"
+            - name: Build example EFR32 Lock App 
               run:
-                  scripts/examples/gn_efr32_example.sh examples/lock-app/efr32/ out/lock_app_debug BRD4161A
+                  scripts/examples/gn_efr32_example.sh examples/lock-app/efr32/ out/lock_app_debug $EFR32_BOARD
 
             - name: Upload artifact
               run: |
-                 scripts/helpers/upload_release_asset.py                  \
-                    --github-repository project-chip/connectedhomeip      \
-                    --github-api-token "${{ secrets.GITHUB_TOKEN }}"      \
-                    --release-tag "${{ github.event.inputs.releaseTag }}" \
-                    --asset-path  out/lock_app_debug/BRD4161A/chip-efr32-lock-example.s37    \
-                    --asset-name  efr32-BRD4161A-lock-example.s37
+                 scripts/helpers/upload_release_asset.py                     \
+                    --github-repository project-chip/connectedhomeip         \
+                    --github-api-token "${{ secrets.GITHUB_TOKEN }}"         \
+                    --release-tag "${{ github.event.inputs.releaseTag }}"    \
+                    --bundle-files $BUILD_DIRECTORY/lock_app.flashbundle.txt \
+                    --working-directory $BUILD_DIRECTORY                     \
+                    --bundle-name efr32-$EFR32_BOARD-chip-lock-example

.pullapprove.yml

@@ -8,13 +8,6 @@ github_api_version: "shadow-cat-preview"
 ############################################################
 
 pullapprove_conditions:
-    ############################################################
-    #  Required status checks
-    ############################################################
-    - condition: "'*restyle*' in statuses.successful"
-      unmet_status: "failure"
-      explanation: "Style must be inline before reviewing can be complete"
-
     ############################################################
     #  License Checks
     ############################################################
@@ -45,6 +38,13 @@ pullapprove_conditions:
     ############################################################
     - "'hotfix' not in labels"
 
+    ############################################################
+    #  Required status checks
+    ############################################################
+    - condition: "'*restyle*' in statuses.successful"
+      unmet_status: "failure"
+      explanation: "Style must be inline before reviewing can be complete"
+
 ############################################################
 #  Notifications
 ############################################################

BUILD.gn

@@ -311,9 +311,18 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
     if (enable_efr32_lock_app_build) {
       deps += [ ":efr32_lock_app" ]
     }
+    if (enable_efr32_lighting_app_build) {
+      deps += [ ":efr32_lighting_app" ]
+    }
     if (enable_k32w_lock_app_build) {
       deps += [ ":k32w_lock_app" ]
     }
+    if (enable_qpg6100_lock_app_build) {
+      deps += [ ":qpg6100_lock_app" ]
+    }
+    if (enable_cc13x2_26x2_lock_app_build) {
+      deps += [ ":cc13x2_26x2_lock_app" ]
+    }
   }
 
   group("check") {

README.md

@@ -1,9 +1,21 @@
 # Connected Home over IP
 
-![Main](https://github.com/project-chip/connectedhomeip/workflows/Builds/badge.svg)
-![Examples](https://github.com/project-chip/connectedhomeip/workflows/Examples/badge.svg)
+![Builds](https://github.com/project-chip/connectedhomeip/workflows/Builds/badge.svg)
+
+![Examples - EFR32](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20EFR32/badge.svg)
+![Examples - nRF Connect SDK](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20nRF%20Connect%20SDK/badge.svg)
+![Examples - QPG6100](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20QPG6100/badge.svg)
+![Examples - Linux Standalone](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20Linux%20Standalone/badge.svg)
+![Examples - ESP32](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20ESP32/badge.svg)
+
+![Android](https://github.com/project-chip/connectedhomeip/workflows/Android/badge.svg)
+
+![Unit / Interation Tests](https://github.com/project-chip/connectedhomeip/workflows/Unit%20/%20Interation%20Tests/badge.svg)
+![Cirque](https://github.com/project-chip/connectedhomeip/workflows/Cirque/badge.svg)
 ![QEMU](https://github.com/project-chip/connectedhomeip/workflows/QEMU/badge.svg)
 
+![ZAP Templates](https://github.com/project-chip/connectedhomeip/workflows/ZAP/badge.svg)
+
 # What is Project Connected Home over IP?
 
 Project Connected Home over IP is a new Working Group within the Zigbee

build/toolchain/flashable_executable.gni

@@ -95,7 +95,13 @@ template("flashable_executable") {
     final_target = executable_target
   }
   group(target_name) {
-    deps = [ ":$final_target" ]
+    data_deps = [ ":$final_target" ]
+
+    if (defined(invoker.data_deps)) {
+      data_deps += invoker.data_deps
+    }
+
+    write_runtime_deps = "${root_out_dir}/${target_name}.flashbundle.txt"
   }
 
   if (defined(invoker.objcopy_image_name)) {

build_overrides/freertos.gni

@@ -0,0 +1,18 @@
+# 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() {
+  # Root directory for FreeRTOS
+  freertos_root = "//third_party/freertos"
+}

build_overrides/ti_simplelink_sdk.gni

@@ -0,0 +1,18 @@
+# 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() {
+  # Root directory for TI SimpleLink SDK build helpers.
+  ti_simplelink_sdk_build_root = "//third_party/ti_simplelink_sdk"
+}

config/cc13x2_26x2/toolchain/BUILD.gn

@@ -0,0 +1,25 @@
+# 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("//build_overrides/build.gni")
+import("//build_overrides/chip.gni")
+
+import("${build_root}/toolchain/arm_gcc/arm_toolchain.gni")
+
+arm_toolchain("cc13x2_26x2_lock_app") {
+  toolchain_args = {
+    current_os = "freertos"
+    import("${chip_root}/examples/lock-app/cc13x2_26x2/args.gni")
+  }
+}

examples/all-clusters-app/all-clusters-common/BUILD.gn

@@ -62,6 +62,8 @@ source_set("all-clusters-common") {
     "gen/callback-stub.cpp",
   ]
 
+  cflags = [ "-Wconversion" ]
+
   deps = [ "${chip_root}/src/lib" ]
 
   public_configs = [ ":includes" ]

examples/all-clusters-app/all-clusters-common/gen/af-structs.h

@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2020 Project CHIP Authors
+ *    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.
@@ -15,6 +15,8 @@
  *    limitations under the License.
  */
 
+// THIS FILE IS GENERATED BY ZAP
+
 // Prevent multiple inclusion
 #pragma once
 

examples/all-clusters-app/all-clusters-common/gen/att-storage.h

@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2020 Project CHIP Authors
+ *    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.
@@ -15,6 +15,8 @@
  *    limitations under the License.
  */
 
+// THIS FILE IS GENERATED BY ZAP
+
 // Prevent multiple inclusion
 #pragma once
 

examples/all-clusters-app/all-clusters-common/gen/attribute-id.h

@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2020 Project CHIP Authors
+ *    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.
@@ -15,6 +15,8 @@
  *    limitations under the License.
  */
 
+// THIS FILE IS GENERATED BY ZAP
+
 // Prevent multiple inclusion
 #pragma once
 

examples/all-clusters-app/all-clusters-common/gen/attribute-size.h

@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2020 Project CHIP Authors
+ *    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.
@@ -15,6 +15,8 @@
  *    limitations under the License.
  */
 
+// THIS FILE IS GENERATED BY ZAP
+
 // Prevent multiple inclusion
 #pragma once
 

examples/all-clusters-app/all-clusters-common/gen/attribute-type.h

@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2020 Project CHIP Authors
+ *    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.
@@ -15,6 +15,8 @@
  *    limitations under the License.
  */
 
+// THIS FILE IS GENERATED BY ZAP
+
 // Prevent multiple inclusion
 #pragma once