Merge pull request #13 from project-chip/master

Update local master

.github/workflows/android.yaml

@@ -34,7 +34,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build-android:0.4.16
+            image: connectedhomeip/chip-build-android:0.4.18
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 

.github/workflows/bloat_check.yaml

@@ -24,7 +24,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.4.16
+            image: connectedhomeip/chip-build:0.4.18
 
         steps:
             - name: Checkout

.github/workflows/build.yaml

@@ -34,7 +34,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.4.16
+            image: connectedhomeip/chip-build:0.4.18
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options:

.github/workflows/examples-efr32.yaml

@@ -29,7 +29,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build-efr32:0.4.16
+            image: connectedhomeip/chip-build-efr32:0.4.18
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
                 - "/tmp/output_binaries:/tmp/output_binaries"

.github/workflows/examples-esp32.yaml

@@ -29,7 +29,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.4.16
+            image: connectedhomeip/chip-build-esp32:0.4.18
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
                 - "/tmp/output_binaries:/tmp/output_binaries"

.github/workflows/examples-linux-standalone.yaml

@@ -31,7 +31,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.4.16
+            image: connectedhomeip/chip-build:0.4.18
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
                 - "/tmp/output_binaries:/tmp/output_binaries"

.github/workflows/examples-nrfconnect.yaml

@@ -27,7 +27,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build-nrf-platform:0.4.16
+            image: connectedhomeip/chip-build-nrf-platform:0.4.18
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
                 - "/tmp/output_binaries:/tmp/output_binaries"

.github/workflows/examples-qpg6100.yaml

@@ -27,7 +27,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.4.16
+            image: connectedhomeip/chip-build:0.4.18
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
                 - "/tmp/output_binaries:/tmp/output_binaries"

.github/workflows/qemu.yaml

@@ -28,7 +28,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build-esp32-qemu:0.4.16
+            image: connectedhomeip/chip-build-esp32-qemu:0.4.18
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 

.github/workflows/unit_integration_test.yaml

@@ -34,7 +34,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-          image: connectedhomeip/chip-build:0.4.16
+          image: connectedhomeip/chip-build:0.4.18
           volumes:
               - "/tmp/log_output:/tmp/test_logs"
               - "/tmp/happy_test_logs:/tmp/happy_test_logs"

.github/workflows/zap_templates.yaml

@@ -0,0 +1,47 @@
+# 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.
+
+name: ZAP
+
+on:
+    push:
+    pull_request:
+
+jobs:
+    templates:
+        name: ZAP templates generation
+
+        runs-on: ubuntu-18.04
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+              with:
+                  submodules: true
+            - name: Use Node.js 12.x
+              uses: actions/setup-node@v1
+              with:
+                node-version: '12.x'
+
+            - run: sudo apt-get update
+            - run: sudo apt-get install --fix-missing libpixman-1-dev libcairo-dev libsdl-pango-dev libjpeg-dev libgif-dev
+            - name: Setup ZAP
+              run: |
+                cd third_party/zap/repo/
+                npm ci
+                npm run version-stamp
+                npm rebuild canvas --update-binary
+                npm run build-spa
+            - name: Generate
+              run: scripts/tools/zap_generate.sh examples/all-clusters-app/all-clusters-common/all-clusters-app.zap

.gitmodules

@@ -66,3 +66,7 @@
 	path = third_party/zap/repo
 	url = https://github.com/project-chip/zap.git
 	branch = master
+[submodule "freertos"]
+	path = third_party/freertos/repo
+	url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git
+	branch = V10.3.1-kernel-only

BUILD.gn

@@ -18,6 +18,7 @@ import("//build_overrides/nlassert.gni")
 import("//build_overrides/nlio.gni")
 import("//build_overrides/nlunit_test.gni")
 import("//build_overrides/pigweed.gni")
+import("//src/platform/device.gni")
 import("$dir_pw_build/python.gni")
 
 # This build file should not be used in superproject builds.
@@ -47,6 +48,7 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
       "${chip_root}/src/app",
       "${chip_root}/src/ble",
       "${chip_root}/src/controller",
+      "${chip_root}/src/credentials",
       "${chip_root}/src/crypto",
       "${chip_root}/src/inet",
       "${chip_root}/src/lib",
@@ -66,13 +68,19 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
       "${nlunit_test_root}:nlunit-test",
     ]
 
+    if (chip_device_platform != "none") {
+      deps += [ "${chip_root}/src/app/server" ]
+    }
+
     if (chip_build_tests) {
       deps += [ "//src:tests" ]
     }
 
     if (chip_build_tools) {
       deps += [
         "${chip_root}/examples/shell/standalone:chip-shell",
+        "${chip_root}/src/app/tests/integration:chip-im-initiator",
+        "${chip_root}/src/app/tests/integration:chip-im-responder",
         "${chip_root}/src/messaging/tests/echo:chip-echo-requester",
         "${chip_root}/src/messaging/tests/echo:chip-echo-responder",
         "${chip_root}/src/qrcodetool",
@@ -115,6 +123,9 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
     # Enable building for Android.
     enable_android_builds = false
 
+    # Set this to true to enable TI builds by default.
+    enable_cc13x2_26x2_builds = false
+
     # Set this to true to enable efr32 builds by default.
     enable_efr32_builds = false
 
@@ -149,6 +160,9 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
     enable_linux_lighting_app_build =
         enable_default_builds && (host_os == "linux" || host_os == "mac")
 
+    # Build the cc13x2_26x2 lock app example.
+    enable_cc13x2_26x2_lock_app_build = enable_cc13x2_26x2_builds
+
     # Build the efr32 lock app example.
     enable_efr32_lock_app_build = enable_efr32_builds
 
@@ -199,13 +213,20 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
   }
 
   standalone_toolchain = "${chip_root}/config/standalone/toolchain:standalone"
+  not_needed([ "standalone_toolchain" ])  # Might not be needed.
 
   if (enable_standalone_chip_tool_build) {
     group("standalone_chip_tool") {
       deps = [ "${chip_root}/examples/chip-tool(${standalone_toolchain})" ]
     }
   }
 
+  if (enable_cc13x2_26x2_lock_app_build) {
+    group("cc13x2_26x2_lock_app") {
+      deps = [ "${chip_root}/examples/lock-app/cc13x2_26x2(${chip_root}/config/cc13x2_26x2/toolchain:cc13x2_26x2_lock_app)" ]
+    }
+  }
+
   if (enable_standalone_shell_build) {
     group("standalone_shell") {
       deps =

config/nrfconnect/README.md

@@ -0,0 +1,11 @@
+# nRF Connect build and configuration files
+
+This directory contains build scripts and common configuration files used by
+CHIP nRF Connect applications. It is structured as follows:
+
+| File/Folder   | Contents                                                                                                                                                       |
+| ------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| chip-gn       | GN project used to build selected CHIP libraries with the _nrfconnect_ platform integration layer                                                              |
+| chip-module   | CMake wrapper for the GN project defined in `chip-gn` directory, and other components that allow one to use CHIP as a Zephyr module                            |
+| app/app.cmake | Helper CMake module to be used by nRF Connect applications in this repository to inject `chip-module` into the Zephyr module list and load Zephyr build system |
+| app/\*.conf   | Common and optional Kconfig configuration files that can be used in nRF Connect applications                                                                   |

config/nrfconnect/app/app.cmake

@@ -0,0 +1,39 @@
+#
+#   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.
+#
+
+#
+#   @file
+#         CMake module for incorporating CHIP into an nRF Connect SDK
+#         application as an out-of-tree Zephyr module.
+#
+
+# Use Device Tree overlay if exists in the application directory
+
+if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/dts.overlay")
+    set(DTC_OVERLAY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/dts.overlay")
+endif()
+
+# Add CHIP to the list of Zephyr modules
+
+list(APPEND ZEPHYR_EXTRA_MODULES ${CMAKE_CURRENT_LIST_DIR}/../chip-module)
+
+# Load NCS/Zephyr build system
+
+find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
+
+# Configure the application
+
+target_link_libraries(app PUBLIC chip)

config/nrfconnect/sample-defaults.conf → config/nrfconnect/app/sample-defaults.conf

@@ -16,12 +16,7 @@
 
 CONFIG_CHIP=y
 
-CONFIG_NEWLIB_LIBC=y
-
-# Export POSIX names for functions implementing a subset of POSIX standard in Zephyr
-CONFIG_POSIX_API=y
-CONFIG_PTHREAD_IPC=y
-CONFIG_EVENTFD=y
+CONFIG_STD_CPP14=y
 
 CONFIG_LOG=y
 CONFIG_LOG_MINIMAL=y

config/nrfconnect/BUILD.gn → config/nrfconnect/chip-gn/BUILD.gn

@@ -29,21 +29,21 @@ group("dummy") {
 group("nrfconnect") {
   deps = [ "${chip_root}/src/lib" ]
 
+  if (chip_build_tests) {
+    deps += [ "${chip_root}/src:tests" ]
+  }
+
   if (chip_build_libshell) {
     deps += [ "${chip_root}/src/lib/shell" ]
   }
 
   # Building PW_RPC lib with GN may go obsolete after getting full CMake
   # support in Pigweed.
   if (chip_build_pw_rpc_lib) {
-    deps += [ "${chip_root}/config/nrfconnect/lib/pw_rpc" ]
+    deps += [ "//lib/pw_rpc" ]
   }
 }
 
 group("default") {
   deps = [ ":nrfconnect" ]
-
-  if (chip_build_tests) {
-    deps += [ "${chip_root}/src:tests" ]
-  }
 }

config/nrfconnect/args.gni → config/nrfconnect/chip-gn/args.gni

@@ -15,17 +15,13 @@
 import("//build_overrides/chip.gni")
 import("//lib/pw_rpc/pw_rpc.gni")
 
-nrfconnect_target = get_label_info(":nrfconnect", "label_no_toolchain")
-
 chip_device_platform = "nrfconnect"
-chip_logging_style = "external"
-
-chip_config_network_layer_ble = true
 
 chip_build_tests = false
 
 chip_project_config_include = ""
 chip_system_project_config_include = ""
+chip_ble_project_config_include = ""
 
 custom_toolchain = "//toolchain:zephyr"
 mbedtls_target = "//:dummy"

config/nrfconnect/chip-gn/build_overrides

@@ -0,0 +1 @@
+../../../examples/build_overrides/

config/nrfconnect/lib/pw_rpc/BUILD.gn → config/nrfconnect/chip-gn/lib/pw_rpc/BUILD.gn

@@ -24,6 +24,7 @@ static_library("pw_rpc") {
   deps = [
     "$dir_pw_rpc:server",
     "$dir_pw_rpc/nanopb:echo_service",
+    "$dir_pw_rpc/system_server",
     "${chip_root}/examples/platform/nrfconnect/pw_sys_io:pw_sys_io_nrfconnect",
     "${dir_pigweed}/pw_hdlc_lite:pw_rpc",
     dir_pw_assert,

config/nrfconnect/lib/pw_rpc/pw_rpc.gni → config/nrfconnect/chip-gn/lib/pw_rpc/pw_rpc.gni

@@ -5,6 +5,7 @@ pw_log_BACKEND = "$dir_pw_log_basic"
 pw_assert_BACKEND = "$dir_pw_assert_log"
 pw_sys_io_BACKEND =
     "${chip_root}/examples/platform/nrfconnect/pw_sys_io:pw_sys_io_nrfconnect"
+pw_rpc_system_server_BACKEND = "$dir_pw_rpc/system_server:sys_io"
 
 dir_pw_third_party_nanopb = "${chip_root}/third_party/nanopb/repo"
 pw_protobuf_GENERATORS = [

config/nrfconnect/chip-gn/third_party/connectedhomeip

@@ -0,0 +1 @@
+../../../../