diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml index eec8d0622bca5c..8f04e49f961498 100644 --- a/.github/workflows/bloat_check.yaml +++ b/.github/workflows/bloat_check.yaml @@ -33,7 +33,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 steps: - name: Checkout diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 30149e0fa5e4cf..23dd3d3eb0f309 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -40,7 +40,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 volumes: - "/tmp/log_output:/tmp/test_logs" options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 @@ -135,7 +135,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 volumes: - "/tmp/log_output:/tmp/test_logs" options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 @@ -283,7 +283,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 volumes: - "/tmp/log_output:/tmp/test_logs" options: --sysctl "net.ipv6.conf.all.disable_ipv6=0 @@ -343,7 +343,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 volumes: - "/tmp/log_output:/tmp/test_logs" options: --sysctl "net.ipv6.conf.all.disable_ipv6=0 @@ -451,7 +451,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 volumes: - "/tmp/log_output:/tmp/test_logs" options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml index df9c05f58c742f..3432fdc9a09779 100644 --- a/.github/workflows/chef.yaml +++ b/.github/workflows/chef.yaml @@ -33,7 +33,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 options: --user root steps: @@ -54,7 +54,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-esp32:32 + image: ghcr.io/project-chip/chip-build-esp32:35 options: --user root steps: @@ -75,7 +75,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-nrf-platform:32 + image: ghcr.io/project-chip/chip-build-nrf-platform:35 options: --user root steps: @@ -96,7 +96,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-telink:32 + image: ghcr.io/project-chip/chip-build-telink:35 options: --user root steps: @@ -108,7 +108,7 @@ jobs: platform: telink # - name: Update Zephyr to specific revision (for developers purpose) # shell: bash - # run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py e6a32f41ccec55c2233631406842b71ff270089d" + # run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py b5c8028ec94f3efa69decff3a09f0d6f8a21fd6d" - name: CI Examples Telink shell: bash run: | diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml index 77bbfcd9fedc80..e71ea876e5100a 100644 --- a/.github/workflows/cirque.yaml +++ b/.github/workflows/cirque.yaml @@ -40,7 +40,7 @@ jobs: # need to run with privilege, which isn't supported by job.XXX.contaner # https://github.com/actions/container-action/issues/2 # container: - # image: ghcr.io/project-chip/chip-build-cirque:32 + # image: ghcr.io/project-chip/chip-build-cirque:35 # volumes: # - "/tmp:/tmp" # - "/dev/pts:/dev/pts" diff --git a/.github/workflows/doxygen.yaml b/.github/workflows/doxygen.yaml index 64d066f4c7fda6..13da9c2b4da1d6 100644 --- a/.github/workflows/doxygen.yaml +++ b/.github/workflows/doxygen.yaml @@ -81,7 +81,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-doxygen:32 + image: ghcr.io/project-chip/chip-build-doxygen:35 if: github.actor != 'restyled-io[bot]' diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml index 9ae90c82a1cf7e..a10f4a84ac7d69 100644 --- a/.github/workflows/examples-ameba.yaml +++ b/.github/workflows/examples-ameba.yaml @@ -36,7 +36,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-ameba:32 + image: ghcr.io/project-chip/chip-build-ameba:35 options: --user root steps: diff --git a/.github/workflows/examples-asr.yaml b/.github/workflows/examples-asr.yaml index 50d833d00ee88e..092f911a233642 100644 --- a/.github/workflows/examples-asr.yaml +++ b/.github/workflows/examples-asr.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-asr:32 + image: ghcr.io/project-chip/chip-build-asr:35 options: --user root steps: diff --git a/.github/workflows/examples-bouffalolab.yaml b/.github/workflows/examples-bouffalolab.yaml index 2a2121cdb6da97..ec90a39b26cf17 100644 --- a/.github/workflows/examples-bouffalolab.yaml +++ b/.github/workflows/examples-bouffalolab.yaml @@ -35,7 +35,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-bouffalolab:32 + image: ghcr.io/project-chip/chip-build-bouffalolab:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-cc13x2x7_26x2x7.yaml b/.github/workflows/examples-cc13x2x7_26x2x7.yaml index 6232831bba36c8..3c864525707a88 100644 --- a/.github/workflows/examples-cc13x2x7_26x2x7.yaml +++ b/.github/workflows/examples-cc13x2x7_26x2x7.yaml @@ -36,7 +36,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-ti:32 + image: ghcr.io/project-chip/chip-build-ti:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-cc32xx.yaml b/.github/workflows/examples-cc32xx.yaml index 7b886423fcf450..73f463b167707b 100644 --- a/.github/workflows/examples-cc32xx.yaml +++ b/.github/workflows/examples-cc32xx.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-ti:32 + image: ghcr.io/project-chip/chip-build-ti:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml index f3451e6bc9de43..36c490956d9ae8 100644 --- a/.github/workflows/examples-efr32.yaml +++ b/.github/workflows/examples-efr32.yaml @@ -38,7 +38,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-efr32:32 + image: ghcr.io/project-chip/chip-build-efr32:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml index 2e5432dd4ec03f..e24492d94e60a7 100644 --- a/.github/workflows/examples-esp32.yaml +++ b/.github/workflows/examples-esp32.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-esp32:32 + image: ghcr.io/project-chip/chip-build-esp32:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" @@ -130,7 +130,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-esp32:32 + image: ghcr.io/project-chip/chip-build-esp32:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml index c9cfd0b15aac6b..ff6f2e91a906b5 100644 --- a/.github/workflows/examples-infineon.yaml +++ b/.github/workflows/examples-infineon.yaml @@ -35,7 +35,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-infineon:32 + image: ghcr.io/project-chip/chip-build-infineon:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-linux-arm.yaml b/.github/workflows/examples-linux-arm.yaml index 41c41f57a19c6b..a346bec097fa81 100644 --- a/.github/workflows/examples-linux-arm.yaml +++ b/.github/workflows/examples-linux-arm.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-crosscompile:32 + image: ghcr.io/project-chip/chip-build-crosscompile:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-linux-imx.yaml b/.github/workflows/examples-linux-imx.yaml index e065fd31d0d586..f6fee89fa966e4 100644 --- a/.github/workflows/examples-linux-imx.yaml +++ b/.github/workflows/examples-linux-imx.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-imx:32 + image: ghcr.io/project-chip/chip-build-imx:35 steps: - name: Checkout diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml index 951164ecd62fac..ad1dc349163c7b 100644 --- a/.github/workflows/examples-linux-standalone.yaml +++ b/.github/workflows/examples-linux-standalone.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml index ae444f5cdfc806..54d33b9f91d3c2 100644 --- a/.github/workflows/examples-mbed.yaml +++ b/.github/workflows/examples-mbed.yaml @@ -40,7 +40,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-mbed-os:32 + image: ghcr.io/project-chip/chip-build-mbed-os:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-mw320.yaml b/.github/workflows/examples-mw320.yaml index 369eeb81114a52..d0e7ce3122c06b 100644 --- a/.github/workflows/examples-mw320.yaml +++ b/.github/workflows/examples-mw320.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml index 88c84d72e28080..64bb5a319eafa8 100644 --- a/.github/workflows/examples-nrfconnect.yaml +++ b/.github/workflows/examples-nrfconnect.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-nrf-platform:32 + image: ghcr.io/project-chip/chip-build-nrf-platform:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-openiotsdk.yaml b/.github/workflows/examples-openiotsdk.yaml index eb142015f5b4e7..254e5688d62435 100644 --- a/.github/workflows/examples-openiotsdk.yaml +++ b/.github/workflows/examples-openiotsdk.yaml @@ -38,7 +38,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-openiotsdk:32 + image: ghcr.io/project-chip/chip-build-openiotsdk:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" options: --privileged diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml index b5aadaf11c11bb..e012eb9b02d065 100644 --- a/.github/workflows/examples-qpg.yaml +++ b/.github/workflows/examples-qpg.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-stm32.yaml b/.github/workflows/examples-stm32.yaml index 2e261c6f1c9735..84442f85294d31 100644 --- a/.github/workflows/examples-stm32.yaml +++ b/.github/workflows/examples-stm32.yaml @@ -38,7 +38,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml index a7b717d0890697..9131b3969df075 100644 --- a/.github/workflows/examples-telink.yaml +++ b/.github/workflows/examples-telink.yaml @@ -36,7 +36,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-telink:32 + image: ghcr.io/project-chip/chip-build-telink:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" @@ -55,7 +55,7 @@ jobs: gh-context: ${{ toJson(github) }} # - name: Update Zephyr to specific revision (for developers purpose) - # run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py e6a32f41ccec55c2233631406842b71ff270089d" + # run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py b5c8028ec94f3efa69decff3a09f0d6f8a21fd6d" - name: Build example Telink (B92 retention) Air Quality Sensor App run: | @@ -175,13 +175,13 @@ jobs: - name: clean out build output run: rm -rf ./out - - name: Build example Telink (B92) Pump App + - name: Build example Telink (B95 retention) Pump App run: | ./scripts/run_in_build_env.sh \ - "./scripts/build/build_examples.py --target 'telink-tlsr9528a-pump' build" + "./scripts/build/build_examples.py --target 'telink-tlsr9258a_retention-pump' build" .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \ - telink tlsr9528a pump-app \ - out/telink-tlsr9528a-pump/zephyr/zephyr.elf \ + telink tlsr9258a_retention pump-app \ + out/telink-tlsr9258a_retention-pump/zephyr/zephyr.elf \ /tmp/bloat_reports/ - name: clean out build output @@ -199,9 +199,6 @@ jobs: - name: clean out build output run: rm -rf ./out - - name: clean out build output - run: rm -rf ./out - - name: Build example Telink (B91) Shell App run: | ./scripts/run_in_build_env.sh \ @@ -250,13 +247,13 @@ jobs: - name: clean out build output run: rm -rf ./out - - name: Build example Telink (B91) Window Covering App + - name: Build example Telink (B95) Window Covering App run: | ./scripts/run_in_build_env.sh \ - "./scripts/build/build_examples.py --target 'telink-tlsr9518adk80d-window-covering' build" + "./scripts/build/build_examples.py --target 'telink-tlsr9258a-window-covering' build" .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \ - telink tlsr9518adk80d window-covering \ - out/telink-tlsr9518adk80d-window-covering/zephyr/zephyr.elf \ + telink tlsr9258a window-covering \ + out/telink-tlsr9258a-window-covering/zephyr/zephyr.elf \ /tmp/bloat_reports/ - name: clean out build output diff --git a/.github/workflows/examples-tizen.yaml b/.github/workflows/examples-tizen.yaml index 55be230f764128..a289e159dc6318 100644 --- a/.github/workflows/examples-tizen.yaml +++ b/.github/workflows/examples-tizen.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-tizen:32 + image: ghcr.io/project-chip/chip-build-tizen:35 options: --user root volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml index 96f6652b56e768..f7a14d1f5d3d1b 100644 --- a/.github/workflows/full-android.yaml +++ b/.github/workflows/full-android.yaml @@ -36,7 +36,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-android:32 + image: ghcr.io/project-chip/chip-build-android:35 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/fuzzing-build.yaml b/.github/workflows/fuzzing-build.yaml index 7a628ca782378f..341097915cab4f 100644 --- a/.github/workflows/fuzzing-build.yaml +++ b/.github/workflows/fuzzing-build.yaml @@ -33,7 +33,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/issue-labeler.yaml b/.github/workflows/issue-labeler.yaml index 8c3df4cdb40399..a92a4c212d187a 100644 --- a/.github/workflows/issue-labeler.yaml +++ b/.github/workflows/issue-labeler.yaml @@ -14,7 +14,7 @@ jobs: - uses: github/issue-labeler@v3.4 #May not be the latest version with: configuration-path: .github/issue-labeler.yml - not-before: 2020-01-15T02:54:32Z + not-before: 2020-01-15T02:54:34Z enable-versioned-regex: 0 sync-labels: 1 repo-token: ${{ github.token }} \ No newline at end of file diff --git a/.github/workflows/java-tests.yaml b/.github/workflows/java-tests.yaml index 9d16e3fbe8d1ae..f19d451fbc2df6 100644 --- a/.github/workflows/java-tests.yaml +++ b/.github/workflows/java-tests.yaml @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-java:32 + image: ghcr.io/project-chip/chip-build-java:35 options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 3f02c2278caa17..a3f2937276d4a9 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -29,7 +29,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 steps: - name: Checkout @@ -42,6 +42,144 @@ jobs: with: platform: linux + - name: Check for orphaned gn files + if: always() + # We should enforce that ALL new files are referenced in our build scripts. + # Several things do not have a clear fix path: + # - various platform implementations (including darwin-specific files as they + # are not using GN) + # - app/clusters (they are fetched dynamically - this should probably be fixed) + # + # All the rest of the exceptions should be driven down to 0: chip should fully + # be defined in build rules. + # + # This check enforces that for any newly added file, it must be part of some + # BUILD.gn file + run: | + ./scripts/run_in_build_env.sh "./scripts/tools/not_known_to_gn.py \ + src \ + --skip-dir app/clusters \ + --skip-dir darwin \ + --skip-dir include \ + --skip-dir platform/Ameba \ + --skip-dir platform/android \ + --skip-dir platform/ASR \ + --skip-dir platform/Beken \ + --skip-dir platform/bouffalolab \ + --skip-dir platform/cc13xx_26xx \ + --skip-dir platform/cc32xx \ + --skip-dir platform/Darwin \ + --skip-dir platform/ESP32 \ + --skip-dir platform/fake \ + --skip-dir platform/FreeRTOS \ + --skip-dir platform/Infineon \ + --skip-dir platform/Linux \ + --skip-dir platform/mbed \ + --skip-dir platform/mt793x \ + --skip-dir platform/nxp \ + --skip-dir platform/OpenThread \ + --skip-dir platform/qpg \ + --skip-dir platform/silabs \ + --skip-dir platform/telink \ + --skip-dir platform/webos \ + --skip-dir platform/Zephyr \ + --skip-dir test_driver \ + --known-failure app/app-platform/ContentApp.cpp \ + --known-failure app/app-platform/ContentApp.h \ + --known-failure app/app-platform/ContentAppPlatform.cpp \ + --known-failure app/app-platform/ContentAppPlatform.h \ + --known-failure controller/ExamplePersistentStorage.cpp \ + --known-failure controller/ExamplePersistentStorage.h \ + --known-failure controller/java/GroupDeviceProxy.h \ + --known-failure controller/java/CHIPEventTLVValueDecoder.h \ + --known-failure controller/python/chip/credentials/cert.h \ + --known-failure controller/python/chip/server/Options.h \ + --known-failure controller/python/chip/crypto/p256keypair.h \ + --known-failure controller/python/chip/commissioning/PlaceholderOperationalCredentialsIssuer.h \ + --known-failure controller/python/chip/native/PyChipError.h \ + --known-failure app/AttributeAccessInterface.h \ + --known-failure app/AttributeAccessToken.h \ + --known-failure app/att-storage.h \ + --known-failure app/BufferedReadCallback.h \ + --known-failure app/CommandHandler.h \ + --known-failure app/CommandHandlerInterface.h \ + --known-failure app/CommandPathParams.h \ + --known-failure app/CommandPathRegistry.h \ + --known-failure app/CommandResponseSender.h \ + --known-failure app/CommandSender.h \ + --known-failure app/CommandSenderLegacyCallback.h \ + --known-failure app/CompatEnumNames.h \ + --known-failure app/ConcreteAttributePath.h \ + --known-failure app/ConcreteCommandPath.h \ + --known-failure app/data-model/ListLargeSystemExtensions.h \ + --known-failure app/EventHeader.h \ + --known-failure app/EventLoggingDelegate.h \ + --known-failure app/EventLogging.h \ + --known-failure app/EventLoggingTypes.h \ + --known-failure app/EventManagement.h \ + --known-failure app/InteractionModelHelper.h \ + --known-failure app/ObjectList.h \ + --known-failure app/ReadClient.h \ + --known-failure app/ReadHandler.h \ + --known-failure app/ReadPrepareParams.h \ + --known-failure app/reporting/tests/MockReportScheduler.cpp \ + --known-failure app/reporting/tests/MockReportScheduler.h \ + --known-failure app/server/AppDelegate.h \ + --known-failure app/TestEventTriggerDelegate.h \ + --known-failure app/tests/integration/common.h \ + --known-failure app/tests/integration/MockEvents.h \ + --known-failure app/tests/suites/credentials/TestHarnessDACProvider.h \ + --known-failure app/tests/TestOperationalDeviceProxy.cpp \ + --known-failure app/util/af-enums.h \ + --known-failure app/util/af.h \ + --known-failure app/util/af-types.h \ + --known-failure app/util/attribute-metadata.h \ + --known-failure app/util/attribute-storage.cpp \ + --known-failure app/util/attribute-storage.h \ + --known-failure app/util/attribute-storage-null-handling.h \ + --known-failure app/util/attribute-table.cpp \ + --known-failure app/util/attribute-table.h \ + --known-failure app/util/binding-table.cpp \ + --known-failure app/util/binding-table.h \ + --known-failure app/util/common.h \ + --known-failure app/util/config.h \ + --known-failure app/util/DataModelHandler.cpp \ + --known-failure app/util/DataModelHandler.h \ + --known-failure app/util/ember-compatibility-functions.cpp \ + --known-failure app/util/endpoint-config-api.h \ + --known-failure app/util/endpoint-config-defines.h \ + --known-failure app/util/error-mapping.h \ + --known-failure app/util/generic-callbacks.h \ + --known-failure app/util/generic-callback-stubs.cpp \ + --known-failure app/util/im-client-callbacks.h \ + --known-failure app/util/MatterCallbacks.h \ + --known-failure app/util/message.cpp \ + --known-failure app/util/mock/Constants.h \ + --known-failure app/util/mock/Functions.h \ + --known-failure app/util/mock/MockNodeConfig.h \ + --known-failure app/util/odd-sized-integers.h \ + --known-failure app/util/types_stub.h \ + --known-failure app/util/util.cpp \ + --known-failure app/util/util.h \ + --known-failure app/WriteClient.h \ + --known-failure app/WriteHandler.h \ + --known-failure inet/tests/TestInetLayerCommon.hpp \ + --known-failure lib/core/CHIPVendorIdentifiers.hpp \ + --known-failure lib/dnssd/Constants.h \ + --known-failure lib/dnssd/minimal_mdns/core/FlatAllocatedQName.h \ + --known-failure lib/dnssd/minimal_mdns/core/HeapQName.h \ + --known-failure lib/dnssd/minimal_mdns/ListenIterator.h \ + --known-failure lib/dnssd/minimal_mdns/tests/CheckOnlyServer.h \ + --known-failure lib/dnssd/platform/DnssdBrowseDelegate.h \ + --known-failure lib/support/CHIPArgParser.hpp \ + --known-failure messaging/tests/echo/common.h \ + --known-failure platform/DeviceSafeQueue.cpp \ + --known-failure platform/DeviceSafeQueue.h \ + --known-failure platform/GLibTypeDeleter.h \ + --known-failure platform/SingletonConfigurationManager.cpp \ + --known-failure transport/retransmit/tests/TestCacheDriver.cpp \ + " + - name: Check for matter lint errors if: always() run: | diff --git a/.github/workflows/minimal-build.yaml b/.github/workflows/minimal-build.yaml index d9c8c7536e14d0..189c8db3159951 100644 --- a/.github/workflows/minimal-build.yaml +++ b/.github/workflows/minimal-build.yaml @@ -31,7 +31,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-minimal:32 + image: ghcr.io/project-chip/chip-build-minimal:35 steps: - name: Checkout diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml index 02810695164830..c4992953780911 100644 --- a/.github/workflows/qemu.yaml +++ b/.github/workflows/qemu.yaml @@ -38,7 +38,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-esp32-qemu:32 + image: ghcr.io/project-chip/chip-build-esp32-qemu:35 volumes: - "/tmp/log_output:/tmp/test_logs" @@ -76,7 +76,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-tizen-qemu:32 + image: ghcr.io/project-chip/chip-build-tizen-qemu:35 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml index 223a736ba0671c..c82e9f59a27674 100644 --- a/.github/workflows/release_artifacts.yaml +++ b/.github/workflows/release_artifacts.yaml @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-esp32:32 + image: ghcr.io/project-chip/chip-build-esp32:35 steps: - name: Checkout @@ -68,7 +68,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-efr32:32 + image: ghcr.io/project-chip/chip-build-efr32:35 steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml index 2e585a703953fd..396fb3ae153a46 100644 --- a/.github/workflows/smoketest-android.yaml +++ b/.github/workflows/smoketest-android.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-android:32 + image: ghcr.io/project-chip/chip-build-android:35 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 61db68f0233509..1a1fefac41d557 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -47,7 +47,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1" diff --git a/.github/workflows/unit_integration_test.yaml b/.github/workflows/unit_integration_test.yaml index 4272777681a4ce..f1be1a194a1b46 100644 --- a/.github/workflows/unit_integration_test.yaml +++ b/.github/workflows/unit_integration_test.yaml @@ -37,7 +37,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 volumes: - "/tmp/log_output:/tmp/test_logs" options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1" diff --git a/.github/workflows/zap_regeneration.yaml b/.github/workflows/zap_regeneration.yaml index 302adc747694f1..a0ab3653d5ecb1 100644 --- a/.github/workflows/zap_regeneration.yaml +++ b/.github/workflows/zap_regeneration.yaml @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-20.04 container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 defaults: run: shell: sh diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml index 122ae0f742a27f..cb8bff6172a119 100644 --- a/.github/workflows/zap_templates.yaml +++ b/.github/workflows/zap_templates.yaml @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-20.04 container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 defaults: run: shell: sh diff --git a/config/telink/chip-module/Kconfig.defaults b/config/telink/chip-module/Kconfig.defaults index 0a71d5a53feaba..964b08547bb0b5 100644 --- a/config/telink/chip-module/Kconfig.defaults +++ b/config/telink/chip-module/Kconfig.defaults @@ -158,7 +158,7 @@ choice B9X_BLE_CTRL_MAC_TYPE endchoice # Board retention config -if BOARD_TLSR9528A_RETENTION || BOARD_TLSR9518ADK80D_RETENTION +if BOARD_TLSR9528A_RETENTION || BOARD_TLSR9258A_RETENTION || BOARD_TLSR9518ADK80D_RETENTION config BOARD_TLSR9X_NON_RETENTION_RAM_CODE default y if PM @@ -170,7 +170,7 @@ config PWM endif # Board non-retention config -if BOARD_TLSR9528A || BOARD_TLSR9518ADK80D +if BOARD_TLSR9528A || BOARD_TLSR9258A || BOARD_TLSR9518ADK80D config PWM default y endif diff --git a/docs/examples/index.md b/docs/examples/index.md index 0162a25afc149f..2c9a0a4659b3bc 100644 --- a/docs/examples/index.md +++ b/docs/examples/index.md @@ -19,7 +19,6 @@ air-quality-sensor-app/**/README :maxdepth: 1 all-clusters-app/**/README -all-clusters-app/**/Readme ``` ## All clusters minimal example @@ -29,7 +28,6 @@ all-clusters-app/**/Readme :maxdepth: 1 all-clusters-minimal-app/**/README -all-clusters-minimal-app/**/Readme ``` ## Bridge example @@ -178,7 +176,6 @@ ota-provider-app/**/README :maxdepth: 1 ota-requestor-app/**/README -ota-requestor-app/**/Readme ``` ## Persistent storage example @@ -282,7 +279,6 @@ temperature-measurement-app/**/README :maxdepth: 1 thermostat/**/README -thermostat/**/Readme thermostat/qpg/APPLICATION ``` diff --git a/examples/air-quality-sensor-app/telink/README.md b/examples/air-quality-sensor-app/telink/README.md index f91c701c00c527..015e613d40896f 100644 --- a/examples/air-quality-sensor-app/telink/README.md +++ b/examples/air-quality-sensor-app/telink/README.md @@ -25,14 +25,14 @@ You can use this example as a reference for creating your own application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/all-clusters-app/all-clusters-common/include/rvc-operational-state-delegate-impl.h b/examples/all-clusters-app/all-clusters-common/include/rvc-operational-state-delegate-impl.h index 89a3e69c5b8bed..4417f9f5a3ab4a 100644 --- a/examples/all-clusters-app/all-clusters-common/include/rvc-operational-state-delegate-impl.h +++ b/examples/all-clusters-app/all-clusters-common/include/rvc-operational-state-delegate-impl.h @@ -90,18 +90,6 @@ class RvcOperationalStateDelegate : public Delegate */ void HandleResumeStateCallback(OperationalState::GenericOperationalError & err) override; - /** - * Handle Command Callback in application: Start - * @param[out] get operational error after callback. - */ - void HandleStartStateCallback(OperationalState::GenericOperationalError & err) override; - - /** - * Handle Command Callback in application: Stop - * @param[out] get operational error after callback. - */ - void HandleStopStateCallback(OperationalState::GenericOperationalError & err) override; - /** * Handle the GoHome command. * @param err diff --git a/examples/all-clusters-app/all-clusters-common/include/static-supported-modes-manager.h b/examples/all-clusters-app/all-clusters-common/include/static-supported-modes-manager.h index 192bb6718bfb0f..ef90de38697f4c 100644 --- a/examples/all-clusters-app/all-clusters-common/include/static-supported-modes-manager.h +++ b/examples/all-clusters-app/all-clusters-common/include/static-supported-modes-manager.h @@ -50,7 +50,7 @@ class StaticSupportedModesManager : public chip::app::Clusters::ModeSelect::Supp }; static storage_value_type coffeeOptions[]; - static const EndpointSpanPair supportedOptionsByEndpoints[EMBER_AF_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT]; + static const EndpointSpanPair supportedOptionsByEndpoints[MATTER_DM_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT]; public: static const StaticSupportedModesManager instance; diff --git a/examples/all-clusters-app/all-clusters-common/include/static-supported-temperature-levels.h b/examples/all-clusters-app/all-clusters-common/include/static-supported-temperature-levels.h index 50739de0201628..3fdce87e109317 100644 --- a/examples/all-clusters-app/all-clusters-common/include/static-supported-temperature-levels.h +++ b/examples/all-clusters-app/all-clusters-common/include/static-supported-temperature-levels.h @@ -49,7 +49,7 @@ class AppSupportedTemperatureLevelsDelegate : public SupportedTemperatureLevelsI static CharSpan temperatureLevelOptions[3]; public: - static const EndpointPair supportedOptionsByEndpoints[EMBER_AF_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT]; + static const EndpointPair supportedOptionsByEndpoints[MATTER_DM_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT]; uint8_t Size() override; diff --git a/examples/all-clusters-app/all-clusters-common/src/rvc-operational-state-delegate-impl.cpp b/examples/all-clusters-app/all-clusters-common/src/rvc-operational-state-delegate-impl.cpp index 946110bb18906c..e41ae2b863fa54 100644 --- a/examples/all-clusters-app/all-clusters-common/src/rvc-operational-state-delegate-impl.cpp +++ b/examples/all-clusters-app/all-clusters-common/src/rvc-operational-state-delegate-impl.cpp @@ -70,34 +70,6 @@ void RvcOperationalStateDelegate::HandleResumeStateCallback(OperationalState::Ge } } -void RvcOperationalStateDelegate::HandleStartStateCallback(OperationalState::GenericOperationalError & err) -{ - // placeholder implementation - auto error = GetInstance()->SetOperationalState(to_underlying(OperationalState::OperationalStateEnum::kRunning)); - if (error == CHIP_NO_ERROR) - { - err.Set(to_underlying(OperationalState::ErrorStateEnum::kNoError)); - } - else - { - err.Set(to_underlying(OperationalState::ErrorStateEnum::kUnableToCompleteOperation)); - } -} - -void RvcOperationalStateDelegate::HandleStopStateCallback(OperationalState::GenericOperationalError & err) -{ - // placeholder implementation - auto error = GetInstance()->SetOperationalState(to_underlying(OperationalState::OperationalStateEnum::kStopped)); - if (error == CHIP_NO_ERROR) - { - err.Set(to_underlying(OperationalState::ErrorStateEnum::kNoError)); - } - else - { - err.Set(to_underlying(OperationalState::ErrorStateEnum::kUnableToCompleteOperation)); - } -} - void RvcOperationalStateDelegate::HandleGoHomeCommandCallback(OperationalState::GenericOperationalError & err) { // placeholder implementation diff --git a/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp b/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp index 17fa5d007b8493..4060d4be85ec9c 100644 --- a/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp +++ b/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp @@ -35,7 +35,7 @@ storage_value_type StaticSupportedModesManager::coffeeOptions[] = { buildModeOptionStruct("Espresso", 7, List(semanticTagsEspresso)) }; const StaticSupportedModesManager::EndpointSpanPair - StaticSupportedModesManager::supportedOptionsByEndpoints[EMBER_AF_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT] = { + StaticSupportedModesManager::supportedOptionsByEndpoints[MATTER_DM_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT] = { EndpointSpanPair(1, Span(StaticSupportedModesManager::coffeeOptions)) // Options for Endpoint 1 }; diff --git a/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp b/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp index 0a830480fb188c..6019006c2a2868 100644 --- a/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp +++ b/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp @@ -30,7 +30,7 @@ CharSpan AppSupportedTemperatureLevelsDelegate::temperatureLevelOptions[] = { Ch CharSpan("Freezing", 8) }; const AppSupportedTemperatureLevelsDelegate::EndpointPair AppSupportedTemperatureLevelsDelegate::supportedOptionsByEndpoints - [EMBER_AF_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT] = { + [MATTER_DM_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT] = { EndpointPair(1, AppSupportedTemperatureLevelsDelegate::temperatureLevelOptions, 3) // Options for Endpoint 1 }; diff --git a/examples/all-clusters-app/ameba/README.md b/examples/all-clusters-app/ameba/README.md index 34fe805281bc17..2689f97026093a 100644 --- a/examples/all-clusters-app/ameba/README.md +++ b/examples/all-clusters-app/ameba/README.md @@ -27,11 +27,11 @@ The CHIP demo application is supported on - Pull docker image: - $ docker pull ghcr.io/project-chip/chip-build-ameba:32 + $ docker pull ghcr.io/project-chip/chip-build-ameba:35 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:32 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:35 - Setup build environment: diff --git a/examples/all-clusters-app/linux/include/CHIPProjectAppConfig.h b/examples/all-clusters-app/linux/include/CHIPProjectAppConfig.h index 588d77da1ce652..440ba53f4ee3ba 100644 --- a/examples/all-clusters-app/linux/include/CHIPProjectAppConfig.h +++ b/examples/all-clusters-app/linux/include/CHIPProjectAppConfig.h @@ -41,7 +41,7 @@ #define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONABLE_DEVICE_TYPE 1 // Marks that a ModeBase Derived cluster is being used. -#define EMBER_AF_PLUGIN_MODE_BASE +#define MATTER_DM_PLUGIN_MODE_BASE // Enable batching of up to 5 commands. #define CHIP_CONFIG_MAX_PATHS_PER_INVOKE 5 diff --git a/examples/all-clusters-app/linux/main-common.cpp b/examples/all-clusters-app/linux/main-common.cpp index 1d849dc5f2751b..775f4a1c0f324c 100644 --- a/examples/all-clusters-app/linux/main-common.cpp +++ b/examples/all-clusters-app/linux/main-common.cpp @@ -104,7 +104,7 @@ const Clusters::Descriptor::Structs::SemanticTagStruct::Type gEp2TagList[] = { }; } // namespace -#ifdef EMBER_AF_PLUGIN_DISHWASHER_ALARM_SERVER +#ifdef MATTER_DM_PLUGIN_DISHWASHER_ALARM_SERVER extern void MatterDishwasherAlarmServerInit(); #endif @@ -225,7 +225,7 @@ void ApplicationInit() SetDeviceInstanceInfoProvider(&gExampleDeviceInstanceInfoProvider); } -#ifdef EMBER_AF_PLUGIN_DISHWASHER_ALARM_SERVER +#ifdef MATTER_DM_PLUGIN_DISHWASHER_ALARM_SERVER MatterDishwasherAlarmServerInit(); #endif Clusters::TemperatureControl::SetInstance(&sAppSupportedTemperatureLevelsDelegate); diff --git a/examples/all-clusters-app/telink/Readme.md b/examples/all-clusters-app/telink/README.md similarity index 98% rename from examples/all-clusters-app/telink/Readme.md rename to examples/all-clusters-app/telink/README.md index b8f5b95d828893..a5532487fa67a2 100644 --- a/examples/all-clusters-app/telink/Readme.md +++ b/examples/all-clusters-app/telink/README.md @@ -27,14 +27,14 @@ creating your own application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/all-clusters-minimal-app/ameba/README.md b/examples/all-clusters-minimal-app/ameba/README.md index 27e2e0e239f8e3..693b06cbaa80e4 100644 --- a/examples/all-clusters-minimal-app/ameba/README.md +++ b/examples/all-clusters-minimal-app/ameba/README.md @@ -27,13 +27,13 @@ The CHIP demo application is supported on - Pull docker image: ``` - $ docker pull ghcr.io/project-chip/chip-build-ameba:32 + $ docker pull ghcr.io/project-chip/chip-build-ameba:35 ``` - Run docker container: ``` - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:32 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:35 ``` - Setup build environment: diff --git a/examples/all-clusters-minimal-app/telink/Readme.md b/examples/all-clusters-minimal-app/telink/README.md similarity index 98% rename from examples/all-clusters-minimal-app/telink/Readme.md rename to examples/all-clusters-minimal-app/telink/README.md index 601fc52ba40fef..8e18bf4b9419b0 100644 --- a/examples/all-clusters-minimal-app/telink/Readme.md +++ b/examples/all-clusters-minimal-app/telink/README.md @@ -27,14 +27,14 @@ for creating your own application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/bridge-app/telink/README.md b/examples/bridge-app/telink/README.md index 1e24fc7fd92b2d..f23d2aeb4c6f85 100644 --- a/examples/bridge-app/telink/README.md +++ b/examples/bridge-app/telink/README.md @@ -104,14 +104,14 @@ defined: ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/chef/common/chef-air-quality.cpp b/examples/chef/common/chef-air-quality.cpp index 3385c9e455e339..0770d0c185aa0c 100644 --- a/examples/chef/common/chef-air-quality.cpp +++ b/examples/chef/common/chef-air-quality.cpp @@ -25,7 +25,7 @@ using namespace chip; using namespace chip::app; using namespace chip::app::Clusters; -#ifdef EMBER_AF_PLUGIN_AIR_QUALITY_SERVER +#ifdef MATTER_DM_PLUGIN_AIR_QUALITY_SERVER #include using namespace chip::app::Clusters::AirQuality; diff --git a/examples/chef/common/chef-air-quality.h b/examples/chef/common/chef-air-quality.h index 0749d4d1afe662..39019b03fbb781 100644 --- a/examples/chef/common/chef-air-quality.h +++ b/examples/chef/common/chef-air-quality.h @@ -21,7 +21,7 @@ #include #include -#ifdef EMBER_AF_PLUGIN_AIR_QUALITY_SERVER +#ifdef MATTER_DM_PLUGIN_AIR_QUALITY_SERVER EmberAfStatus chefAirQualityWriteCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, const EmberAfAttributeMetadata * attributeMetadata, uint8_t * buffer); EmberAfStatus chefAirQualityReadCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, diff --git a/examples/chef/common/chef-channel-manager.cpp b/examples/chef/common/chef-channel-manager.cpp index b50cb0076f6f38..4a8d6de466d746 100644 --- a/examples/chef/common/chef-channel-manager.cpp +++ b/examples/chef/common/chef-channel-manager.cpp @@ -23,7 +23,7 @@ using ChangeChannelResponseType = chip::app::Clusters::Channel::Commands::Change using ChannelInfoType = chip::app::Clusters::Channel::Structs::ChannelInfoStruct::Type; using LineupInfoType = chip::app::Clusters::Channel::Structs::LineupInfoStruct::Type; // Include Channel Cluster Server callbacks only when the server is enabled -#ifdef EMBER_AF_PLUGIN_CHANNEL_SERVER +#ifdef MATTER_DM_PLUGIN_CHANNEL_SERVER #include using namespace chip; @@ -213,7 +213,7 @@ bool ChefChannelManager::HandleSkipChannel(const int16_t & count) uint32_t ChefChannelManager::GetFeatureMap(chip::EndpointId endpoint) { - if (endpoint > EMBER_AF_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT) + if (endpoint > MATTER_DM_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT) { return 0; } @@ -223,4 +223,4 @@ uint32_t ChefChannelManager::GetFeatureMap(chip::EndpointId endpoint) return featureMap; } -#endif /* EMBER_AF_PLUGIN_CHANNEL_SERVER */ +#endif /* MATTER_DM_PLUGIN_CHANNEL_SERVER */ diff --git a/examples/chef/common/chef-concentration-measurement.cpp b/examples/chef/common/chef-concentration-measurement.cpp index 90c6f85d3b99d1..395d6604582edf 100644 --- a/examples/chef/common/chef-concentration-measurement.cpp +++ b/examples/chef/common/chef-concentration-measurement.cpp @@ -27,16 +27,16 @@ using namespace chip::app; using namespace chip::app::DataModel; using namespace chip::app::Clusters; -#if defined(EMBER_AF_PLUGIN_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_OZONE_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_PM2__5_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_FORMALDEHYDE_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_PM1_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_PM10_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_TOTAL_VOLATILE_ORGANIC_COMPOUNDS_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_RADON_CONCENTRATION_MEASUREMENT_SERVER) +#if defined(MATTER_DM_PLUGIN_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_OZONE_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_PM2__5_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_FORMALDEHYDE_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_PM1_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_PM10_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_TOTAL_VOLATILE_ORGANIC_COMPOUNDS_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_RADON_CONCENTRATION_MEASUREMENT_SERVER) #include using namespace chip::app::Clusters::ConcentrationMeasurement; @@ -184,7 +184,7 @@ EmberAfStatus chefConcentrationMeasurementReadCallback(chip::EndpointId endpoint } #endif -#ifdef EMBER_AF_PLUGIN_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_SERVER +#ifdef MATTER_DM_PLUGIN_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_SERVER void emberAfCarbonMonoxideConcentrationMeasurementClusterInitCallback(EndpointId endpoint) { gCarbonMonoxideConcentrationMeasurementInstance[EndpointId(endpoint)] = new Instance( @@ -202,7 +202,7 @@ void emberAfCarbonMonoxideConcentrationMeasurementClusterInitCallback(EndpointId } #endif -#ifdef EMBER_AF_PLUGIN_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER +#ifdef MATTER_DM_PLUGIN_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER void emberAfCarbonDioxideConcentrationMeasurementClusterInitCallback(EndpointId endpoint) { gCarbonDioxideConcentrationMeasurementInstance[EndpointId(endpoint)] = new Instance( @@ -220,7 +220,7 @@ void emberAfCarbonDioxideConcentrationMeasurementClusterInitCallback(EndpointId } #endif -#ifdef EMBER_AF_PLUGIN_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER +#ifdef MATTER_DM_PLUGIN_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER void emberAfNitrogenDioxideConcentrationMeasurementClusterInitCallback(EndpointId endpoint) { gNitrogenDioxideConcentrationMeasurementInstance[EndpointId(endpoint)] = new Instance( @@ -238,7 +238,7 @@ void emberAfNitrogenDioxideConcentrationMeasurementClusterInitCallback(EndpointI } #endif -#ifdef EMBER_AF_PLUGIN_OZONE_CONCENTRATION_MEASUREMENT_SERVER +#ifdef MATTER_DM_PLUGIN_OZONE_CONCENTRATION_MEASUREMENT_SERVER void emberAfOzoneConcentrationMeasurementClusterInitCallback(EndpointId endpoint) { gOzoneConcentrationMeasurementInstance[EndpointId(endpoint)] = new Instance( @@ -256,7 +256,7 @@ void emberAfOzoneConcentrationMeasurementClusterInitCallback(EndpointId endpoint } #endif -#ifdef EMBER_AF_PLUGIN_PM2__5_CONCENTRATION_MEASUREMENT_SERVER +#ifdef MATTER_DM_PLUGIN_PM2__5_CONCENTRATION_MEASUREMENT_SERVER void emberAfPm25ConcentrationMeasurementClusterInitCallback(EndpointId endpoint) { gPm25ConcentrationMeasurementInstance[EndpointId(endpoint)] = new Instance( @@ -274,7 +274,7 @@ void emberAfPm25ConcentrationMeasurementClusterInitCallback(EndpointId endpoint) } #endif -#ifdef EMBER_AF_PLUGIN_FORMALDEHYDE_CONCENTRATION_MEASUREMENT_SERVER +#ifdef MATTER_DM_PLUGIN_FORMALDEHYDE_CONCENTRATION_MEASUREMENT_SERVER void emberAfFormaldehydeConcentrationMeasurementClusterInitCallback(EndpointId endpoint) { gFormaldehydeConcentrationMeasurementInstance[EndpointId(endpoint)] = new Instance( @@ -292,7 +292,7 @@ void emberAfFormaldehydeConcentrationMeasurementClusterInitCallback(EndpointId e } #endif -#ifdef EMBER_AF_PLUGIN_PM1_CONCENTRATION_MEASUREMENT_SERVER +#ifdef MATTER_DM_PLUGIN_PM1_CONCENTRATION_MEASUREMENT_SERVER void emberAfPm1ConcentrationMeasurementClusterInitCallback(EndpointId endpoint) { gPm1ConcentrationMeasurementInstance[EndpointId(endpoint)] = new Instance( @@ -310,7 +310,7 @@ void emberAfPm1ConcentrationMeasurementClusterInitCallback(EndpointId endpoint) } #endif -#ifdef EMBER_AF_PLUGIN_PM10_CONCENTRATION_MEASUREMENT_SERVER +#ifdef MATTER_DM_PLUGIN_PM10_CONCENTRATION_MEASUREMENT_SERVER void emberAfPm10ConcentrationMeasurementClusterInitCallback(EndpointId endpoint) { gPm10ConcentrationMeasurementInstance[EndpointId(endpoint)] = new Instance( @@ -328,7 +328,7 @@ void emberAfPm10ConcentrationMeasurementClusterInitCallback(EndpointId endpoint) } #endif -#ifdef EMBER_AF_PLUGIN_RADON_CONCENTRATION_MEASUREMENT_SERVER +#ifdef MATTER_DM_PLUGIN_RADON_CONCENTRATION_MEASUREMENT_SERVER void emberAfRadonConcentrationMeasurementClusterInitCallback(EndpointId endpoint) { gRadonConcentrationMeasurementInstance[EndpointId(endpoint)] = new Instance( @@ -346,7 +346,7 @@ void emberAfRadonConcentrationMeasurementClusterInitCallback(EndpointId endpoint } #endif -#ifdef EMBER_AF_PLUGIN_TOTAL_VOLATILE_ORGANIC_COMPOUNDS_CONCENTRATION_MEASUREMENT_SERVER +#ifdef MATTER_DM_PLUGIN_TOTAL_VOLATILE_ORGANIC_COMPOUNDS_CONCENTRATION_MEASUREMENT_SERVER void emberAfTotalVolatileOrganicCompoundsConcentrationMeasurementClusterInitCallback(EndpointId endpoint) { gTotalVolatileOrganicCompoundsConcentrationMeasurementInstance[EndpointId(endpoint)] = diff --git a/examples/chef/common/chef-concentration-measurement.h b/examples/chef/common/chef-concentration-measurement.h index ea874314814f22..ddd004ebd7047e 100644 --- a/examples/chef/common/chef-concentration-measurement.h +++ b/examples/chef/common/chef-concentration-measurement.h @@ -21,16 +21,16 @@ #include #include -#if defined(EMBER_AF_PLUGIN_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_OZONE_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_PM2__5_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_FORMALDEHYDE_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_PM1_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_PM10_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_TOTAL_VOLATILE_ORGANIC_COMPOUNDS_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_RADON_CONCENTRATION_MEASUREMENT_SERVER) +#if defined(MATTER_DM_PLUGIN_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_OZONE_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_PM2__5_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_FORMALDEHYDE_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_PM1_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_PM10_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_TOTAL_VOLATILE_ORGANIC_COMPOUNDS_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_RADON_CONCENTRATION_MEASUREMENT_SERVER) EmberAfStatus chefConcentrationMeasurementWriteCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, const EmberAfAttributeMetadata * attributeMetadata, uint8_t * buffer); EmberAfStatus chefConcentrationMeasurementReadCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, diff --git a/examples/chef/common/chef-rvc-operational-state-delegate.cpp b/examples/chef/common/chef-rvc-operational-state-delegate.cpp index 6a773f41c6450e..9ea4e610e64fb1 100644 --- a/examples/chef/common/chef-rvc-operational-state-delegate.cpp +++ b/examples/chef/common/chef-rvc-operational-state-delegate.cpp @@ -167,4 +167,4 @@ void emberAfRvcOperationalStateClusterInitCallback(chip::EndpointId endpointId) gRvcOperationalStateInstance->Init(); } -#endif // EMBER_AF_PLUGIN_RVC_OPERATIONAL_STATE_SERVER +#endif // MATTER_DM_PLUGIN_RVC_OPERATIONAL_STATE_SERVER diff --git a/examples/chef/common/stubs.cpp b/examples/chef/common/stubs.cpp index bfd5e370cba136..483919c1c9a952 100644 --- a/examples/chef/common/stubs.cpp +++ b/examples/chef/common/stubs.cpp @@ -3,19 +3,19 @@ #include #include #include -#ifdef EMBER_AF_PLUGIN_AIR_QUALITY_SERVER +#ifdef MATTER_DM_PLUGIN_AIR_QUALITY_SERVER #include "chef-air-quality.h" -#endif // EMBER_AF_PLUGIN_AIR_QUALITY_SERVER -#if defined(EMBER_AF_PLUGIN_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_OZONE_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_PM2__5_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_FORMALDEHYDE_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_PM1_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_PM10_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_TOTAL_VOLATILE_ORGANIC_COMPOUNDS_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_RADON_CONCENTRATION_MEASUREMENT_SERVER) +#endif // MATTER_DM_PLUGIN_AIR_QUALITY_SERVER +#if defined(MATTER_DM_PLUGIN_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_OZONE_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_PM2__5_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_FORMALDEHYDE_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_PM1_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_PM10_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_TOTAL_VOLATILE_ORGANIC_COMPOUNDS_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_RADON_CONCENTRATION_MEASUREMENT_SERVER) #include "chef-concentration-measurement.h" #endif @@ -29,20 +29,20 @@ EmberAfStatus emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterI { switch (clusterId) { -#ifdef EMBER_AF_PLUGIN_AIR_QUALITY_SERVER +#ifdef MATTER_DM_PLUGIN_AIR_QUALITY_SERVER case chip::app::Clusters::AirQuality::Id: return chefAirQualityReadCallback(endpoint, clusterId, attributeMetadata, buffer, maxReadLength); #endif -#if defined(EMBER_AF_PLUGIN_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_OZONE_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_PM2__5_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_FORMALDEHYDE_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_PM1_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_PM10_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_TOTAL_VOLATILE_ORGANIC_COMPOUNDS_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_RADON_CONCENTRATION_MEASUREMENT_SERVER) +#if defined(MATTER_DM_PLUGIN_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_OZONE_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_PM2__5_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_FORMALDEHYDE_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_PM1_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_PM10_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_TOTAL_VOLATILE_ORGANIC_COMPOUNDS_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_RADON_CONCENTRATION_MEASUREMENT_SERVER) case chip::app::Clusters::CarbonMonoxideConcentrationMeasurement::Id: case chip::app::Clusters::CarbonDioxideConcentrationMeasurement::Id: case chip::app::Clusters::NitrogenDioxideConcentrationMeasurement::Id: @@ -76,20 +76,20 @@ EmberAfStatus emberAfExternalAttributeWriteCallback(EndpointId endpoint, Cluster { switch (clusterId) { -#ifdef EMBER_AF_PLUGIN_AIR_QUALITY_SERVER +#ifdef MATTER_DM_PLUGIN_AIR_QUALITY_SERVER case chip::app::Clusters::AirQuality::Id: return chefAirQualityWriteCallback(endpoint, clusterId, attributeMetadata, buffer); #endif -#if defined(EMBER_AF_PLUGIN_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_OZONE_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_PM2__5_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_FORMALDEHYDE_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_PM1_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_PM10_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_TOTAL_VOLATILE_ORGANIC_COMPOUNDS_CONCENTRATION_MEASUREMENT_SERVER) || \ - defined(EMBER_AF_PLUGIN_RADON_CONCENTRATION_MEASUREMENT_SERVER) +#if defined(MATTER_DM_PLUGIN_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_OZONE_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_PM2__5_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_FORMALDEHYDE_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_PM1_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_PM10_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_TOTAL_VOLATILE_ORGANIC_COMPOUNDS_CONCENTRATION_MEASUREMENT_SERVER) || \ + defined(MATTER_DM_PLUGIN_RADON_CONCENTRATION_MEASUREMENT_SERVER) case chip::app::Clusters::CarbonMonoxideConcentrationMeasurement::Id: case chip::app::Clusters::CarbonDioxideConcentrationMeasurement::Id: case chip::app::Clusters::NitrogenDioxideConcentrationMeasurement::Id: @@ -109,7 +109,7 @@ EmberAfStatus emberAfExternalAttributeWriteCallback(EndpointId endpoint, Cluster } // Include door lock callbacks only when the server is enabled -#ifdef EMBER_AF_PLUGIN_DOOR_LOCK_SERVER +#ifdef MATTER_DM_PLUGIN_DOOR_LOCK_SERVER #include class LockManager @@ -338,9 +338,9 @@ bool emberAfPluginDoorLockSetCredential(chip::EndpointId endpointId, uint16_t cr credentialType, credentialData); } -#endif /* EMBER_AF_PLUGIN_DOOR_LOCK_SERVER */ +#endif /* MATTER_DM_PLUGIN_DOOR_LOCK_SERVER */ -#ifdef EMBER_AF_PLUGIN_CHANNEL_SERVER +#ifdef MATTER_DM_PLUGIN_CHANNEL_SERVER #include void emberAfChannelClusterInitCallback(EndpointId endpoint) @@ -348,6 +348,6 @@ void emberAfChannelClusterInitCallback(EndpointId endpoint) app::Clusters::Channel::SetDefaultDelegate(endpoint, static_cast(&(ChefChannelManager::Instance()))); } -#endif // EMBER_AF_PLUGIN_CHANNEL_SERVER +#endif // MATTER_DM_PLUGIN_CHANNEL_SERVER void emberAfPluginSmokeCoAlarmSelfTestRequestCommand(EndpointId endpointId) {} diff --git a/examples/contact-sensor-app/telink/README.md b/examples/contact-sensor-app/telink/README.md index 370ffbdee63a7f..9b6a59ba0c086f 100755 --- a/examples/contact-sensor-app/telink/README.md +++ b/examples/contact-sensor-app/telink/README.md @@ -25,14 +25,14 @@ You can use this example as a reference for creating your own application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/light-switch-app/ameba/README.md b/examples/light-switch-app/ameba/README.md index a14e504b073292..3c38ac3fbb4a2a 100644 --- a/examples/light-switch-app/ameba/README.md +++ b/examples/light-switch-app/ameba/README.md @@ -26,11 +26,11 @@ The CHIP demo application is supported on - Pull docker image: - $ docker pull ghcr.io/project-chip/chip-build-ameba:32 + $ docker pull ghcr.io/project-chip/chip-build-ameba:35 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:32 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:35 - Setup build environment: diff --git a/examples/light-switch-app/telink/README.md b/examples/light-switch-app/telink/README.md index 562be75144d584..d6ba4b34cd6351 100755 --- a/examples/light-switch-app/telink/README.md +++ b/examples/light-switch-app/telink/README.md @@ -30,14 +30,14 @@ creating your own application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/lighting-app/ameba/README.md b/examples/lighting-app/ameba/README.md index 61defcba4e7e2e..b7a1a2a0e120e1 100644 --- a/examples/lighting-app/ameba/README.md +++ b/examples/lighting-app/ameba/README.md @@ -23,11 +23,11 @@ The CHIP demo application is supported on - Pull docker image: - $ docker pull ghcr.io/project-chip/chip-build-ameba:32 + $ docker pull ghcr.io/project-chip/chip-build-ameba:35 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:32 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:35 - Setup build environment: diff --git a/examples/lighting-app/telink/README.md b/examples/lighting-app/telink/README.md index 278dfad530a1b0..2f696170f3cca2 100644 --- a/examples/lighting-app/telink/README.md +++ b/examples/lighting-app/telink/README.md @@ -28,14 +28,14 @@ a reference for creating your own application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/lock-app/telink/README.md b/examples/lock-app/telink/README.md index 4d20388ce4277a..27a95baffa0b6a 100755 --- a/examples/lock-app/telink/README.md +++ b/examples/lock-app/telink/README.md @@ -28,14 +28,14 @@ a reference for creating your own application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/ota-requestor-app/ameba/README.md b/examples/ota-requestor-app/ameba/README.md index ae871c20ce882f..76560658a18be6 100644 --- a/examples/ota-requestor-app/ameba/README.md +++ b/examples/ota-requestor-app/ameba/README.md @@ -6,11 +6,11 @@ A prototype application that demonstrates OTA Requestor capabilities. - Pull docker image: - $ docker pull ghcr.io/project-chip/chip-build-ameba:32 + $ docker pull ghcr.io/project-chip/chip-build-ameba:35 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:32 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:35 - Setup build environment: diff --git a/examples/ota-requestor-app/telink/Readme.md b/examples/ota-requestor-app/telink/README.md similarity index 98% rename from examples/ota-requestor-app/telink/Readme.md rename to examples/ota-requestor-app/telink/README.md index bf58651ce0253a..81870b738f18df 100755 --- a/examples/ota-requestor-app/telink/Readme.md +++ b/examples/ota-requestor-app/telink/README.md @@ -21,14 +21,14 @@ ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/pigweed-app/ameba/README.md b/examples/pigweed-app/ameba/README.md index 55b600e64988b6..794db6bae306be 100644 --- a/examples/pigweed-app/ameba/README.md +++ b/examples/pigweed-app/ameba/README.md @@ -31,11 +31,11 @@ following features are available: - Pull docker image: - $ docker pull ghcr.io/project-chip/chip-build-ameba:32 + $ docker pull ghcr.io/project-chip/chip-build-ameba:35 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:32 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:35 - Setup build environment: diff --git a/examples/placeholder/linux/include/static-supported-modes-manager.h b/examples/placeholder/linux/include/static-supported-modes-manager.h index 192bb6718bfb0f..ef90de38697f4c 100644 --- a/examples/placeholder/linux/include/static-supported-modes-manager.h +++ b/examples/placeholder/linux/include/static-supported-modes-manager.h @@ -50,7 +50,7 @@ class StaticSupportedModesManager : public chip::app::Clusters::ModeSelect::Supp }; static storage_value_type coffeeOptions[]; - static const EndpointSpanPair supportedOptionsByEndpoints[EMBER_AF_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT]; + static const EndpointSpanPair supportedOptionsByEndpoints[MATTER_DM_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT]; public: static const StaticSupportedModesManager instance; diff --git a/examples/placeholder/linux/include/static-supported-temperature-levels.h b/examples/placeholder/linux/include/static-supported-temperature-levels.h index 50739de0201628..3fdce87e109317 100644 --- a/examples/placeholder/linux/include/static-supported-temperature-levels.h +++ b/examples/placeholder/linux/include/static-supported-temperature-levels.h @@ -49,7 +49,7 @@ class AppSupportedTemperatureLevelsDelegate : public SupportedTemperatureLevelsI static CharSpan temperatureLevelOptions[3]; public: - static const EndpointPair supportedOptionsByEndpoints[EMBER_AF_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT]; + static const EndpointPair supportedOptionsByEndpoints[MATTER_DM_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT]; uint8_t Size() override; diff --git a/examples/placeholder/linux/static-supported-modes-manager.cpp b/examples/placeholder/linux/static-supported-modes-manager.cpp index 17fa5d007b8493..4060d4be85ec9c 100644 --- a/examples/placeholder/linux/static-supported-modes-manager.cpp +++ b/examples/placeholder/linux/static-supported-modes-manager.cpp @@ -35,7 +35,7 @@ storage_value_type StaticSupportedModesManager::coffeeOptions[] = { buildModeOptionStruct("Espresso", 7, List(semanticTagsEspresso)) }; const StaticSupportedModesManager::EndpointSpanPair - StaticSupportedModesManager::supportedOptionsByEndpoints[EMBER_AF_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT] = { + StaticSupportedModesManager::supportedOptionsByEndpoints[MATTER_DM_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT] = { EndpointSpanPair(1, Span(StaticSupportedModesManager::coffeeOptions)) // Options for Endpoint 1 }; diff --git a/examples/placeholder/linux/static-supported-temperature-levels.cpp b/examples/placeholder/linux/static-supported-temperature-levels.cpp index ed80f5490df821..de8933fdf649ea 100644 --- a/examples/placeholder/linux/static-supported-temperature-levels.cpp +++ b/examples/placeholder/linux/static-supported-temperature-levels.cpp @@ -29,7 +29,7 @@ using chip::Protocols::InteractionModel::Status; CharSpan AppSupportedTemperatureLevelsDelegate::temperatureLevelOptions[] = { "Hot"_span, "Warm"_span, "Cold"_span }; const AppSupportedTemperatureLevelsDelegate::EndpointPair AppSupportedTemperatureLevelsDelegate::supportedOptionsByEndpoints - [EMBER_AF_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT] = { + [MATTER_DM_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT] = { EndpointPair(1, AppSupportedTemperatureLevelsDelegate::temperatureLevelOptions, 3) // Options for Endpoint 1 }; diff --git a/examples/platform/asr/CHIPDeviceManager.cpp b/examples/platform/asr/CHIPDeviceManager.cpp index 9d190400c53aa7..9aa349dc6d517e 100644 --- a/examples/platform/asr/CHIPDeviceManager.cpp +++ b/examples/platform/asr/CHIPDeviceManager.cpp @@ -32,7 +32,7 @@ #include #include -#ifdef EMBER_AF_PLUGIN_IDENTIFY_SERVER +#ifdef MATTER_DM_PLUGIN_IDENTIFY_SERVER #include #endif @@ -81,7 +81,7 @@ void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & } } -#ifdef EMBER_AF_PLUGIN_IDENTIFY_SERVER +#ifdef MATTER_DM_PLUGIN_IDENTIFY_SERVER void OnIdentifyStart(Identify *) { ChipLogProgress(Zcl, "OnIdentifyStart"); diff --git a/examples/platform/silabs/BaseApplication.cpp b/examples/platform/silabs/BaseApplication.cpp index d2c6266a58382b..4216dbb4864452 100644 --- a/examples/platform/silabs/BaseApplication.cpp +++ b/examples/platform/silabs/BaseApplication.cpp @@ -129,7 +129,7 @@ StaticTask_t appTaskStruct; SilabsLCD slLCD; #endif -#ifdef EMBER_AF_PLUGIN_IDENTIFY_SERVER +#ifdef MATTER_DM_PLUGIN_IDENTIFY_SERVER Clusters::Identify::EffectIdentifierEnum sIdentifyEffect = Clusters::Identify::EffectIdentifierEnum::kStopEffect; Identify gIdentify = { @@ -140,7 +140,7 @@ Identify gIdentify = { BaseApplication::OnTriggerIdentifyEffect, }; -#endif // EMBER_AF_PLUGIN_IDENTIFY_SERVER +#endif // MATTER_DM_PLUGIN_IDENTIFY_SERVER } // namespace bool BaseApplication::sIsProvisioned = false; @@ -298,7 +298,7 @@ bool BaseApplication::ActivateStatusLedPatterns() { bool isPatternSet = false; #if (defined(ENABLE_WSTK_LEDS) && (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(SIWX_917))) -#ifdef EMBER_AF_PLUGIN_IDENTIFY_SERVER +#ifdef MATTER_DM_PLUGIN_IDENTIFY_SERVER if (gIdentify.mActive) { // Identify in progress @@ -342,7 +342,7 @@ bool BaseApplication::ActivateStatusLedPatterns() } isPatternSet = true; } -#endif // EMBER_AF_PLUGIN_IDENTIFY_SERVER +#endif // MATTER_DM_PLUGIN_IDENTIFY_SERVER #if !(defined(CHIP_CONFIG_ENABLE_ICD_SERVER) && CHIP_CONFIG_ENABLE_ICD_SERVER) // Identify Patterns have priority over Status patterns @@ -583,7 +583,7 @@ void BaseApplication::StopStatusLEDTimer() } } -#ifdef EMBER_AF_PLUGIN_IDENTIFY_SERVER +#ifdef MATTER_DM_PLUGIN_IDENTIFY_SERVER void BaseApplication::OnIdentifyStart(Identify * identify) { ChipLogProgress(Zcl, "onIdentifyStart"); @@ -650,7 +650,7 @@ void BaseApplication::OnTriggerIdentifyEffect(Identify * identify) ChipLogProgress(Zcl, "No identifier effect"); } } -#endif // EMBER_AF_PLUGIN_IDENTIFY_SERVER +#endif // MATTER_DM_PLUGIN_IDENTIFY_SERVER void BaseApplication::LightTimerEventHandler(TimerHandle_t xTimer) { diff --git a/examples/platform/silabs/BaseApplication.h b/examples/platform/silabs/BaseApplication.h index b38f0e58e1c305..1714f47024f2c2 100644 --- a/examples/platform/silabs/BaseApplication.h +++ b/examples/platform/silabs/BaseApplication.h @@ -38,7 +38,7 @@ #include "LEDWidget.h" -#ifdef EMBER_AF_PLUGIN_IDENTIFY_SERVER +#ifdef MATTER_DM_PLUGIN_IDENTIFY_SERVER #include #endif @@ -134,7 +134,7 @@ class BaseApplication static void StartFactoryResetSequence(void); static void CancelFactoryResetSequence(void); -#ifdef EMBER_AF_PLUGIN_IDENTIFY_SERVER +#ifdef MATTER_DM_PLUGIN_IDENTIFY_SERVER // Idenfiy server command callbacks. static void OnIdentifyStart(Identify * identify); static void OnIdentifyStop(Identify * identify); diff --git a/examples/platform/silabs/SoftwareFaultReports.cpp b/examples/platform/silabs/SoftwareFaultReports.cpp index 0f4e8a4822a435..0b730576807628 100644 --- a/examples/platform/silabs/SoftwareFaultReports.cpp +++ b/examples/platform/silabs/SoftwareFaultReports.cpp @@ -54,7 +54,7 @@ namespace Silabs { void OnSoftwareFaultEventHandler(const char * faultRecordString) { -#ifdef EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER +#ifdef MATTER_DM_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER EnabledEndpointsWithServerCluster enabledEndpoints(SoftwareDiagnostics::Id); VerifyOrReturn(enabledEndpoints.begin() != enabledEndpoints.end()); @@ -71,7 +71,7 @@ void OnSoftwareFaultEventHandler(const char * faultRecordString) softwareFault.faultRecording.SetValue(ByteSpan(Uint8::from_const_char(faultRecordString), strlen(faultRecordString))); SoftwareDiagnosticsServer::Instance().OnSoftwareFaultDetect(softwareFault); -#endif // EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER +#endif // MATTER_DM_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER } } // namespace Silabs diff --git a/examples/pump-app/telink/README.md b/examples/pump-app/telink/README.md index 4d67799bfd28f5..487833f4fb7d30 100755 --- a/examples/pump-app/telink/README.md +++ b/examples/pump-app/telink/README.md @@ -29,14 +29,14 @@ reference for creating your own pump application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/pump-controller-app/telink/README.md b/examples/pump-controller-app/telink/README.md index 6e3fa7ef3b0b88..5a9e95548f883a 100755 --- a/examples/pump-controller-app/telink/README.md +++ b/examples/pump-controller-app/telink/README.md @@ -30,14 +30,14 @@ your own pump application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/refrigerator-app/refrigerator-common/include/static-supported-temperature-levels.h b/examples/refrigerator-app/refrigerator-common/include/static-supported-temperature-levels.h index 50739de0201628..3fdce87e109317 100644 --- a/examples/refrigerator-app/refrigerator-common/include/static-supported-temperature-levels.h +++ b/examples/refrigerator-app/refrigerator-common/include/static-supported-temperature-levels.h @@ -49,7 +49,7 @@ class AppSupportedTemperatureLevelsDelegate : public SupportedTemperatureLevelsI static CharSpan temperatureLevelOptions[3]; public: - static const EndpointPair supportedOptionsByEndpoints[EMBER_AF_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT]; + static const EndpointPair supportedOptionsByEndpoints[MATTER_DM_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT]; uint8_t Size() override; diff --git a/examples/refrigerator-app/refrigerator-common/src/static-supported-temperature-levels.cpp b/examples/refrigerator-app/refrigerator-common/src/static-supported-temperature-levels.cpp index a03a98d89feb1f..8678e5f3d009d0 100644 --- a/examples/refrigerator-app/refrigerator-common/src/static-supported-temperature-levels.cpp +++ b/examples/refrigerator-app/refrigerator-common/src/static-supported-temperature-levels.cpp @@ -31,7 +31,7 @@ CharSpan AppSupportedTemperatureLevelsDelegate::temperatureLevelOptions[] = { Ch CharSpan::fromCharString("Freezing") }; const AppSupportedTemperatureLevelsDelegate::EndpointPair AppSupportedTemperatureLevelsDelegate::supportedOptionsByEndpoints - [EMBER_AF_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT] = { + [MATTER_DM_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT] = { EndpointPair(2, AppSupportedTemperatureLevelsDelegate::temperatureLevelOptions, ArraySize(AppSupportedTemperatureLevelsDelegate::temperatureLevelOptions)), // Options for Endpoint 2 EndpointPair(3, AppSupportedTemperatureLevelsDelegate::temperatureLevelOptions, diff --git a/examples/rvc-app/rvc-common/include/rvc-operational-state-delegate.h b/examples/rvc-app/rvc-common/include/rvc-operational-state-delegate.h index 400dfd67910234..e40ba64fbf7f3a 100644 --- a/examples/rvc-app/rvc-common/include/rvc-operational-state-delegate.h +++ b/examples/rvc-app/rvc-common/include/rvc-operational-state-delegate.h @@ -99,22 +99,6 @@ class RvcOperationalStateDelegate : public RvcOperationalState::Delegate */ void HandleResumeStateCallback(Clusters::OperationalState::GenericOperationalError & err) override; - /** - * Handle Command Callback in application: Start - * @param[out] get operational error after callback. - */ - void HandleStartStateCallback(Clusters::OperationalState::GenericOperationalError & err) override{ - // This command in not supported. - }; - - /** - * Handle Command Callback in application: Stop - * @param[out] get operational error after callback. - */ - void HandleStopStateCallback(Clusters::OperationalState::GenericOperationalError & err) override{ - // This command in not supported. - }; - void SetPauseCallback(HandleOpStateCommand aCallback, RvcDevice * aInstance) { mPauseCallback = aCallback; diff --git a/examples/shell/telink/README.md b/examples/shell/telink/README.md index 744a0498a8f7d4..aa7023043e0b9f 100755 --- a/examples/shell/telink/README.md +++ b/examples/shell/telink/README.md @@ -25,14 +25,14 @@ You can use this example as a reference for creating your own application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/smoke-co-alarm-app/telink/README.md b/examples/smoke-co-alarm-app/telink/README.md index 71fc7afd668a23..7f7138a7f14771 100755 --- a/examples/smoke-co-alarm-app/telink/README.md +++ b/examples/smoke-co-alarm-app/telink/README.md @@ -25,14 +25,14 @@ You can use this example as a reference for creating your own application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/temperature-measurement-app/telink/README.md b/examples/temperature-measurement-app/telink/README.md index 77558a8968472a..6f147721149b19 100644 --- a/examples/temperature-measurement-app/telink/README.md +++ b/examples/temperature-measurement-app/telink/README.md @@ -29,14 +29,14 @@ creating your own application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/thermostat/telink/Readme.md b/examples/thermostat/telink/README.md similarity index 98% rename from examples/thermostat/telink/Readme.md rename to examples/thermostat/telink/README.md index ca93b6b1fb2fd3..85a98d8ce4862e 100755 --- a/examples/thermostat/telink/Readme.md +++ b/examples/thermostat/telink/README.md @@ -25,14 +25,14 @@ You can use this example as a reference for creating your own application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/tv-app/android/include/content-control/ContentController.cpp b/examples/tv-app/android/include/content-control/ContentController.cpp index c4eee0355f4552..99373583b0632d 100644 --- a/examples/tv-app/android/include/content-control/ContentController.cpp +++ b/examples/tv-app/android/include/content-control/ContentController.cpp @@ -94,7 +94,7 @@ void ContentController::HandleSetScheduledContentRatingThreshold(chip::CharSpan uint32_t ContentController::GetFeatureMap(chip::EndpointId endpoint) { - if (endpoint >= EMBER_AF_CONTENT_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT) + if (endpoint >= MATTER_DM_CONTENT_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT) { return mDynamicEndpointFeatureMap; } diff --git a/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp b/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp index 329df8cd802299..50b451994de2f7 100644 --- a/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp +++ b/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp @@ -156,7 +156,7 @@ uint32_t AppContentLauncherManager::HandleGetSupportedStreamingProtocols() uint32_t AppContentLauncherManager::GetFeatureMap(chip::EndpointId endpoint) { - if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) + if (endpoint >= MATTER_DM_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) { return mDynamicEndpointFeatureMap; } diff --git a/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp b/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp index e7d8100e9e5ce0..c3195133711552 100644 --- a/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp +++ b/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp @@ -274,7 +274,7 @@ CHIP_ERROR AppMediaPlaybackManager::HandleGetSampledPosition(AttributeValueEncod uint32_t AppMediaPlaybackManager::GetFeatureMap(chip::EndpointId endpoint) { - if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) + if (endpoint >= MATTER_DM_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) { return mDynamicEndpointFeatureMap; } diff --git a/examples/tv-app/android/java/ChannelManager.cpp b/examples/tv-app/android/java/ChannelManager.cpp index d471bebf3075f6..5b368df6e32c2d 100644 --- a/examples/tv-app/android/java/ChannelManager.cpp +++ b/examples/tv-app/android/java/ChannelManager.cpp @@ -742,7 +742,7 @@ void ChannelManager::InitializeWithObjects(jobject managerObject) uint32_t ChannelManager::GetFeatureMap(chip::EndpointId endpoint) { - if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) + if (endpoint >= MATTER_DM_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) { return mDynamicEndpointFeatureMap; } diff --git a/examples/tv-app/android/java/KeypadInputManager.cpp b/examples/tv-app/android/java/KeypadInputManager.cpp index 2b642a825b0bef..88b5168072585b 100644 --- a/examples/tv-app/android/java/KeypadInputManager.cpp +++ b/examples/tv-app/android/java/KeypadInputManager.cpp @@ -94,7 +94,7 @@ void KeypadInputManager::InitializeWithObjects(jobject managerObject) uint32_t KeypadInputManager::GetFeatureMap(chip::EndpointId endpoint) { - if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) + if (endpoint >= MATTER_DM_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) { return mDynamicEndpointFeatureMap; } diff --git a/examples/tv-app/android/java/LevelManager.cpp b/examples/tv-app/android/java/LevelManager.cpp index cefb26ecfe325d..b2cbddbb110a2a 100644 --- a/examples/tv-app/android/java/LevelManager.cpp +++ b/examples/tv-app/android/java/LevelManager.cpp @@ -27,7 +27,7 @@ using namespace chip; -static constexpr size_t kLevelManagerTableSize = EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT; +static constexpr size_t kLevelManagerTableSize = MATTER_DM_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT; namespace { @@ -46,7 +46,7 @@ void LevelManager::NewManager(jint endpoint, jobject manager) { ChipLogProgress(Zcl, "TV Android App: LevelManager::NewManager"); uint16_t ep = emberAfGetClusterServerEndpointIndex(static_cast(endpoint), app::Clusters::LevelControl::Id, - EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); VerifyOrReturn(ep < kLevelManagerTableSize, ChipLogError(Zcl, "TV Android App::Level::NewManager: endpoint %d not found", endpoint)); @@ -68,7 +68,7 @@ void LevelManager::NewManager(jint endpoint, jobject manager) LevelManager * GetLevelManager(EndpointId endpoint) { uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, app::Clusters::LevelControl::Id, - EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); return ((ep >= kLevelManagerTableSize) ? nullptr : gLevelManagerTable[ep]); } diff --git a/examples/tv-app/android/java/MediaPlaybackManager.cpp b/examples/tv-app/android/java/MediaPlaybackManager.cpp index 52666e8da9bfda..234c846c476c84 100644 --- a/examples/tv-app/android/java/MediaPlaybackManager.cpp +++ b/examples/tv-app/android/java/MediaPlaybackManager.cpp @@ -593,7 +593,7 @@ CHIP_ERROR MediaPlaybackManager::HandleGetSampledPosition(AttributeValueEncoder uint32_t MediaPlaybackManager::GetFeatureMap(chip::EndpointId endpoint) { - if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) + if (endpoint >= MATTER_DM_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) { return mDynamicEndpointFeatureMap; } diff --git a/examples/tv-app/android/java/OnOffManager.cpp b/examples/tv-app/android/java/OnOffManager.cpp index bf6796d4cb9542..b0916540d9cb5e 100644 --- a/examples/tv-app/android/java/OnOffManager.cpp +++ b/examples/tv-app/android/java/OnOffManager.cpp @@ -27,7 +27,7 @@ using namespace chip; -static constexpr size_t kOnffManagerTableSize = EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT; +static constexpr size_t kOnffManagerTableSize = MATTER_DM_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT; namespace { @@ -46,7 +46,7 @@ void OnOffManager::NewManager(jint endpoint, jobject manager) { ChipLogProgress(Zcl, "TV Android App: OnOffManager::NewManager"); uint16_t ep = emberAfGetClusterServerEndpointIndex(static_cast(endpoint), app::Clusters::OnOff::Id, - EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT); VerifyOrReturn(ep < kOnffManagerTableSize, ChipLogError(Zcl, "TV Android App::OnOff::NewManager: endpoint %d not found", endpoint)); @@ -68,7 +68,7 @@ void OnOffManager::NewManager(jint endpoint, jobject manager) OnOffManager * GetOnOffManager(EndpointId endpoint) { uint16_t ep = - emberAfGetClusterServerEndpointIndex(endpoint, app::Clusters::OnOff::Id, EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT); + emberAfGetClusterServerEndpointIndex(endpoint, app::Clusters::OnOff::Id, MATTER_DM_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT); return (ep >= kOnffManagerTableSize ? nullptr : gOnOffManagerTable[ep]); } diff --git a/examples/tv-app/tv-common/clusters/channel/ChannelManager.cpp b/examples/tv-app/tv-common/clusters/channel/ChannelManager.cpp index 7599bc48ef5d29..6fc558da5d3759 100644 --- a/examples/tv-app/tv-common/clusters/channel/ChannelManager.cpp +++ b/examples/tv-app/tv-common/clusters/channel/ChannelManager.cpp @@ -329,7 +329,7 @@ bool ChannelManager::HandleCancelRecordProgram(const chip::CharSpan & programIde uint32_t ChannelManager::GetFeatureMap(chip::EndpointId endpoint) { - if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) + if (endpoint >= MATTER_DM_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) { return mDynamicEndpointFeatureMap; } diff --git a/examples/tv-app/tv-common/clusters/content-control/ContentController.cpp b/examples/tv-app/tv-common/clusters/content-control/ContentController.cpp index 7ebb2ee4a45954..3d622e4a5b9383 100644 --- a/examples/tv-app/tv-common/clusters/content-control/ContentController.cpp +++ b/examples/tv-app/tv-common/clusters/content-control/ContentController.cpp @@ -94,7 +94,7 @@ void ContentControlManager::HandleSetScheduledContentRatingThreshold(chip::CharS uint32_t ContentControlManager::GetFeatureMap(chip::EndpointId endpoint) { - if (endpoint >= EMBER_AF_CONTENT_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT) + if (endpoint >= MATTER_DM_CONTENT_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT) { return mDynamicEndpointFeatureMap; } diff --git a/examples/tv-app/tv-common/clusters/content-launcher/ContentLauncherManager.cpp b/examples/tv-app/tv-common/clusters/content-launcher/ContentLauncherManager.cpp index ff2da45d7db461..013831ec5a6055 100644 --- a/examples/tv-app/tv-common/clusters/content-launcher/ContentLauncherManager.cpp +++ b/examples/tv-app/tv-common/clusters/content-launcher/ContentLauncherManager.cpp @@ -196,7 +196,7 @@ uint32_t ContentLauncherManager::HandleGetSupportedStreamingProtocols() uint32_t ContentLauncherManager::GetFeatureMap(chip::EndpointId endpoint) { - if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) + if (endpoint >= MATTER_DM_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) { return mDynamicEndpointFeatureMap; } diff --git a/examples/tv-app/tv-common/clusters/keypad-input/KeypadInputManager.cpp b/examples/tv-app/tv-common/clusters/keypad-input/KeypadInputManager.cpp index 17c372accea7a9..5817f9a6bb1654 100644 --- a/examples/tv-app/tv-common/clusters/keypad-input/KeypadInputManager.cpp +++ b/examples/tv-app/tv-common/clusters/keypad-input/KeypadInputManager.cpp @@ -99,7 +99,7 @@ void KeypadInputManager::HandleSendKey(CommandResponseHelper= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) + if (endpoint >= MATTER_DM_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) { return mDynamicEndpointFeatureMap; } diff --git a/examples/tv-app/tv-common/clusters/media-playback/MediaPlaybackManager.cpp b/examples/tv-app/tv-common/clusters/media-playback/MediaPlaybackManager.cpp index fe220ce612e7d5..0bb3f1366d7e3a 100644 --- a/examples/tv-app/tv-common/clusters/media-playback/MediaPlaybackManager.cpp +++ b/examples/tv-app/tv-common/clusters/media-playback/MediaPlaybackManager.cpp @@ -317,7 +317,7 @@ bool MediaPlaybackManager::HandleDeactivateTextTrack() uint32_t MediaPlaybackManager::GetFeatureMap(chip::EndpointId endpoint) { - if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) + if (endpoint >= MATTER_DM_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) { return mDynamicEndpointFeatureMap; } diff --git a/examples/virtual-device-app/android/java/ColorControlManager.cpp b/examples/virtual-device-app/android/java/ColorControlManager.cpp index 0386f96272f66e..c792f825a47282 100644 --- a/examples/virtual-device-app/android/java/ColorControlManager.cpp +++ b/examples/virtual-device-app/android/java/ColorControlManager.cpp @@ -26,7 +26,7 @@ using namespace chip; -static constexpr size_t kColorControlManagerTableSize = EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT; +static constexpr size_t kColorControlManagerTableSize = MATTER_DM_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT; namespace { @@ -45,7 +45,7 @@ void ColorControlManager::NewManager(jint endpoint, jobject manager) { ChipLogProgress(Zcl, "Device App: ColorControlManager::NewManager"); uint16_t ep = emberAfGetClusterServerEndpointIndex(static_cast(endpoint), app::Clusters::ColorControl::Id, - EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); VerifyOrReturn(ep < kColorControlManagerTableSize, ChipLogError(Zcl, "Device App::ColorControl::NewManager: endpoint %d not found", endpoint)); @@ -67,7 +67,7 @@ void ColorControlManager::NewManager(jint endpoint, jobject manager) static ColorControlManager * GetColorControlManager(EndpointId endpoint) { uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, app::Clusters::ColorControl::Id, - EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); return (ep >= kColorControlManagerTableSize ? nullptr : gColorControlManagerTable[ep]); } diff --git a/examples/virtual-device-app/android/java/DoorLockManager.cpp b/examples/virtual-device-app/android/java/DoorLockManager.cpp index 9a2c5748635dbd..00b4c734b4914e 100644 --- a/examples/virtual-device-app/android/java/DoorLockManager.cpp +++ b/examples/virtual-device-app/android/java/DoorLockManager.cpp @@ -36,7 +36,7 @@ using namespace chip::app::Clusters::DoorLock; using namespace chip::DeviceLayer; static constexpr size_t kDoorLockManagerTableSize = - EMBER_AF_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; namespace { @@ -76,7 +76,7 @@ void DoorLockManager::NewManager(jint endpoint, jobject manager) { ChipLogProgress(Zcl, "Device App: DoorLockManager::NewManager"); uint16_t ep = emberAfGetClusterServerEndpointIndex(static_cast(endpoint), app::Clusters::DoorLock::Id, - EMBER_AF_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT); VerifyOrReturn(ep < kDoorLockManagerTableSize, ChipLogError(Zcl, "Device App::DoorLock::NewManager: endpoint %d not found", endpoint)); @@ -98,7 +98,7 @@ void DoorLockManager::NewManager(jint endpoint, jobject manager) DoorLockManager * GetDoorLockManager(EndpointId endpoint) { uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, app::Clusters::DoorLock::Id, - EMBER_AF_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT); return ((ep >= kDoorLockManagerTableSize) ? nullptr : gDoorLockManagerTable[ep]); } diff --git a/examples/virtual-device-app/android/java/OnOffManager.cpp b/examples/virtual-device-app/android/java/OnOffManager.cpp index c5a12dfebf30bf..0f1789e8bb5a1d 100644 --- a/examples/virtual-device-app/android/java/OnOffManager.cpp +++ b/examples/virtual-device-app/android/java/OnOffManager.cpp @@ -27,7 +27,7 @@ using namespace chip; -static constexpr size_t kOnffManagerTableSize = EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT; +static constexpr size_t kOnffManagerTableSize = MATTER_DM_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT; namespace { @@ -46,7 +46,7 @@ void OnOffManager::NewManager(jint endpoint, jobject manager) { ChipLogProgress(Zcl, "Device App: OnOffManager::NewManager"); uint16_t ep = emberAfGetClusterServerEndpointIndex(static_cast(endpoint), app::Clusters::OnOff::Id, - EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT); VerifyOrReturn(ep < kOnffManagerTableSize, ChipLogError(Zcl, "Device App::OnOff::NewManager: endpoint %d not found", endpoint)); VerifyOrReturn(gOnOffManagerTable[ep] == nullptr, @@ -67,7 +67,7 @@ void OnOffManager::NewManager(jint endpoint, jobject manager) OnOffManager * GetOnOffManager(EndpointId endpoint) { uint16_t ep = - emberAfGetClusterServerEndpointIndex(endpoint, app::Clusters::OnOff::Id, EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT); + emberAfGetClusterServerEndpointIndex(endpoint, app::Clusters::OnOff::Id, MATTER_DM_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT); return (ep >= kOnffManagerTableSize ? nullptr : gOnOffManagerTable[ep]); } diff --git a/examples/virtual-device-app/android/java/PowerSourceManager.cpp b/examples/virtual-device-app/android/java/PowerSourceManager.cpp index 0d56b587448e40..3e3af95af72b48 100644 --- a/examples/virtual-device-app/android/java/PowerSourceManager.cpp +++ b/examples/virtual-device-app/android/java/PowerSourceManager.cpp @@ -35,7 +35,7 @@ using namespace chip::app::Clusters; using namespace chip::app::Clusters::PowerSource; static constexpr size_t kPowerSourceManagerTableSize = - EMBER_AF_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; namespace { @@ -53,7 +53,7 @@ void PowerSourceManager::NewManager(jint endpoint, jobject manager) { ChipLogProgress(Zcl, "Device App: PowerSourceManager::NewManager"); uint16_t ep = emberAfGetClusterServerEndpointIndex(static_cast(endpoint), app::Clusters::PowerSource::Id, - EMBER_AF_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT); VerifyOrReturn(ep < kPowerSourceManagerTableSize, ChipLogError(Zcl, "Device App::PowerSource::NewManager: endpoint %d not found", endpoint)); @@ -75,7 +75,7 @@ void PowerSourceManager::NewManager(jint endpoint, jobject manager) PowerSourceManager * GetPowerSourceManager(EndpointId endpoint) { uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, app::Clusters::PowerSource::Id, - EMBER_AF_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT); return ((ep >= kPowerSourceManagerTableSize) ? nullptr : gPowerSourceManagerTable[ep]); } diff --git a/examples/window-app/telink/README.md b/examples/window-app/telink/README.md index 28dcc9aadd0ef6..c5500aa5c9cbd6 100644 --- a/examples/window-app/telink/README.md +++ b/examples/window-app/telink/README.md @@ -28,14 +28,14 @@ for creating your own application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/integrations/cloudbuild/build-all.yaml b/integrations/cloudbuild/build-all.yaml index e2e46c0ba059b7..6590630957d902 100644 --- a/integrations/cloudbuild/build-all.yaml +++ b/integrations/cloudbuild/build-all.yaml @@ -6,7 +6,7 @@ steps: - "--init" - "--recursive" id: Submodules - - name: "ghcr.io/project-chip/chip-build-vscode:32" + - name: "ghcr.io/project-chip/chip-build-vscode:35" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -21,7 +21,7 @@ steps: path: /pwenv timeout: 900s - - name: "ghcr.io/project-chip/chip-build-vscode:32" + - name: "ghcr.io/project-chip/chip-build-vscode:35" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -85,7 +85,7 @@ steps: --target k32w-shell build --create-archives /workspace/artifacts/ - - name: "ghcr.io/project-chip/chip-build-vscode:32" + - name: "ghcr.io/project-chip/chip-build-vscode:35" env: - PW_ENVIRONMENT_ROOT=/pwenv args: diff --git a/integrations/cloudbuild/chef.yaml b/integrations/cloudbuild/chef.yaml index a29ddb18176ebc..432308a8bd695f 100644 --- a/integrations/cloudbuild/chef.yaml +++ b/integrations/cloudbuild/chef.yaml @@ -1,5 +1,5 @@ steps: - - name: "ghcr.io/project-chip/chip-build-vscode:32" + - name: "ghcr.io/project-chip/chip-build-vscode:35" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -12,7 +12,7 @@ steps: path: /pwenv timeout: 2700s - - name: "ghcr.io/project-chip/chip-build-vscode:32" + - name: "ghcr.io/project-chip/chip-build-vscode:35" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -27,7 +27,7 @@ steps: - name: pwenv path: /pwenv - - name: "ghcr.io/project-chip/chip-build-vscode:32" + - name: "ghcr.io/project-chip/chip-build-vscode:35" env: - PW_ENVIRONMENT_ROOT=/pwenv args: diff --git a/integrations/cloudbuild/smoke-test.yaml b/integrations/cloudbuild/smoke-test.yaml index bae7c4b4c2c823..f05bbd0e369d2d 100644 --- a/integrations/cloudbuild/smoke-test.yaml +++ b/integrations/cloudbuild/smoke-test.yaml @@ -1,5 +1,5 @@ steps: - - name: "ghcr.io/project-chip/chip-build-vscode:32" + - name: "ghcr.io/project-chip/chip-build-vscode:35" entrypoint: "bash" args: - "-c" @@ -7,7 +7,7 @@ steps: git config --global --add safe.directory "*" git submodule update --init --recursive id: Submodules - - name: "ghcr.io/project-chip/chip-build-vscode:32" + - name: "ghcr.io/project-chip/chip-build-vscode:35" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -22,7 +22,7 @@ steps: path: /pwenv timeout: 900s - - name: "ghcr.io/project-chip/chip-build-vscode:32" + - name: "ghcr.io/project-chip/chip-build-vscode:35" id: ESP32 env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -43,7 +43,7 @@ steps: volumes: - name: pwenv path: /pwenv - - name: "ghcr.io/project-chip/chip-build-vscode:32" + - name: "ghcr.io/project-chip/chip-build-vscode:35" id: NRFConnect env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -64,7 +64,7 @@ steps: - name: pwenv path: /pwenv - - name: "ghcr.io/project-chip/chip-build-vscode:32" + - name: "ghcr.io/project-chip/chip-build-vscode:35" id: EFR32 env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -86,7 +86,7 @@ steps: - name: pwenv path: /pwenv - - name: "ghcr.io/project-chip/chip-build-vscode:32" + - name: "ghcr.io/project-chip/chip-build-vscode:35" id: Linux env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -139,7 +139,7 @@ steps: - name: pwenv path: /pwenv - - name: "ghcr.io/project-chip/chip-build-vscode:32" + - name: "ghcr.io/project-chip/chip-build-vscode:35" id: Android env: - PW_ENVIRONMENT_ROOT=/pwenv diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py index e8241e0bfe5913..771c92b99cabef 100755 --- a/scripts/build/build/targets.py +++ b/scripts/build/build/targets.py @@ -715,6 +715,8 @@ def BuildTelinkTarget(): TargetPart('tlsr9518adk80d', board=TelinkBoard.TLSR9518ADK80D), TargetPart('tlsr9528a', board=TelinkBoard.TLSR9528A), TargetPart('tlsr9528a_retention', board=TelinkBoard.TLSR9528A_RETENTION), + TargetPart('tlsr9258a', board=TelinkBoard.TLSR9258A), + TargetPart('tlsr9258a_retention', board=TelinkBoard.TLSR9258A_RETENTION), ]) target.AppendFixedTargets([ diff --git a/scripts/build/builders/telink.py b/scripts/build/builders/telink.py index 4eb7b3f1ff4005..9160c044a2be57 100644 --- a/scripts/build/builders/telink.py +++ b/scripts/build/builders/telink.py @@ -117,6 +117,8 @@ class TelinkBoard(Enum): TLSR9518ADK80D = auto() TLSR9528A = auto() TLSR9528A_RETENTION = auto() + TLSR9258A = auto() + TLSR9258A_RETENTION = auto() def GnArgName(self): if self == TelinkBoard.TLSR9518ADK80D: @@ -125,6 +127,10 @@ def GnArgName(self): return 'tlsr9528a' elif self == TelinkBoard.TLSR9528A_RETENTION: return 'tlsr9528a_retention' + elif self == TelinkBoard.TLSR9258A: + return 'tlsr9258a' + elif self == TelinkBoard.TLSR9258A_RETENTION: + return 'tlsr9258a_retention' else: raise Exception('Unknown board type: %r' % self) diff --git a/scripts/build/testdata/all_targets_linux_x64.txt b/scripts/build/testdata/all_targets_linux_x64.txt index c400af29ce138a..6a0b73362b8f5c 100644 --- a/scripts/build/testdata/all_targets_linux_x64.txt +++ b/scripts/build/testdata/all_targets_linux_x64.txt @@ -22,5 +22,5 @@ nrf-native-posix-64-tests qpg-qpg6105-{lock,light,shell,persistent-storage,light-switch,thermostat}[-updateimage] stm32-stm32wb5mm-dk-light tizen-arm-{all-clusters,all-clusters-minimal,chip-tool,light,tests}[-no-ble][-no-thread][-no-wifi][-asan][-ubsan][-with-ui] -telink-{tlsr9518adk80d,tlsr9528a,tlsr9528a_retention}-{air-quality-sensor,all-clusters,all-clusters-minimal,bridge,contact-sensor,light,light-switch,lock,ota-requestor,pump,pump-controller,shell,smoke-co-alarm,temperature-measurement,thermostat,window-covering}[-ota][-dfu][-shell][-rpc][-factory-data][-4mb][-mars] +telink-{tlsr9518adk80d,tlsr9528a,tlsr9528a_retention,tlsr9258a,tlsr9258a_retention}-{air-quality-sensor,all-clusters,all-clusters-minimal,bridge,contact-sensor,light,light-switch,lock,ota-requestor,pump,pump-controller,shell,smoke-co-alarm,temperature-measurement,thermostat,window-covering}[-ota][-dfu][-shell][-rpc][-factory-data][-4mb][-mars] openiotsdk-{shell,lock}[-mbedtls][-psa] diff --git a/scripts/tools/not_known_to_gn.py b/scripts/tools/not_known_to_gn.py new file mode 100755 index 00000000000000..613f8a23ecb707 --- /dev/null +++ b/scripts/tools/not_known_to_gn.py @@ -0,0 +1,182 @@ +#!/usr/bin/env python3 +# +# Copyright (c) 2024 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. +# +""" +Lists files specific files from a source tree and ensures +they are covered by GN in some way. + +'Covered' is very loosely and it just tries to see if the GN text +contains that word without trying to validate if this is a +comment or some actual 'source' element. + +It is intended as a failsafe to not foget adding source files +to gn. +""" +import logging +import os +import sys +from pathlib import Path, PurePath +from typing import Dict, Set + +import click +import coloredlogs + +__LOG_LEVELS__ = { + 'debug': logging.DEBUG, + 'info': logging.INFO, + 'warn': logging.WARN, + 'fatal': logging.FATAL, +} + + +class OrphanChecker: + def __init__(self): + self.gn_data: Dict[str, str] = {} + self.known_failures: Set[str] = set() + self.fatal_failures = 0 + self.failures = 0 + self.found_failures: Set[str] = set() + + def AppendGnData(self, gn: PurePath): + """Adds a GN file to the list of internally known GN data. + + Will read the entire content of the GN file in memory for future reference. + """ + logging.debug(f'Adding GN {gn!s} for {gn.parent!s}') + self.gn_data[str(gn.parent)] = gn.read_text('utf-8') + + def AddKnownFailure(self, k: str): + self.known_failures.add(k) + + def _IsKnownFailure(self, path: str) -> bool: + """check if failing on the given path is a known/acceptable failure""" + for k in self.known_failures: + if path == k or path.endswith(os.path.sep + k): + # mark some found failures to report if something is supposed + # to be known but it is not + self.found_failures.add(k) + return True + return False + + def Check(self, top_dir: str, file: PurePath): + """ + Validates that the given path is somehow referenced in GN files in any + of the parent sub-directories of the file. + + `file` must be relative to `top_dir`. Top_dir is used to resolve relative + paths in error reports and known failure checks. + """ + # Check logic: + # - ensure the file name is included in some GN file inside this or + # upper directory (although upper directory is not ideal) + for p in file.parents: + data = self.gn_data.get(str(p), None) + if not data: + continue + + if file.name in data: + logging.debug("%s found in BUILD.gn for %s", file, p) + return + + path = str(file.relative_to(top_dir)) + if not self._IsKnownFailure(path): + logging.error("UNKNOWN to gn: %s", path) + self.fatal_failures += 1 + else: + logging.warning("UNKNOWN to gn: %s (known error)", path) + + self.failures += 1 + + +@click.command() +@click.option( + '--log-level', + default='INFO', + type=click.Choice(list(__LOG_LEVELS__.keys()), case_sensitive=False), + help='Determines the verbosity of script output', +) +@click.option( + '--extensions', + default=["cpp", "cc", "c", "h", "hpp"], + type=str, multiple=True, + help='What file extensions to consider', +) +@click.option( + '--known-failure', + type=str, multiple=True, + help='What paths are known to fail', +) +@click.option( + '--skip-dir', + type=str, + multiple=True, + help='Skip a specific sub-directory from checks', +) +@click.argument('dirs', + type=click.Path(exists=True, file_okay=False, resolve_path=True), nargs=-1) +def main(log_level, extensions, dirs, known_failure, skip_dir): + coloredlogs.install(level=__LOG_LEVELS__[log_level], + fmt='%(asctime)s %(levelname)-7s %(message)s') + + if not dirs: + logging.error("Please provide at least one directory to scan") + sys.exit(1) + + if not extensions: + logging.error("Need at least one extension") + sys.exit(1) + + checker = OrphanChecker() + for k in known_failure: + checker.AddKnownFailure(k) + + # ensure all GN data is loaded + for directory in dirs: + for name in Path(directory).rglob("BUILD.gn"): + checker.AppendGnData(name) + + skip_dir = set(skip_dir) + + # Go through all files and check for orphaned (if any) + extensions = set(extensions) + for directory in dirs: + for path, dirnames, filenames in os.walk(directory): + if any([s in path for s in skip_dir]): + continue + for f in filenames: + full_path = Path(os.path.join(path, f)) + if not full_path.suffix or full_path.suffix[1:] not in extensions: + continue + checker.Check(directory, full_path) + + if checker.failures: + logging.warning("%d files not known to GN (%d fatal)", checker.failures, checker.fatal_failures) + + if checker.known_failures != checker.found_failures: + not_failing = checker.known_failures - checker.found_failures + logging.warning("NOTE: %d failures are not found anymore:", len(not_failing)) + for name in not_failing: + logging.warning(" - %s", name) + # Assume this is fatal - remove some of the "known-failing" should be easy. + # This forces scripts to always be correct and not accumulate bad input. + sys.exit(1) + + if checker.fatal_failures > 0: + sys.exit(1) + + +if __name__ == '__main__': + main(auto_envvar_prefix='CHIP') diff --git a/scripts/tools/telink/update_zephyr.py b/scripts/tools/telink/update_zephyr.py index 5c133f0f8fbdf7..fe735df0ccaac4 100755 --- a/scripts/tools/telink/update_zephyr.py +++ b/scripts/tools/telink/update_zephyr.py @@ -39,6 +39,9 @@ def main(): args = parser.parse_args() + command = ['git', '-C', zephyr_base, 'fetch'] + subprocess.run(command, check=True) + command = ['git', '-C', zephyr_base, 'reset', args.hash, '--hard'] subprocess.run(command, check=True) diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h index 8324cf19058453..e4347a93f273b1 100644 --- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h +++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h @@ -21,244 +21,244 @@ #pragma once /**** Cluster endpoint counts ****/ -#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (3) -#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (3) -#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (2) -#define EMBER_AF_ON_OFF_SWITCH_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_BINARY_INPUT_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (4) -#define EMBER_AF_BINDING_CLUSTER_SERVER_ENDPOINT_COUNT (2) -#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_ACTIONS_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_BASIC_INFORMATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_UNIT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT (3) -#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (2) -#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (2) -#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (2) -#define EMBER_AF_BOOLEAN_STATE_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (2) -#define EMBER_AF_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_BARRIER_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_THERMOSTAT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_FAN_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_TEMPERATURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (2) -#define EMBER_AF_OCCUPANCY_SENSING_CLUSTER_SERVER_ENDPOINT_COUNT (2) -#define EMBER_AF_WAKE_ON_LAN_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_TARGET_NAVIGATOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_MEDIA_PLAYBACK_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_MEDIA_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_LOW_POWER_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_AUDIO_OUTPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_APPLICATION_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_APPLICATION_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_ACCOUNT_LOGIN_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_ELECTRICAL_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_UNIT_TESTING_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_FAULT_INJECTION_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (3) +#define MATTER_DM_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (3) +#define MATTER_DM_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (2) +#define MATTER_DM_ON_OFF_SWITCH_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_BINARY_INPUT_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (4) +#define MATTER_DM_BINDING_CLUSTER_SERVER_ENDPOINT_COUNT (2) +#define MATTER_DM_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_ACTIONS_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_BASIC_INFORMATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define MATTER_DM_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_UNIT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT (3) +#define MATTER_DM_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (2) +#define MATTER_DM_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (2) +#define MATTER_DM_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (2) +#define MATTER_DM_BOOLEAN_STATE_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (2) +#define MATTER_DM_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_BARRIER_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_THERMOSTAT_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_FAN_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_TEMPERATURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_PRESSURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_FLOW_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (2) +#define MATTER_DM_OCCUPANCY_SENSING_CLUSTER_SERVER_ENDPOINT_COUNT (2) +#define MATTER_DM_WAKE_ON_LAN_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_TARGET_NAVIGATOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_MEDIA_PLAYBACK_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_MEDIA_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_LOW_POWER_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_AUDIO_OUTPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_APPLICATION_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_APPLICATION_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_ACCOUNT_LOGIN_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_ELECTRICAL_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_UNIT_TESTING_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_FAULT_INJECTION_CLUSTER_SERVER_ENDPOINT_COUNT (1) /**** Cluster Plugins ****/ // Use this macro to check if the server side of the Identify cluster is included #define ZCL_USING_IDENTIFY_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_IDENTIFY_SERVER -#define EMBER_AF_PLUGIN_IDENTIFY +#define MATTER_DM_PLUGIN_IDENTIFY_SERVER +#define MATTER_DM_PLUGIN_IDENTIFY // Use this macro to check if the server side of the Groups cluster is included #define ZCL_USING_GROUPS_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_GROUPS_SERVER -#define EMBER_AF_PLUGIN_GROUPS +#define MATTER_DM_PLUGIN_GROUPS_SERVER +#define MATTER_DM_PLUGIN_GROUPS // Use this macro to check if the server side of the On/Off cluster is included #define ZCL_USING_ON_OFF_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_ON_OFF_SERVER -#define EMBER_AF_PLUGIN_ON_OFF +#define MATTER_DM_PLUGIN_ON_OFF_SERVER +#define MATTER_DM_PLUGIN_ON_OFF // Use this macro to check if the server side of the On/off Switch Configuration cluster is included #define ZCL_USING_ON_OFF_SWITCH_CONFIGURATION_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_ON_OFF_SWITCH_CONFIGURATION_SERVER -#define EMBER_AF_PLUGIN_ON_OFF_SWITCH_CONFIGURATION +#define MATTER_DM_PLUGIN_ON_OFF_SWITCH_CONFIGURATION_SERVER +#define MATTER_DM_PLUGIN_ON_OFF_SWITCH_CONFIGURATION // Use this macro to check if the server side of the Level Control cluster is included #define ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_LEVEL_CONTROL_SERVER -#define EMBER_AF_PLUGIN_LEVEL_CONTROL +#define MATTER_DM_PLUGIN_LEVEL_CONTROL_SERVER +#define MATTER_DM_PLUGIN_LEVEL_CONTROL // User options for server plugin Level Control -#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL 254 -#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0 -#define EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE 0 +#define MATTER_DM_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL 254 +#define MATTER_DM_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0 +#define MATTER_DM_PLUGIN_LEVEL_CONTROL_RATE 0 // Use this macro to check if the server side of the Binary Input (Basic) cluster is included #define ZCL_USING_BINARY_INPUT_BASIC_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_BINARY_INPUT_BASIC_SERVER -#define EMBER_AF_PLUGIN_BINARY_INPUT_BASIC +#define MATTER_DM_PLUGIN_BINARY_INPUT_BASIC_SERVER +#define MATTER_DM_PLUGIN_BINARY_INPUT_BASIC // Use this macro to check if the server side of the Descriptor cluster is included #define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER -#define EMBER_AF_PLUGIN_DESCRIPTOR +#define MATTER_DM_PLUGIN_DESCRIPTOR_SERVER +#define MATTER_DM_PLUGIN_DESCRIPTOR // Use this macro to check if the server side of the Binding cluster is included #define ZCL_USING_BINDING_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_BINDING_SERVER -#define EMBER_AF_PLUGIN_BINDING +#define MATTER_DM_PLUGIN_BINDING_SERVER +#define MATTER_DM_PLUGIN_BINDING // Use this macro to check if the server side of the Access Control cluster is included #define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER -#define EMBER_AF_PLUGIN_ACCESS_CONTROL +#define MATTER_DM_PLUGIN_ACCESS_CONTROL_SERVER +#define MATTER_DM_PLUGIN_ACCESS_CONTROL // Use this macro to check if the server side of the Actions cluster is included #define ZCL_USING_ACTIONS_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_ACTIONS_SERVER -#define EMBER_AF_PLUGIN_ACTIONS +#define MATTER_DM_PLUGIN_ACTIONS_SERVER +#define MATTER_DM_PLUGIN_ACTIONS // Use this macro to check if the server side of the Basic Information cluster is included #define ZCL_USING_BASIC_INFORMATION_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_BASIC_INFORMATION_SERVER -#define EMBER_AF_PLUGIN_BASIC_INFORMATION +#define MATTER_DM_PLUGIN_BASIC_INFORMATION_SERVER +#define MATTER_DM_PLUGIN_BASIC_INFORMATION // Use this macro to check if the client side of the OTA Software Update Provider cluster is included #define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT -#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT +#define MATTER_DM_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included #define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER -#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR +#define MATTER_DM_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER +#define MATTER_DM_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR // Use this macro to check if the server side of the Localization Configuration cluster is included #define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER -#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION +#define MATTER_DM_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER +#define MATTER_DM_PLUGIN_LOCALIZATION_CONFIGURATION // Use this macro to check if the server side of the Time Format Localization cluster is included #define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER -#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION +#define MATTER_DM_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER +#define MATTER_DM_PLUGIN_TIME_FORMAT_LOCALIZATION // Use this macro to check if the server side of the Unit Localization cluster is included #define ZCL_USING_UNIT_LOCALIZATION_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION_SERVER -#define EMBER_AF_PLUGIN_UNIT_LOCALIZATION +#define MATTER_DM_PLUGIN_UNIT_LOCALIZATION_SERVER +#define MATTER_DM_PLUGIN_UNIT_LOCALIZATION // Use this macro to check if the server side of the Power Source cluster is included #define ZCL_USING_POWER_SOURCE_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_POWER_SOURCE_SERVER -#define EMBER_AF_PLUGIN_POWER_SOURCE +#define MATTER_DM_PLUGIN_POWER_SOURCE_SERVER +#define MATTER_DM_PLUGIN_POWER_SOURCE // Use this macro to check if the server side of the General Commissioning cluster is included #define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER -#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING +#define MATTER_DM_PLUGIN_GENERAL_COMMISSIONING_SERVER +#define MATTER_DM_PLUGIN_GENERAL_COMMISSIONING // Use this macro to check if the server side of the Network Commissioning cluster is included #define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER -#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING +#define MATTER_DM_PLUGIN_NETWORK_COMMISSIONING_SERVER +#define MATTER_DM_PLUGIN_NETWORK_COMMISSIONING // Use this macro to check if the server side of the Diagnostic Logs cluster is included #define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER -#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS +#define MATTER_DM_PLUGIN_DIAGNOSTIC_LOGS_SERVER +#define MATTER_DM_PLUGIN_DIAGNOSTIC_LOGS // Use this macro to check if the server side of the General Diagnostics cluster is included #define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER -#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS +#define MATTER_DM_PLUGIN_GENERAL_DIAGNOSTICS_SERVER +#define MATTER_DM_PLUGIN_GENERAL_DIAGNOSTICS // Use this macro to check if the server side of the Software Diagnostics cluster is included #define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER -#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS +#define MATTER_DM_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER +#define MATTER_DM_PLUGIN_SOFTWARE_DIAGNOSTICS // Use this macro to check if the server side of the Thread Network Diagnostics cluster is included #define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER -#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS +#define MATTER_DM_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER +#define MATTER_DM_PLUGIN_THREAD_NETWORK_DIAGNOSTICS // Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included #define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER -#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS +#define MATTER_DM_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER +#define MATTER_DM_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS // Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included #define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER -#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS +#define MATTER_DM_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER +#define MATTER_DM_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS // Use this macro to check if the server side of the Switch cluster is included #define ZCL_USING_SWITCH_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_SWITCH_SERVER -#define EMBER_AF_PLUGIN_SWITCH +#define MATTER_DM_PLUGIN_SWITCH_SERVER +#define MATTER_DM_PLUGIN_SWITCH // Use this macro to check if the server side of the Administrator Commissioning cluster is included #define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER -#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING +#define MATTER_DM_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER +#define MATTER_DM_PLUGIN_ADMINISTRATOR_COMMISSIONING // Use this macro to check if the server side of the Operational Credentials cluster is included #define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER -#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS +#define MATTER_DM_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER +#define MATTER_DM_PLUGIN_OPERATIONAL_CREDENTIALS // Use this macro to check if the server side of the Group Key Management cluster is included #define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER -#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT +#define MATTER_DM_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER +#define MATTER_DM_PLUGIN_GROUP_KEY_MANAGEMENT // Use this macro to check if the server side of the Fixed Label cluster is included #define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER -#define EMBER_AF_PLUGIN_FIXED_LABEL +#define MATTER_DM_PLUGIN_FIXED_LABEL_SERVER +#define MATTER_DM_PLUGIN_FIXED_LABEL // Use this macro to check if the server side of the User Label cluster is included #define ZCL_USING_USER_LABEL_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_USER_LABEL_SERVER -#define EMBER_AF_PLUGIN_USER_LABEL +#define MATTER_DM_PLUGIN_USER_LABEL_SERVER +#define MATTER_DM_PLUGIN_USER_LABEL // Use this macro to check if the server side of the Boolean State cluster is included #define ZCL_USING_BOOLEAN_STATE_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_BOOLEAN_STATE_SERVER -#define EMBER_AF_PLUGIN_BOOLEAN_STATE +#define MATTER_DM_PLUGIN_BOOLEAN_STATE_SERVER +#define MATTER_DM_PLUGIN_BOOLEAN_STATE // Use this macro to check if the server side of the Mode Select cluster is included #define ZCL_USING_MODE_SELECT_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_MODE_SELECT_SERVER -#define EMBER_AF_PLUGIN_MODE_SELECT +#define MATTER_DM_PLUGIN_MODE_SELECT_SERVER +#define MATTER_DM_PLUGIN_MODE_SELECT // Use this macro to check if the server side of the Scenes Management cluster is included #define ZCL_USING_SCENES_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_SCENES_MANAGEMENT_SERVER -#define EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#define MATTER_DM_PLUGIN_SCENES_MANAGEMENT_SERVER +#define MATTER_DM_PLUGIN_SCENES_MANAGEMENT // User options for server plugin Scenes Management // Scenes FeatureMap Attribute Toggle Scenes Name feature // App cluster specs 1.4.4 @@ -271,149 +271,149 @@ // Use this macro to check if the server side of the Door Lock cluster is included #define ZCL_USING_DOOR_LOCK_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_DOOR_LOCK_SERVER -#define EMBER_AF_PLUGIN_DOOR_LOCK +#define MATTER_DM_PLUGIN_DOOR_LOCK_SERVER +#define MATTER_DM_PLUGIN_DOOR_LOCK // Use this macro to check if the server side of the Window Covering cluster is included #define ZCL_USING_WINDOW_COVERING_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_WINDOW_COVERING_SERVER -#define EMBER_AF_PLUGIN_WINDOW_COVERING +#define MATTER_DM_PLUGIN_WINDOW_COVERING_SERVER +#define MATTER_DM_PLUGIN_WINDOW_COVERING // Use this macro to check if the server side of the Barrier Control cluster is included #define ZCL_USING_BARRIER_CONTROL_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_BARRIER_CONTROL_SERVER -#define EMBER_AF_PLUGIN_BARRIER_CONTROL +#define MATTER_DM_PLUGIN_BARRIER_CONTROL_SERVER +#define MATTER_DM_PLUGIN_BARRIER_CONTROL // Use this macro to check if the server side of the Pump Configuration and Control cluster is included #define ZCL_USING_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL_SERVER -#define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL +#define MATTER_DM_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL_SERVER +#define MATTER_DM_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL // Use this macro to check if the server side of the Thermostat cluster is included #define ZCL_USING_THERMOSTAT_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_THERMOSTAT_SERVER -#define EMBER_AF_PLUGIN_THERMOSTAT +#define MATTER_DM_PLUGIN_THERMOSTAT_SERVER +#define MATTER_DM_PLUGIN_THERMOSTAT // Use this macro to check if the server side of the Fan Control cluster is included #define ZCL_USING_FAN_CONTROL_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_FAN_CONTROL_SERVER -#define EMBER_AF_PLUGIN_FAN_CONTROL +#define MATTER_DM_PLUGIN_FAN_CONTROL_SERVER +#define MATTER_DM_PLUGIN_FAN_CONTROL // Use this macro to check if the server side of the Thermostat User Interface Configuration cluster is included #define ZCL_USING_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION_SERVER -#define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION +#define MATTER_DM_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION_SERVER +#define MATTER_DM_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION // Use this macro to check if the server side of the Color Control cluster is included #define ZCL_USING_COLOR_CONTROL_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER -#define EMBER_AF_PLUGIN_COLOR_CONTROL +#define MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER +#define MATTER_DM_PLUGIN_COLOR_CONTROL // User options for server plugin Color Control -#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY -#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP -#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV +#define MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_XY +#define MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#define MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_HSV // Use this macro to check if the server side of the Illuminance Measurement cluster is included #define ZCL_USING_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT_SERVER -#define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT +#define MATTER_DM_PLUGIN_ILLUMINANCE_MEASUREMENT_SERVER +#define MATTER_DM_PLUGIN_ILLUMINANCE_MEASUREMENT // Use this macro to check if the server side of the Temperature Measurement cluster is included #define ZCL_USING_TEMPERATURE_MEASUREMENT_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_SERVER -#define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT +#define MATTER_DM_PLUGIN_TEMPERATURE_MEASUREMENT_SERVER +#define MATTER_DM_PLUGIN_TEMPERATURE_MEASUREMENT // Use this macro to check if the server side of the Pressure Measurement cluster is included #define ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_PRESSURE_MEASUREMENT_SERVER -#define EMBER_AF_PLUGIN_PRESSURE_MEASUREMENT +#define MATTER_DM_PLUGIN_PRESSURE_MEASUREMENT_SERVER +#define MATTER_DM_PLUGIN_PRESSURE_MEASUREMENT // Use this macro to check if the server side of the Flow Measurement cluster is included #define ZCL_USING_FLOW_MEASUREMENT_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT_SERVER -#define EMBER_AF_PLUGIN_FLOW_MEASUREMENT +#define MATTER_DM_PLUGIN_FLOW_MEASUREMENT_SERVER +#define MATTER_DM_PLUGIN_FLOW_MEASUREMENT // Use this macro to check if the server side of the Relative Humidity Measurement cluster is included #define ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_RELATIVE_HUMIDITY_MEASUREMENT_SERVER -#define EMBER_AF_PLUGIN_RELATIVE_HUMIDITY_MEASUREMENT +#define MATTER_DM_PLUGIN_RELATIVE_HUMIDITY_MEASUREMENT_SERVER +#define MATTER_DM_PLUGIN_RELATIVE_HUMIDITY_MEASUREMENT // Use this macro to check if the server side of the Occupancy Sensing cluster is included #define ZCL_USING_OCCUPANCY_SENSING_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING_SERVER -#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING +#define MATTER_DM_PLUGIN_OCCUPANCY_SENSING_SERVER +#define MATTER_DM_PLUGIN_OCCUPANCY_SENSING // Use this macro to check if the server side of the Wake on LAN cluster is included #define ZCL_USING_WAKE_ON_LAN_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_WAKE_ON_LAN_SERVER -#define EMBER_AF_PLUGIN_WAKE_ON_LAN +#define MATTER_DM_PLUGIN_WAKE_ON_LAN_SERVER +#define MATTER_DM_PLUGIN_WAKE_ON_LAN // Use this macro to check if the server side of the Channel cluster is included #define ZCL_USING_CHANNEL_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_CHANNEL_SERVER -#define EMBER_AF_PLUGIN_CHANNEL +#define MATTER_DM_PLUGIN_CHANNEL_SERVER +#define MATTER_DM_PLUGIN_CHANNEL // Use this macro to check if the server side of the Target Navigator cluster is included #define ZCL_USING_TARGET_NAVIGATOR_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_TARGET_NAVIGATOR_SERVER -#define EMBER_AF_PLUGIN_TARGET_NAVIGATOR +#define MATTER_DM_PLUGIN_TARGET_NAVIGATOR_SERVER +#define MATTER_DM_PLUGIN_TARGET_NAVIGATOR // Use this macro to check if the server side of the Media Playback cluster is included #define ZCL_USING_MEDIA_PLAYBACK_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_MEDIA_PLAYBACK_SERVER -#define EMBER_AF_PLUGIN_MEDIA_PLAYBACK +#define MATTER_DM_PLUGIN_MEDIA_PLAYBACK_SERVER +#define MATTER_DM_PLUGIN_MEDIA_PLAYBACK // Use this macro to check if the server side of the Media Input cluster is included #define ZCL_USING_MEDIA_INPUT_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_MEDIA_INPUT_SERVER -#define EMBER_AF_PLUGIN_MEDIA_INPUT +#define MATTER_DM_PLUGIN_MEDIA_INPUT_SERVER +#define MATTER_DM_PLUGIN_MEDIA_INPUT // Use this macro to check if the server side of the Low Power cluster is included #define ZCL_USING_LOW_POWER_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_LOW_POWER_SERVER -#define EMBER_AF_PLUGIN_LOW_POWER +#define MATTER_DM_PLUGIN_LOW_POWER_SERVER +#define MATTER_DM_PLUGIN_LOW_POWER // Use this macro to check if the server side of the Keypad Input cluster is included #define ZCL_USING_KEYPAD_INPUT_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_KEYPAD_INPUT_SERVER -#define EMBER_AF_PLUGIN_KEYPAD_INPUT +#define MATTER_DM_PLUGIN_KEYPAD_INPUT_SERVER +#define MATTER_DM_PLUGIN_KEYPAD_INPUT // Use this macro to check if the server side of the Content Launcher cluster is included #define ZCL_USING_CONTENT_LAUNCHER_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_SERVER -#define EMBER_AF_PLUGIN_CONTENT_LAUNCHER +#define MATTER_DM_PLUGIN_CONTENT_LAUNCHER_SERVER +#define MATTER_DM_PLUGIN_CONTENT_LAUNCHER // Use this macro to check if the server side of the Audio Output cluster is included #define ZCL_USING_AUDIO_OUTPUT_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_AUDIO_OUTPUT_SERVER -#define EMBER_AF_PLUGIN_AUDIO_OUTPUT +#define MATTER_DM_PLUGIN_AUDIO_OUTPUT_SERVER +#define MATTER_DM_PLUGIN_AUDIO_OUTPUT // Use this macro to check if the server side of the Application Launcher cluster is included #define ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_APPLICATION_LAUNCHER_SERVER -#define EMBER_AF_PLUGIN_APPLICATION_LAUNCHER +#define MATTER_DM_PLUGIN_APPLICATION_LAUNCHER_SERVER +#define MATTER_DM_PLUGIN_APPLICATION_LAUNCHER // Use this macro to check if the server side of the Application Basic cluster is included #define ZCL_USING_APPLICATION_BASIC_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_APPLICATION_BASIC_SERVER -#define EMBER_AF_PLUGIN_APPLICATION_BASIC +#define MATTER_DM_PLUGIN_APPLICATION_BASIC_SERVER +#define MATTER_DM_PLUGIN_APPLICATION_BASIC // Use this macro to check if the server side of the Account Login cluster is included #define ZCL_USING_ACCOUNT_LOGIN_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_ACCOUNT_LOGIN_SERVER -#define EMBER_AF_PLUGIN_ACCOUNT_LOGIN +#define MATTER_DM_PLUGIN_ACCOUNT_LOGIN_SERVER +#define MATTER_DM_PLUGIN_ACCOUNT_LOGIN // Use this macro to check if the server side of the Electrical Measurement cluster is included #define ZCL_USING_ELECTRICAL_MEASUREMENT_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_ELECTRICAL_MEASUREMENT_SERVER -#define EMBER_AF_PLUGIN_ELECTRICAL_MEASUREMENT +#define MATTER_DM_PLUGIN_ELECTRICAL_MEASUREMENT_SERVER +#define MATTER_DM_PLUGIN_ELECTRICAL_MEASUREMENT // Use this macro to check if the server side of the Unit Testing cluster is included #define ZCL_USING_UNIT_TESTING_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_UNIT_TESTING_SERVER -#define EMBER_AF_PLUGIN_UNIT_TESTING +#define MATTER_DM_PLUGIN_UNIT_TESTING_SERVER +#define MATTER_DM_PLUGIN_UNIT_TESTING // Use this macro to check if the server side of the Fault Injection cluster is included #define ZCL_USING_FAULT_INJECTION_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_FAULT_INJECTION_SERVER -#define EMBER_AF_PLUGIN_FAULT_INJECTION +#define MATTER_DM_PLUGIN_FAULT_INJECTION_SERVER +#define MATTER_DM_PLUGIN_FAULT_INJECTION diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/gen_config.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/gen_config.h index 0c29e4f6258917..7002f3ef3bd806 100644 --- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/gen_config.h +++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/gen_config.h @@ -21,174 +21,174 @@ #pragma once /**** Cluster endpoint counts ****/ -#define EMBER_AF_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (2) -#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2) -#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_BASIC_INFORMATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OCCUPANCY_SENSING_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (2) +#define MATTER_DM_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2) +#define MATTER_DM_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_BASIC_INFORMATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define MATTER_DM_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_SWITCH_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define MATTER_DM_OCCUPANCY_SENSING_CLUSTER_SERVER_ENDPOINT_COUNT (1) /**** Cluster Plugins ****/ // Use this macro to check if the server side of the Identify cluster is included #define ZCL_USING_IDENTIFY_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_IDENTIFY_SERVER -#define EMBER_AF_PLUGIN_IDENTIFY +#define MATTER_DM_PLUGIN_IDENTIFY_SERVER +#define MATTER_DM_PLUGIN_IDENTIFY // Use this macro to check if the server side of the Groups cluster is included #define ZCL_USING_GROUPS_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_GROUPS_SERVER -#define EMBER_AF_PLUGIN_GROUPS +#define MATTER_DM_PLUGIN_GROUPS_SERVER +#define MATTER_DM_PLUGIN_GROUPS // Use this macro to check if the server side of the On/Off cluster is included #define ZCL_USING_ON_OFF_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_ON_OFF_SERVER -#define EMBER_AF_PLUGIN_ON_OFF +#define MATTER_DM_PLUGIN_ON_OFF_SERVER +#define MATTER_DM_PLUGIN_ON_OFF // Use this macro to check if the server side of the Level Control cluster is included #define ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_LEVEL_CONTROL_SERVER -#define EMBER_AF_PLUGIN_LEVEL_CONTROL +#define MATTER_DM_PLUGIN_LEVEL_CONTROL_SERVER +#define MATTER_DM_PLUGIN_LEVEL_CONTROL // User options for server plugin Level Control -#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL 254 -#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0 -#define EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE 0 +#define MATTER_DM_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL 254 +#define MATTER_DM_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0 +#define MATTER_DM_PLUGIN_LEVEL_CONTROL_RATE 0 // Use this macro to check if the server side of the Descriptor cluster is included #define ZCL_USING_DESCRIPTOR_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER -#define EMBER_AF_PLUGIN_DESCRIPTOR +#define MATTER_DM_PLUGIN_DESCRIPTOR_SERVER +#define MATTER_DM_PLUGIN_DESCRIPTOR // Use this macro to check if the server side of the Access Control cluster is included #define ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER -#define EMBER_AF_PLUGIN_ACCESS_CONTROL +#define MATTER_DM_PLUGIN_ACCESS_CONTROL_SERVER +#define MATTER_DM_PLUGIN_ACCESS_CONTROL // Use this macro to check if the server side of the Basic Information cluster is included #define ZCL_USING_BASIC_INFORMATION_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_BASIC_INFORMATION_SERVER -#define EMBER_AF_PLUGIN_BASIC_INFORMATION +#define MATTER_DM_PLUGIN_BASIC_INFORMATION_SERVER +#define MATTER_DM_PLUGIN_BASIC_INFORMATION // Use this macro to check if the client side of the OTA Software Update Provider cluster is included #define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT -#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT +#define MATTER_DM_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included #define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER -#define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR +#define MATTER_DM_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER +#define MATTER_DM_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR // Use this macro to check if the server side of the Localization Configuration cluster is included #define ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER -#define EMBER_AF_PLUGIN_LOCALIZATION_CONFIGURATION +#define MATTER_DM_PLUGIN_LOCALIZATION_CONFIGURATION_SERVER +#define MATTER_DM_PLUGIN_LOCALIZATION_CONFIGURATION // Use this macro to check if the server side of the Time Format Localization cluster is included #define ZCL_USING_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER -#define EMBER_AF_PLUGIN_TIME_FORMAT_LOCALIZATION +#define MATTER_DM_PLUGIN_TIME_FORMAT_LOCALIZATION_SERVER +#define MATTER_DM_PLUGIN_TIME_FORMAT_LOCALIZATION // Use this macro to check if the server side of the General Commissioning cluster is included #define ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING_SERVER -#define EMBER_AF_PLUGIN_GENERAL_COMMISSIONING +#define MATTER_DM_PLUGIN_GENERAL_COMMISSIONING_SERVER +#define MATTER_DM_PLUGIN_GENERAL_COMMISSIONING // Use this macro to check if the server side of the Network Commissioning cluster is included #define ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER -#define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING +#define MATTER_DM_PLUGIN_NETWORK_COMMISSIONING_SERVER +#define MATTER_DM_PLUGIN_NETWORK_COMMISSIONING // Use this macro to check if the server side of the Diagnostic Logs cluster is included #define ZCL_USING_DIAGNOSTIC_LOGS_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS_SERVER -#define EMBER_AF_PLUGIN_DIAGNOSTIC_LOGS +#define MATTER_DM_PLUGIN_DIAGNOSTIC_LOGS_SERVER +#define MATTER_DM_PLUGIN_DIAGNOSTIC_LOGS // Use this macro to check if the server side of the General Diagnostics cluster is included #define ZCL_USING_GENERAL_DIAGNOSTICS_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS_SERVER -#define EMBER_AF_PLUGIN_GENERAL_DIAGNOSTICS +#define MATTER_DM_PLUGIN_GENERAL_DIAGNOSTICS_SERVER +#define MATTER_DM_PLUGIN_GENERAL_DIAGNOSTICS // Use this macro to check if the server side of the Software Diagnostics cluster is included #define ZCL_USING_SOFTWARE_DIAGNOSTICS_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER -#define EMBER_AF_PLUGIN_SOFTWARE_DIAGNOSTICS +#define MATTER_DM_PLUGIN_SOFTWARE_DIAGNOSTICS_SERVER +#define MATTER_DM_PLUGIN_SOFTWARE_DIAGNOSTICS // Use this macro to check if the server side of the Thread Network Diagnostics cluster is included #define ZCL_USING_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER -#define EMBER_AF_PLUGIN_THREAD_NETWORK_DIAGNOSTICS +#define MATTER_DM_PLUGIN_THREAD_NETWORK_DIAGNOSTICS_SERVER +#define MATTER_DM_PLUGIN_THREAD_NETWORK_DIAGNOSTICS // Use this macro to check if the server side of the WiFi Network Diagnostics cluster is included #define ZCL_USING_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER -#define EMBER_AF_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS +#define MATTER_DM_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS_SERVER +#define MATTER_DM_PLUGIN_WI_FI_NETWORK_DIAGNOSTICS // Use this macro to check if the server side of the Ethernet Network Diagnostics cluster is included #define ZCL_USING_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER -#define EMBER_AF_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS +#define MATTER_DM_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS_SERVER +#define MATTER_DM_PLUGIN_ETHERNET_NETWORK_DIAGNOSTICS // Use this macro to check if the server side of the Switch cluster is included #define ZCL_USING_SWITCH_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_SWITCH_SERVER -#define EMBER_AF_PLUGIN_SWITCH +#define MATTER_DM_PLUGIN_SWITCH_SERVER +#define MATTER_DM_PLUGIN_SWITCH // Use this macro to check if the server side of the Administrator Commissioning cluster is included #define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER -#define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING +#define MATTER_DM_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER +#define MATTER_DM_PLUGIN_ADMINISTRATOR_COMMISSIONING // Use this macro to check if the server side of the Operational Credentials cluster is included #define ZCL_USING_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER -#define EMBER_AF_PLUGIN_OPERATIONAL_CREDENTIALS +#define MATTER_DM_PLUGIN_OPERATIONAL_CREDENTIALS_SERVER +#define MATTER_DM_PLUGIN_OPERATIONAL_CREDENTIALS // Use this macro to check if the server side of the Group Key Management cluster is included #define ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER -#define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT +#define MATTER_DM_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER +#define MATTER_DM_PLUGIN_GROUP_KEY_MANAGEMENT // Use this macro to check if the server side of the Fixed Label cluster is included #define ZCL_USING_FIXED_LABEL_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_FIXED_LABEL_SERVER -#define EMBER_AF_PLUGIN_FIXED_LABEL +#define MATTER_DM_PLUGIN_FIXED_LABEL_SERVER +#define MATTER_DM_PLUGIN_FIXED_LABEL // Use this macro to check if the server side of the User Label cluster is included #define ZCL_USING_USER_LABEL_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_USER_LABEL_SERVER -#define EMBER_AF_PLUGIN_USER_LABEL +#define MATTER_DM_PLUGIN_USER_LABEL_SERVER +#define MATTER_DM_PLUGIN_USER_LABEL // Use this macro to check if the server side of the Color Control cluster is included #define ZCL_USING_COLOR_CONTROL_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER -#define EMBER_AF_PLUGIN_COLOR_CONTROL +#define MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER +#define MATTER_DM_PLUGIN_COLOR_CONTROL // User options for server plugin Color Control -#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY -#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP -#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV +#define MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_XY +#define MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#define MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_HSV // Use this macro to check if the server side of the Occupancy Sensing cluster is included #define ZCL_USING_OCCUPANCY_SENSING_CLUSTER_SERVER -#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING_SERVER -#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING +#define MATTER_DM_PLUGIN_OCCUPANCY_SENSING_SERVER +#define MATTER_DM_PLUGIN_OCCUPANCY_SENSING diff --git a/src/app/clusters/account-login-server/account-login-server.cpp b/src/app/clusters/account-login-server/account-login-server.cpp index 1ba2218a69f737..9fc4b1511d35bb 100644 --- a/src/app/clusters/account-login-server/account-login-server.cpp +++ b/src/app/clusters/account-login-server/account-login-server.cpp @@ -49,7 +49,7 @@ using chip::Protocols::InteractionModel::Status; using LoggedOutEvent = chip::app::Clusters::AccountLogin::Events::LoggedOut::Type; static constexpr size_t kAccountLoginDeletageTableSize = - EMBER_AF_ACCOUNT_LOGIN_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_ACCOUNT_LOGIN_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; static_assert(kAccountLoginDeletageTableSize <= kEmberInvalidEndpointIndex, "AccountLogin Delegate table size error"); // ----------------------------------------------------------------------------- @@ -72,7 +72,7 @@ Delegate * GetDelegate(EndpointId endpoint) ChipLogProgress(Zcl, "AccountLogin NOT returning ContentApp delegate for endpoint:%u", endpoint); uint16_t ep = - emberAfGetClusterServerEndpointIndex(endpoint, AccountLogin::Id, EMBER_AF_ACCOUNT_LOGIN_CLUSTER_SERVER_ENDPOINT_COUNT); + emberAfGetClusterServerEndpointIndex(endpoint, AccountLogin::Id, MATTER_DM_ACCOUNT_LOGIN_CLUSTER_SERVER_ENDPOINT_COUNT); return (ep >= kAccountLoginDeletageTableSize ? nullptr : gDelegateTable[ep]); } @@ -95,7 +95,7 @@ namespace AccountLogin { void SetDefaultDelegate(EndpointId endpoint, Delegate * delegate) { uint16_t ep = - emberAfGetClusterServerEndpointIndex(endpoint, AccountLogin::Id, EMBER_AF_ACCOUNT_LOGIN_CLUSTER_SERVER_ENDPOINT_COUNT); + emberAfGetClusterServerEndpointIndex(endpoint, AccountLogin::Id, MATTER_DM_ACCOUNT_LOGIN_CLUSTER_SERVER_ENDPOINT_COUNT); // if endpoint is found if (ep < kAccountLoginDeletageTableSize) { diff --git a/src/app/clusters/application-basic-server/application-basic-server.cpp b/src/app/clusters/application-basic-server/application-basic-server.cpp index 4c61cf11a3a97d..ca78bc31d7bc6f 100644 --- a/src/app/clusters/application-basic-server/application-basic-server.cpp +++ b/src/app/clusters/application-basic-server/application-basic-server.cpp @@ -45,7 +45,7 @@ using namespace chip::AppPlatform; #endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED static constexpr size_t kApplicationBasicDelegateTableSize = - EMBER_AF_APPLICATION_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_APPLICATION_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; static_assert(kApplicationBasicDelegateTableSize <= kEmberInvalidEndpointIndex, "ApplicationBasic Delegate table size error"); // ----------------------------------------------------------------------------- @@ -70,7 +70,7 @@ Delegate * GetDelegate(EndpointId endpoint) ChipLogProgress(Zcl, "ApplicationBasic NOT returning ContentApp delegate for endpoint:%u", endpoint); uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, chip::app::Clusters::ApplicationBasic::Id, - EMBER_AF_APPLICATION_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_APPLICATION_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT); return (ep >= kApplicationBasicDelegateTableSize ? nullptr : gDelegateTable[ep]); } @@ -93,7 +93,7 @@ namespace ApplicationBasic { void SetDefaultDelegate(EndpointId endpoint, Delegate * delegate) { uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, ApplicationBasic::Id, - EMBER_AF_APPLICATION_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_APPLICATION_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT); // if endpoint is found if (ep < kApplicationBasicDelegateTableSize) { diff --git a/src/app/clusters/application-launcher-server/application-launcher-server.cpp b/src/app/clusters/application-launcher-server/application-launcher-server.cpp index 18442de56e5dcc..aa72d8ad499620 100644 --- a/src/app/clusters/application-launcher-server/application-launcher-server.cpp +++ b/src/app/clusters/application-launcher-server/application-launcher-server.cpp @@ -49,7 +49,7 @@ using namespace chip::AppPlatform; using namespace chip::Uint8; static constexpr size_t kApplicationLauncherDelegateTableSize = - EMBER_AF_APPLICATION_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_APPLICATION_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; static_assert(kApplicationLauncherDelegateTableSize <= kEmberInvalidEndpointIndex, "ApplicationLauncher Delegate table size error"); // ----------------------------------------------------------------------------- @@ -77,7 +77,7 @@ Delegate * GetDelegate(EndpointId endpoint) ChipLogProgress(Zcl, "ApplicationLauncher NOT returning ContentApp delegate for endpoint:%u", endpoint); uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, ApplicationLauncher::Id, - EMBER_AF_APPLICATION_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_APPLICATION_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT); return (ep >= kApplicationLauncherDelegateTableSize ? nullptr : gDelegateTable[ep]); } @@ -100,7 +100,7 @@ namespace ApplicationLauncher { void SetDefaultDelegate(EndpointId endpoint, Delegate * delegate) { uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, ApplicationLauncher::Id, - EMBER_AF_APPLICATION_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_APPLICATION_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT); // if endpoint is found if (ep < kApplicationLauncherDelegateTableSize) { diff --git a/src/app/clusters/audio-output-server/audio-output-server.cpp b/src/app/clusters/audio-output-server/audio-output-server.cpp index d73f340547ce47..f47fc528456a78 100644 --- a/src/app/clusters/audio-output-server/audio-output-server.cpp +++ b/src/app/clusters/audio-output-server/audio-output-server.cpp @@ -39,7 +39,7 @@ using namespace chip::app::Clusters::AudioOutput; using chip::Protocols::InteractionModel::Status; static constexpr size_t kAudioOutputDelegateTableSize = - EMBER_AF_AUDIO_OUTPUT_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_AUDIO_OUTPUT_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; static_assert(kAudioOutputDelegateTableSize <= kEmberInvalidEndpointIndex, "AudioOutput Delegate table size error"); // ----------------------------------------------------------------------------- @@ -54,7 +54,7 @@ Delegate * gDelegateTable[kAudioOutputDelegateTableSize] = { nullptr }; Delegate * GetDelegate(EndpointId endpoint) { uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, chip::app::Clusters::AudioOutput::Id, - EMBER_AF_AUDIO_OUTPUT_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_AUDIO_OUTPUT_CLUSTER_SERVER_ENDPOINT_COUNT); return (ep >= kAudioOutputDelegateTableSize ? nullptr : gDelegateTable[ep]); } @@ -77,7 +77,7 @@ namespace AudioOutput { void SetDefaultDelegate(EndpointId endpoint, Delegate * delegate) { uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, chip::app::Clusters::AudioOutput::Id, - EMBER_AF_AUDIO_OUTPUT_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_AUDIO_OUTPUT_CLUSTER_SERVER_ENDPOINT_COUNT); if (ep < kAudioOutputDelegateTableSize) { gDelegateTable[ep] = delegate; diff --git a/src/app/clusters/boolean-state-configuration-server/boolean-state-configuration-server.cpp b/src/app/clusters/boolean-state-configuration-server/boolean-state-configuration-server.cpp index 9ca68da511980d..8fa2f36d3a3aab 100644 --- a/src/app/clusters/boolean-state-configuration-server/boolean-state-configuration-server.cpp +++ b/src/app/clusters/boolean-state-configuration-server/boolean-state-configuration-server.cpp @@ -41,7 +41,7 @@ using chip::app::Clusters::BooleanStateConfiguration::Delegate; using chip::Protocols::InteractionModel::Status; static constexpr size_t kBooleanStateConfigurationDelegateTableSize = - EMBER_AF_BOOLEAN_STATE_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_BOOLEAN_STATE_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; static_assert(kBooleanStateConfigurationDelegateTableSize <= kEmberInvalidEndpointIndex, "BooleanStateConfiguration Delegate table size error"); @@ -57,7 +57,7 @@ Delegate * gDelegateTable[kBooleanStateConfigurationDelegateTableSize] = { nullp Delegate * GetDelegate(EndpointId endpoint) { uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, BooleanStateConfiguration::Id, - EMBER_AF_BOOLEAN_STATE_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_BOOLEAN_STATE_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT); return (ep >= kBooleanStateConfigurationDelegateTableSize ? nullptr : gDelegateTable[ep]); } @@ -234,7 +234,7 @@ namespace BooleanStateConfiguration { void SetDefaultDelegate(EndpointId endpoint, Delegate * delegate) { uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, BooleanStateConfiguration::Id, - EMBER_AF_BOOLEAN_STATE_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_BOOLEAN_STATE_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT); // if endpoint is found if (ep < kBooleanStateConfigurationDelegateTableSize) { diff --git a/src/app/clusters/channel-server/channel-server.cpp b/src/app/clusters/channel-server/channel-server.cpp index 52d30083075d66..af977653da1749 100644 --- a/src/app/clusters/channel-server/channel-server.cpp +++ b/src/app/clusters/channel-server/channel-server.cpp @@ -39,7 +39,7 @@ using namespace chip::AppPlatform; using chip::Protocols::InteractionModel::Status; static constexpr size_t kChannelDelegateTableSize = - EMBER_AF_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; static_assert(kChannelDelegateTableSize <= kEmberInvalidEndpointIndex, "Channel Delegate table size error"); // ----------------------------------------------------------------------------- @@ -63,7 +63,7 @@ Delegate * GetDelegate(EndpointId endpoint) #endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED ChipLogProgress(Zcl, "Channel NOT returning ContentApp delegate for endpoint:%u", endpoint); - uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, Channel::Id, EMBER_AF_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT); + uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, Channel::Id, MATTER_DM_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT); return (ep >= kChannelDelegateTableSize ? nullptr : gDelegateTable[ep]); } @@ -85,7 +85,7 @@ namespace Channel { void SetDefaultDelegate(EndpointId endpoint, Delegate * delegate) { - uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, Channel::Id, EMBER_AF_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT); + uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, Channel::Id, MATTER_DM_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT); // if endpoint is found if (ep < kChannelDelegateTableSize) { diff --git a/src/app/clusters/color-control-server/color-control-server.cpp b/src/app/clusters/color-control-server/color-control-server.cpp index 0f24ccd5b01e43..941f9d5a5f5842 100644 --- a/src/app/clusters/color-control-server/color-control-server.cpp +++ b/src/app/clusters/color-control-server/color-control-server.cpp @@ -26,7 +26,7 @@ #include #include -#ifdef EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT #include #endif @@ -60,7 +60,7 @@ constexpr uint8_t kExecuteIfOff = 1; } // namespace app } // namespace chip -#if defined(EMBER_AF_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#if defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS class DefaultColorControlSceneHandler : public scenes::DefaultSceneHandlerImpl { public: @@ -206,19 +206,19 @@ class DefaultColorControlSceneHandler : public scenes::DefaultSceneHandlerImpl ReturnErrorOnFailure(attributeValueList.ComputeSize(&attributeCount)); VerifyOrReturnError(attributeCount <= kColorControlScenableAttributesCount, CHIP_ERROR_BUFFER_TOO_SMALL); // Retrieve the buffers for different modes -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_HSV ColorControlServer::ColorHueTransitionState * colorHueTransitionState = ColorControlServer::Instance().getColorHueTransitionState(endpoint); ColorControlServer::Color16uTransitionState * colorSaturationTransitionState = ColorControlServer::Instance().getSaturationTransitionState(endpoint); #endif -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_XY ColorControlServer::Color16uTransitionState * colorXTransitionState = ColorControlServer::Instance().getXTransitionState(endpoint); ColorControlServer::Color16uTransitionState * colorYTransitionState = ColorControlServer::Instance().getYTransitionState(endpoint); #endif -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP ColorControlServer::Color16uTransitionState * colorTempTransitionState = ColorControlServer::Instance().getTempTransitionState(endpoint); #endif @@ -319,29 +319,29 @@ class DefaultColorControlSceneHandler : public scenes::DefaultSceneHandlerImpl switch (targetColorMode) { case ColorControl::EnhancedColorMode::kCurrentHueAndCurrentSaturation: -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_HSV ColorControlServer::Instance().moveToSaturation(static_cast(colorSaturationTransitionState->finalValue), transitionTime10th, endpoint); -#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV +#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_HSV break; case ColorControl::EnhancedColorMode::kCurrentXAndCurrentY: -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_XY ColorControlServer::Instance().moveToColor(colorXTransitionState->finalValue, colorYTransitionState->finalValue, transitionTime10th, endpoint); -#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY +#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_XY break; case ColorControl::EnhancedColorMode::kColorTemperature: -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP ColorControlServer::Instance().moveToColorTemp( endpoint, static_cast(colorTempTransitionState->finalValue), transitionTime10th); -#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP break; case ColorControl::EnhancedColorMode::kEnhancedCurrentHueAndCurrentSaturation: -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_HSV ColorControlServer::Instance().moveToHueAndSaturation( colorHueTransitionState->finalEnhancedHue, static_cast(colorSaturationTransitionState->finalValue), transitionTime10th, true, endpoint); -#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV +#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_HSV break; default: return CHIP_ERROR_INVALID_ARGUMENT; @@ -381,7 +381,7 @@ class DefaultColorControlSceneHandler : public scenes::DefaultSceneHandlerImpl } }; static DefaultColorControlSceneHandler sColorControlSceneHandler; -#endif // defined(EMBER_AF_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#endif // defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS /********************************************************** * Matter timer scheduling glue logic @@ -435,11 +435,11 @@ ColorControlServer & ColorControlServer::Instance() chip::scenes::SceneHandler * ColorControlServer::GetSceneHandler() { -#if defined(EMBER_AF_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#if defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS return &sColorControlSceneHandler; #else return nullptr; -#endif // defined(EMBER_AF_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#endif // defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS } bool ColorControlServer::HasFeature(chip::EndpointId endpoint, Feature feature) @@ -470,7 +470,7 @@ bool ColorControlServer::stopMoveStepCommand(app::CommandHandler * commandObj, c { status = stopAllColorTransitions(endpoint); -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_HSV // Because Hue and Saturation have separate transitions and can be kicked separately, // a new command specific to Hue could resume an old unfinished Saturation transition. Or vice versa. // Init both transition states on stop command to prevent that. @@ -481,7 +481,7 @@ bool ColorControlServer::stopMoveStepCommand(app::CommandHandler * commandObj, c initHueTransitionState(endpoint, hueState, false /*isEnhancedHue don't care*/); initSaturationTransitionState(endpoint, saturationState); } -#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV +#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_HSV } commandObj->AddStatus(commandPath, status); @@ -666,7 +666,7 @@ uint16_t ColorControlServer::computeTransitionTimeFromStateAndRate(ColorControlS EmberEventControl * ColorControlServer::getEventControl(EndpointId endpoint) { uint16_t index = - emberAfGetClusterServerEndpointIndex(endpoint, ColorControl::Id, EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); + emberAfGetClusterServerEndpointIndex(endpoint, ColorControl::Id, MATTER_DM_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); EmberEventControl * event = nullptr; if (index < ArraySize(eventControls)) @@ -785,7 +785,7 @@ bool ColorControlServer::computeNewColor16uValue(ColorControlServer::Color16uTra return false; } -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_HSV /** * @brief Returns ColorHueTransititionState associated to an endpoint @@ -796,7 +796,7 @@ bool ColorControlServer::computeNewColor16uValue(ColorControlServer::Color16uTra ColorControlServer::ColorHueTransitionState * ColorControlServer::getColorHueTransitionState(EndpointId endpoint) { uint16_t index = - emberAfGetClusterServerEndpointIndex(endpoint, ColorControl::Id, EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); + emberAfGetClusterServerEndpointIndex(endpoint, ColorControl::Id, MATTER_DM_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); ColorHueTransitionState * state = nullptr; if (index < ArraySize(colorHueTransitionStates)) @@ -815,7 +815,7 @@ ColorControlServer::ColorHueTransitionState * ColorControlServer::getColorHueTra ColorControlServer::Color16uTransitionState * ColorControlServer::getSaturationTransitionState(EndpointId endpoint) { uint16_t index = - emberAfGetClusterServerEndpointIndex(endpoint, ColorControl::Id, EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); + emberAfGetClusterServerEndpointIndex(endpoint, ColorControl::Id, MATTER_DM_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); Color16uTransitionState * state = nullptr; if (index < ArraySize(colorSatTransitionStates)) @@ -1611,9 +1611,9 @@ bool ColorControlServer::moveToHueAndSaturationCommand(app::CommandHandler * com return true; } Status status = moveToHueAndSaturation(hue, saturation, transitionTime, isEnhanced, commandPath.mEndpointId); -#ifdef EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT ScenesManagement::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(commandPath.mEndpointId); -#endif // EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#endif // MATTER_DM_PLUGIN_SCENES_MANAGEMENT commandObj->AddStatus(commandPath, status); return true; } @@ -1819,9 +1819,9 @@ bool ColorControlServer::moveToSaturationCommand(app::CommandHandler * commandOb return true; } Status status = moveToSaturation(commandData.saturation, commandData.transitionTime, commandPath.mEndpointId); -#ifdef EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT ScenesManagement::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(commandPath.mEndpointId); -#endif // EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#endif // MATTER_DM_PLUGIN_SCENES_MANAGEMENT commandObj->AddStatus(commandPath, status); return true; } @@ -2005,9 +2005,9 @@ bool ColorControlServer::colorLoopCommand(app::CommandHandler * commandObj, cons } exit: -#ifdef EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT ScenesManagement::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(endpoint); -#endif // EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#endif // MATTER_DM_PLUGIN_SCENES_MANAGEMENT commandObj->AddStatus(commandPath, status); return true; } @@ -2070,9 +2070,9 @@ void ColorControlServer::updateHueSatCommand(EndpointId endpoint) computePwmFromHsv(endpoint); } -#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV +#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_HSV -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_XY /** * @brief Returns Color16uTransitionState for X color associated to an endpoint @@ -2083,7 +2083,7 @@ void ColorControlServer::updateHueSatCommand(EndpointId endpoint) ColorControlServer::Color16uTransitionState * ColorControlServer::getXTransitionState(EndpointId endpoint) { uint16_t index = - emberAfGetClusterServerEndpointIndex(endpoint, ColorControl::Id, EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); + emberAfGetClusterServerEndpointIndex(endpoint, ColorControl::Id, MATTER_DM_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); Color16uTransitionState * state = nullptr; if (index < ArraySize(colorXtransitionStates)) @@ -2103,7 +2103,7 @@ ColorControlServer::Color16uTransitionState * ColorControlServer::getXTransition ColorControlServer::Color16uTransitionState * ColorControlServer::getYTransitionState(EndpointId endpoint) { uint16_t index = - emberAfGetClusterServerEndpointIndex(endpoint, ColorControl::Id, EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); + emberAfGetClusterServerEndpointIndex(endpoint, ColorControl::Id, MATTER_DM_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); Color16uTransitionState * state = nullptr; if (index < ArraySize(colorYtransitionStates)) @@ -2215,9 +2215,9 @@ bool ColorControlServer::moveToColorCommand(app::CommandHandler * commandObj, co } Status status = moveToColor(commandData.colorX, commandData.colorY, commandData.transitionTime, commandPath.mEndpointId); -#ifdef EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT ScenesManagement::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(commandPath.mEndpointId); -#endif // EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#endif // MATTER_DM_PLUGIN_SCENES_MANAGEMENT commandObj->AddStatus(commandPath, status); return true; } @@ -2423,9 +2423,9 @@ void ColorControlServer::updateXYCommand(EndpointId endpoint) computePwmFromXy(endpoint); } -#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY +#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_XY -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP /** * @brief Get the Temp Transition State object associated to the endpoint * @@ -2435,7 +2435,7 @@ void ColorControlServer::updateXYCommand(EndpointId endpoint) ColorControlServer::Color16uTransitionState * ColorControlServer::getTempTransitionState(EndpointId endpoint) { uint16_t index = - emberAfGetClusterServerEndpointIndex(endpoint, ColorControl::Id, EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); + emberAfGetClusterServerEndpointIndex(endpoint, ColorControl::Id, MATTER_DM_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); Color16uTransitionState * state = nullptr; if (index < ArraySize(colorTempTransitionStates)) @@ -2760,9 +2760,9 @@ bool ColorControlServer::moveToColorTempCommand(app::CommandHandler * commandObj } Status status = moveToColorTemp(commandPath.mEndpointId, commandData.colorTemperatureMireds, commandData.transitionTime); -#ifdef EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT ScenesManagement::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(commandPath.mEndpointId); -#endif // EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#endif // MATTER_DM_PLUGIN_SCENES_MANAGEMENT commandObj->AddStatus(commandPath, status); return true; } @@ -2943,13 +2943,13 @@ void ColorControlServer::levelControlColorTempChangeCommand(EndpointId endpoint) } } -#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP /********************************************************** * Callbacks Implementation *********************************************************/ -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_HSV bool emberAfColorControlClusterMoveHueCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, const Commands::MoveHue::DecodableType & commandData) @@ -3046,9 +3046,9 @@ bool emberAfColorControlClusterColorLoopSetCallback(app::CommandHandler * comman return ColorControlServer::Instance().colorLoopCommand(commandObj, commandPath, commandData); } -#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV +#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_HSV -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_XY bool emberAfColorControlClusterMoveToColorCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, const Commands::MoveToColor::DecodableType & commandData) @@ -3068,9 +3068,9 @@ bool emberAfColorControlClusterStepColorCallback(app::CommandHandler * commandOb return ColorControlServer::Instance().stepColorCommand(commandObj, commandPath, commandData); } -#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY +#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_XY -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP bool emberAfColorControlClusterMoveToColorTemperatureCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, @@ -3098,7 +3098,7 @@ void emberAfPluginLevelControlCoupledColorTempChangeCallback(EndpointId endpoint ColorControlServer::Instance().levelControlColorTempChangeCommand(endpoint); } -#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP bool emberAfColorControlClusterStopMoveStepCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, const Commands::StopMoveStep::DecodableType & commandData) @@ -3109,14 +3109,14 @@ bool emberAfColorControlClusterStopMoveStepCallback(app::CommandHandler * comman void emberAfColorControlClusterServerInitCallback(EndpointId endpoint) { -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP ColorControlServer::Instance().startUpColorTempCommand(endpoint); -#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP -#if defined(EMBER_AF_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#if defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS // Registers Scene handlers for the color control cluster on the server app::Clusters::ScenesManagement::ScenesServer::Instance().RegisterSceneHandler( endpoint, ColorControlServer::Instance().GetSceneHandler()); -#endif // defined(EMBER_AF_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#endif // defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS } void MatterColorControlClusterServerShutdownCallback(EndpointId endpoint) @@ -3125,7 +3125,7 @@ void MatterColorControlClusterServerShutdownCallback(EndpointId endpoint) ColorControlServer::Instance().cancelEndpointTimerCallback(endpoint); } -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP /** * @brief Callback for temperature update when timer is finished * @@ -3135,9 +3135,9 @@ void emberAfPluginColorControlServerTempTransitionEventHandler(EndpointId endpoi { ColorControlServer::Instance().updateTempCommand(endpoint); } -#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_XY /** * @brief Callback for color update when timer is finished * @@ -3147,9 +3147,9 @@ void emberAfPluginColorControlServerXyTransitionEventHandler(EndpointId endpoint { ColorControlServer::Instance().updateXYCommand(endpoint); } -#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY +#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_XY -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_HSV /** * @brief Callback for color hue and saturation update when timer is finished * @@ -3159,6 +3159,6 @@ void emberAfPluginColorControlServerHueSatTransitionEventHandler(EndpointId endp { ColorControlServer::Instance().updateHueSatCommand(endpoint); } -#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV +#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_HSV void MatterColorControlPluginServerInitCallback() {} diff --git a/src/app/clusters/color-control-server/color-control-server.h b/src/app/clusters/color-control-server/color-control-server.h index 56110a33373f8d..5c13c5619c82cf 100644 --- a/src/app/clusters/color-control-server/color-control-server.h +++ b/src/app/clusters/color-control-server/color-control-server.h @@ -141,7 +141,7 @@ class ColorControlServer bool stopMoveStepCommand(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, uint8_t optionsMask, uint8_t optionsOverride); -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_HSV bool moveHueCommand(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, HueMoveMode moveMode, uint16_t rate, uint8_t optionsMask, uint8_t optionsOverride, bool isEnhanced); bool moveToHueCommand(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, uint16_t hue, @@ -162,9 +162,9 @@ class ColorControlServer bool colorLoopCommand(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::ColorControl::Commands::ColorLoopSet::DecodableType & commandData); void updateHueSatCommand(chip::EndpointId endpoint); -#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV +#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_HSV -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_XY bool moveToColorCommand(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::ColorControl::Commands::MoveToColor::DecodableType & commandData); bool moveColorCommand(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, @@ -172,9 +172,9 @@ class ColorControlServer bool stepColorCommand(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::ColorControl::Commands::StepColor::DecodableType & commandData); void updateXYCommand(chip::EndpointId endpoint); -#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY +#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_XY -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP bool moveColorTempCommand(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::ColorControl::Commands::MoveColorTemperature::DecodableType & commandData); bool @@ -185,7 +185,7 @@ class ColorControlServer void levelControlColorTempChangeCommand(chip::EndpointId endpoint); void startUpColorTempCommand(chip::EndpointId endpoint); void updateTempCommand(chip::EndpointId endpoint); -#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP void cancelEndpointTimerCallback(chip::EndpointId endpoint); @@ -209,7 +209,7 @@ class ColorControlServer void scheduleTimerCallbackMs(EmberEventControl * control, uint32_t delayMs); void cancelEndpointTimerCallback(EmberEventControl * control); -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_HSV chip::Protocols::InteractionModel::Status moveToSaturation(uint8_t saturation, uint16_t transitionTime, chip::EndpointId endpoint); chip::Protocols::InteractionModel::Status moveToHueAndSaturation(uint16_t hue, uint8_t saturation, uint16_t transitionTime, @@ -229,46 +229,46 @@ class ColorControlServer void SetHSVRemainingTime(chip::EndpointId endpoint); bool computeNewHueValue(ColorHueTransitionState * p); EmberEventControl * configureHSVEventControl(chip::EndpointId); -#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV +#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_HSV -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_XY chip::Protocols::InteractionModel::Status moveToColor(uint16_t colorX, uint16_t colorY, uint16_t transitionTime, chip::EndpointId endpoint); Color16uTransitionState * getXTransitionState(chip::EndpointId endpoint); Color16uTransitionState * getYTransitionState(chip::EndpointId endpoint); uint16_t findNewColorValueFromStep(uint16_t oldValue, int16_t step); EmberEventControl * configureXYEventControl(chip::EndpointId); -#endif // #ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY +#endif // #ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_XY -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP Color16uTransitionState * getTempTransitionState(chip::EndpointId endpoint); chip::Protocols::InteractionModel::Status moveToColorTemp(chip::EndpointId aEndpoint, uint16_t colorTemperature, uint16_t transitionTime); uint16_t getTemperatureCoupleToLevelMin(chip::EndpointId endpoint); EmberEventControl * configureTempEventControl(chip::EndpointId); -#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP /********************************************************** * Attributes Declaration *********************************************************/ static ColorControlServer instance; static constexpr size_t kColorControlClusterServerMaxEndpointCount = - EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; static_assert(kColorControlClusterServerMaxEndpointCount <= kEmberInvalidEndpointIndex, "ColorControl endpoint count error"); -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_HSV ColorHueTransitionState colorHueTransitionStates[kColorControlClusterServerMaxEndpointCount]; Color16uTransitionState colorSatTransitionStates[kColorControlClusterServerMaxEndpointCount]; #endif -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_XY Color16uTransitionState colorXtransitionStates[kColorControlClusterServerMaxEndpointCount]; Color16uTransitionState colorYtransitionStates[kColorControlClusterServerMaxEndpointCount]; -#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY +#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_XY -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP Color16uTransitionState colorTempTransitionStates[kColorControlClusterServerMaxEndpointCount]; -#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP EmberEventControl eventControls[kColorControlClusterServerMaxEndpointCount]; @@ -279,18 +279,18 @@ class ColorControlServer * Callbacks *********************************************************/ -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP void emberAfPluginColorControlServerTempTransitionEventHandler(chip::EndpointId endpoint); -#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_XY void emberAfPluginColorControlServerXyTransitionEventHandler(chip::EndpointId endpoint); -#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY +#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_XY -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_HSV void emberAfPluginColorControlServerHueSatTransitionEventHandler(chip::EndpointId endpoint); -#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV +#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_HSV -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP void emberAfPluginLevelControlCoupledColorTempChangeCallback(chip::EndpointId endpoint); -#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP diff --git a/src/app/clusters/content-app-observer/content-app-observer.cpp b/src/app/clusters/content-app-observer/content-app-observer.cpp index 26739027b494af..08ed95c10aa679 100644 --- a/src/app/clusters/content-app-observer/content-app-observer.cpp +++ b/src/app/clusters/content-app-observer/content-app-observer.cpp @@ -46,7 +46,7 @@ using chip::app::Clusters::ContentAppObserver::Delegate; using chip::Protocols::InteractionModel::Status; static constexpr size_t kContentAppObserverDeletageTableSize = - EMBER_AF_CONTENT_APP_OBSERVER_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_CONTENT_APP_OBSERVER_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; static_assert(kContentAppObserverDeletageTableSize <= kEmberInvalidEndpointIndex, "ContentAppObserver Delegate table size error"); // ----------------------------------------------------------------------------- @@ -69,7 +69,7 @@ Delegate * GetDelegate(EndpointId endpoint) ChipLogProgress(Zcl, "ContentAppObserver NOT returning ContentApp delegate for endpoint:%u", endpoint); uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, ContentAppObserver::Id, - EMBER_AF_CONTENT_APP_OBSERVER_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_CONTENT_APP_OBSERVER_CLUSTER_SERVER_ENDPOINT_COUNT); return (ep >= kContentAppObserverDeletageTableSize ? nullptr : gDelegateTable[ep]); } @@ -92,7 +92,7 @@ namespace ContentAppObserver { void SetDefaultDelegate(EndpointId endpoint, Delegate * delegate) { uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, ContentAppObserver::Id, - EMBER_AF_CONTENT_APP_OBSERVER_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_CONTENT_APP_OBSERVER_CLUSTER_SERVER_ENDPOINT_COUNT); // if endpoint is found if (ep < kContentAppObserverDeletageTableSize) { diff --git a/src/app/clusters/content-control-server/content-control-server.cpp b/src/app/clusters/content-control-server/content-control-server.cpp index 1434e25000f389..60c30f4b71845a 100644 --- a/src/app/clusters/content-control-server/content-control-server.cpp +++ b/src/app/clusters/content-control-server/content-control-server.cpp @@ -49,7 +49,7 @@ using chip::Protocols::InteractionModel::Status; using RemainingScreenTimeExpiredEvent = chip::app::Clusters::ContentControl::Events::RemainingScreenTimeExpired::Type; static constexpr size_t kContentControlDeletageTableSize = - EMBER_AF_CONTENT_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_CONTENT_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; static_assert(kContentControlDeletageTableSize <= kEmberInvalidEndpointIndex, "ContentControl Delegate table size error"); // ----------------------------------------------------------------------------- @@ -72,7 +72,7 @@ Delegate * GetDelegate(EndpointId endpoint) ChipLogProgress(Zcl, "ContentControl NOT returning ContentApp delegate for endpoint:%u", endpoint); uint16_t ep = - emberAfGetClusterServerEndpointIndex(endpoint, ContentControl::Id, EMBER_AF_CONTENT_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); + emberAfGetClusterServerEndpointIndex(endpoint, ContentControl::Id, MATTER_DM_CONTENT_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); return (ep >= kContentControlDeletageTableSize ? nullptr : gDelegateTable[ep]); } @@ -95,7 +95,7 @@ namespace ContentControl { void SetDefaultDelegate(EndpointId endpoint, Delegate * delegate) { uint16_t ep = - emberAfGetClusterServerEndpointIndex(endpoint, ContentControl::Id, EMBER_AF_CONTENT_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); + emberAfGetClusterServerEndpointIndex(endpoint, ContentControl::Id, MATTER_DM_CONTENT_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); // if endpoint is found if (ep < kContentControlDeletageTableSize) { diff --git a/src/app/clusters/content-launch-server/content-launch-server.cpp b/src/app/clusters/content-launch-server/content-launch-server.cpp index 405ec7b427f373..d9bba198a9df5c 100644 --- a/src/app/clusters/content-launch-server/content-launch-server.cpp +++ b/src/app/clusters/content-launch-server/content-launch-server.cpp @@ -44,7 +44,7 @@ using namespace chip::AppPlatform; using chip::Protocols::InteractionModel::Status; static constexpr size_t kContentLaunchDelegateTableSize = - EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; static_assert(kContentLaunchDelegateTableSize < kEmberInvalidEndpointIndex, "ContentLaunch Delegate table size error"); // ----------------------------------------------------------------------------- @@ -69,7 +69,7 @@ Delegate * GetDelegate(EndpointId endpoint) ChipLogProgress(Zcl, "Content Launcher NOT returning ContentApp delegate for endpoint:%u", endpoint); uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, ContentLauncher::Id, - EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT); return (ep >= kContentLaunchDelegateTableSize ? nullptr : gDelegateTable[ep]); } @@ -92,7 +92,7 @@ namespace ContentLauncher { void SetDefaultDelegate(EndpointId endpoint, Delegate * delegate) { uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, ContentLauncher::Id, - EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT); // if endpoint is found if (ep < kContentLaunchDelegateTableSize) { diff --git a/src/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp b/src/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp index 5d7de3b077a982..95d9a332819ae3 100644 --- a/src/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp +++ b/src/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp @@ -24,9 +24,9 @@ #include "BDXDiagnosticLogsProvider.h" -#ifdef EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT +#ifdef MATTER_DM_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT static constexpr size_t kDiagnosticLogsDiagnosticLogsProviderDelegateTableSize = - EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; static_assert(kDiagnosticLogsDiagnosticLogsProviderDelegateTableSize < kEmberInvalidEndpointIndex, "DiagnosticLogs: log provider delegate table size error"); @@ -49,7 +49,7 @@ DiagnosticLogsProviderDelegate * gDiagnosticLogsProviderDelegateTable[kDiagnosti DiagnosticLogsProviderDelegate * GetDiagnosticLogsProviderDelegate(EndpointId endpoint) { - uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, Id, EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT); + uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, Id, MATTER_DM_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT); auto delegate = (ep >= ArraySize(gDiagnosticLogsProviderDelegateTable) ? nullptr : gDiagnosticLogsProviderDelegateTable[ep]); if (delegate == nullptr) @@ -89,7 +89,7 @@ DiagnosticLogsServer DiagnosticLogsServer::sInstance; void DiagnosticLogsServer::SetDiagnosticLogsProviderDelegate(EndpointId endpoint, DiagnosticLogsProviderDelegate * delegate) { - uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, Id, EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT); + uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, Id, MATTER_DM_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT); if (ep < kDiagnosticLogsDiagnosticLogsProviderDelegateTableSize) { gDiagnosticLogsProviderDelegateTable[ep] = delegate; @@ -187,4 +187,4 @@ bool emberAfDiagnosticLogsClusterRetrieveLogsRequestCallback(chip::app::CommandH } void MatterDiagnosticLogsPluginServerInitCallback() {} -#endif // #ifdef EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT +#endif // #ifdef MATTER_DM_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT diff --git a/src/app/clusters/dishwasher-alarm-server/dishwasher-alarm-server.cpp b/src/app/clusters/dishwasher-alarm-server/dishwasher-alarm-server.cpp index a89bf17ae4ef9c..aaed13bbded7e4 100644 --- a/src/app/clusters/dishwasher-alarm-server/dishwasher-alarm-server.cpp +++ b/src/app/clusters/dishwasher-alarm-server/dishwasher-alarm-server.cpp @@ -36,7 +36,7 @@ using chip::Protocols::InteractionModel::Status; using namespace std; static constexpr size_t kDishwasherAlarmDelegateTableSize = - EMBER_AF_DISHWASHER_ALARM_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_DISHWASHER_ALARM_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; static_assert(kDishwasherAlarmDelegateTableSize <= kEmberInvalidEndpointIndex, "Dishwasher Alarm Delegate table size error"); @@ -50,14 +50,14 @@ Delegate * gDelegateTable[kDishwasherAlarmDelegateTableSize] = { nullptr }; Delegate * GetDelegate(EndpointId endpoint) { uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, DishwasherAlarm::Id, - EMBER_AF_DISHWASHER_ALARM_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_DISHWASHER_ALARM_CLUSTER_SERVER_ENDPOINT_COUNT); return (ep >= kDishwasherAlarmDelegateTableSize ? nullptr : gDelegateTable[ep]); } void SetDefaultDelegate(EndpointId endpoint, Delegate * delegate) { uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, DishwasherAlarm::Id, - EMBER_AF_DISHWASHER_ALARM_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_DISHWASHER_ALARM_CLUSTER_SERVER_ENDPOINT_COUNT); // if endpoint is found if (ep < kDishwasherAlarmDelegateTableSize) { diff --git a/src/app/clusters/door-lock-server/door-lock-server.cpp b/src/app/clusters/door-lock-server/door-lock-server.cpp index b4df96a8e50f4c..fe7bfa76b5e8ef 100644 --- a/src/app/clusters/door-lock-server/door-lock-server.cpp +++ b/src/app/clusters/door-lock-server/door-lock-server.cpp @@ -51,7 +51,7 @@ static constexpr uint8_t DOOR_LOCK_ALIRO_CREDENTIAL_SIZE = 65; static constexpr uint32_t DOOR_LOCK_MAX_LOCK_TIMEOUT_SEC = MAX_INT32U_VALUE / MILLISECOND_TICKS_PER_SECOND; static constexpr size_t kDoorLockDelegateTableSize = - EMBER_AF_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; static_assert(kDoorLockDelegateTableSize <= kEmberInvalidEndpointIndex, "Door Lock Delegate table size error"); @@ -64,13 +64,13 @@ Delegate * gDelegateTable[kDoorLockDelegateTableSize] = { nullptr }; Delegate * GetDelegate(EndpointId endpoint) { - uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, DoorLock::Id, EMBER_AF_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT); + uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, DoorLock::Id, MATTER_DM_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT); return (ep >= kDoorLockDelegateTableSize ? nullptr : gDelegateTable[ep]); } void SetDefaultDelegate(EndpointId endpoint, Delegate * delegate) { - uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, DoorLock::Id, EMBER_AF_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT); + uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, DoorLock::Id, MATTER_DM_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT); // if endpoint is found if (ep < ArraySize(gDelegateTable)) { @@ -3424,7 +3424,7 @@ void DoorLockServer::sendClusterResponse(chip::app::CommandHandler * commandObj, EmberAfDoorLockEndpointContext * DoorLockServer::getContext(chip::EndpointId endpointId) { - auto index = emberAfGetClusterServerEndpointIndex(endpointId, ::Id, EMBER_AF_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT); + auto index = emberAfGetClusterServerEndpointIndex(endpointId, ::Id, MATTER_DM_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT); if (index < kDoorLockClusterServerMaxEndpointCount) { return &mEndpointCtx[index]; diff --git a/src/app/clusters/door-lock-server/door-lock-server.h b/src/app/clusters/door-lock-server/door-lock-server.h index 6f25cd507621bf..9b1a7f6fd27791 100644 --- a/src/app/clusters/door-lock-server/door-lock-server.h +++ b/src/app/clusters/door-lock-server/door-lock-server.h @@ -706,7 +706,7 @@ class DoorLockServer : public chip::app::AttributeAccessInterface const chip::app::Clusters::DoorLock::Commands::ClearAliroReaderConfig::DecodableType & commandData); static constexpr size_t kDoorLockClusterServerMaxEndpointCount = - EMBER_AF_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; static_assert(kDoorLockClusterServerMaxEndpointCount <= kEmberInvalidEndpointIndex, "DoorLock Endpoint count error"); std::array mEndpointCtx; diff --git a/src/app/clusters/electrical-energy-measurement-server/electrical-energy-measurement-server.cpp b/src/app/clusters/electrical-energy-measurement-server/electrical-energy-measurement-server.cpp index 38911ff7e54358..a26e1a33844bef 100644 --- a/src/app/clusters/electrical-energy-measurement-server/electrical-energy-measurement-server.cpp +++ b/src/app/clusters/electrical-energy-measurement-server/electrical-energy-measurement-server.cpp @@ -35,8 +35,8 @@ using namespace chip; using namespace chip::app::Clusters::ElectricalEnergyMeasurement::Attributes; using namespace chip::app::Clusters::ElectricalEnergyMeasurement::Structs; -MeasurementData - gMeasurements[EMBER_AF_ELECTRICAL_ENERGY_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT]; +MeasurementData gMeasurements[MATTER_DM_ELECTRICAL_ENERGY_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT + + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT]; CHIP_ERROR ElectricalEnergyMeasurementAttrAccess::Init() { @@ -143,14 +143,14 @@ bool ElectricalEnergyMeasurementAttrAccess::SupportsOptAttr(OptionalAttributes a MeasurementData * MeasurementDataForEndpoint(EndpointId endpointId) { auto index = emberAfGetClusterServerEndpointIndex(endpointId, app::Clusters::ElectricalEnergyMeasurement::Id, - EMBER_AF_ELECTRICAL_ENERGY_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_ELECTRICAL_ENERGY_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT); if (index == kEmberInvalidEndpointIndex) { return nullptr; } - if (index >= EMBER_AF_ELECTRICAL_ENERGY_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT) + if (index >= MATTER_DM_ELECTRICAL_ENERGY_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT) { ChipLogError(NotSpecified, "Internal error: invalid/unexpected energy measurement index."); return nullptr; diff --git a/src/app/clusters/fan-control-server/fan-control-server.cpp b/src/app/clusters/fan-control-server/fan-control-server.cpp index 8359e03610b96e..4ed216b9cad088 100644 --- a/src/app/clusters/fan-control-server/fan-control-server.cpp +++ b/src/app/clusters/fan-control-server/fan-control-server.cpp @@ -45,7 +45,7 @@ using namespace chip::app::Clusters::FanControl::Attributes; namespace { constexpr size_t kFanControlDelegateTableSize = - EMBER_AF_FAN_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_FAN_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; static_assert(kFanControlDelegateTableSize <= kEmberInvalidEndpointIndex, "FanControl Delegate table size error"); @@ -61,14 +61,14 @@ namespace FanControl { Delegate * GetDelegate(EndpointId aEndpoint) { uint16_t ep = - emberAfGetClusterServerEndpointIndex(aEndpoint, FanControl::Id, EMBER_AF_FAN_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); + emberAfGetClusterServerEndpointIndex(aEndpoint, FanControl::Id, MATTER_DM_FAN_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); return (ep >= kFanControlDelegateTableSize ? nullptr : gDelegateTable[ep]); } void SetDefaultDelegate(EndpointId aEndpoint, Delegate * aDelegate) { uint16_t ep = - emberAfGetClusterServerEndpointIndex(aEndpoint, FanControl::Id, EMBER_AF_FAN_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); + emberAfGetClusterServerEndpointIndex(aEndpoint, FanControl::Id, MATTER_DM_FAN_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); // if endpoint is found if (ep < kFanControlDelegateTableSize) { diff --git a/src/app/clusters/groups-server/groups-server.cpp b/src/app/clusters/groups-server/groups-server.cpp index a6d502acb18e52..d591c3f3d6e331 100644 --- a/src/app/clusters/groups-server/groups-server.cpp +++ b/src/app/clusters/groups-server/groups-server.cpp @@ -30,9 +30,9 @@ #include #include -#ifdef EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT #include -#endif // EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#endif // MATTER_DM_PLUGIN_SCENES_MANAGEMENT using namespace chip; using namespace app::Clusters; @@ -292,7 +292,7 @@ bool emberAfGroupsClusterRemoveGroupCallback(app::CommandHandler * commandObj, c auto fabricIndex = commandObj->GetAccessingFabricIndex(); Groups::Commands::RemoveGroupResponse::Type response; -#ifdef EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT // If a group is removed the scenes associated with that group SHOULD be removed. ScenesManagement::ScenesServer::Instance().GroupWillBeRemoved(fabricIndex, commandPath.mEndpointId, commandData.groupID); #endif @@ -313,7 +313,7 @@ bool emberAfGroupsClusterRemoveAllGroupsCallback(app::CommandHandler * commandOb VerifyOrExit(nullptr != provider, status = Status::Failure); -#ifdef EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT { GroupDataProvider::EndpointIterator * iter = provider->IterateEndpoints(fabricIndex); GroupDataProvider::GroupEndpoint mapping; diff --git a/src/app/clusters/keypad-input-server/keypad-input-server.cpp b/src/app/clusters/keypad-input-server/keypad-input-server.cpp index bf33427bfcd371..e298a2cb3f2392 100644 --- a/src/app/clusters/keypad-input-server/keypad-input-server.cpp +++ b/src/app/clusters/keypad-input-server/keypad-input-server.cpp @@ -47,7 +47,7 @@ using namespace chip::AppPlatform; using chip::Protocols::InteractionModel::Status; static constexpr size_t kKeypadInputDelegateTableSize = - EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; static_assert(kKeypadInputDelegateTableSize < kEmberInvalidEndpointIndex, "KeypadInput Delegate table size error"); // ----------------------------------------------------------------------------- @@ -72,7 +72,7 @@ Delegate * GetDelegate(EndpointId endpoint) ChipLogProgress(Zcl, "KeypadInput NOT returning ContentApp delegate for endpoint:%u", endpoint); uint16_t ep = - emberAfGetClusterServerEndpointIndex(endpoint, KeypadInput::Id, EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT); + emberAfGetClusterServerEndpointIndex(endpoint, KeypadInput::Id, MATTER_DM_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT); return (ep >= kKeypadInputDelegateTableSize ? nullptr : gDelegateTable[ep]); } @@ -95,7 +95,7 @@ namespace KeypadInput { void SetDefaultDelegate(EndpointId endpoint, Delegate * delegate) { uint16_t ep = - emberAfGetClusterServerEndpointIndex(endpoint, KeypadInput::Id, EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT); + emberAfGetClusterServerEndpointIndex(endpoint, KeypadInput::Id, MATTER_DM_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT); // if endpoint is found if (ep < kKeypadInputDelegateTableSize) { diff --git a/src/app/clusters/laundry-dryer-controls-server/laundry-dryer-controls-server.cpp b/src/app/clusters/laundry-dryer-controls-server/laundry-dryer-controls-server.cpp index 3c3bc524269da7..b672f953a16d56 100644 --- a/src/app/clusters/laundry-dryer-controls-server/laundry-dryer-controls-server.cpp +++ b/src/app/clusters/laundry-dryer-controls-server/laundry-dryer-controls-server.cpp @@ -43,7 +43,7 @@ using namespace chip::app::Clusters::LaundryDryerControls::Attributes; using chip::Protocols::InteractionModel::Status; static constexpr size_t kLaundryDryerControlsDelegateTableSize = - EMBER_AF_LAUNDRY_DRYER_CONTROLS_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_LAUNDRY_DRYER_CONTROLS_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; // ----------------------------------------------------------------------------- // Delegate Implementation @@ -56,7 +56,7 @@ namespace { Delegate * GetDelegate(EndpointId endpoint) { uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, LaundryDryerControls::Id, - EMBER_AF_LAUNDRY_DRYER_CONTROLS_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_LAUNDRY_DRYER_CONTROLS_CLUSTER_SERVER_ENDPOINT_COUNT); return (ep >= kLaundryDryerControlsDelegateTableSize ? nullptr : gDelegateTable[ep]); } @@ -70,7 +70,7 @@ LaundryDryerControlsServer LaundryDryerControlsServer::sInstance; void LaundryDryerControlsServer::SetDefaultDelegate(EndpointId endpoint, Delegate * delegate) { uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, LaundryDryerControls::Id, - EMBER_AF_LAUNDRY_DRYER_CONTROLS_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_LAUNDRY_DRYER_CONTROLS_CLUSTER_SERVER_ENDPOINT_COUNT); // if endpoint is found if (ep < kLaundryDryerControlsDelegateTableSize) { diff --git a/src/app/clusters/laundry-washer-controls-server/laundry-washer-controls-server.cpp b/src/app/clusters/laundry-washer-controls-server/laundry-washer-controls-server.cpp index a22e86ffe2e108..7800f075d159b7 100644 --- a/src/app/clusters/laundry-washer-controls-server/laundry-washer-controls-server.cpp +++ b/src/app/clusters/laundry-washer-controls-server/laundry-washer-controls-server.cpp @@ -42,7 +42,7 @@ using namespace chip::app::Clusters::LaundryWasherControls::Attributes; using chip::Protocols::InteractionModel::Status; static constexpr size_t kLaundryWasherControlsDelegateTableSize = - EMBER_AF_LAUNDRY_WASHER_CONTROLS_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_LAUNDRY_WASHER_CONTROLS_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; // ----------------------------------------------------------------------------- // Delegate Implementation @@ -55,7 +55,7 @@ namespace { Delegate * GetDelegate(EndpointId endpoint) { uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, LaundryWasherControls::Id, - EMBER_AF_LAUNDRY_WASHER_CONTROLS_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_LAUNDRY_WASHER_CONTROLS_CLUSTER_SERVER_ENDPOINT_COUNT); return (ep >= kLaundryWasherControlsDelegateTableSize ? nullptr : gDelegateTable[ep]); } @@ -69,7 +69,7 @@ LaundryWasherControlsServer LaundryWasherControlsServer::sInstance; void LaundryWasherControlsServer::SetDefaultDelegate(EndpointId endpoint, Delegate * delegate) { uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, LaundryWasherControls::Id, - EMBER_AF_LAUNDRY_WASHER_CONTROLS_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_LAUNDRY_WASHER_CONTROLS_CLUSTER_SERVER_ENDPOINT_COUNT); // if endpoint is found if (ep < kLaundryWasherControlsDelegateTableSize) { diff --git a/src/app/clusters/level-control/level-control.cpp b/src/app/clusters/level-control/level-control.cpp index f3f31d58982d93..5838f604085c56 100644 --- a/src/app/clusters/level-control/level-control.cpp +++ b/src/app/clusters/level-control/level-control.cpp @@ -35,17 +35,17 @@ #include #include -#ifdef EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT #include -#endif // EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#endif // MATTER_DM_PLUGIN_SCENES_MANAGEMENT -#ifdef EMBER_AF_PLUGIN_ON_OFF +#ifdef MATTER_DM_PLUGIN_ON_OFF #include -#endif // EMBER_AF_PLUGIN_ON_OFF +#endif // MATTER_DM_PLUGIN_ON_OFF -#ifdef EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP #include -#endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP #include @@ -58,11 +58,11 @@ using chip::Protocols::InteractionModel::Status; static bool areStartUpLevelControlServerAttributesNonVolatile(EndpointId endpoint); #endif // IGNORE_LEVEL_CONTROL_CLUSTER_START_UP_CURRENT_LEVEL -#if (EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE == 0) +#if (MATTER_DM_PLUGIN_LEVEL_CONTROL_RATE == 0) #define FASTEST_TRANSITION_TIME_MS 0 #else -#define FASTEST_TRANSITION_TIME_MS (MILLISECOND_TICKS_PER_SECOND / EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE) -#endif // EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE +#define FASTEST_TRANSITION_TIME_MS (MILLISECOND_TICKS_PER_SECOND / MATTER_DM_PLUGIN_LEVEL_CONTROL_RATE) +#endif // MATTER_DM_PLUGIN_LEVEL_CONTROL_RATE #define LEVEL_CONTROL_LIGHTING_MIN_LEVEL 0x01 #define LEVEL_CONTROL_LIGHTING_MAX_LEVEL 0xFE @@ -73,7 +73,7 @@ static bool areStartUpLevelControlServerAttributesNonVolatile(EndpointId endpoin #define STARTUP_CURRENT_LEVEL_USE_PREVIOUS_LEVEL 0xFF static constexpr size_t kLevelControlStateTableSize = - EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; static_assert(kLevelControlStateTableSize <= kEmberInvalidEndpointIndex, "LevelControl state table size error"); struct CallbackScheduleState @@ -121,7 +121,7 @@ static void writeRemainingTime(EndpointId endpoint, uint16_t remainingTimeMs); static bool shouldExecuteIfOff(EndpointId endpoint, CommandId commandId, chip::Optional> optionsMask, chip::Optional> optionsOverride); -#if defined(EMBER_AF_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#if defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS class DefaultLevelControlSceneHandler : public scenes::DefaultSceneHandlerImpl { public: @@ -255,14 +255,14 @@ class DefaultLevelControlSceneHandler : public scenes::DefaultSceneHandlerImpl }; static DefaultLevelControlSceneHandler sLevelControlSceneHandler; -#endif // defined(EMBER_AF_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#endif // defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS -#if !defined(IGNORE_LEVEL_CONTROL_CLUSTER_OPTIONS) && defined(EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP) +#if !defined(IGNORE_LEVEL_CONTROL_CLUSTER_OPTIONS) && defined(MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP) static void reallyUpdateCoupledColorTemp(EndpointId endpoint); #define updateCoupledColorTemp(endpoint) reallyUpdateCoupledColorTemp(endpoint) #else #define updateCoupledColorTemp(endpoint) -#endif // IGNORE_LEVEL_CONTROL_CLUSTER_OPTIONS && EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#endif // IGNORE_LEVEL_CONTROL_CLUSTER_OPTIONS && MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP void emberAfLevelControlClusterServerTickCallback(EndpointId endpoint); @@ -330,11 +330,11 @@ static void cancelEndpointTimerCallback(EndpointId endpoint) static EmberAfLevelControlState * getState(EndpointId endpoint) { uint16_t ep = - emberAfGetClusterServerEndpointIndex(endpoint, LevelControl::Id, EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); + emberAfGetClusterServerEndpointIndex(endpoint, LevelControl::Id, MATTER_DM_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); return (ep >= kLevelControlStateTableSize ? nullptr : &stateTable[ep]); } -#if !defined(IGNORE_LEVEL_CONTROL_CLUSTER_OPTIONS) && defined(EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP) +#if !defined(IGNORE_LEVEL_CONTROL_CLUSTER_OPTIONS) && defined(MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP) static void reallyUpdateCoupledColorTemp(EndpointId endpoint) { LevelControl::Attributes::Options::TypeInfo::Type options; @@ -353,7 +353,7 @@ static void reallyUpdateCoupledColorTemp(EndpointId endpoint) } } } -#endif // IGNORE_LEVEL_CONTROL_CLUSTER_OPTIONS && EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#endif // IGNORE_LEVEL_CONTROL_CLUSTER_OPTIONS && MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP void emberAfLevelControlClusterServerTickCallback(EndpointId endpoint) { @@ -481,13 +481,13 @@ static void writeRemainingTime(EndpointId endpoint, uint16_t remainingTimeMs) static void setOnOffValue(EndpointId endpoint, bool onOff) { -#ifdef EMBER_AF_PLUGIN_ON_OFF +#ifdef MATTER_DM_PLUGIN_ON_OFF if (emberAfContainsServer(endpoint, OnOff::Id)) { ChipLogProgress(Zcl, "Setting on/off to %s due to level change", onOff ? "ON" : "OFF"); OnOffServer::Instance().setOnOffValue(endpoint, (onOff ? OnOff::Commands::On::Id : OnOff::Commands::Off::Id), true); } -#endif // EMBER_AF_PLUGIN_ON_OFF +#endif // MATTER_DM_PLUGIN_ON_OFF } static bool shouldExecuteIfOff(EndpointId endpoint, CommandId commandId, chip::Optional> optionsMask, @@ -610,11 +610,11 @@ Status MoveToLevel(EndpointId endpointId, const Commands::MoveToLevel::Decodable chip::scenes::SceneHandler * GetSceneHandler() { -#if defined(EMBER_AF_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#if defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS return &sLevelControlSceneHandler; #else return nullptr; -#endif // defined(EMBER_AF_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#endif // defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS } } // namespace LevelControlServer @@ -791,7 +791,7 @@ static Status moveToLevelHandler(EndpointId endpoint, CommandId commandId, uint8 return Status::Failure; } - if (level > EMBER_AF_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL) + if (level > MATTER_DM_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL) { return Status::InvalidCommand; } @@ -913,25 +913,25 @@ static Status moveToLevelHandler(EndpointId endpoint, CommandId commandId, uint8 state->callbackSchedule.runTime = System::Clock::Milliseconds32(0); -#ifdef EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT // The level has changed, the scene is no longer valid. if (emberAfContainsServer(endpoint, ScenesManagement::Id)) { ScenesManagement::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(endpoint); } -#endif // EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#endif // MATTER_DM_PLUGIN_SCENES_MANAGEMENT // The setup was successful, so mark the new state as active and return. scheduleTimerCallbackMs(endpoint, computeCallbackWaitTimeMs(state->callbackSchedule, state->eventDurationMs)); -#ifdef EMBER_AF_PLUGIN_ON_OFF +#ifdef MATTER_DM_PLUGIN_ON_OFF // Check that the received MoveToLevelWithOnOff produces a On action and that the onoff support the lighting featuremap if (commandId == Commands::MoveToLevelWithOnOff::Id && state->moveToLevel != state->minLevel && OnOffServer::Instance().SupportsLightingApplications(endpoint)) { OnOff::Attributes::GlobalSceneControl::Set(endpoint, true); } -#endif // EMBER_AF_PLUGIN_ON_OFF +#endif // MATTER_DM_PLUGIN_ON_OFF return Status::Success; } @@ -1365,8 +1365,8 @@ void emberAfLevelControlClusterServerInitCallback(EndpointId endpoint) return; } - state->minLevel = EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL; - state->maxLevel = EMBER_AF_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL; + state->minLevel = MATTER_DM_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL; + state->maxLevel = MATTER_DM_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL; // If these read only attributes are enabled we use those values as our set minLevel and maxLevel // if get isn't possible, value stays at default @@ -1453,10 +1453,10 @@ void emberAfLevelControlClusterServerInitCallback(EndpointId endpoint) } } -#if defined(EMBER_AF_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#if defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS // Registers Scene handlers for the level control cluster on the server app::Clusters::ScenesManagement::ScenesServer::Instance().RegisterSceneHandler(endpoint, LevelControlServer::GetSceneHandler()); -#endif // defined(EMBER_AF_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#endif // defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS emberAfPluginLevelControlClusterServerPostInitCallback(endpoint); } diff --git a/src/app/clusters/level-control/level-control.h b/src/app/clusters/level-control/level-control.h index ba4bea7816752b..95497cc117e6d2 100644 --- a/src/app/clusters/level-control/level-control.h +++ b/src/app/clusters/level-control/level-control.h @@ -19,9 +19,9 @@ // Rate of level control tick execution. // To increase tick frequency (for more granular updates of device state based -// on level), redefine EMBER_AF_PLUGIN_LEVEL_CONTROL_TICKS_PER_SECOND. -#ifndef EMBER_AF_PLUGIN_LEVEL_CONTROL_TICKS_PER_SECOND -#define EMBER_AF_PLUGIN_LEVEL_CONTROL_TICKS_PER_SECOND 32 +// on level), redefine MATTER_DM_PLUGIN_LEVEL_CONTROL_TICKS_PER_SECOND. +#ifndef MATTER_DM_PLUGIN_LEVEL_CONTROL_TICKS_PER_SECOND +#define MATTER_DM_PLUGIN_LEVEL_CONTROL_TICKS_PER_SECOND 32 #endif #include diff --git a/src/app/clusters/low-power-server/low-power-server.cpp b/src/app/clusters/low-power-server/low-power-server.cpp index 4e8b10e8f082ea..fab5217908afea 100644 --- a/src/app/clusters/low-power-server/low-power-server.cpp +++ b/src/app/clusters/low-power-server/low-power-server.cpp @@ -38,7 +38,7 @@ using namespace chip::app::Clusters; using namespace chip::app::Clusters::LowPower; static constexpr size_t kLowPowerDelegateTableSize = - EMBER_AF_LOW_POWER_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_LOW_POWER_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; static_assert(kLowPowerDelegateTableSize <= kEmberInvalidEndpointIndex, "LowPower Delegate table size error"); // ----------------------------------------------------------------------------- @@ -53,7 +53,7 @@ Delegate * gDelegateTable[kLowPowerDelegateTableSize] = { nullptr }; Delegate * GetDelegate(EndpointId endpoint) { uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, chip::app::Clusters::LowPower::Id, - EMBER_AF_LOW_POWER_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_LOW_POWER_CLUSTER_SERVER_ENDPOINT_COUNT); return (ep >= kLowPowerDelegateTableSize ? nullptr : gDelegateTable[ep]); } @@ -76,7 +76,7 @@ namespace LowPower { void SetDefaultDelegate(EndpointId endpoint, Delegate * delegate) { uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, chip::app::Clusters::LowPower::Id, - EMBER_AF_LOW_POWER_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_LOW_POWER_CLUSTER_SERVER_ENDPOINT_COUNT); if (ep < kLowPowerDelegateTableSize) { gDelegateTable[ep] = delegate; diff --git a/src/app/clusters/media-input-server/media-input-server.cpp b/src/app/clusters/media-input-server/media-input-server.cpp index 71e6223b5ce2aa..02b114c648b2fd 100644 --- a/src/app/clusters/media-input-server/media-input-server.cpp +++ b/src/app/clusters/media-input-server/media-input-server.cpp @@ -39,7 +39,7 @@ using namespace chip::app::Clusters::MediaInput; using Protocols::InteractionModel::Status; static constexpr size_t kMediaInputDelegateTableSize = - EMBER_AF_MEDIA_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_MEDIA_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; static_assert(kMediaInputDelegateTableSize <= kEmberInvalidEndpointIndex, "MediaInput Delegate tablle size error"); // ----------------------------------------------------------------------------- @@ -54,7 +54,7 @@ Delegate * gDelegateTable[kMediaInputDelegateTableSize] = { nullptr }; Delegate * GetDelegate(EndpointId endpoint) { uint16_t ep = - emberAfGetClusterServerEndpointIndex(endpoint, MediaInput::Id, EMBER_AF_MEDIA_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT); + emberAfGetClusterServerEndpointIndex(endpoint, MediaInput::Id, MATTER_DM_MEDIA_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT); return (ep >= kMediaInputDelegateTableSize ? nullptr : gDelegateTable[ep]); } @@ -77,7 +77,7 @@ namespace MediaInput { void SetDefaultDelegate(EndpointId endpoint, Delegate * delegate) { uint16_t ep = - emberAfGetClusterServerEndpointIndex(endpoint, MediaInput::Id, EMBER_AF_MEDIA_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT); + emberAfGetClusterServerEndpointIndex(endpoint, MediaInput::Id, MATTER_DM_MEDIA_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT); if (ep < kMediaInputDelegateTableSize) { gDelegateTable[ep] = delegate; diff --git a/src/app/clusters/media-playback-server/media-playback-server.cpp b/src/app/clusters/media-playback-server/media-playback-server.cpp index ea8f00270aaf30..ee8113382b730a 100644 --- a/src/app/clusters/media-playback-server/media-playback-server.cpp +++ b/src/app/clusters/media-playback-server/media-playback-server.cpp @@ -50,7 +50,7 @@ using StateChangedEvent = chip::app::Clusters::MediaPlayback::Events::StateChang using chip::app::LogEvent; static constexpr size_t kMediaPlaybackDelegateTableSize = - EMBER_AF_MEDIA_PLAYBACK_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_MEDIA_PLAYBACK_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; static_assert(kMediaPlaybackDelegateTableSize <= kEmberInvalidEndpointIndex, "kMediaPlayback Delegate table size error"); // ----------------------------------------------------------------------------- @@ -75,7 +75,7 @@ Delegate * GetDelegate(EndpointId endpoint) ChipLogError(Zcl, "MediaPlayback NOT returning ContentApp delegate for endpoint:%u", endpoint); uint16_t ep = - emberAfGetClusterServerEndpointIndex(endpoint, MediaPlayback::Id, EMBER_AF_MEDIA_PLAYBACK_CLUSTER_SERVER_ENDPOINT_COUNT); + emberAfGetClusterServerEndpointIndex(endpoint, MediaPlayback::Id, MATTER_DM_MEDIA_PLAYBACK_CLUSTER_SERVER_ENDPOINT_COUNT); return (ep >= kMediaPlaybackDelegateTableSize ? nullptr : gDelegateTable[ep]); } @@ -98,7 +98,7 @@ namespace MediaPlayback { void SetDefaultDelegate(EndpointId endpoint, Delegate * delegate) { uint16_t ep = - emberAfGetClusterServerEndpointIndex(endpoint, MediaPlayback::Id, EMBER_AF_MEDIA_PLAYBACK_CLUSTER_SERVER_ENDPOINT_COUNT); + emberAfGetClusterServerEndpointIndex(endpoint, MediaPlayback::Id, MATTER_DM_MEDIA_PLAYBACK_CLUSTER_SERVER_ENDPOINT_COUNT); // if endpoint is found if (ep < kMediaPlaybackDelegateTableSize) { diff --git a/src/app/clusters/mode-base-server/README.md b/src/app/clusters/mode-base-server/README.md index 432091f041d31c..44505fa83d5f9a 100644 --- a/src/app/clusters/mode-base-server/README.md +++ b/src/app/clusters/mode-base-server/README.md @@ -23,7 +23,7 @@ To use a Mode Base derived cluster, you need to `Server::Init()`. - Alternatively, the last two steps can be done in the `emberAfClusterInitCallback` function. -- Add `#define EMBER_AF_PLUGIN_MODE_BASE` to your +- Add `#define MATTER_DM_PLUGIN_MODE_BASE` to your `chip_device_project_config_include` file. In the examples, this file is `CHIPProjectAppConfig.h`. diff --git a/src/app/clusters/mode-base-server/mode-base-server.cpp b/src/app/clusters/mode-base-server/mode-base-server.cpp index 1d01c10c718ac2..6c5feb1d69c88e 100644 --- a/src/app/clusters/mode-base-server/mode-base-server.cpp +++ b/src/app/clusters/mode-base-server/mode-base-server.cpp @@ -122,7 +122,7 @@ CHIP_ERROR Instance::Init() } } -#ifdef EMBER_AF_PLUGIN_ON_OFF_SERVER +#ifdef MATTER_DM_PLUGIN_ON_OFF_SERVER // OnMode with Power Up // If the On/Off feature is supported and the On/Off cluster attribute StartUpOnOff is present, with a // value of On (turn on at power up), then the CurrentMode attribute SHALL be set to the OnMode attribute @@ -156,7 +156,7 @@ CHIP_ERROR Instance::Init() } } } -#endif // EMBER_AF_PLUGIN_ON_OFF_SERVER +#endif // MATTER_DM_PLUGIN_ON_OFF_SERVER return CHIP_NO_ERROR; } diff --git a/src/app/clusters/mode-select-server/mode-select-server.cpp b/src/app/clusters/mode-select-server/mode-select-server.cpp index 4ca641e8e48d95..57cd6d71312012 100644 --- a/src/app/clusters/mode-select-server/mode-select-server.cpp +++ b/src/app/clusters/mode-select-server/mode-select-server.cpp @@ -34,9 +34,9 @@ #include #include -#ifdef EMBER_AF_PLUGIN_ON_OFF +#ifdef MATTER_DM_PLUGIN_ON_OFF #include -#endif // EMBER_AF_PLUGIN_ON_OFF +#endif // MATTER_DM_PLUGIN_ON_OFF using namespace std; using namespace chip; @@ -140,7 +140,7 @@ void emberAfModeSelectClusterServerInitCallback(EndpointId endpointId) EmberAfStatus status = Attributes::StartUpMode::Get(endpointId, startUpMode); if (status == EMBER_ZCL_STATUS_SUCCESS && !startUpMode.IsNull()) { -#ifdef EMBER_AF_PLUGIN_ON_OFF +#ifdef MATTER_DM_PLUGIN_ON_OFF // OnMode with Power Up // If the On/Off feature is supported and the On/Off cluster attribute StartUpOnOff is present, with a // value of On (turn on at power up), then the CurrentMode attribute SHALL be set to the OnMode attribute @@ -162,7 +162,7 @@ void emberAfModeSelectClusterServerInitCallback(EndpointId endpointId) } } } -#endif // EMBER_AF_PLUGIN_ON_OFF +#endif // MATTER_DM_PLUGIN_ON_OFF BootReasonType bootReason = BootReasonType::kUnspecified; CHIP_ERROR error = DeviceLayer::GetDiagnosticDataProvider().GetBootReason(bootReason); diff --git a/src/app/clusters/on-off-server/on-off-server.cpp b/src/app/clusters/on-off-server/on-off-server.cpp index ea7dd0786a9917..8d0f849d923b3f 100644 --- a/src/app/clusters/on-off-server/on-off-server.cpp +++ b/src/app/clusters/on-off-server/on-off-server.cpp @@ -26,21 +26,21 @@ #include #include -#ifdef EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT #include -#endif // EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#endif // MATTER_DM_PLUGIN_SCENES_MANAGEMENT -#ifdef EMBER_AF_PLUGIN_LEVEL_CONTROL +#ifdef MATTER_DM_PLUGIN_LEVEL_CONTROL #include -#endif // EMBER_AF_PLUGIN_LEVEL_CONTROL +#endif // MATTER_DM_PLUGIN_LEVEL_CONTROL -#ifdef EMBER_AF_PLUGIN_MODE_BASE +#ifdef MATTER_DM_PLUGIN_MODE_BASE // nogncheck because the gn dependency checker does not understand // conditional includes, so will fail in an application that has an On/Off // cluster but no ModeBase-derived cluster. #include // nogncheck #include // nogncheck -#endif // EMBER_AF_PLUGIN_MODE_BASE +#endif // MATTER_DM_PLUGIN_MODE_BASE #include #include @@ -52,7 +52,7 @@ using chip::Protocols::InteractionModel::Status; namespace { -#ifdef EMBER_AF_PLUGIN_MODE_BASE +#ifdef MATTER_DM_PLUGIN_MODE_BASE /** * For all ModeBase alias clusters on the given endpoint, if the OnOff feature is supported and @@ -85,11 +85,11 @@ void UpdateModeBaseCurrentModeToOnMode(EndpointId endpoint) } } -#endif // EMBER_AF_PLUGIN_MODE_BASE +#endif // MATTER_DM_PLUGIN_MODE_BASE } // namespace -#ifdef EMBER_AF_PLUGIN_LEVEL_CONTROL +#ifdef MATTER_DM_PLUGIN_LEVEL_CONTROL static bool LevelControlWithOnOffFeaturePresent(EndpointId endpoint) { if (!emberAfContainsServer(endpoint, LevelControl::Id)) @@ -99,16 +99,16 @@ static bool LevelControlWithOnOffFeaturePresent(EndpointId endpoint) return LevelControlHasFeature(endpoint, LevelControl::Feature::kOnOff); } -#endif // EMBER_AF_PLUGIN_LEVEL_CONTROL +#endif // MATTER_DM_PLUGIN_LEVEL_CONTROL static constexpr size_t kOnOffMaxEnpointCount = - EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; -#if defined(EMBER_AF_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#if defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS static void sceneOnOffCallback(EndpointId endpoint); using OnOffEndPointPair = scenes::DefaultSceneHandlerImpl::EndpointStatePair; using OnOffTransitionTimeInterface = - scenes::DefaultSceneHandlerImpl::TransitionTimeInterface; + scenes::DefaultSceneHandlerImpl::TransitionTimeInterface; class DefaultOnOffSceneHandler : public scenes::DefaultSceneHandlerImpl { @@ -209,7 +209,7 @@ class DefaultOnOffSceneHandler : public scenes::DefaultSceneHandlerImpl // handler will take action on the on-off state. This assumes the level control attributes were also saved in the scene. // This is to prevent a behavior where the on off state is set by this handler, and then the level control handler or vice // versa. -#ifdef EMBER_AF_PLUGIN_LEVEL_CONTROL +#ifdef MATTER_DM_PLUGIN_LEVEL_CONTROL if (!(LevelControlWithOnOffFeaturePresent(endpoint) && ScenesManagement::ScenesServer::Instance().IsHandlerRegistered(endpoint, LevelControlServer::GetSceneHandler()))) #endif @@ -233,7 +233,7 @@ static void sceneOnOffCallback(EndpointId endpoint) OnOffServer::Instance().setOnOffValue(endpoint, command, false); ReturnOnFailure(sOnOffSceneHandler.mSceneEndpointStatePairs.RemovePair(endpoint)); } -#endif // defined(EMBER_AF_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#endif // defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS /********************************************************** * Attributes Definition @@ -301,11 +301,11 @@ OnOffServer & OnOffServer::Instance() chip::scenes::SceneHandler * OnOffServer::GetSceneHandler() { -#if defined(EMBER_AF_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#if defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS return &sOnOffSceneHandler; #else return nullptr; -#endif // defined(EMBER_AF_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#endif // defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS } bool OnOffServer::HasFeature(chip::EndpointId endpoint, Feature feature) @@ -403,7 +403,7 @@ EmberAfStatus OnOffServer::setOnOffValue(chip::EndpointId endpoint, chip::Comman return status; } -#ifdef EMBER_AF_PLUGIN_LEVEL_CONTROL +#ifdef MATTER_DM_PLUGIN_LEVEL_CONTROL // If initiatedByLevelChange is false, then we assume that the level change // ZCL stuff has not happened and we do it here if (!initiatedByLevelChange && LevelControlWithOnOffFeaturePresent(endpoint)) @@ -411,7 +411,7 @@ EmberAfStatus OnOffServer::setOnOffValue(chip::EndpointId endpoint, chip::Comman emberAfOnOffClusterLevelControlEffectCallback(endpoint, newValue); } #endif -#ifdef EMBER_AF_PLUGIN_MODE_SELECT +#ifdef MATTER_DM_PLUGIN_MODE_SELECT // If OnMode is not a null value, then change the current mode to it. if (emberAfContainsServer(endpoint, ModeSelect::Id) && emberAfContainsAttribute(endpoint, ModeSelect::Id, ModeSelect::Attributes::OnMode::Id)) @@ -424,14 +424,14 @@ EmberAfStatus OnOffServer::setOnOffValue(chip::EndpointId endpoint, chip::Comman } } #endif -#ifdef EMBER_AF_PLUGIN_MODE_BASE +#ifdef MATTER_DM_PLUGIN_MODE_BASE // If OnMode is not a null value, then change the current mode to it. UpdateModeBaseCurrentModeToOnMode(endpoint); #endif } else // Set Off { -#ifdef EMBER_AF_PLUGIN_LEVEL_CONTROL +#ifdef MATTER_DM_PLUGIN_LEVEL_CONTROL // If initiatedByLevelChange is false, then we assume that the level change // ZCL stuff has not happened and we do it here if (!initiatedByLevelChange && LevelControlWithOnOffFeaturePresent(endpoint)) @@ -457,13 +457,13 @@ EmberAfStatus OnOffServer::setOnOffValue(chip::EndpointId endpoint, chip::Comman } } -#ifdef EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT // the scene has been changed (the value of on/off has changed) so // the current scene as described in the attribute table is invalid, // so mark it as invalid (just writes the valid/invalid attribute) ScenesManagement::ScenesServer::Instance().MakeSceneInvalidForAllFabrics(endpoint); -#endif // EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#endif // MATTER_DM_PLUGIN_SCENES_MANAGEMENT // The returned status is based solely on the On/Off cluster. Errors in the // Level Control and/or Scenes cluster are ignored. @@ -501,13 +501,13 @@ void OnOffServer::initOnOffServer(chip::EndpointId endpoint) status = setOnOffValue(endpoint, onOffValueForStartUp, true); } -#if defined(EMBER_AF_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#if defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS // Registers Scene handlers for the On/Off cluster on the server app::Clusters::ScenesManagement::ScenesServer::Instance().RegisterSceneHandler(endpoint, OnOffServer::Instance().GetSceneHandler()); -#endif // defined(EMBER_AF_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS +#endif // defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS -#ifdef EMBER_AF_PLUGIN_MODE_SELECT +#ifdef MATTER_DM_PLUGIN_MODE_SELECT // If OnMode is not a null value, then change the current mode to it. if (onOffValueForStartUp && emberAfContainsServer(endpoint, ModeSelect::Id) && emberAfContainsAttribute(endpoint, ModeSelect::Id, ModeSelect::Attributes::OnMode::Id)) @@ -606,9 +606,9 @@ bool OnOffServer::offWithEffectCommand(app::CommandHandler * commandObj, const a if (SupportsLightingApplications(endpoint)) { -#ifdef EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT FabricIndex fabric = commandObj->GetAccessingFabricIndex(); -#endif // EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#endif // MATTER_DM_PLUGIN_SCENES_MANAGEMENT bool globalSceneControl = false; OnOff::Attributes::GlobalSceneControl::Get(endpoint, &globalSceneControl); @@ -617,7 +617,7 @@ bool OnOffServer::offWithEffectCommand(app::CommandHandler * commandObj, const a if (globalSceneControl) { -#ifdef EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT GroupId groupId = ZCL_SCENES_GLOBAL_SCENE_GROUP_ID; if (commandObj->GetExchangeContext()->IsGroupExchangeContext()) { @@ -625,7 +625,7 @@ bool OnOffServer::offWithEffectCommand(app::CommandHandler * commandObj, const a } ScenesManagement::ScenesServer::Instance().StoreCurrentScene(fabric, endpoint, groupId, ZCL_SCENES_GLOBAL_SCENE_SCENE_ID); -#endif // EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#endif // MATTER_DM_PLUGIN_SCENES_MANAGEMENT OnOff::Attributes::GlobalSceneControl::Set(endpoint, false); } @@ -665,9 +665,9 @@ bool OnOffServer::OnWithRecallGlobalSceneCommand(app::CommandHandler * commandOb return true; } -#ifdef EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT FabricIndex fabric = commandObj->GetAccessingFabricIndex(); -#endif // EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#endif // MATTER_DM_PLUGIN_SCENES_MANAGEMENT bool globalSceneControl = false; OnOff::Attributes::GlobalSceneControl::Get(endpoint, &globalSceneControl); @@ -678,7 +678,7 @@ bool OnOffServer::OnWithRecallGlobalSceneCommand(app::CommandHandler * commandOb return true; } -#ifdef EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT GroupId groupId = ZCL_SCENES_GLOBAL_SCENE_GROUP_ID; if (commandObj->GetExchangeContext()->IsGroupExchangeContext()) { @@ -686,7 +686,7 @@ bool OnOffServer::OnWithRecallGlobalSceneCommand(app::CommandHandler * commandOb } ScenesManagement::ScenesServer::Instance().RecallScene(fabric, endpoint, groupId, ZCL_SCENES_GLOBAL_SCENE_SCENE_ID); -#endif // EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#endif // MATTER_DM_PLUGIN_SCENES_MANAGEMENT OnOff::Attributes::GlobalSceneControl::Set(endpoint, true); setOnOffValue(endpoint, Commands::On::Id, false); @@ -860,7 +860,7 @@ bool OnOffServer::areStartUpOnOffServerAttributesNonVolatile(EndpointId endpoint */ EmberEventControl * OnOffServer::getEventControl(EndpointId endpoint, const Span & eventControlArray) { - uint16_t index = emberAfGetClusterServerEndpointIndex(endpoint, OnOff::Id, EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT); + uint16_t index = emberAfGetClusterServerEndpointIndex(endpoint, OnOff::Id, MATTER_DM_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT); if (index >= eventControlArray.size()) { return nullptr; diff --git a/src/app/clusters/operational-state-server/operational-state-server.h b/src/app/clusters/operational-state-server/operational-state-server.h index e4ab6d981ca75a..5a461c272177ba 100644 --- a/src/app/clusters/operational-state-server/operational-state-server.h +++ b/src/app/clusters/operational-state-server/operational-state-server.h @@ -341,10 +341,32 @@ namespace RvcOperationalState { class Delegate : public OperationalState::Delegate { public: + /** + * Handle Command Callback in application: GoHome + * @param[out] err operational error after callback. + */ virtual void HandleGoHomeCommandCallback(OperationalState::GenericOperationalError & err) { err.Set(to_underlying(OperationalState::ErrorStateEnum::kUnknownEnumValue)); }; + + /** + * The start command is not supported by the RvcOperationalState cluster hence this method should never be called. + * This is a dummy implementation of the handler method so the consumer of this class does not need to define it. + */ + void HandleStartStateCallback(OperationalState::GenericOperationalError & err) override + { + err.Set(to_underlying(OperationalState::ErrorStateEnum::kUnknownEnumValue)); + }; + + /** + * The stop command is not supported by the RvcOperationalState cluster hence this method should never be called. + * This is a dummy implementation of the handler method so the consumer of this class does not need to define it. + */ + void HandleStopStateCallback(OperationalState::GenericOperationalError & err) override + { + err.Set(to_underlying(OperationalState::ErrorStateEnum::kUnknownEnumValue)); + }; }; class Instance : public OperationalState::Instance diff --git a/src/app/clusters/ota-provider/ota-provider.cpp b/src/app/clusters/ota-provider/ota-provider.cpp index 6b353073a829dc..46f55905157a95 100644 --- a/src/app/clusters/ota-provider/ota-provider.cpp +++ b/src/app/clusters/ota-provider/ota-provider.cpp @@ -37,16 +37,16 @@ using namespace chip::app::Clusters::OtaSoftwareUpdateProvider; using chip::app::Clusters::OTAProviderDelegate; using Protocols::InteractionModel::Status; -// EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT is only defined if the +// MATTER_DM_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT is only defined if the // cluster is actually enabled in the ZAP config. To allow operation in setups // where that's not the case (and custom dispatch is used), define it here as // needed. -#ifndef EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT -#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT 0 -#endif // EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT +#ifndef MATTER_DM_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT +#define MATTER_DM_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT 0 +#endif // MATTER_DM_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT static constexpr size_t kOtaProviderDelegateTableSize = - EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; static_assert(kOtaProviderDelegateTableSize <= kEmberInvalidEndpointIndex, "OtaProvider Delegate table size error"); namespace { @@ -60,7 +60,7 @@ OTAProviderDelegate * gDelegateTable[kOtaProviderDelegateTableSize] = { nullptr OTAProviderDelegate * GetDelegate(EndpointId endpoint) { uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, OtaSoftwareUpdateProvider::Id, - EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT); return (ep >= kOtaProviderDelegateTableSize ? nullptr : gDelegateTable[ep]); } @@ -229,7 +229,7 @@ namespace OTAProvider { void SetDelegate(EndpointId endpoint, OTAProviderDelegate * delegate) { uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, OtaSoftwareUpdateProvider::Id, - EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT); if (ep < kOtaProviderDelegateTableSize) { gDelegateTable[ep] = delegate; diff --git a/src/app/clusters/power-source-server/power-source-server.cpp b/src/app/clusters/power-source-server/power-source-server.cpp index 037a182dd7a0d6..717c610830b8fb 100644 --- a/src/app/clusters/power-source-server/power-source-server.cpp +++ b/src/app/clusters/power-source-server/power-source-server.cpp @@ -72,9 +72,9 @@ PowerSourceServer gPowerSourceServer; PowerSourceAttrAccess gAttrAccess; #ifdef ZCL_USING_POWER_SOURCE_CLUSTER_SERVER -static constexpr uint16_t kNumStaticEndpoints = EMBER_AF_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT; +static constexpr uint16_t kNumStaticEndpoints = MATTER_DM_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT; #define POWER_SERVER_NUM_SUPPORTED_ENDPOINTS \ - (EMBER_AF_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT) + (MATTER_DM_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT) #else static constexpr uint16_t kNumStaticEndpoints = 0; #define POWER_SERVER_NUM_SUPPORTED_ENDPOINTS CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT diff --git a/src/app/clusters/pump-configuration-and-control-server/pump-configuration-and-control-server.cpp b/src/app/clusters/pump-configuration-and-control-server/pump-configuration-and-control-server.cpp index 4d9a88d3f8216c..76f2a3d01830ed 100644 --- a/src/app/clusters/pump-configuration-and-control-server/pump-configuration-and-control-server.cpp +++ b/src/app/clusters/pump-configuration-and-control-server/pump-configuration-and-control-server.cpp @@ -156,12 +156,12 @@ static void setEffectiveModes(EndpointId endpoint) // Maximum, Minimum or Local case OperationModeEnum::kMaximum: { -#ifdef EMBER_AF_PLUGIN_LEVEL_CONTROL +#ifdef MATTER_DM_PLUGIN_LEVEL_CONTROL uint8_t maxLevel; #endif Attributes::EffectiveOperationMode::Set(endpoint, OperationModeEnum::kMaximum); Attributes::EffectiveControlMode::Set(endpoint, ControlModeEnum::kConstantSpeed); -#ifdef EMBER_AF_PLUGIN_LEVEL_CONTROL +#ifdef MATTER_DM_PLUGIN_LEVEL_CONTROL LevelControl::Attributes::MaxLevel::Get(endpoint, &maxLevel); LevelControl::Attributes::CurrentLevel::Set(endpoint, maxLevel); #endif @@ -175,12 +175,12 @@ static void setEffectiveModes(EndpointId endpoint) break; case OperationModeEnum::kMinimum: { -#ifdef EMBER_AF_PLUGIN_LEVEL_CONTROL +#ifdef MATTER_DM_PLUGIN_LEVEL_CONTROL uint8_t minLevel; #endif Attributes::EffectiveOperationMode::Set(endpoint, OperationModeEnum::kMinimum); Attributes::EffectiveControlMode::Set(endpoint, ControlModeEnum::kConstantSpeed); -#ifdef EMBER_AF_PLUGIN_LEVEL_CONTROL +#ifdef MATTER_DM_PLUGIN_LEVEL_CONTROL LevelControl::Attributes::MinLevel::Get(endpoint, &minLevel); if (minLevel == 0) { diff --git a/src/app/clusters/sample-mei-server/sample-mei-server.cpp b/src/app/clusters/sample-mei-server/sample-mei-server.cpp index f52aa573ece038..25bcb2aaf77b13 100644 --- a/src/app/clusters/sample-mei-server/sample-mei-server.cpp +++ b/src/app/clusters/sample-mei-server/sample-mei-server.cpp @@ -27,7 +27,7 @@ using namespace chip::app::Clusters::SampleMei::Attributes; void MatterSampleMeiPluginServerInitCallback() { - ChipLogProgress(Zcl, "Sample MEI Init. Ep %d, Total Ep %u", EMBER_AF_SAMPLE_MEI_CLUSTER_SERVER_ENDPOINT_COUNT, + ChipLogProgress(Zcl, "Sample MEI Init. Ep %d, Total Ep %u", MATTER_DM_SAMPLE_MEI_CLUSTER_SERVER_ENDPOINT_COUNT, static_cast(kNumSupportedEndpoints)); ReturnOnFailure(InteractionModelEngine::GetInstance()->RegisterCommandHandler(&SampleMeiServer::Instance())); VerifyOrReturn(registerAttributeAccessOverride(&SampleMeiServer::Instance()), CHIP_ERROR_INCORRECT_STATE); diff --git a/src/app/clusters/sample-mei-server/sample-mei-server.h b/src/app/clusters/sample-mei-server/sample-mei-server.h index 9f5307dba6d753..14446ba6f38f02 100644 --- a/src/app/clusters/sample-mei-server/sample-mei-server.h +++ b/src/app/clusters/sample-mei-server/sample-mei-server.h @@ -13,7 +13,7 @@ #ifdef ZCL_USING_SAMPLE_MEI_CLUSTER_SERVER #define SAMPLE_MEI_NUM_SUPPORTED_ENDPOINTS \ - (EMBER_AF_SAMPLE_MEI_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT) + (MATTER_DM_SAMPLE_MEI_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT) #else #define SAMPLE_MEI_NUM_SUPPORTED_ENDPOINTS CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT #endif /* ZCL_USING_SAMPLE_MEI_CLUSTER_SERVER */ diff --git a/src/app/clusters/scenes-server/scenes-server.cpp b/src/app/clusters/scenes-server/scenes-server.cpp index 94039297713bed..c595ee6486779f 100644 --- a/src/app/clusters/scenes-server/scenes-server.cpp +++ b/src/app/clusters/scenes-server/scenes-server.cpp @@ -269,7 +269,7 @@ CHIP_ERROR ScenesServer::FabricSceneInfo::FindFabricSceneInfoIndex(EndpointId en VerifyOrReturnError(kInvalidEndpointId != endpoint, CHIP_ERROR_INVALID_ARGUMENT); uint16_t index = - emberAfGetClusterServerEndpointIndex(endpoint, ScenesManagement::Id, EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT); + emberAfGetClusterServerEndpointIndex(endpoint, ScenesManagement::Id, MATTER_DM_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT); if (index < ArraySize(mSceneInfoStructs)) { diff --git a/src/app/clusters/scenes-server/scenes-server.h b/src/app/clusters/scenes-server/scenes-server.h index e85e72ea07606b..86459fb8e82c67 100644 --- a/src/app/clusters/scenes-server/scenes-server.h +++ b/src/app/clusters/scenes-server/scenes-server.h @@ -35,7 +35,7 @@ class ScenesServer : public CommandHandlerInterface, public AttributeAccessInter { public: static constexpr size_t kScenesServerMaxEndpointCount = - EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; static_assert(kScenesServerMaxEndpointCount <= kEmberInvalidEndpointIndex, "Scenes endpoint count error"); static constexpr uint8_t kScenesServerMaxFabricCount = CHIP_CONFIG_MAX_FABRICS; diff --git a/src/app/clusters/target-navigator-server/target-navigator-server.cpp b/src/app/clusters/target-navigator-server/target-navigator-server.cpp index e52ef407003eb1..71d396a671d67b 100644 --- a/src/app/clusters/target-navigator-server/target-navigator-server.cpp +++ b/src/app/clusters/target-navigator-server/target-navigator-server.cpp @@ -49,7 +49,7 @@ using chip::Protocols::InteractionModel::Status; using TargetUpdatedEvent = chip::app::Clusters::TargetNavigator::Events::TargetUpdated::Type; static constexpr size_t kTargetNavigatorDelegateTableSize = - EMBER_AF_TARGET_NAVIGATOR_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_TARGET_NAVIGATOR_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; static_assert(kTargetNavigatorDelegateTableSize <= kEmberInvalidEndpointIndex, "TargetNavigator Delegate table size error"); // ----------------------------------------------------------------------------- @@ -74,7 +74,7 @@ Delegate * GetDelegate(EndpointId endpoint) ChipLogProgress(Zcl, "TargetNavigator NOT returning ContentApp delegate for endpoint:%u", endpoint); uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, TargetNavigator::Id, - EMBER_AF_TARGET_NAVIGATOR_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_TARGET_NAVIGATOR_CLUSTER_SERVER_ENDPOINT_COUNT); return (ep >= kTargetNavigatorDelegateTableSize ? nullptr : gDelegateTable[ep]); } @@ -97,7 +97,7 @@ namespace TargetNavigator { void SetDefaultDelegate(EndpointId endpoint, Delegate * delegate) { uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, TargetNavigator::Id, - EMBER_AF_TARGET_NAVIGATOR_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_TARGET_NAVIGATOR_CLUSTER_SERVER_ENDPOINT_COUNT); // if endpoint is found if (ep < kTargetNavigatorDelegateTableSize) { diff --git a/src/app/clusters/valve-configuration-and-control-server/valve-configuration-and-control-server.cpp b/src/app/clusters/valve-configuration-and-control-server/valve-configuration-and-control-server.cpp index 30481d8ddf5cbc..62d5e1b2c77da8 100644 --- a/src/app/clusters/valve-configuration-and-control-server/valve-configuration-and-control-server.cpp +++ b/src/app/clusters/valve-configuration-and-control-server/valve-configuration-and-control-server.cpp @@ -50,7 +50,7 @@ using chip::app::Clusters::ValveConfigurationAndControl::Delegate; using chip::Protocols::InteractionModel::Status; static constexpr size_t kValveConfigurationAndControlDelegateTableSize = - EMBER_AF_VALVE_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_VALVE_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; static_assert(kValveConfigurationAndControlDelegateTableSize <= kEmberInvalidEndpointIndex, "ValveConfigurationAndControl Delegate table size error"); @@ -69,7 +69,7 @@ Delegate * gDelegateTable[kValveConfigurationAndControlDelegateTableSize] = { nu bool GetRemainingDuration(EndpointId endpoint, DataModel::Nullable & duration) { uint16_t epIdx = emberAfGetClusterServerEndpointIndex(endpoint, ValveConfigurationAndControl::Id, - EMBER_AF_VALVE_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_VALVE_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); VerifyOrReturnValue(epIdx < kValveConfigurationAndControlDelegateTableSize, false); duration = gRemainingDuration[epIdx].remainingDuration; return true; @@ -78,7 +78,7 @@ bool GetRemainingDuration(EndpointId endpoint, DataModel::Nullable & d void SetRemainingDuration(EndpointId endpoint, DataModel::Nullable duration) { uint16_t epIdx = emberAfGetClusterServerEndpointIndex(endpoint, ValveConfigurationAndControl::Id, - EMBER_AF_VALVE_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_VALVE_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); if (epIdx < kValveConfigurationAndControlDelegateTableSize) { gRemainingDuration[epIdx].endpoint = endpoint; @@ -89,7 +89,7 @@ void SetRemainingDuration(EndpointId endpoint, DataModel::Nullable dur void SetRemainingDurationNull(EndpointId endpoint) { uint16_t epIdx = emberAfGetClusterServerEndpointIndex(endpoint, ValveConfigurationAndControl::Id, - EMBER_AF_VALVE_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_VALVE_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); if (epIdx < kValveConfigurationAndControlDelegateTableSize) { if (!gRemainingDuration[epIdx].remainingDuration.IsNull()) @@ -103,7 +103,7 @@ void SetRemainingDurationNull(EndpointId endpoint) RemainingDurationTable * GetRemainingDurationItem(EndpointId endpoint) { uint16_t epIdx = emberAfGetClusterServerEndpointIndex(endpoint, ValveConfigurationAndControl::Id, - EMBER_AF_VALVE_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_VALVE_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); if (epIdx < kValveConfigurationAndControlDelegateTableSize) { return &gRemainingDuration[epIdx]; @@ -114,7 +114,7 @@ RemainingDurationTable * GetRemainingDurationItem(EndpointId endpoint) Delegate * GetDelegate(EndpointId endpoint) { uint16_t epIdx = emberAfGetClusterServerEndpointIndex(endpoint, ValveConfigurationAndControl::Id, - EMBER_AF_VALVE_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_VALVE_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); return (epIdx >= kValveConfigurationAndControlDelegateTableSize ? nullptr : gDelegateTable[epIdx]); } @@ -261,7 +261,7 @@ namespace ValveConfigurationAndControl { void SetDefaultDelegate(EndpointId endpoint, Delegate * delegate) { uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, ValveConfigurationAndControl::Id, - EMBER_AF_VALVE_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); + MATTER_DM_VALVE_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT); // if endpoint is found if (ep < kValveConfigurationAndControlDelegateTableSize) { diff --git a/src/app/clusters/wake-on-lan-server/wake-on-lan-server.cpp b/src/app/clusters/wake-on-lan-server/wake-on-lan-server.cpp index 15b514c9e3f247..ec989bbc588372 100644 --- a/src/app/clusters/wake-on-lan-server/wake-on-lan-server.cpp +++ b/src/app/clusters/wake-on-lan-server/wake-on-lan-server.cpp @@ -38,7 +38,7 @@ using namespace chip::app::Clusters; using namespace chip::app::Clusters::WakeOnLan; static constexpr size_t kWakeOnLanDelegateTableSize = - EMBER_AF_WAKE_ON_LAN_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_WAKE_ON_LAN_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; static_assert(kWakeOnLanDelegateTableSize <= kEmberInvalidEndpointIndex, "WakeOnLan Delegate table size error"); // ----------------------------------------------------------------------------- @@ -52,7 +52,8 @@ Delegate * gDelegateTable[kWakeOnLanDelegateTableSize] = { nullptr }; Delegate * GetDelegate(EndpointId endpoint) { - uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, WakeOnLan::Id, EMBER_AF_WAKE_ON_LAN_CLUSTER_SERVER_ENDPOINT_COUNT); + uint16_t ep = + emberAfGetClusterServerEndpointIndex(endpoint, WakeOnLan::Id, MATTER_DM_WAKE_ON_LAN_CLUSTER_SERVER_ENDPOINT_COUNT); return (ep >= kWakeOnLanDelegateTableSize ? nullptr : gDelegateTable[ep]); } @@ -74,7 +75,8 @@ namespace WakeOnLan { void SetDefaultDelegate(EndpointId endpoint, Delegate * delegate) { - uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, WakeOnLan::Id, EMBER_AF_WAKE_ON_LAN_CLUSTER_SERVER_ENDPOINT_COUNT); + uint16_t ep = + emberAfGetClusterServerEndpointIndex(endpoint, WakeOnLan::Id, MATTER_DM_WAKE_ON_LAN_CLUSTER_SERVER_ENDPOINT_COUNT); if (ep < kWakeOnLanDelegateTableSize) { gDelegateTable[ep] = delegate; diff --git a/src/app/clusters/window-covering-server/window-covering-server.cpp b/src/app/clusters/window-covering-server/window-covering-server.cpp index b55f59074de843..79956d0c448894 100644 --- a/src/app/clusters/window-covering-server/window-covering-server.cpp +++ b/src/app/clusters/window-covering-server/window-covering-server.cpp @@ -30,9 +30,9 @@ #include #include -#ifdef EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT #include -#endif // EMBER_AF_PLUGIN_SCENES_MANAGEMENT +#endif // MATTER_DM_PLUGIN_SCENES_MANAGEMENT using namespace chip; using namespace chip::app::Clusters; @@ -47,7 +47,7 @@ using chip::Protocols::InteractionModel::Status; namespace { constexpr size_t kWindowCoveringDelegateTableSize = - EMBER_AF_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + MATTER_DM_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; static_assert(kWindowCoveringDelegateTableSize <= kEmberInvalidEndpointIndex, "WindowCovering Delegate table size error"); Delegate * gDelegateTable[kWindowCoveringDelegateTableSize] = { nullptr }; @@ -55,7 +55,7 @@ Delegate * gDelegateTable[kWindowCoveringDelegateTableSize] = { nullptr }; Delegate * GetDelegate(EndpointId endpoint) { uint16_t ep = - emberAfGetClusterServerEndpointIndex(endpoint, WindowCovering::Id, EMBER_AF_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT); + emberAfGetClusterServerEndpointIndex(endpoint, WindowCovering::Id, MATTER_DM_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT); return (ep >= kWindowCoveringDelegateTableSize ? nullptr : gDelegateTable[ep]); } @@ -596,7 +596,7 @@ Status GetMotionLockStatus(chip::EndpointId endpoint) void SetDefaultDelegate(EndpointId endpoint, Delegate * delegate) { uint16_t ep = - emberAfGetClusterServerEndpointIndex(endpoint, WindowCovering::Id, EMBER_AF_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT); + emberAfGetClusterServerEndpointIndex(endpoint, WindowCovering::Id, MATTER_DM_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT); // if endpoint is found if (ep < kWindowCoveringDelegateTableSize) diff --git a/src/app/util/af-types.h b/src/app/util/af-types.h index d154399a6973a6..e394a2098e4005 100644 --- a/src/app/util/af-types.h +++ b/src/app/util/af-types.h @@ -59,7 +59,7 @@ typedef void (*EmberAfGenericClusterFunction)(void); * @brief A distinguished manufacturer code that is used to indicate the * absence of a manufacturer-specific cluster, command, or attribute. */ -#define EMBER_AF_NULL_MANUFACTURER_CODE 0x0000 +#define MATTER_DM_NULL_MANUFACTURER_CODE 0x0000 /** * @brief Struct describing cluster @@ -234,12 +234,12 @@ struct EmberAfDefinedEndpoint /** * @brief Indicates the absence of a Scene table entry. */ -#define EMBER_AF_SCENE_TABLE_NULL_INDEX 0xFF +#define MATTER_DM_SCENE_TABLE_NULL_INDEX 0xFF /** * @brief Value used when setting or getting the endpoint in a Scene table * entry. It indicates that the entry is not in use. */ -#define EMBER_AF_SCENE_TABLE_UNUSED_ENDPOINT_ID 0x00 +#define MATTER_DM_SCENE_TABLE_UNUSED_ENDPOINT_ID 0x00 /** * @brief Maximum length of Scene names, not including the length byte. */ diff --git a/src/app/util/af.h b/src/app/util/af.h index c186699cbc68a7..d18d69956b9746 100644 --- a/src/app/util/af.h +++ b/src/app/util/af.h @@ -176,7 +176,7 @@ uint16_t emberAfIndexFromEndpointIncludingDisabledEndpoints(chip::EndpointId end * @param endpoint Endpoint number * @param cluster Id the of the Cluster server you are interrested on * @param fixedClusterServerEndpointCount The number of fixed endpoints containing this cluster server. Typically one of the - EMBER_AF_*_CLUSTER_SERVER_ENDPOINT_COUNT constants. + MATTER_DM_*_CLUSTER_SERVER_ENDPOINT_COUNT constants. */ uint16_t emberAfGetClusterServerEndpointIndex(chip::EndpointId endpoint, chip::ClusterId cluster, uint16_t fixedClusterServerEndpointCount); diff --git a/src/app/util/util.cpp b/src/app/util/util.cpp index fb166ff72453bd..2593609d77af93 100644 --- a/src/app/util/util.cpp +++ b/src/app/util/util.cpp @@ -28,9 +28,9 @@ // TODO: figure out a clear path for compile-time codegen #include -#ifdef EMBER_AF_PLUGIN_GROUPS_SERVER +#ifdef MATTER_DM_PLUGIN_GROUPS_SERVER #include -#endif // EMBER_AF_PLUGIN_GROUPS_SERVER +#endif // MATTER_DM_PLUGIN_GROUPS_SERVER using namespace chip; @@ -45,8 +45,8 @@ const EmberAfClusterName zclClusterNames[] = { { kInvalidClusterId, nullptr }, // terminator }; -#ifdef EMBER_AF_GENERATED_PLUGIN_TICK_FUNCTION_DECLARATIONS -EMBER_AF_GENERATED_PLUGIN_TICK_FUNCTION_DECLARATIONS +#ifdef MATTER_DM_GENERATED_PLUGIN_TICK_FUNCTION_DECLARATIONS +MATTER_DM_GENERATED_PLUGIN_TICK_FUNCTION_DECLARATIONS #endif //------------------------------------------------------------------------------ diff --git a/src/app/zap-templates/templates/app/gen_config.zapt b/src/app/zap-templates/templates/app/gen_config.zapt index 65a7705b459036..87dce18a6673b1 100644 --- a/src/app/zap-templates/templates/app/gen_config.zapt +++ b/src/app/zap-templates/templates/app/gen_config.zapt @@ -5,7 +5,7 @@ /**** Cluster endpoint counts ****/ {{#all_user_clusters}} -#define EMBER_AF_{{as_delimited_macro define}}_{{as_delimited_macro side}}_ENDPOINT_COUNT ({{user_endpoint_count_by_cluster id side}}) +#define MATTER_DM_{{as_delimited_macro define}}_{{as_delimited_macro side}}_ENDPOINT_COUNT ({{user_endpoint_count_by_cluster id side}}) {{/all_user_clusters}} /**** Cluster Plugins ****/ @@ -13,30 +13,30 @@ // Use this macro to check if the {{side}} side of the {{name}} cluster is included #define ZCL_USING_{{as_delimited_macro define}}_{{as_delimited_macro side}} -#define EMBER_AF_PLUGIN_{{as_delimited_macro name}}_{{as_delimited_macro side}} +#define MATTER_DM_PLUGIN_{{as_delimited_macro name}}_{{as_delimited_macro side}} {{#if (is_server side)}} -#define EMBER_AF_PLUGIN_{{as_delimited_macro name}} +#define MATTER_DM_PLUGIN_{{as_delimited_macro name}} {{/if}} {{#if (is_str_equal name "Color Control")}} {{#if (is_server side)}} // User options for {{side}} plugin {{name}} -#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY -#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP -#define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV +#define MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_XY +#define MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP +#define MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_HSV {{/if}} {{else if (is_str_equal name "IAS Zone")}} // User options for {{side}} plugin {{name}} {{#if (is_server side)}} -#define EMBER_AF_PLUGIN_IAS_ZONE_SERVER_ZONE_TYPE 541 +#define MATTER_DM_PLUGIN_IAS_ZONE_SERVER_ZONE_TYPE 541 {{else}} -#define EMBER_AF_PLUGIN_IAS_ZONE_CLIENT_MAX_DEVICES 10 +#define MATTER_DM_PLUGIN_IAS_ZONE_CLIENT_MAX_DEVICES 10 {{/if}} {{else if (is_str_equal name "Level Control")}} {{#if (is_server side)}} // User options for {{side}} plugin {{name}} -#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL 254 -#define EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0 -#define EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE 0 +#define MATTER_DM_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL 254 +#define MATTER_DM_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0 +#define MATTER_DM_PLUGIN_LEVEL_CONTROL_RATE 0 {{/if}} {{else if (is_str_equal name "Scenes Management")}} {{#if (is_server side)}} diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index ae5942f5a4fdc3..24b9efcec73ff2 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -8549,6 +8549,8 @@ - EnergyEVSEMode - DeviceEnergyManagementMode - Messages + - ElectricalPowerMeasurement + - PowerTopology attributes: DoorLock: # Aliro is not ready yet. diff --git a/src/platform/stm32/CHIPDevicePlatformConfig.h b/src/platform/stm32/CHIPDevicePlatformConfig.h index 4f43c3538cd043..aee9ec36a2b73a 100644 --- a/src/platform/stm32/CHIPDevicePlatformConfig.h +++ b/src/platform/stm32/CHIPDevicePlatformConfig.h @@ -106,9 +106,9 @@ // ========== Platform-specific Cluster Overrides ========= #define CHIP_CLUSTER_NETWORK_COMMISSIONING_MAX_NETWORKS 1 -// EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT is only defined if the +// MATTER_DM_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT is only defined if the // cluster is actually enabled in the ZAP config. To allow operation in setups -#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT 1 +#define MATTER_DM_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT 1 /** * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC diff --git a/src/platform/telink/tlsr9258a.overlay b/src/platform/telink/tlsr9258a.overlay new file mode 100644 index 00000000000000..b300411d6da621 --- /dev/null +++ b/src/platform/telink/tlsr9258a.overlay @@ -0,0 +1,79 @@ +/ { + aliases { + system-state-led = &led_red; + pwm-led0 = &pwm_led0; + pwm-led1 = &pwm_led1; + pwm-led2 = &pwm_led2; + pwm-led3 = &pwm_led3; + }; + + pwm_leds { + /delete-node/ pwm_led_0; + pwm_led0: pwm_led_0 { + pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>; + label = "PWM LED Blue"; + }; + pwm_led1: pwm_led_1 { + pwms = <&pwm0 3 PWM_MSEC(20) PWM_POLARITY_NORMAL>; + label = "PWM LED Green"; + }; + pwm_led2: pwm_led_2 { + pwms = <&pwm0 2 PWM_MSEC(20) PWM_POLARITY_NORMAL>; + label = "PWM LED Red"; + }; + pwm_led3: pwm_led_3 { + pwms = <&pwm0 1 PWM_MSEC(20) PWM_POLARITY_NORMAL>; + label = "PWM IDENTIFY LED Green"; + }; + }; + + keys { + /delete-node/ button_1; + /delete-node/ button_3; + compatible = "gpio-keys"; + key_1: button_1 { + gpios = <&gpiod 2 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; + }; + key_2: button_2 { + gpios = <&gpiod 7 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; + }; + key_3: button_3 { + gpios = <&gpiod 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; + }; + key_4: button_4 { + gpios = <&gpiof 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; + }; + + key_matrix_col1: key_matrix_col1 { + gpios = <&gpiod 6 GPIO_ACTIVE_HIGH>; + }; + key_matrix_col2: key_matrix_col2 { + gpios = <&gpiof 6 GPIO_ACTIVE_HIGH>; + }; + key_matrix_row1: key_matrix_row1 { + gpios = <&gpiod 2 GPIO_PULL_DOWN>; + }; + key_matrix_row2: key_matrix_row2 { + gpios = <&gpiod 7 GPIO_PULL_DOWN>; + }; + }; +}; + +&pinctrl { + pwm_ch0_pd0_default: pwm_ch0_pd0_default { + pinmux = ; + }; + pwm_ch1_pd1_default: pwm_ch1_pd1_default { + pinmux = ; + }; + pwm_ch2_pe2_default: pwm_ch2_pe2_default { + pinmux = ; + }; + pwm_ch3_pe0_default: pwm_ch3_pe0_default { + pinmux = ; + }; +}; + +&pwm0 { + pinctrl-0 = <&pwm_ch0_pd0_default &pwm_ch1_pd1_default &pwm_ch2_pe2_default &pwm_ch3_pe0_default>; +}; diff --git a/src/platform/telink/tlsr9258a_retention.overlay b/src/platform/telink/tlsr9258a_retention.overlay new file mode 100644 index 00000000000000..98a0e5af508f32 --- /dev/null +++ b/src/platform/telink/tlsr9258a_retention.overlay @@ -0,0 +1,55 @@ +/ { + /* + * There is no way to keep GPIOs + * during deep-sleep mode so output GPIOs + * and PWM's are useless. + */ + + aliases { + /delete-property/ led0; + /delete-property/ led1; + /delete-property/ led2; + /delete-property/ led3; + /delete-property/ mcuboot-led0; + /delete-property/ pwm-led0; + /delete-property/ pwm-0; + }; + + /delete-node/ leds; + /delete-node/ pwm_leds; + + keys { + /delete-node/ button_1; + /delete-node/ button_3; + compatible = "gpio-keys"; + key_1: button_1 { + gpios = <&gpiod 2 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; + }; + key_2: button_2 { + gpios = <&gpiod 7 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; + }; + key_3: button_3 { + gpios = <&gpiod 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; + }; + key_4: button_4 { + gpios = <&gpiof 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; + }; + + key_matrix_col1: key_matrix_col1 { + gpios = <&gpiod 6 GPIO_ACTIVE_HIGH>; + }; + key_matrix_col2: key_matrix_col2 { + gpios = <&gpiof 6 GPIO_ACTIVE_HIGH>; + }; + key_matrix_row1: key_matrix_row1 { + gpios = <&gpiod 2 GPIO_PULL_DOWN>; + }; + key_matrix_row2: key_matrix_row2 { + gpios = <&gpiod 7 GPIO_PULL_DOWN>; + }; + }; +}; + +&pwm0 { + status = "disabled"; +}; diff --git a/src/test_driver/tizen/README.md b/src/test_driver/tizen/README.md index 1c6ad4ebbdd636..559b75699c0995 100644 --- a/src/test_driver/tizen/README.md +++ b/src/test_driver/tizen/README.md @@ -12,7 +12,7 @@ image from hub.docker.com or build it locally using the provided Dockerfile in ```sh # Pull the image from hub.docker.com -docker pull ghcr.io/project-chip/chip-build-tizen-qemu:32 +docker pull ghcr.io/project-chip/chip-build-tizen-qemu:35 ``` ## Building and Running Tests on QEMU @@ -21,7 +21,7 @@ All steps described below should be done inside the docker container. ```sh docker run -it --rm --name chip-tizen-qemu \ - ghcr.io/project-chip/chip-build-tizen-qemu:32 /bin/bash + ghcr.io/project-chip/chip-build-tizen-qemu:35 /bin/bash ``` ### Clone the connectedhomeip repository