Merge branch 'master' into feature/improve_java_controller

project-chip · May 23, 2023 · 090c382 · 090c382
2 parents 2b98cef + b91830a
commit 090c382
Show file tree

Hide file tree

Showing 673 changed files with 79,594 additions and 32,833 deletions.
diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
@@ -564,6 +564,7 @@ FW
 gbl
 gcloud
 GDB
+gdbgui
 gdbserver
 GeneralCommissioning
 GeneralDiagnostics
@@ -719,6 +720,7 @@ Jupyter
 jupyterlab
 KA
 kAdminister
+kbd
 kBusy
 kCase
 Kconfig

diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
@@ -109,11 +109,11 @@ jobs:
         run: |
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
              efr32 BRD4187C lighting-app \
-             out/efr32-brd4187c-light-rpc/chip-efr32-lighting-example.out \
+             out/efr32-brd4187c-light-rpc/matter-silabs-lighting-example.out \
              /tmp/bloat_reports/
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py  \
              efr32 BRD4187C window-app \
-             out/efr32-brd4187c-window-covering-additional_data_advertising/chip-efr32-window-example.out \
+             out/efr32-brd4187c-window-covering-additional_data_advertising/matter-silabs-window-example.out \
              /tmp/bloat_reports/
       - name: Clean out build output
         run: rm -rf ./out
@@ -122,15 +122,15 @@ jobs:
         run: |
           scripts/examples/gn_efr32_example.sh examples/lock-app/silabs/efr32/ out/lock_app_wifi_wf200 BRD4161A is_debug=false chip_logging=false --wifi wf200 --docker
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+wf200 lock-app \
-            out/lock_app_wifi_wf200/BRD4161A/chip-efr32-lock-example.out /tmp/bloat_reports/
+            out/lock_app_wifi_wf200/BRD4161A/matter-silabs-lock-example.out /tmp/bloat_reports/
       - name: Clean out build output
         run: rm -rf ./out
       - name: Build example EFR32+RS9116 WiFi Lighting app for BRD4161A
         timeout-minutes: 15
         run: |
           scripts/examples/gn_efr32_example.sh examples/lighting-app/silabs/efr32/ out/lighting_app_wifi_rs9116 BRD4161A --wifi rs9116 --docker
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+rs9116 lighting-app \
-            out/lighting_app_wifi_rs9116/BRD4161A/chip-efr32-lighting-example.out /tmp/bloat_reports/
+            out/lighting_app_wifi_rs9116/BRD4161A/matter-silabs-lighting-example.out /tmp/bloat_reports/
       - name: Clean out build output
         run: rm -rf ./out
       - name: Uploading Size Reports

diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
@@ -38,7 +38,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-telink:0.7.3
+            image: connectedhomeip/chip-build-telink:0.7.11
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -171,6 +171,7 @@ jobs:
                       src/app/zap-templates/zcl/data-model/chip/proxy-valid-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/pwm-cluster.xml \
+                      src/app/zap-templates/zcl/data-model/chip/refrigerator-alarm.xml \
                       src/app/zap-templates/zcl/data-model/chip/relative-humidity-measurement-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/scene.xml \
                       src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml \
@@ -188,6 +189,7 @@ jobs:
                       src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/window-covering.xml \
+                      src/app/zap-templates/zcl/data-model/chip/temperature-control-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/matter-devices.xml \
                       src/app/zap-templates/zcl/data-model/draft/barrier-control-cluster.xml \
                       src/app/zap-templates/zcl/data-model/draft/electrical-measurement-cluster.xml \

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -430,16 +430,16 @@
             "name": "Debug Open IoT SDK example application",
             "type": "cortex-debug",
             "request": "launch",
-            "cwd": "${workspaceRoot}/examples/${input:openiotsdkApp}/openiotsdk",
-            "executable": "./build/chip-openiotsdk-${input:openiotsdkApp}-example.elf",
+            "cwd": "${workspaceRoot}/examples/${input:openiotsdkExample}/openiotsdk",
+            "executable": "./build/chip-openiotsdk-${input:openiotsdkExample}-example.elf",
             "armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/packages/arm/bin/",
             "servertype": "external",
             "gdbTarget": "${input:openiotsdkRemoteHost}:31627", //GDBserver port on FVP
             "overrideLaunchCommands": [
                 "-enable-pretty-printing",
                 "add-symbol-file ./build/bl2.elf 0x10000000",
                 "add-symbol-file ./build/tfm_s.elf 0x38000400",
-                "add-symbol-file ./build/chip-openiotsdk-${input:openiotsdkApp}-example_ns.elf 0x28060400",
+                "add-symbol-file ./build/chip-openiotsdk-${input:openiotsdkExample}-example_ns.elf 0x28060400",
                 "break main_ns.cpp:main"
             ],
             "runToEntryPoint": "main",
@@ -451,15 +451,15 @@
             "type": "cortex-debug",
             "request": "launch",
             "cwd": "${workspaceRoot}/src/test_driver/openiotsdk/unit-tests",
-            "executable": "./build/${input:openiotsdkUnittest}.elf",
+            "executable": "./build/${input:openiotsdkUnitTest}.elf",
             "armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/packages/arm/bin/",
             "servertype": "external",
             "gdbTarget": ":31627", //GDBserver port on FVP
             "overrideLaunchCommands": [
                 "-enable-pretty-printing",
                 "add-symbol-file ./build/bl2.elf 0x10000000",
                 "add-symbol-file ./build/tfm_s.elf 0x38000400",
-                "add-symbol-file ./build/${input:openiotsdkUnittest}_ns.elf 0x28060400",
+                "add-symbol-file ./build/${input:openiotsdkUnitTest}_ns.elf 0x28060400",
                 "break main_ns.cpp:main"
             ],
             "runToEntryPoint": "main",
@@ -522,11 +522,13 @@
             "default": "CY8CPROTO_062_4343W"
         },
         {
-            "type": "pickString",
-            "id": "openiotsdkApp",
-            "description": "What Open IoT SDK example do you want to use?",
-            "options": ["shell", "lock-app"],
-            "default": "shell"
+            "type": "command",
+            "id": "openiotsdkExample",
+            "command": "shellCommand.execute",
+            "args": {
+                "command": "cat examples/platform/openiotsdk/supported_examples.txt",
+                "description": "What Open IoT SDK example application do you want to use?"
+            }
         },
         {
             "type": "promptString",
@@ -535,37 +537,13 @@
             "default": ""
         },
         {
-            "type": "pickString",
-            "id": "openiotsdkUnittest",
-            "description": "What Open IoT SDK unit test do you want to use?",
-            "options": [
-                "accesstest",
-                "AppTests",
-                "ASN1Tests",
-                "BDXTests",
-                "ChipCryptoTests",
-                "ControllerTests",
-                "CoreTests",
-                "CredentialsTest",
-                "DataModelTests",
-                "InetLayerTests",
-                "MdnsTests",
-                "MessagingLayerTests",
-                "MinimalMdnsCoreTests",
-                "MinimalMdnsRecordsTests",
-                "MinimalMdnsRespondersTests",
-                "PlatformTests",
-                "RawTransportTests",
-                "RetransmitTests",
-                "SecureChannelTests",
-                "SetupPayloadTests",
-                "SupportTests",
-                "SystemLayerTests",
-                "TestShell",
-                "TransportLayerTests",
-                "UserDirectedCommissioningTests"
-            ],
-            "default": "accesstest"
+            "type": "command",
+            "id": "openiotsdkUnitTest",
+            "command": "shellCommand.execute",
+            "args": {
+                "command": "cat src/test_driver/openiotsdk/unit-tests/test_components.txt",
+                "description": "What Open IoT SDK unit test application do you want to use?"
+            }
         }
     ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -243,6 +243,19 @@
                 "clear": true
             }
         },
+        {
+            "label": "Setup Open IoT SDK network",
+            "type": "shell",
+            "command": "sudo scripts/setup/openiotsdk/network_setup.sh -n${input:openiotsdkNetworkSetupName} ${input:openiotsdkNetworkSetupCmd}",
+            "problemMatcher": {
+                "pattern": {
+                    "regexp": "^(.*):(\\d+):(\\d+):\\s+(warning|error):\\s+(.*)$",
+                    "file": 1,
+                    "line": 2,
+                    "message": 5
+                }
+            }
+        },
         {
             "label": "Build Open IoT SDK example",
             "type": "shell",
@@ -453,6 +466,19 @@
             "options": ["simple", "boot", "upgrade"],
             "default": "simple"
         },
+        {
+            "type": "pickString",
+            "id": "openiotsdkNetworkSetupCmd",
+            "description": "Which command do you wish to use?",
+            "options": ["up", "down", "restart"],
+            "default": "up"
+        },
+        {
+            "type": "promptString",
+            "id": "openiotsdkNetworkSetupName",
+            "description": "Type the network namespace name that you want to use.",
+            "default": "ARM"
+        },
         {
             "type": "pickString",
             "id": "openiotsdkDebugMode",
@@ -468,44 +494,22 @@
             "default": "false"
         },
         {
-            "type": "pickString",
+            "type": "command",
             "id": "openiotsdkExample",
-            "description": "What Open IoT SDK example application do you want to use?",
-            "options": ["shell", "lock-app"],
-            "default": "shell"
+            "command": "shellCommand.execute",
+            "args": {
+                "command": "cat examples/platform/openiotsdk/supported_examples.txt",
+                "description": "What Open IoT SDK example application do you want to use?"
+            }
         },
         {
-            "type": "pickString",
+            "type": "command",
             "id": "openiotsdkUnitTest",
-            "description": "What unit test do you want to use?",
-            "options": [
-                "accesstest",
-                "AppTests",
-                "ASN1Tests",
-                "BDXTests",
-                "ChipCryptoTests",
-                "ControllerTests",
-                "CoreTests",
-                "CredentialsTest",
-                "DataModelTests",
-                "InetLayerTests",
-                "MdnsTests",
-                "MessagingLayerTests",
-                "MinimalMdnsCoreTests",
-                "MinimalMdnsRecordsTests",
-                "MinimalMdnsRespondersTests",
-                "PlatformTests",
-                "RawTransportTests",
-                "RetransmitTests",
-                "SecureChannelTests",
-                "SetupPayloadTests",
-                "SupportTests",
-                "SystemLayerTests",
-                "TestShell",
-                "TransportLayerTests",
-                "UserDirectedCommissioningTests"
-            ],
-            "default": "accesstest"
+            "command": "shellCommand.execute",
+            "args": {
+                "command": "cat src/test_driver/openiotsdk/unit-tests/test_components.txt",
+                "description": "What Open IoT SDK unit test application do you want to use?"
+            }
         },
         {
             "type": "promptString",
@@ -654,12 +658,12 @@
                 "nrf-nrf52840dk-pump",
                 "nrf-nrf52840dk-pump-controller",
                 "nrf-nrf52840dk-shell",
-                "nrf-nrf5340-light",
-                "nrf-nrf5340-light-rpc",
-                "nrf-nrf5340-lock",
-                "nrf-nrf5340-pump",
-                "nrf-nrf5340-pump-controller",
-                "nrf-nrf5340-shell",
+                "nrf-nrf5340dk-light",
+                "nrf-nrf5340dk-light-rpc",
+                "nrf-nrf5340dk-lock",
+                "nrf-nrf5340dk-pump",
+                "nrf-nrf5340dk-pump-controller",
+                "nrf-nrf5340dk-shell",
                 "openiotsdk-lock",
                 "openiotsdk-shell",
                 "qpg-qpg6100-lock",

diff --git a/build/chip/chip_codegen.cmake b/build/chip/chip_codegen.cmake
@@ -162,19 +162,13 @@ function(chip_zapgen TARGET_NAME)
             #       out links of template files and zap files and such
             SET(EXTRA_DEPENDENCIES
                 "${CHIP_ROOT}/src/app/zap-templates/partials/header.zapt"
-                "${CHIP_ROOT}/src/app/zap-templates/partials/idl/command_request_response.zapt"
-                "${CHIP_ROOT}/src/app/zap-templates/partials/idl/command_request_struct.zapt"
-                "${CHIP_ROOT}/src/app/zap-templates/partials/idl/command_response_struct.zapt"
-                "${CHIP_ROOT}/src/app/zap-templates/partials/idl/structure_definition.zapt"
-                "${CHIP_ROOT}/src/app/zap-templates/partials/idl/structure_member.zapt"
                 "${CHIP_ROOT}/src/app/zap-templates/partials/im_command_handler_cluster_commands.zapt"
                 "${CHIP_ROOT}/src/app/zap-templates/templates/app/access.zapt"
                 "${CHIP_ROOT}/src/app/zap-templates/templates/app/CHIPClientCallbacks.zapt"
                 "${CHIP_ROOT}/src/app/zap-templates/templates/app/CHIPClusters.zapt"
                 "${CHIP_ROOT}/src/app/zap-templates/templates/app/endpoint_config.zapt"
                 "${CHIP_ROOT}/src/app/zap-templates/templates/app/gen_config.zapt"
                 "${CHIP_ROOT}/src/app/zap-templates/templates/app/im-cluster-command-handler.zapt"
-                "${CHIP_ROOT}/src/app/zap-templates/templates/app/MatterIDL.zapt"
            )
            SET(OUTPUT_SUBDIR "zap-generated")
         else()