WIP: Command processing

.devcontainer/Dockerfile

@@ -18,7 +18,7 @@ RUN apt-get -fy install git vim emacs sudo \
     iproute2 procps lsb-release \
     bash-completion \
     build-essential cmake cppcheck valgrind \
-    wget curl telnet bsdtar \
+    wget curl telnet \
     docker.io
 RUN groupadd -g $USER_GID $USERNAME
 RUN useradd -s /bin/bash -u $USER_UID -g $USER_GID -G docker -m $USERNAME
@@ -27,7 +27,8 @@ RUN chmod 0440 /etc/sudoers.d/$USERNAME
 
 RUN mkdir -p /var/downloads
 RUN cd /var/downloads
-RUN curl -JL https://github.com/microsoft/vscode-cpptools/releases/download/0.27.0/cpptools-linux.vsix | bsdtar -xvf - extension
+RUN curl -JL https://github.com/microsoft/vscode-cpptools/releases/download/0.27.0/cpptools-linux.vsix > extension.zip
+RUN unzip extension.zip
 RUN mkdir -p /home/$USERNAME/.vscode-server/extensions
 RUN mv extension /home/$USERNAME/.vscode-server/extensions/ms-vscode.cpptools-0.27.0
 RUN mkdir -p /home/$USERNAME/bin

.github/workflows/bloat_check.yaml

@@ -1,7 +1,7 @@
 name: Bloat Check
 on:
     schedule:
-        - cron: '*/10 * * * *'
+        - cron: '*/5 * * * *'
 
 
 jobs:
@@ -11,9 +11,12 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: "connectedhomeip/chip-build-openssl:0.2.18"
+            image: connectedhomeip/chip-build:0.3.0
 
         steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+
             - name: Report
               run: |
                   scripts/helpers/bloat_check.py                        \

.github/workflows/gn_examples.yaml

@@ -9,7 +9,7 @@ jobs:
         name: nRF
 
         env:
-            BUILD_TYPE: nrf
+            BUILD_TYPE: gn_nrf
             BUILD_VERSION: 0.2.14
             BUILD_IMAGE: chip-build-nrf-platform
             BUILD_ORG: connectedhomeip
@@ -33,18 +33,26 @@ jobs:
               run: scripts/examples/gn_nrf_example.sh examples/lock-app/nrf5 out/lock_app_debug
             - name: Build example nRF5 Lighting App
               run: scripts/examples/gn_nrf_example.sh examples/lighting-app/nrf5 out/lighting_app_debug
-            - name: Preserve artifacts
-              run: |
-                  mkdir -p example_binaries/nrf-build
-                  cp out/lock_app_debug/chip-nrf52840-lock-example \
-                     out/lighting_app_debug/chip-nrf52840-lighting-example \
-                     example_binaries/nrf-build/
+            - name: Binary artifact suffix
+              id: outsuffix
+              uses: haya14busa/[email protected]
+              with:
+                  cond: ${{ github.event.pull_request.number == '' }}
+                  if_true: "${{ github.sha }}"
+                  if_false: "pull-${{ github.event.pull_request.number }}"
+            - name: Uploading Binaries
+              uses: actions/upload-artifact@v2
+              with:
+                  name: ${{ env.BUILD_TYPE }}-example-build-${{ steps.outsuffix.outputs.value }}
+                  path: |
+                          out/lock_app_debug/chip-nrf52840-lock-example
+                          out/lighting_app_debug/chip-nrf52840-lighting-example
 
     linux-standalone:
         name: Linux Standalone
 
         env:
-            BUILD_TYPE: linux
+            BUILD_TYPE: gn_linux
             BUILD_VERSION: 0.2.14
             BUILD_IMAGE: chip-build
             BUILD_ORG: connectedhomeip
@@ -68,9 +76,17 @@ jobs:
               run: scripts/examples/gn_build_example.sh examples/chip-tool out/chip_tool_debug
             - name: Build example Standalone Shell
               run: scripts/examples/gn_build_example.sh examples/shell out/shell_debug
-            - name: Preserve artifacts
-              run: |
-                  mkdir -p example_binaries/$BUILD_TYPE
-                  cp out/chip_tool_debug/bin/chip-standalone-demo \
-                     out/shell_debug/bin/chip-shell \
-                     example_binaries/$BUILD_TYPE/
+            - name: Binary artifact suffix
+              id: outsuffix
+              uses: haya14busa/[email protected]
+              with:
+                  cond: ${{ github.event.pull_request.number == '' }}
+                  if_true: "${{ github.sha }}"
+                  if_false: "pull-${{ github.event.pull_request.number }}"
+            - name: Uploading Binaries
+              uses: actions/upload-artifact@v2
+              with:
+                  name: ${{ env.BUILD_TYPE }}-example-build-${{ steps.outsuffix.outputs.value }}
+                  path: |
+                          out/chip_tool_debug/chip-standalone-demo
+                          out/shell_debug/chip-shell

.gitmodules

@@ -39,22 +39,22 @@
 	url = https://github.com/jeremyjh/ESP32_TFT_library.git
 	branch = master
 	ignore = dirty
-	commit = 35be9760b4edf485287f78c0cf652beb19c047f0
+	commit = 42cadf2de25fa7e9b5d5d5189e90756cf9938df2
 [submodule "pigweed"]
 	path = third_party/pigweed/repo
 	url = https://pigweed.googlesource.com/pigweed/pigweed
 	branch = master
 	ignore = dirty
-	commit = 023f35bab59c73c498377d1be1b4e60534ce7b20
+	commit = ce87bc01d82d813506ece5122250a1b909d78e68
 [submodule "openthread"]
 	path = third_party/openthread/repo
 	url = https://github.com/openthread/openthread.git
 	branch = master
 	ignore = dirty
-	commit = 5f0e36eeb236a507631e9c822e43f742b7b6738a
+	commit = c6d5c4aae0ff9f891ec9f734f6b44598e569c48d
 [submodule "ot-br-posix"]
 	path = third_party/ot-br-posix/repo
 	url = https://github.com/openthread/ot-br-posix.git
 	branch = master
 	ignore = dirty
-	commit = 38e91052d1fb12a55c4e34073f9e399471650b4b
+	commit = 250c6d605b83910f86fa61fcdbde9ba67dcc7d93

.vscode/tasks.json

@@ -17,6 +17,21 @@
             },
             "problemMatcher": ["$gcc"]
         },
+        {
+            "label": "GN Build",
+            "type": "shell",
+            "command": "./gn_build.sh",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "isBackground": false,
+            "presentation": {
+                "reveal": "always",
+                "panel": "shared"
+            },
+            "problemMatcher": ["$gcc"]
+        },
         {
             "label": "Auto-enforce coding style",
             "type": "shell",

BUILD.gn

@@ -40,6 +40,7 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
       "${chip_root}/src/inet",
       "${chip_root}/src/lib",
       "${chip_root}/src/lib/core",
+      "${chip_root}/src/lib/datamodel",
       "${chip_root}/src/lib/shell",
       "${chip_root}/src/lib/support",
       "${chip_root}/src/lwip:all",
@@ -59,6 +60,7 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
       deps += [
         "${chip_root}/src/qrcodetool",
         "${chip_root}/src/setup_payload",
+        "${chip_root}/examples/shell",
       ]
     }
   }
@@ -73,6 +75,7 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
         "${chip_root}/src/crypto/tests",
         "${chip_root}/src/inet/tests",
         "${chip_root}/src/lib/core/tests",
+        "${chip_root}/src/lib/datamodel/tests",
         "${chip_root}/src/lib/support/tests",
         "${chip_root}/src/lwip/tests",
         "${chip_root}/src/platform/tests",
@@ -104,8 +107,11 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
     # Enable building chip with gcc.
     enable_host_gcc_build = enable_default_builds
 
-    # Build building chip with gcc & mbedtls.
-    enable_host_gcc_mbdtls_build = enable_default_builds
+    # Enable building chip with gcc & mbedtls.
+    enable_host_gcc_mbedtls_build = enable_default_builds
+
+    # Enable building chip for linux embedded.
+    enable_linux_embedded_build = enable_default_builds && host_os == "linux"
 
     # Build the chip-tool example.
     enable_standalone_chip_tool_build = enable_default_builds
@@ -132,6 +138,13 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
     toolchain = "${chip_root}/config/mbedtls/toolchain:${host_os}_${host_cpu}_gcc_mbedtls"
   }
 
+  if (host_os == "linux") {
+    chip_build("linux_embedded") {
+      toolchain =
+          "${chip_root}/config/linux/toolchain:linux_${host_cpu}_gcc_embedded"
+    }
+  }
+
   standalone_toolchain = "${chip_root}/config/standalone/toolchain:standalone"
 
   group("standalone_chip_tool") {
@@ -162,9 +175,12 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
     if (enable_host_gcc_build) {
       deps += [ ":all_host_gcc" ]
     }
-    if (enable_host_gcc_mbdtls_build) {
+    if (enable_host_gcc_mbedtls_build) {
       deps += [ ":all_host_gcc_mbedtls" ]
     }
+    if (enable_linux_embedded_build) {
+      deps += [ ":all_linux_embedded" ]
+    }
     if (enable_standalone_chip_tool_build) {
       deps += [ ":standalone_chip_tool" ]
     }
@@ -188,9 +204,12 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
       if (enable_host_gcc_build) {
         deps += [ ":check_host_gcc" ]
       }
-      if (enable_host_gcc_mbdtls_build) {
+      if (enable_host_gcc_mbedtls_build) {
         deps += [ ":check_host_gcc_mbedtls" ]
       }
+      if (enable_linux_embedded_build) {
+        deps += [ ":check_linux_embedded" ]
+      }
     }
   }
 }

config/efr32/efr32-app.mk

@@ -122,7 +122,8 @@ EXTRA_SRCS += \
     $(EFR32_SDK_ROOT)/util/third_party/segger/systemview/SEGGER/SEGGER_RTT.c
 
 STD_INC_DIRS += \
-    $(CHIP_ROOT)/src/include/platform/EFR32                                                 \
+    $(CHIP_ROOT)/src/include/platform                                                       \
+    $(CHIP_ROOT)/src/platform/EFR32                                                         \
     $(FREERTOS_ROOT)/Source/include                                                         \
     $(FREERTOS_ROOT)/Source/portable/GCC/ARM_CM3                                            \
     $(EFR32_SDK_ROOT)                                                                       \
@@ -252,13 +253,15 @@ ifeq ($(EFR32FAMILY), efr32mg12)
 STD_LIBS += \
     $(EFR32_SDK_ROOT)/protocol/bluetooth/lib/EFR32MG12P/GCC/libbluetooth.a \
     $(EFR32_SDK_ROOT)/platform/radio/rail_lib/autogen/librail_release/librail_multiprotocol_efr32xg12_gcc_release.a \
-    $(EFR32_SDK_ROOT)/platform/emdrv/nvm3/lib/libnvm3_CM4_gcc.a
+    $(EFR32_SDK_ROOT)/platform/emdrv/nvm3/lib/libnvm3_CM4_gcc.a \
+    $(EFR32_SDK_ROOT)/protocol/bluetooth/lib/EFR32MG12P/GCC/libmbedtls.a
 else
 ifeq ($(EFR32FAMILY), efr32mg21)
 STD_LIBS += \
     $(EFR32_SDK_ROOT)/protocol/bluetooth/lib/EFR32MG21/GCC/libbluetooth.a \
     $(EFR32_SDK_ROOT)/platform/radio/rail_lib/autogen/librail_release/librail_multiprotocol_efr32xg21_gcc_release.a \
-    $(EFR32_SDK_ROOT)/platform/emdrv/nvm3/lib/libnvm3_CM33_gcc.a
+    $(EFR32_SDK_ROOT)/platform/emdrv/nvm3/lib/libnvm3_CM33_gcc.a \
+    $(EFR32_SDK_ROOT)/protocol/bluetooth/lib/EFR32MG21/GCC/libmbedtls.a
 endif
 endif
 

config/linux/toolchain/BUILD.gn

@@ -0,0 +1,26 @@
+# 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/chip.gni")
+
+import("//build/toolchain/gcc_toolchain.gni")
+
+gcc_toolchain("linux_${host_cpu}_gcc_embedded") {
+  toolchain_args = {
+    current_os = "linux"
+    current_cpu = host_cpu
+    is_clang = false
+    import("${chip_root}/src/platform/Linux/args.gni")
+  }
+}

config/nrf5/nrf5-chip.mk

@@ -109,7 +109,7 @@ CHIP_CONFIGURE_OPTIONS = \
     --with-chip-ble-project-includes=$(CHIP_PROJECT_CONFIG) \
     --with-chip-warm-project-includes=$(CHIP_PROJECT_CONFIG) \
     --with-chip-device-project-includes=$(CHIP_PROJECT_CONFIG) \
-    --with-openthread=$(NRF5_SDK_ROOT)/external/openthread \
+    --with-openthread=internal \
     --disable-ipv4 \
     --disable-tests \
     --disable-tools \

config/standalone/args.gni

@@ -12,11 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Options from standalone-chip.mk that differ from configure defaults. These
+# options are used from examples/.
 chip_build_tests = false
-
 config_network_layer_ble = false
-inet_config_enable_async_dns_sockets = false
-
-project_config_include_dirs = rebase_path([ "." ])
-chip_project_config_include = "<CHIPProjectConfig.h>"
-system_project_config_include = "<SystemProjectConfig.h>"
+inet_config_enable_tun_endpoint = false
+inet_config_enable_raw_endpoint = false
+inet_config_enable_dns_resolver = false

config/standalone/standalone-chip.mk

@@ -58,10 +58,10 @@ CHIP_OUTPUT_DIR = $(OUTPUT_DIR)/chip
 # An optional file containing application-specific configuration overrides.
 CHIP_PROJECT_CONFIG = $(wildcard $(PROJECT_ROOT)/include/CHIPProjectConfig.h)
 
-# Architcture on which CHIP is being built.
+# Architecture on which CHIP is being built.
 CHIP_BUILD_ARCH = $(shell $(CHIP_ROOT)/third_party/nlbuild-autotools/repo/third_party/autoconf/config.guess | sed -e 's/[[:digit:].]*$$//g')
 
-# Archtecture for which CHIP will be built.
+# Architecture for which CHIP will be built.
 CHIP_HOST_ARCH := $(CHIP_BUILD_ARCH)
 
 
@@ -135,12 +135,18 @@ STD_LDFLAGS += -L$(CHIP_OUTPUT_DIR)/lib
 # Add CHIP libraries to standard libraries list.
 STD_LIBS += \
     -lCHIP \
+    -lDeviceLayer \
     -lInetLayer \
     -lnlfaultinjection \
     -lSystemLayer
 
 STD_LIBS += $(shell pkg-config --libs openssl)
 
+ifeq ($(findstring linux,$(CHIP_HOST_ARCH)),linux)
+STD_LIBS += $(shell pkg-config --libs gio-2.0)
+STD_CFLAGS += $(shell pkg-config --cflags gio-2.0)
+endif
+
 # Add the appropriate CHIP target as a prerequisite to all application
 # compilation targets to ensure that CHIP gets built and its header
 # files installed prior to compiling any dependent source files.
@@ -149,6 +155,7 @@ STD_COMPILE_PREREQUISITES += install-chip
 # Add the CHIP libraries as prerequisites for linking the application.
 STD_LINK_PREREQUISITES += \
     $(CHIP_OUTPUT_DIR)/lib/libCHIP.a \
+    $(CHIP_OUTPUT_DIR)/lib/libDeviceLayer.a \
     $(CHIP_OUTPUT_DIR)/lib/libInetLayer.a \
     $(CHIP_OUTPUT_DIR)/lib/libnlfaultinjection.a \
     $(CHIP_OUTPUT_DIR)/lib/libSystemLayer.a