Merge branch 'master' into im/command-list

project-chip · Feb 2, 2022 · f03d9f4 · f03d9f4
2 parents 7f45f3c + 8bb93af
commit f03d9f4
Show file tree

Hide file tree

Showing 218 changed files with 12,903 additions and 1,688 deletions.
diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
@@ -261,6 +261,7 @@ CYW
 DAC
 DAP
 DataFrame
+DataModelRevision
 dataset
 datasets
 dbf

diff --git a/.github/workflows/examples-cyw30739.yaml b/.github/workflows/examples-cyw30739.yaml
@@ -57,12 +57,12 @@ jobs:
                   path: |
                    .environment/gn_out/.ninja_log
                    .environment/pigweed-venv/*.log
-            - name: Build example CYW30739 Lighting App
-              timeout-minutes: 10
+            - name: Build example CYW30739 Apps
+              timeout-minutes: 30
               run: |
                   ./scripts/run_in_build_env.sh \
                     "./scripts/build/build_examples.py \
-                      --target cyw30739-cyw930739m2evb_01-light \
+                      --target-glob 'cyw30739-cyw930739m2evb_01-{light,lock,ota-requestor}' \
                       build \
                       --copy-artifacts-to out/artifacts \
                     "
@@ -73,12 +73,20 @@ jobs:
                     cyw30739 cyw930739m2evb_01 light \
                     out/artifacts/cyw30739-cyw930739m2evb_01-light/chip-cyw30739-lighting-example.elf \
                     /tmp/bloat_reports/
-            - name: Build example CYW30739 Lock App
-              timeout-minutes: 10
+            - name: Get lock size stats
+              timeout-minutes: 5
               run: |
-                  scripts/examples/gn_build_example.sh examples/lock-app/cyw30739 out/lock_app
-                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py cyw30739 CYW30739 lock-app \
-                    out/lock_app/chip-cyw30739-lock-example.elf /tmp/bloat_reports/
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                    cyw30739 cyw930739m2evb_01 lock \
+                    out/artifacts/cyw30739-cyw930739m2evb_01-lock/chip-cyw30739-lock-example.elf \
+                    /tmp/bloat_reports/
+            - name: Get ota-requestor size stats
+              timeout-minutes: 5
+              run: |
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                    cyw30739 cyw930739m2evb_01 ota-requestor \
+                    out/artifacts/cyw30739-cyw930739m2evb_01-ota-requestor/chip-cyw30739-ota-requestor-example.elf \
+                    /tmp/bloat_reports/
             - name: Uploading Size Reports
               uses: actions/upload-artifact@v2
               if: ${{ !env.ACT }}

diff --git a/docs/guides/python_chip_controller_building.md b/docs/guides/python_chip_controller_building.md
@@ -505,7 +505,7 @@ List available commands in cluster. For example, for _Basic_ cluster:
 
 ```
 chip-device-ctrl > zcl ? Basic
-InteractionModelVersion
+DataModelRevision
 VendorName
 VendorID
 ProductName

diff --git a/docs/guides/repl/Matter - Access Control.ipynb b/docs/guides/repl/Matter - Access Control.ipynb
@@ -27,6 +27,48 @@
     "Briefly, you can read and write the entire ACL attribute in the all-clusters-app, but Access Control isn’t yet turned on, so it won’t affect interactions. There’s almost no error checking when writing the ACL attribute (e.g. ensuring subjects match auth mode, only your fabric can be written, etc.) so exercise caution for now."
    ]
   },
+  {
+   "cell_type": "markdown",
+   "id": "be8d3d64-e3d3-46b9-bbea-29aba67aee3b",
+   "metadata": {},
+   "source": [
+    "## Clear Persisted Storage\n",
+    "\n",
+    "Let's clear out our persisted storage (if one exists) to start from a clean slate."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 7,
+   "id": "59352193-6c8f-4bda-9a3c-d84317b63c30",
+   "metadata": {
+    "tags": []
+   },
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">0</span>\n",
+       "</pre>\n"
+      ],
+      "text/plain": [
+       "\u001b[1;36m0\u001b[0m\n"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    }
+   ],
+   "source": [
+    "import os, subprocess\n",
+    "\n",
+    "if os.path.isfile('/tmp/repl-storage.json'):\n",
+    "    os.remove('/tmp/repl-storage.json')\n",
+    "\n",
+    "# So that the all-clusters-app won't boot with stale prior state.\n",
+    "os.system('rm -rf /tmp/chip_*')"
+   ]
+  },
   {
    "cell_type": "markdown",
    "id": "99ce2877",
@@ -43,7 +85,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 8,
    "id": "bad327b7-c78a-4c46-b224-077fe7539ee1",
    "metadata": {},
    "outputs": [
@@ -106,16 +148,6 @@
      "metadata": {},
      "output_type": "display_data"
     },
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "2022-01-25 16:59:51 johnsj-macbookpro1.roam.corp.google.com root[28183] CRITICAL Loading configuration from /tmp/repl-storage.json...\n",
-      "2022-01-25 16:59:51 johnsj-macbookpro1.roam.corp.google.com chip.DL[28183] ERROR MAC is not known, using a default.\n",
-      "2022-01-25 16:59:51 johnsj-macbookpro1.roam.corp.google.com chip.DL[28183] ERROR Register (kDNSServiceErr_NameConflict)\n",
-      "2022-01-25 16:59:51 johnsj-macbookpro1.roam.corp.google.com chip.DIS[28183] ERROR Failed to advertise unprovisioned commissionable node: ../../src/platform/Darwin/DnssdImpl.cpp:302: CHIP Error 0x000000AC: Internal error\n"
-     ]
-    },
     {
      "data": {
       "text/html": [
@@ -151,26 +183,6 @@
       "New FabricAdmin: FabricId: 1(1)\n"
      ]
     },
-    {
-     "data": {
-      "text/html": [
-       "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"color: #af00ff; text-decoration-color: #af00ff\">Restoring FabricAdmin from storage to manage FabricId </span><span style=\"color: #af00ff; text-decoration-color: #af00ff; font-weight: bold\">2</span><span style=\"color: #af00ff; text-decoration-color: #af00ff\">, FabricIndex </span><span style=\"color: #af00ff; text-decoration-color: #af00ff; font-weight: bold\">2</span><span style=\"color: #af00ff; text-decoration-color: #af00ff\">...</span>\n",
-       "</pre>\n"
-      ],
-      "text/plain": [
-       "\u001b[38;5;129mRestoring FabricAdmin from storage to manage FabricId \u001b[0m\u001b[1;38;5;129m2\u001b[0m\u001b[38;5;129m, FabricIndex \u001b[0m\u001b[1;38;5;129m2\u001b[0m\u001b[38;5;129m...\u001b[0m\n"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "New FabricAdmin: FabricId: 2(2)\n"
-     ]
-    },
     {
      "data": {
       "text/html": [
@@ -268,26 +280,22 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 9,
    "id": "52ccd8c6",
    "metadata": {},
    "outputs": [],
    "source": [
     "import time, os\n",
     "import subprocess\n",
-    "subprocess.Popen(['pkill', '-f', 'chip-all-clusters-app'])\n",
-    "time.sleep(1)\n",
-    "\n",
-    "# So that the all-clusters-app won't boot with stale prior state.    \n",
-    "subprocess.Popen(['rm', '-rf', '/tmp/chip_*'])\n",
+    "os.system('pkill -f chip-all-clusters-app')\n",
     "time.sleep(1)\n",
     "\n",
     "# The location of the all-clusters-app in the cloud playground is one level higher - adjust for this by testing for file presence.\n",
     "if (os.path.isfile('../../../out/debug/chip-all-clusters-app')):\n",
     "    appPath = '../../../out/debug/chip-all-clusters-app'\n",
     "else:\n",
     "    appPath = '../../../../out/debug/chip-all-clusters-app'\n",
-    "    \n",
+    "\n",
     "process = subprocess.Popen(appPath, stdout=subprocess.DEVNULL)\n",
     "time.sleep(1)"
    ]
@@ -304,7 +312,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 10,
    "id": "5e964fe3",
    "metadata": {
     "tags": []
@@ -314,8 +322,7 @@
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "2022-01-25 16:59:54 johnsj-macbookpro1.roam.corp.google.com chip.CTL[28183] ERROR Unable to find country code, defaulting to WW\n",
-      "2022-01-25 16:59:54 johnsj-macbookpro1.roam.corp.google.com chip.SC[28183] ERROR The device does not support GetClock_RealTimeMS() API. This will eventually result in CASE session setup failures.\n"
+      "2022-01-29 16:01:43 johnsj-macbookpro1.roam.corp.google.com chip.SC[9915] ERROR The device does not support GetClock_RealTimeMS() API. This will eventually result in CASE session setup failures.\n"
      ]
     },
     {
@@ -364,7 +371,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 11,
    "id": "058504b3",
    "metadata": {},
    "outputs": [
-Original file line number
+Diff line change
@@ Expand Up / @@ -261,6 +261,7 @@ CYW @@
     DAC
     DAP
     DataFrame
+    DataModelRevision
     dataset
     datasets
     dbf
@@ Expand Down @@