Merge pull request #9 from project-chip/master

Update local master

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.
@@ -66,13 +67,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",
@@ -199,6 +206,7 @@ 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") {

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/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-module/CMakeLists.txt

@@ -227,6 +227,7 @@ zephyr_interface_library_named(chip)
 target_compile_definitions(chip INTERFACE CHIP_HAVE_CONFIG_H)
 target_include_directories(chip INTERFACE
     ${CHIP_ROOT}/src
+    ${CHIP_ROOT}/src/app/server
     ${CHIP_ROOT}/src/app/util
     ${CHIP_ROOT}/src/include
     ${CHIP_ROOT}/src/lib

docs/BUILDING.md

@@ -83,6 +83,8 @@ Finally, install some Raspberry Pi specific dependencies:
 sudo apt-get install pi-bluetooth
 ```
 
+You need to reboot your RPi after install `pi-bluetooth`.
+
 ### Build Preparation
 
 Before running any other build command, the `scripts/activate.sh` environment