diff --git a/.github/workflows/examples-cyw30739.yaml b/.github/workflows/examples-cyw30739.yaml deleted file mode 100644 index a3126dbba0442c..00000000000000 --- a/.github/workflows/examples-cyw30739.yaml +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright (c) 2021 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. - -name: Build example - Infineon CYW30739 - -on: - push: - pull_request: - -concurrency: - group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }} - cancel-in-progress: true - -jobs: - cyw30739: - name: CYW30739 - timeout-minutes: 60 - - runs-on: ubuntu-latest - if: github.actor != 'restyled-io[bot]' - - container: - image: connectedhomeip/chip-build:latest - volumes: - - "/tmp/bloat_reports:/tmp/bloat_reports" - steps: - - uses: Wandalen/wretry.action@v1.0.15 - name: Checkout - with: - action: actions/checkout@v3 - with: | - token: ${{ github.token }} - attempt_limit: 3 - attempt_delay: 2000 - - name: Checkout submodules - run: scripts/checkout_submodules.py --shallow --platform cyw30739 - - - name: Set up environment for size reports - if: ${{ !env.ACT }} - env: - GH_CONTEXT: ${{ toJson(github) }} - run: scripts/tools/memory/gh_sizes_environment.py "${GH_CONTEXT}" - - - name: Bootstrap - timeout-minutes: 25 - run: scripts/build/gn_bootstrap.sh - - name: Uploading bootstrap logs - uses: actions/upload-artifact@v2 - if: ${{ always() && !env.ACT }} - with: - name: bootstrap-logs - path: | - .environment/gn_out/.ninja_log - .environment/pigweed-venv/*.log - - name: Build example CYW30739 Apps - timeout-minutes: 30 - run: | - ./scripts/run_in_build_env.sh \ - "./scripts/build/build_examples.py \ - --target-glob 'cyw30739-cyw930739m2evb_01-{light,lock,ota-requestor-no-progress-logging}' \ - build \ - --copy-artifacts-to out/artifacts \ - " - - name: Get light size stats - timeout-minutes: 5 - run: | - .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \ - cyw30739 cyw930739m2evb_01 light \ - out/artifacts/cyw30739-cyw930739m2evb_01-light/chip-cyw30739-lighting-example.elf \ - /tmp/bloat_reports/ - - name: Get lock size stats - timeout-minutes: 5 - run: | - .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \ - cyw30739 cyw930739m2evb_01 lock \ - out/artifacts/cyw30739-cyw930739m2evb_01-lock/chip-cyw30739-lock-example.elf \ - /tmp/bloat_reports/ - - name: Get ota-requestor size stats - timeout-minutes: 5 - run: | - .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \ - cyw30739 cyw930739m2evb_01 ota-requestor-no-progress-logging \ - out/artifacts/cyw30739-cyw930739m2evb_01-ota-requestor-no-progress-logging/chip-cyw30739-ota-requestor-example.elf \ - /tmp/bloat_reports/ - - name: Uploading Size Reports - uses: actions/upload-artifact@v2 - if: ${{ !env.ACT }} - with: - name: Size,CYW30739-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }} - path: | - /tmp/bloat_reports/ diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml index e616bce7f1d7eb..233140e989d8d1 100644 --- a/.github/workflows/examples-infineon.yaml +++ b/.github/workflows/examples-infineon.yaml @@ -121,6 +121,36 @@ jobs: out/artifacts/infineon-psoc6-light/chip-psoc6-lighting-example.out \ /tmp/bloat_reports/ + - name: Build example CYW30739 Apps + timeout-minutes: 30 + run: | + ./scripts/run_in_build_env.sh \ + "./scripts/build/build_examples.py \ + --target-glob 'cyw30739-cyw930739m2evb_01-{light,lock,ota-requestor-no-progress-logging}' \ + build \ + --copy-artifacts-to out/artifacts \ + " + - name: Get light size stats + timeout-minutes: 5 + run: | + .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \ + cyw30739 cyw930739m2evb_01 light \ + out/artifacts/cyw30739-cyw930739m2evb_01-light/chip-cyw30739-lighting-example.elf \ + /tmp/bloat_reports/ + - name: Get lock size stats + timeout-minutes: 5 + run: | + .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \ + cyw30739 cyw930739m2evb_01 lock \ + out/artifacts/cyw30739-cyw930739m2evb_01-lock/chip-cyw30739-lock-example.elf \ + /tmp/bloat_reports/ + - name: Get ota-requestor size stats + timeout-minutes: 5 + run: | + .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \ + cyw30739 cyw930739m2evb_01 ota-requestor-no-progress-logging \ + out/artifacts/cyw30739-cyw930739m2evb_01-ota-requestor-no-progress-logging/chip-cyw30739-ota-requestor-example.elf \ + /tmp/bloat_reports/ - name: Uploading Size Reports uses: actions/upload-artifact@v2 if: ${{ !env.ACT }} diff --git a/.gitmodules b/.gitmodules index e01065d1a00b2c..4720c38610b9a5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -83,7 +83,7 @@ [submodule "third_party/openthread/ot-ifx"] path = third_party/openthread/ot-ifx url = https://github.com/Infineon/ot-ifx-release.git - platforms = cyw30739 + platforms = infineon [submodule "third_party/mbed-os/repo"] path = third_party/mbed-os/repo url = https://github.com/ARMmbed/mbed-os.git @@ -196,21 +196,21 @@ path = third_party/jsoncpp/repo url = https://github.com/open-source-parsers/jsoncpp.git [submodule "cyw30739_sdk/30739A0"] - path = third_party/cyw30739_sdk/repos/30739A0 + path = third_party/infineon/cyw30739_sdk/repos/30739A0 url = https://github.com/Infineon/OT-Matter-30739A0.git - platforms = cyw30739 + platforms = infineon [submodule "cyw30739_sdk/include"] - path = third_party/cyw30739_sdk/repos/btsdk-include + path = third_party/infineon/cyw30739_sdk/repos/btsdk-include url = https://github.com/Infineon/btsdk-include.git - platforms = cyw30739 + platforms = infineon [submodule "cyw30739_sdk/target"] - path = third_party/cyw30739_sdk/repos/CYW930739M2EVB-01 + path = third_party/infineon/cyw30739_sdk/repos/CYW930739M2EVB-01 url = https://github.com/Infineon/OT-Matter-TARGET_CYW930739M2EVB-01.git - platforms = cyw30739 + platforms = infineon [submodule "cyw30739_sdk/tools"] - path = third_party/cyw30739_sdk/repos/btsdk-tools + path = third_party/infineon/cyw30739_sdk/repos/btsdk-tools url = https://github.com/Infineon/btsdk-tools.git - platforms = cyw30739 + platforms = infineon [submodule "third_party/p6/p6_sdk/libs/anycloud-ota"] path = third_party/infineon/psoc6/psoc6_sdk/libs/anycloud-ota url = https://github.com/Infineon/anycloud-ota diff --git a/BUILD.gn b/BUILD.gn index a233ab272621c7..7dbbb83d3cc77b 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -271,8 +271,8 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") { # Set this to true to enable efr32 builds by default. enable_efr32_builds = false - # Set this to true to enable p6 builds by default. - enable_p6_builds = false + # Set this to true to enable psoc6 builds by default. + enable_psoc6_builds = false # Set this to true to enable Qorvo qpg builds by default. enable_qpg_builds = false @@ -364,8 +364,8 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") { # Build the efr32 lock app example. enable_efr32_lock_app_build = enable_efr32_builds - # Build the p6 lock app example. - enable_p6_lock_app_build = enable_p6_builds + # Build the psoc6 lock app example. + enable_psoc6_lock_app_build = enable_psoc6_builds # Build the qpgxxxx lock app example. enable_qpg_lock_app_build = enable_qpg_builds && !is_debug @@ -610,12 +610,12 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") { extra_build_deps += [ ":efr32_lock_app" ] } - if (enable_p6_lock_app_build) { - group("p6_lock_app") { - deps = [ "${chip_root}/examples/lock-app/p6(${chip_root}/config/p6/toolchain:p6_lock_app)" ] + if (enable_psoc6_lock_app_build) { + group("psoc6_lock_app") { + deps = [ "${chip_root}/examples/lock-app/infineon/psoc6(${chip_root}/config/psoc6/toolchain:psoc6_lock_app)" ] } - extra_build_deps += [ ":p6_lock_app" ] + extra_build_deps += [ ":psoc6_lock_app" ] } if (enable_qpg_lock_app_build) { diff --git a/config/p6/toolchain/BUILD.gn b/config/psoc6/toolchain/BUILD.gn similarity index 88% rename from config/p6/toolchain/BUILD.gn rename to config/psoc6/toolchain/BUILD.gn index 219ae1bf1102ed..542012522ea8cb 100644 --- a/config/p6/toolchain/BUILD.gn +++ b/config/psoc6/toolchain/BUILD.gn @@ -17,9 +17,9 @@ import("//build_overrides/chip.gni") import("${build_root}/toolchain/arm_gcc/arm_toolchain.gni") -arm_toolchain("p6_lock_app") { +arm_toolchain("psoc6_lock_app") { toolchain_args = { current_os = "freertos" - import("${chip_root}/examples/lock-app/p6/args.gni") + import("${chip_root}/examples/lock-app/infineon/psoc6/args.gni") } } diff --git a/docs/guides/README.md b/docs/guides/README.md index 34b71306f7aedd..1ae2dcde8286ca 100644 --- a/docs/guides/README.md +++ b/docs/guides/README.md @@ -4,7 +4,7 @@ - [Android - Building](./android_building.md) - [Apple - Testing with iPhone, iPad, macOS, Apple TV, HomePod, Watch, etc](./darwin.md) -- [Infineon - Software Update](./infineon_p6_software_update.md) +- [Infineon - Software Update](./infineon_psoc6_software_update.md) - [Linux - Simulated Devices](./simulated_device_linux.md) - [mbedOS - Adding a new target](./mbedos_add_new_target.md) - [mbedOS - Commissioning](./mbedos_commissioning.md) diff --git a/docs/guides/darwin.md b/docs/guides/darwin.md index ef76ec1a36725b..b28a9925d53cd0 100644 --- a/docs/guides/darwin.md +++ b/docs/guides/darwin.md @@ -205,7 +205,6 @@ requirements ##### Guides - [Bouffalo Lab](/examples/lighting-app/bouffalolab/bl602/README.md) -- [CYW30739 Lighting](/examples/lighting-app/cyw30739/README.md) - [EFR32 Window Covering](/examples/window-app/efr32/README.md) - [ESP32 All Clusters](/examples/all-clusters-app/esp32/README.md) - [ESP32 Lighting](/examples/lighting-app/esp32/README.md) @@ -215,7 +214,8 @@ requirements - [nRF Connect Pump](/examples/pump-app/nrfconnect/README.md) - [NXP Examples](./nxp_imx8m_linux_examples.md) - [NXP](/examples/all-clusters-app/nxp/mw320/README.md) -- [P6](/examples/all-clusters-app/infineon/p6/README.md) +- [Infineon CYW30739 Lighting](/examples/lighting-app/infineon/cyw30739/README.md) +- [Infineon PSoC6](/examples/all-clusters-app/infineon/psoc6/README.md) - [Qorvo](/examples/lighting-app/qpg/README.md) - [SiliconLabs](./silabs_efr32_building.md) - [Simulated Linux](./simulated_device_linux.md) diff --git a/examples/all-clusters-app/infineon/psoc6/README.md b/examples/all-clusters-app/infineon/psoc6/README.md index e1debd5aea0495..c28c43d9c3f248 100644 --- a/examples/all-clusters-app/infineon/psoc6/README.md +++ b/examples/all-clusters-app/infineon/psoc6/README.md @@ -24,9 +24,9 @@ The PSoC6 clusters example provides a baseline demonstration of a Cluster control device, built using Matter and the Infineon Modustoolbox SDK. It can be controlled by Matter controller over Wi-Fi network. -The P6 device can be commissioned over Bluetooth Low Energy where the device and -the Matter controller will exchange security information with the Rendezvous -procedure. Wi-Fi Network credentials are then provided to the P6 device which +The PSoC6 device can be commissioned over Bluetooth Low Energy where the device +and the Matter controller will exchange security information with the Rendezvous +procedure. Wi-Fi Network credentials are then provided to the PSoC6 device which will then join the network. @@ -36,8 +36,8 @@ will then join the network. - [Modustoolbox Software](https://www.cypress.com/products/modustoolbox) Refer to `integrations/docker/images/chip-build-infineon/Dockerfile` or - `scripts/examples/gn_p6_example.sh` for downloading the Software and related - tools. + `scripts/examples/gn_psoc6_example.sh` for downloading the Software and + related tools. - Install some additional tools (likely already present for Matter developers): @@ -84,7 +84,7 @@ Commissioning can be carried out using BLE. ### Setting up Chip tool -Once P6 is up and running, we need to set up chip-tool on Raspberry Pi 4 to +Once PSoC6 is up and running, we need to set up chip-tool on Raspberry Pi 4 to perform commissioning and cluster control. - Set up python controller. @@ -125,6 +125,6 @@ commands. These power cycle the BlueTooth hardware and disable BR/EDR mode. ## OTA Software Update -For the description of Software Update process with infineon P6 example +For the description of Software Update process with infineon PSoC6 example applications see -[Infineon P6 OTA Software Update](../../../docs/guides/infineon_p6_software_update.md) +[Infineon PSoC6 OTA Software Update](../../../../docs/guides/infineon_psoc6_software_update.md) diff --git a/examples/all-clusters-minimal-app/infineon/psoc6/README.md b/examples/all-clusters-minimal-app/infineon/psoc6/README.md index d0ba92bfb4cc6f..1f7a40ef9b28ac 100644 --- a/examples/all-clusters-minimal-app/infineon/psoc6/README.md +++ b/examples/all-clusters-minimal-app/infineon/psoc6/README.md @@ -24,9 +24,9 @@ The PSoC6 clusters example provides a baseline demonstration of a Cluster control device, built using Matter and the Infineon Modustoolbox SDK. It can be controlled by Matter controller over Wi-Fi network. -The P6 device can be commissioned over Bluetooth Low Energy where the device and -the Matter controller will exchange security information with the Rendezvous -procedure. Wi-Fi Network credentials are then provided to the P6 device which +The PSoC6 device can be commissioned over Bluetooth Low Energy where the device +and the Matter controller will exchange security information with the Rendezvous +procedure. Wi-Fi Network credentials are then provided to the PSoC6 device which will then join the network. @@ -36,8 +36,8 @@ will then join the network. - [Modustoolbox Software](https://www.cypress.com/products/modustoolbox) Refer to `integrations/docker/images/chip-build-infineon/Dockerfile` or - `scripts/examples/gn_p6_example.sh` for downloading the Software and related - tools. + `scripts/examples/gn_psoc6_example.sh` for downloading the Software and + related tools. - Install some additional tools (likely already present for Matter developers): @@ -84,7 +84,7 @@ Commissioning can be carried out using BLE. ### Setting up Chip tool -Once P6 is up and running, we need to set up chip-tool on Raspberry Pi 4 to +Once PSoC6 is up and running, we need to set up chip-tool on Raspberry Pi 4 to perform commissioning and cluster control. - Set up python controller. @@ -125,6 +125,6 @@ commands. These power cycle the BlueTooth hardware and disable BR/EDR mode. ## OTA Software Update -For the description of Software Update process with infineon P6 example +For the description of Software Update process with infineon PSoC6 example applications see -[Infineon P6 OTA Software Update](../../../docs/guides/infineon_p6_software_update.md) +[Infineon PSoC6 OTA Software Update](../../../../docs/guides/infineon_psoc6_software_update.md) diff --git a/examples/build_overrides/cyw30739_sdk.gni b/examples/build_overrides/cyw30739_sdk.gni index d2c81de46ba614..d98ac9866b0a4f 100644 --- a/examples/build_overrides/cyw30739_sdk.gni +++ b/examples/build_overrides/cyw30739_sdk.gni @@ -15,5 +15,5 @@ declare_args() { # Root directory for CYW30739 SDK. cyw30739_sdk_build_root = - "//third_party/connectedhomeip/third_party/cyw30739_sdk" + "//third_party/connectedhomeip/third_party/infineon/cyw30739_sdk" } diff --git a/examples/lighting-app/cyw30739/build_overrides b/examples/lighting-app/cyw30739/build_overrides deleted file mode 120000 index e578e73312ebd1..00000000000000 --- a/examples/lighting-app/cyw30739/build_overrides +++ /dev/null @@ -1 +0,0 @@ -../../build_overrides \ No newline at end of file diff --git a/examples/lighting-app/cyw30739/third_party/connectedhomeip b/examples/lighting-app/cyw30739/third_party/connectedhomeip deleted file mode 120000 index c866b86874994d..00000000000000 --- a/examples/lighting-app/cyw30739/third_party/connectedhomeip +++ /dev/null @@ -1 +0,0 @@ -../../../.. \ No newline at end of file diff --git a/examples/lighting-app/cyw30739/.gn b/examples/lighting-app/infineon/cyw30739/.gn similarity index 100% rename from examples/lighting-app/cyw30739/.gn rename to examples/lighting-app/infineon/cyw30739/.gn diff --git a/examples/lighting-app/cyw30739/BUILD.gn b/examples/lighting-app/infineon/cyw30739/BUILD.gn similarity index 93% rename from examples/lighting-app/cyw30739/BUILD.gn rename to examples/lighting-app/infineon/cyw30739/BUILD.gn index 86d7342430b378..be63607b0bf97b 100644 --- a/examples/lighting-app/cyw30739/BUILD.gn +++ b/examples/lighting-app/infineon/cyw30739/BUILD.gn @@ -19,8 +19,8 @@ import("//build_overrides/cyw30739_sdk.gni") import("${cyw30739_sdk_build_root}/cyw30739_executable.gni") import("${cyw30739_sdk_build_root}/cyw30739_sdk.gni") -cyw30739_project_dir = "${chip_root}/examples/lighting-app/cyw30739" -examples_plat_dir = "${chip_root}/examples/platform/cyw30739" +cyw30739_project_dir = "${chip_root}/examples/lighting-app/infineon/cyw30739" +examples_plat_dir = "${chip_root}/examples/platform/infineon/cyw30739" declare_args() { setupPinCode = 20202021 diff --git a/examples/lighting-app/cyw30739/README.md b/examples/lighting-app/infineon/cyw30739/README.md similarity index 93% rename from examples/lighting-app/cyw30739/README.md rename to examples/lighting-app/infineon/cyw30739/README.md index d43e663b5f12e0..72753e2299f942 100644 --- a/examples/lighting-app/cyw30739/README.md +++ b/examples/lighting-app/infineon/cyw30739/README.md @@ -32,7 +32,7 @@ dataset and CASE credentials are then provided. ```bash $ cd ~/connectedhomeip $ git submodule update --init - $ ./scripts/examples/gn_build_example.sh examples/lighting-app/cyw30739 out/lighting-app + $ ./scripts/examples/gn_build_example.sh examples/lighting-app/infineon/cyw30739 out/lighting-app ``` - To delete generated executable, libraries and object files use: @@ -45,7 +45,7 @@ dataset and CASE credentials are then provided. - OR use GN/Ninja directly ```bash - $ cd ~/connectedhomeip/examples/lighting-app/cyw30739 + $ cd ~/connectedhomeip/examples/lighting-app/infineon/cyw30739 $ git submodule update --init $ source third_party/connectedhomeip/scripts/activate.sh $ gn gen out/debug @@ -55,7 +55,7 @@ dataset and CASE credentials are then provided. - To delete generated executable, libraries and object files use: ```bash - $ cd ~/connectedhomeip/examples/lighting-app/cyw30739 + $ cd ~/connectedhomeip/examples/lighting-app/infineon/cyw30739 $ rm -rf out/ ``` @@ -75,7 +75,7 @@ Put the CYW30739 in to the recovery mode before running the flash script. - On the command line: ```bash - $ cd ~/connectedhomeip/examples/lighting-app/cyw30739 + $ cd ~/connectedhomeip/examples/lighting-app/infineon/cyw30739 $ python3 out/debug/chip-cyw30739-lighting-example.flash.py ``` diff --git a/examples/lighting-app/cyw30739/args.gni b/examples/lighting-app/infineon/cyw30739/args.gni similarity index 93% rename from examples/lighting-app/cyw30739/args.gni rename to examples/lighting-app/infineon/cyw30739/args.gni index 267c1db9b56817..ff653ee769356a 100644 --- a/examples/lighting-app/cyw30739/args.gni +++ b/examples/lighting-app/infineon/cyw30739/args.gni @@ -13,7 +13,7 @@ # limitations under the License. import("//build_overrides/chip.gni") -import("${chip_root}/src/platform/CYW30739/args.gni") +import("${chip_root}/src/platform/Infineon/CYW30739/args.gni") cyw30739_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/lighting-app/infineon/cyw30739/build_overrides b/examples/lighting-app/infineon/cyw30739/build_overrides new file mode 120000 index 00000000000000..ee19c065d619a2 --- /dev/null +++ b/examples/lighting-app/infineon/cyw30739/build_overrides @@ -0,0 +1 @@ +../../../build_overrides/ \ No newline at end of file diff --git a/examples/lighting-app/cyw30739/include/AppShellCommands.h b/examples/lighting-app/infineon/cyw30739/include/AppShellCommands.h similarity index 100% rename from examples/lighting-app/cyw30739/include/AppShellCommands.h rename to examples/lighting-app/infineon/cyw30739/include/AppShellCommands.h diff --git a/examples/lighting-app/cyw30739/include/ButtonHandler.h b/examples/lighting-app/infineon/cyw30739/include/ButtonHandler.h similarity index 100% rename from examples/lighting-app/cyw30739/include/ButtonHandler.h rename to examples/lighting-app/infineon/cyw30739/include/ButtonHandler.h diff --git a/examples/lighting-app/cyw30739/include/CHIPProjectConfig.h b/examples/lighting-app/infineon/cyw30739/include/CHIPProjectConfig.h similarity index 100% rename from examples/lighting-app/cyw30739/include/CHIPProjectConfig.h rename to examples/lighting-app/infineon/cyw30739/include/CHIPProjectConfig.h diff --git a/examples/lighting-app/cyw30739/include/LightingManager.h b/examples/lighting-app/infineon/cyw30739/include/LightingManager.h similarity index 100% rename from examples/lighting-app/cyw30739/include/LightingManager.h rename to examples/lighting-app/infineon/cyw30739/include/LightingManager.h diff --git a/examples/lighting-app/cyw30739/src/AppShellCommands.cpp b/examples/lighting-app/infineon/cyw30739/src/AppShellCommands.cpp similarity index 100% rename from examples/lighting-app/cyw30739/src/AppShellCommands.cpp rename to examples/lighting-app/infineon/cyw30739/src/AppShellCommands.cpp diff --git a/examples/lighting-app/cyw30739/src/ButtonHandler.cpp b/examples/lighting-app/infineon/cyw30739/src/ButtonHandler.cpp similarity index 100% rename from examples/lighting-app/cyw30739/src/ButtonHandler.cpp rename to examples/lighting-app/infineon/cyw30739/src/ButtonHandler.cpp diff --git a/examples/lighting-app/cyw30739/src/LightingManager.cpp b/examples/lighting-app/infineon/cyw30739/src/LightingManager.cpp similarity index 100% rename from examples/lighting-app/cyw30739/src/LightingManager.cpp rename to examples/lighting-app/infineon/cyw30739/src/LightingManager.cpp diff --git a/examples/lighting-app/cyw30739/src/ZclCallbacks.cpp b/examples/lighting-app/infineon/cyw30739/src/ZclCallbacks.cpp similarity index 100% rename from examples/lighting-app/cyw30739/src/ZclCallbacks.cpp rename to examples/lighting-app/infineon/cyw30739/src/ZclCallbacks.cpp diff --git a/examples/lighting-app/cyw30739/src/main.cpp b/examples/lighting-app/infineon/cyw30739/src/main.cpp similarity index 100% rename from examples/lighting-app/cyw30739/src/main.cpp rename to examples/lighting-app/infineon/cyw30739/src/main.cpp diff --git a/examples/lighting-app/cyw30739/static_config.txt b/examples/lighting-app/infineon/cyw30739/static_config.txt similarity index 100% rename from examples/lighting-app/cyw30739/static_config.txt rename to examples/lighting-app/infineon/cyw30739/static_config.txt diff --git a/examples/lighting-app/infineon/cyw30739/third_party/connectedhomeip b/examples/lighting-app/infineon/cyw30739/third_party/connectedhomeip new file mode 120000 index 00000000000000..3efed95be5dbe9 --- /dev/null +++ b/examples/lighting-app/infineon/cyw30739/third_party/connectedhomeip @@ -0,0 +1 @@ +../../../../../ \ No newline at end of file diff --git a/examples/lighting-app/infineon/psoc6/README.md b/examples/lighting-app/infineon/psoc6/README.md index 9aa2ac72949541..ea229f0f391029 100644 --- a/examples/lighting-app/infineon/psoc6/README.md +++ b/examples/lighting-app/infineon/psoc6/README.md @@ -25,9 +25,9 @@ The PSoC6 lighting example provides a baseline demonstration of a Light control device, built using Matter and the Infineon Modustoolbox SDK. It can be controlled by Matter controller over Wi-Fi network. -The P6 device can be commissioned over Bluetooth Low Energy where the device and -the Matter controller will exchange security information with the Rendezvous -procedure. Wi-Fi Network credentials are then provided to the P6 device which +The PSoC6 device can be commissioned over Bluetooth Low Energy where the device +and the Matter controller will exchange security information with the Rendezvous +procedure. Wi-Fi Network credentials are then provided to the PSoC6 device which will then join the network. @@ -37,8 +37,8 @@ will then join the network. - [Modustoolbox Software](https://www.cypress.com/products/modustoolbox) Refer to `integrations/docker/images/chip-build-infineon/Dockerfile` or - `scripts/examples/gn_p6_example.sh` for downloading the Software and related - tools. + `scripts/examples/gn_psoc6_example.sh` for downloading the Software and + related tools. - Install some additional tools (likely already present for Matter developers): \$ sudo apt install gcc g++ clang ninja-build python @@ -81,7 +81,7 @@ Commissioning can be carried out using BLE. ### Setting up Chip tool -Once P6 is up and running, we need to set up chip-tool on Raspberry Pi 4 to +Once PSoC6 is up and running, we need to set up chip-tool on Raspberry Pi 4 to perform commissioning and cluster control. - Set up python controller. @@ -139,6 +139,6 @@ commands. These power cycle the BlueTooth hardware and disable BR/EDR mode. ## OTA Software Update -For the description of Software Update process with infineon P6 example +For the description of Software Update process with infineon PSoC6 example applications see -[Infineon P6 OTA Software Update](../../../docs/guides/infineon_p6_software_update.md) +[Infineon PSoC6 OTA Software Update](../../../../docs/guides/infineon_psoc6_software_update.md) diff --git a/examples/lock-app/cyw30739/build_overrides b/examples/lock-app/cyw30739/build_overrides deleted file mode 120000 index e578e73312ebd1..00000000000000 --- a/examples/lock-app/cyw30739/build_overrides +++ /dev/null @@ -1 +0,0 @@ -../../build_overrides \ No newline at end of file diff --git a/examples/lock-app/cyw30739/third_party/connectedhomeip b/examples/lock-app/cyw30739/third_party/connectedhomeip deleted file mode 120000 index c866b86874994d..00000000000000 --- a/examples/lock-app/cyw30739/third_party/connectedhomeip +++ /dev/null @@ -1 +0,0 @@ -../../../.. \ No newline at end of file diff --git a/examples/lock-app/cyw30739/.gn b/examples/lock-app/infineon/cyw30739/.gn similarity index 100% rename from examples/lock-app/cyw30739/.gn rename to examples/lock-app/infineon/cyw30739/.gn diff --git a/examples/lock-app/cyw30739/BUILD.gn b/examples/lock-app/infineon/cyw30739/BUILD.gn similarity index 93% rename from examples/lock-app/cyw30739/BUILD.gn rename to examples/lock-app/infineon/cyw30739/BUILD.gn index 87f0e15e92bff3..8d0cc6333d32d9 100644 --- a/examples/lock-app/cyw30739/BUILD.gn +++ b/examples/lock-app/infineon/cyw30739/BUILD.gn @@ -19,8 +19,8 @@ import("//build_overrides/cyw30739_sdk.gni") import("${cyw30739_sdk_build_root}/cyw30739_executable.gni") import("${cyw30739_sdk_build_root}/cyw30739_sdk.gni") -cyw30739_project_dir = "${chip_root}/examples/lock-app/cyw30739" -examples_plat_dir = "${chip_root}/examples/platform/cyw30739" +cyw30739_project_dir = "${chip_root}/examples/lock-app/infineon/cyw30739" +examples_plat_dir = "${chip_root}/examples/platform/infineon/cyw30739" declare_args() { setupPinCode = 20202021 diff --git a/examples/lock-app/cyw30739/README.md b/examples/lock-app/infineon/cyw30739/README.md similarity index 92% rename from examples/lock-app/cyw30739/README.md rename to examples/lock-app/infineon/cyw30739/README.md index 41a6a23598d3df..12ac917071ce55 100644 --- a/examples/lock-app/cyw30739/README.md +++ b/examples/lock-app/infineon/cyw30739/README.md @@ -32,7 +32,7 @@ dataset and CASE credentials are then provided. ```bash $ cd ~/connectedhomeip $ git submodule update --init - $ ./scripts/examples/gn_build_example.sh examples/lock-app/cyw30739 out/lock-app + $ ./scripts/examples/gn_build_example.sh examples/lock-app/infineon/cyw30739 out/lock-app ``` - To delete generated executable, libraries and object files use: @@ -45,7 +45,7 @@ dataset and CASE credentials are then provided. - OR use GN/Ninja directly ```bash - $ cd ~/connectedhomeip/examples/lock-app/cyw30739 + $ cd ~/connectedhomeip/examples/lock-app/infineon/cyw30739 $ git submodule update --init $ source third_party/connectedhomeip/scripts/activate.sh $ gn gen out/debug @@ -55,7 +55,7 @@ dataset and CASE credentials are then provided. - To delete generated executable, libraries and object files use: ```bash - $ cd ~/connectedhomeip/examples/lock-app/cyw30739 + $ cd ~/connectedhomeip/examples/lock-app/infineon/cyw30739 $ rm -rf out/ ``` @@ -75,7 +75,7 @@ Put the CYW30739 in to the recovery mode before running the flash script. - On the command line: ```bash - $ cd ~/connectedhomeip/examples/lock-app/cyw30739 + $ cd ~/connectedhomeip/examples/lock-app/infineon/cyw30739 $ python3 out/debug/chip-cyw30739-lock-example.flash.py ``` diff --git a/examples/lock-app/cyw30739/args.gni b/examples/lock-app/infineon/cyw30739/args.gni similarity index 93% rename from examples/lock-app/cyw30739/args.gni rename to examples/lock-app/infineon/cyw30739/args.gni index 267c1db9b56817..ff653ee769356a 100644 --- a/examples/lock-app/cyw30739/args.gni +++ b/examples/lock-app/infineon/cyw30739/args.gni @@ -13,7 +13,7 @@ # limitations under the License. import("//build_overrides/chip.gni") -import("${chip_root}/src/platform/CYW30739/args.gni") +import("${chip_root}/src/platform/Infineon/CYW30739/args.gni") cyw30739_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/lock-app/infineon/cyw30739/build_overrides b/examples/lock-app/infineon/cyw30739/build_overrides new file mode 120000 index 00000000000000..ee19c065d619a2 --- /dev/null +++ b/examples/lock-app/infineon/cyw30739/build_overrides @@ -0,0 +1 @@ +../../../build_overrides/ \ No newline at end of file diff --git a/examples/lock-app/cyw30739/include/AppEvent.h b/examples/lock-app/infineon/cyw30739/include/AppEvent.h similarity index 100% rename from examples/lock-app/cyw30739/include/AppEvent.h rename to examples/lock-app/infineon/cyw30739/include/AppEvent.h diff --git a/examples/lock-app/cyw30739/include/AppShellCommands.h b/examples/lock-app/infineon/cyw30739/include/AppShellCommands.h similarity index 100% rename from examples/lock-app/cyw30739/include/AppShellCommands.h rename to examples/lock-app/infineon/cyw30739/include/AppShellCommands.h diff --git a/examples/lock-app/cyw30739/include/ButtonHandler.h b/examples/lock-app/infineon/cyw30739/include/ButtonHandler.h similarity index 100% rename from examples/lock-app/cyw30739/include/ButtonHandler.h rename to examples/lock-app/infineon/cyw30739/include/ButtonHandler.h diff --git a/examples/lock-app/cyw30739/include/CHIPProjectConfig.h b/examples/lock-app/infineon/cyw30739/include/CHIPProjectConfig.h similarity index 100% rename from examples/lock-app/cyw30739/include/CHIPProjectConfig.h rename to examples/lock-app/infineon/cyw30739/include/CHIPProjectConfig.h diff --git a/examples/lock-app/cyw30739/include/LockManager.h b/examples/lock-app/infineon/cyw30739/include/LockManager.h similarity index 100% rename from examples/lock-app/cyw30739/include/LockManager.h rename to examples/lock-app/infineon/cyw30739/include/LockManager.h diff --git a/examples/lock-app/cyw30739/include/chip_lock.h b/examples/lock-app/infineon/cyw30739/include/chip_lock.h similarity index 100% rename from examples/lock-app/cyw30739/include/chip_lock.h rename to examples/lock-app/infineon/cyw30739/include/chip_lock.h diff --git a/examples/lock-app/cyw30739/src/AppShellCommands.cpp b/examples/lock-app/infineon/cyw30739/src/AppShellCommands.cpp similarity index 100% rename from examples/lock-app/cyw30739/src/AppShellCommands.cpp rename to examples/lock-app/infineon/cyw30739/src/AppShellCommands.cpp diff --git a/examples/lock-app/cyw30739/src/ButtonHandler.cpp b/examples/lock-app/infineon/cyw30739/src/ButtonHandler.cpp similarity index 100% rename from examples/lock-app/cyw30739/src/ButtonHandler.cpp rename to examples/lock-app/infineon/cyw30739/src/ButtonHandler.cpp diff --git a/examples/lock-app/cyw30739/src/LockManager.cpp b/examples/lock-app/infineon/cyw30739/src/LockManager.cpp similarity index 100% rename from examples/lock-app/cyw30739/src/LockManager.cpp rename to examples/lock-app/infineon/cyw30739/src/LockManager.cpp diff --git a/examples/lock-app/cyw30739/src/ZclCallbacks.cpp b/examples/lock-app/infineon/cyw30739/src/ZclCallbacks.cpp similarity index 100% rename from examples/lock-app/cyw30739/src/ZclCallbacks.cpp rename to examples/lock-app/infineon/cyw30739/src/ZclCallbacks.cpp diff --git a/examples/lock-app/cyw30739/src/main.cpp b/examples/lock-app/infineon/cyw30739/src/main.cpp similarity index 100% rename from examples/lock-app/cyw30739/src/main.cpp rename to examples/lock-app/infineon/cyw30739/src/main.cpp diff --git a/examples/lock-app/cyw30739/static_config.txt b/examples/lock-app/infineon/cyw30739/static_config.txt similarity index 100% rename from examples/lock-app/cyw30739/static_config.txt rename to examples/lock-app/infineon/cyw30739/static_config.txt diff --git a/examples/lock-app/infineon/cyw30739/third_party/connectedhomeip b/examples/lock-app/infineon/cyw30739/third_party/connectedhomeip new file mode 120000 index 00000000000000..3efed95be5dbe9 --- /dev/null +++ b/examples/lock-app/infineon/cyw30739/third_party/connectedhomeip @@ -0,0 +1 @@ +../../../../../ \ No newline at end of file diff --git a/examples/lock-app/infineon/psoc6/README.md b/examples/lock-app/infineon/psoc6/README.md index 2edc26716b839e..5046ce5c0343c7 100644 --- a/examples/lock-app/infineon/psoc6/README.md +++ b/examples/lock-app/infineon/psoc6/README.md @@ -25,9 +25,9 @@ The PSoC6 lock example provides a demonstration of a door lock control device, built using Matter and the Infineon Modustoolbox SDK. It can be controlled by a Matter controller over Wi-Fi network. -The P6 device can be commissioned over Bluetooth Low Energy where the device and -the Matter controller will exchange security information with the Rendezvous -procedure. Wi-Fi Network credentials are then provided to the P6 device which +The PSoC6 device can be commissioned over Bluetooth Low Energy where the device +and the Matter controller will exchange security information with the Rendezvous +procedure. Wi-Fi Network credentials are then provided to the PSoC6 device which will then join the network. @@ -37,8 +37,8 @@ will then join the network. - [Modustoolbox Software](https://www.cypress.com/products/modustoolbox) Refer to `integrations/docker/images/chip-build-infineon/Dockerfile` or - `scripts/examples/gn_p6_example.sh` for downloading the Software and related - tools. + `scripts/examples/gn_psoc6_example.sh` for downloading the Software and + related tools. - Install some additional tools (likely already present for Matter developers): \$ sudo apt install gcc g++ clang ninja-build python @@ -81,7 +81,7 @@ Commissioning can be carried out using BLE. ### Setting up Chip tool -Once P6 is up and running, we need to set up chip-tool on Raspberry Pi 4 to +Once PSoC6 is up and running, we need to set up chip-tool on Raspberry Pi 4 to perform commissioning and cluster control. - Set up python controller. @@ -139,6 +139,6 @@ commands. These power cycle the BlueTooth hardware and disable BR/EDR mode. ## OTA Software Update -For the description of Software Update process with infineon P6 example +For the description of Software Update process with infineon PSoC6 example applications see -[Infineon P6 OTA Software Update](../../../docs/guides/infineon_p6_software_update.md) +[Infineon PSoC6 OTA Software Update](../../../docs/guides/infineon_psoc6_software_update.md) diff --git a/examples/ota-requestor-app/cyw30739/build_overrides b/examples/ota-requestor-app/cyw30739/build_overrides deleted file mode 120000 index e578e73312ebd1..00000000000000 --- a/examples/ota-requestor-app/cyw30739/build_overrides +++ /dev/null @@ -1 +0,0 @@ -../../build_overrides \ No newline at end of file diff --git a/examples/ota-requestor-app/cyw30739/third_party/connectedhomeip b/examples/ota-requestor-app/cyw30739/third_party/connectedhomeip deleted file mode 120000 index c866b86874994d..00000000000000 --- a/examples/ota-requestor-app/cyw30739/third_party/connectedhomeip +++ /dev/null @@ -1 +0,0 @@ -../../../.. \ No newline at end of file diff --git a/examples/ota-requestor-app/cyw30739/.gn b/examples/ota-requestor-app/infineon/cyw30739/.gn similarity index 100% rename from examples/ota-requestor-app/cyw30739/.gn rename to examples/ota-requestor-app/infineon/cyw30739/.gn diff --git a/examples/ota-requestor-app/cyw30739/BUILD.gn b/examples/ota-requestor-app/infineon/cyw30739/BUILD.gn similarity index 92% rename from examples/ota-requestor-app/cyw30739/BUILD.gn rename to examples/ota-requestor-app/infineon/cyw30739/BUILD.gn index b1ea6fde6aa876..3701330b0f7113 100644 --- a/examples/ota-requestor-app/cyw30739/BUILD.gn +++ b/examples/ota-requestor-app/infineon/cyw30739/BUILD.gn @@ -19,8 +19,9 @@ import("//build_overrides/cyw30739_sdk.gni") import("${cyw30739_sdk_build_root}/cyw30739_executable.gni") import("${cyw30739_sdk_build_root}/cyw30739_sdk.gni") -cyw30739_project_dir = "${chip_root}/examples/ota-requestor-app/cyw30739" -examples_plat_dir = "${chip_root}/examples/platform/cyw30739" +cyw30739_project_dir = + "${chip_root}/examples/ota-requestor-app/infineon/cyw30739" +examples_plat_dir = "${chip_root}/examples/platform/infineon/cyw30739" declare_args() { setupPinCode = 20202021 diff --git a/examples/ota-requestor-app/cyw30739/README.md b/examples/ota-requestor-app/infineon/cyw30739/README.md similarity index 93% rename from examples/ota-requestor-app/cyw30739/README.md rename to examples/ota-requestor-app/infineon/cyw30739/README.md index 49737cd4f270fc..7ac0990009fbcd 100644 --- a/examples/ota-requestor-app/cyw30739/README.md +++ b/examples/ota-requestor-app/infineon/cyw30739/README.md @@ -33,7 +33,7 @@ dataset and CASE credentials are then provided. ```bash $ cd ~/connectedhomeip $ git submodule update --init - $ ./scripts/examples/gn_build_example.sh examples/ota-requestor-app/cyw30739 out/ota-requestor-app + $ ./scripts/examples/gn_build_example.sh examples/ota-requestor-app/infineon/cyw30739 out/ota-requestor-app ``` - To delete generated executable, libraries and object files use: @@ -46,7 +46,7 @@ dataset and CASE credentials are then provided. - OR use GN/Ninja directly ```bash - $ cd ~/connectedhomeip/examples/ota-requestor-app/cyw30739 + $ cd ~/connectedhomeip/examples/ota-requestor-app/infineon/cyw30739 $ git submodule update --init $ source third_party/connectedhomeip/scripts/activate.sh $ gn gen out/debug @@ -56,7 +56,7 @@ dataset and CASE credentials are then provided. - To delete generated executable, libraries and object files use: ```bash - $ cd ~/connectedhomeip/examples/ota-requestor-app/cyw30739 + $ cd ~/connectedhomeip/examples/ota-requestor-app/infineon/cyw30739 $ rm -rf out/ ``` @@ -76,7 +76,7 @@ Put the CYW30739 in to the recovery mode before running the flash script. - On the command line: ```bash - $ cd ~/connectedhomeip/examples/ota-requestor-app/cyw30739 + $ cd ~/connectedhomeip/examples/ota-requestor-app/infineon/cyw30739 $ python3 out/debug/chip-cyw30739-ota-requestor-example.flash.py ``` diff --git a/examples/ota-requestor-app/cyw30739/args.gni b/examples/ota-requestor-app/infineon/cyw30739/args.gni similarity index 92% rename from examples/ota-requestor-app/cyw30739/args.gni rename to examples/ota-requestor-app/infineon/cyw30739/args.gni index 8eda8fb616b4aa..37d8fa8d701fb9 100644 --- a/examples/ota-requestor-app/cyw30739/args.gni +++ b/examples/ota-requestor-app/infineon/cyw30739/args.gni @@ -13,7 +13,7 @@ # limitations under the License. import("//build_overrides/chip.gni") -import("${chip_root}/src/platform/CYW30739/args.gni") +import("${chip_root}/src/platform/Infineon/CYW30739/args.gni") cyw30739_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/ota-requestor-app/infineon/cyw30739/build_overrides b/examples/ota-requestor-app/infineon/cyw30739/build_overrides new file mode 120000 index 00000000000000..ee19c065d619a2 --- /dev/null +++ b/examples/ota-requestor-app/infineon/cyw30739/build_overrides @@ -0,0 +1 @@ +../../../build_overrides/ \ No newline at end of file diff --git a/examples/ota-requestor-app/cyw30739/include/CHIPProjectConfig.h b/examples/ota-requestor-app/infineon/cyw30739/include/CHIPProjectConfig.h similarity index 100% rename from examples/ota-requestor-app/cyw30739/include/CHIPProjectConfig.h rename to examples/ota-requestor-app/infineon/cyw30739/include/CHIPProjectConfig.h diff --git a/examples/ota-requestor-app/cyw30739/src/main.cpp b/examples/ota-requestor-app/infineon/cyw30739/src/main.cpp similarity index 100% rename from examples/ota-requestor-app/cyw30739/src/main.cpp rename to examples/ota-requestor-app/infineon/cyw30739/src/main.cpp diff --git a/examples/ota-requestor-app/cyw30739/static_config.txt b/examples/ota-requestor-app/infineon/cyw30739/static_config.txt similarity index 100% rename from examples/ota-requestor-app/cyw30739/static_config.txt rename to examples/ota-requestor-app/infineon/cyw30739/static_config.txt diff --git a/examples/ota-requestor-app/infineon/cyw30739/third_party/connectedhomeip b/examples/ota-requestor-app/infineon/cyw30739/third_party/connectedhomeip new file mode 120000 index 00000000000000..3efed95be5dbe9 --- /dev/null +++ b/examples/ota-requestor-app/infineon/cyw30739/third_party/connectedhomeip @@ -0,0 +1 @@ +../../../../../ \ No newline at end of file diff --git a/examples/persistent-storage/p6/.gn b/examples/persistent-storage/infineon/psoc6/.gn similarity index 100% rename from examples/persistent-storage/p6/.gn rename to examples/persistent-storage/infineon/psoc6/.gn diff --git a/examples/persistent-storage/p6/BUILD.gn b/examples/persistent-storage/infineon/psoc6/BUILD.gn similarity index 63% rename from examples/persistent-storage/p6/BUILD.gn rename to examples/persistent-storage/infineon/psoc6/BUILD.gn index 944a2e07178056..d359f833815136 100644 --- a/examples/persistent-storage/p6/BUILD.gn +++ b/examples/persistent-storage/infineon/psoc6/BUILD.gn @@ -14,43 +14,44 @@ import("//build_overrides/build.gni") import("//build_overrides/chip.gni") -import("//build_overrides/p6.gni") +import("//build_overrides/psoc6.gni") import("${build_root}/config/defaults.gni") -import("${p6_sdk_build_root}/p6_executable.gni") -import("${p6_sdk_build_root}/p6_sdk.gni") +import("${psoc6_sdk_build_root}/psoc6_executable.gni") +import("${psoc6_sdk_build_root}/psoc6_sdk.gni") assert(current_os == "freertos") -p6_project_dir = "${chip_root}/examples/persistent-storage/p6" -examples_plat_dir = "${chip_root}/examples/platform/p6" +psoc6_project_dir = "${chip_root}/examples/persistent-storage/infineon/psoc6" +examples_plat_dir = "${chip_root}/examples/platform/infineon/psoc6" declare_args() { # Dump memory usage at link time. chip_print_memory_usage = false } -p6_sdk_sources("persistent_storage_app_sdk_sources") { +psoc6_sdk_sources("persistent_storage_app_sdk_sources") { include_dirs = [ - "${chip_root}/src/platform/P6", - "${p6_project_dir}/include", + "${chip_root}/src/platform/Infineon/PSOC6", + "${psoc6_project_dir}/include", "${examples_plat_dir}", ] defines = [ - "BOARD_ID=${p6_board}", + "BOARD_ID=${psoc6_board}", "P6_LOG_ENABLED=1", ] - sources = [ "${p6_project_dir}/include/CHIPProjectConfig.h" ] + sources = [ "${psoc6_project_dir}/include/CHIPProjectConfig.h" ] - public_configs = [ "${chip_root}/third_party/p6:p6_sdk_config" ] + public_configs = + [ "${chip_root}/third_party/infineon/psoc6:psoc6_sdk_config" ] } -p6_executable("persistent_storage_app") { +psoc6_executable("persistent_storage_app") { include_dirs = [] defines = [] - output_name = "chip-p6-persistent-storage-example.out" + output_name = "chip-psoc6-persistent-storage-example.out" public_deps = [ ":persistent_storage_app_sdk_sources", @@ -61,14 +62,14 @@ p6_executable("persistent_storage_app") { include_dirs += [ "include", "${examples_plat_dir}", - "${p6_project_dir}/include", + "${psoc6_project_dir}/include", "${chip_root}/examples/persistent-storage", ] sources = [ "${chip_root}/examples/persistent-storage/KeyValueStorageTest.cpp", - "${examples_plat_dir}/init_p6Platform.cpp", - "${p6_project_dir}/include/CHIPProjectConfig.h", + "${examples_plat_dir}/init_psoc6Platform.cpp", + "${psoc6_project_dir}/include/CHIPProjectConfig.h", "main.cpp", ] @@ -82,10 +83,10 @@ p6_executable("persistent_storage_app") { } } -group("p6") { +group("psoc6") { deps = [ ":persistent_storage_app" ] } group("default") { - deps = [ ":p6" ] + deps = [ ":psoc6" ] } diff --git a/examples/persistent-storage/p6/README.md b/examples/persistent-storage/infineon/psoc6/README.md similarity index 65% rename from examples/persistent-storage/p6/README.md rename to examples/persistent-storage/infineon/psoc6/README.md index 8f30ecab6dbc39..19a32c60c85acf 100644 --- a/examples/persistent-storage/p6/README.md +++ b/examples/persistent-storage/infineon/psoc6/README.md @@ -1,12 +1,12 @@ -# CHIP P6 Persistent Storage Example +# CHIP PSoC6 Persistent Storage Example An example testing and demonstrating the key value storage API.
-- [CHIP P6 Persistent Storage Example](#chip-P6-persistent-storage-example) +- [CHIP PSoC6 Persistent Storage Example](#chip-PSoC6-persistent-storage-example) - [Introduction](#introduction) - - [P6](#P6) + - [PSoC6](#PSoC6) - [Building](#building) - [Flashing the Application](#flashing-the-application) @@ -23,12 +23,12 @@ to use the API. In the future this example can be moved into a unit test when available on all platforms. - + -## P6 +## PSoC6 -The P6 platform KVS is fully implemented, the KVS is enabled and configured by -providing a file during the init call. +The Infineon PSoC6 platform KVS is fully implemented, the KVS is enabled and +configured by providing a file during the init call. @@ -38,7 +38,7 @@ providing a file during the init call. $ git submodule update --init $ source third_party/connectedhomeip/scripts/activate.sh - $ ./scripts/examples/gn_p6_example.sh examples/persistent-storage/p6 out/persistent_storage_app_p6 + $ ./scripts/examples/gn_psoc6_example.sh examples/persistent-storage/infineon/psoc6 out/persistent_storage_app_psoc6 @@ -51,4 +51,4 @@ providing a file during the init call. - On the command line: $ cd ~/connectedhomeip - $ python3 out/persistent_storage_app_p6/chip-p6-persistent-storage-example.flash.py + $ python3 out/persistent_storage_app_psoc6/chip-psoc6-persistent-storage-example.flash.py diff --git a/examples/persistent-storage/p6/args.gni b/examples/persistent-storage/infineon/psoc6/args.gni similarity index 89% rename from examples/persistent-storage/p6/args.gni rename to examples/persistent-storage/infineon/psoc6/args.gni index 1c30d812940d3d..0b4443ebd96fcc 100644 --- a/examples/persistent-storage/p6/args.gni +++ b/examples/persistent-storage/infineon/psoc6/args.gni @@ -14,7 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") -import("${chip_root}/src/platform/P6/args.gni") +import("${chip_root}/src/platform/Infineon/PSOC6/args.gni") -p6_target_project = +psoc6_target_project = get_label_info(":persistent_storage_app_sdk_sources", "label_no_toolchain") diff --git a/examples/persistent-storage/infineon/psoc6/build_overrides b/examples/persistent-storage/infineon/psoc6/build_overrides new file mode 120000 index 00000000000000..ee19c065d619a2 --- /dev/null +++ b/examples/persistent-storage/infineon/psoc6/build_overrides @@ -0,0 +1 @@ +../../../build_overrides/ \ No newline at end of file diff --git a/examples/persistent-storage/p6/include/AppConfig.h b/examples/persistent-storage/infineon/psoc6/include/AppConfig.h similarity index 100% rename from examples/persistent-storage/p6/include/AppConfig.h rename to examples/persistent-storage/infineon/psoc6/include/AppConfig.h diff --git a/examples/persistent-storage/p6/include/CHIPProjectConfig.h b/examples/persistent-storage/infineon/psoc6/include/CHIPProjectConfig.h similarity index 100% rename from examples/persistent-storage/p6/include/CHIPProjectConfig.h rename to examples/persistent-storage/infineon/psoc6/include/CHIPProjectConfig.h diff --git a/examples/persistent-storage/p6/main.cpp b/examples/persistent-storage/infineon/psoc6/main.cpp similarity index 98% rename from examples/persistent-storage/p6/main.cpp rename to examples/persistent-storage/infineon/psoc6/main.cpp index 03a5132aa73d99..104d63ffea0085 100644 --- a/examples/persistent-storage/p6/main.cpp +++ b/examples/persistent-storage/infineon/psoc6/main.cpp @@ -18,7 +18,7 @@ #include "AppConfig.h" #include "KeyValueStorageTest.h" -#include "init_p6Platform.h" +#include "init_psoc6Platform.h" #include #include #include diff --git a/examples/persistent-storage/infineon/psoc6/third_party/connectedhomeip b/examples/persistent-storage/infineon/psoc6/third_party/connectedhomeip new file mode 120000 index 00000000000000..3efed95be5dbe9 --- /dev/null +++ b/examples/persistent-storage/infineon/psoc6/third_party/connectedhomeip @@ -0,0 +1 @@ +../../../../../ \ No newline at end of file diff --git a/examples/persistent-storage/p6/build_overrides b/examples/persistent-storage/p6/build_overrides deleted file mode 120000 index 194ee0b812dc3d..00000000000000 --- a/examples/persistent-storage/p6/build_overrides +++ /dev/null @@ -1 +0,0 @@ -../../build_overrides/ \ No newline at end of file diff --git a/examples/persistent-storage/p6/third_party/connectedhomeip b/examples/persistent-storage/p6/third_party/connectedhomeip deleted file mode 120000 index c866b86874994d..00000000000000 --- a/examples/persistent-storage/p6/third_party/connectedhomeip +++ /dev/null @@ -1 +0,0 @@ -../../../.. \ No newline at end of file diff --git a/examples/platform/cyw30739/BUILD.gn b/examples/platform/infineon/cyw30739/BUILD.gn similarity index 100% rename from examples/platform/cyw30739/BUILD.gn rename to examples/platform/infineon/cyw30739/BUILD.gn diff --git a/examples/platform/cyw30739/OTAConfig.cpp b/examples/platform/infineon/cyw30739/OTAConfig.cpp similarity index 97% rename from examples/platform/cyw30739/OTAConfig.cpp rename to examples/platform/infineon/cyw30739/OTAConfig.cpp index 05902c113aa451..206db24040f98c 100644 --- a/examples/platform/cyw30739/OTAConfig.cpp +++ b/examples/platform/infineon/cyw30739/OTAConfig.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include using namespace ::chip; using namespace ::chip::DeviceLayer; diff --git a/examples/platform/cyw30739/OTAConfig.h b/examples/platform/infineon/cyw30739/OTAConfig.h similarity index 100% rename from examples/platform/cyw30739/OTAConfig.h rename to examples/platform/infineon/cyw30739/OTAConfig.h diff --git a/examples/platform/cyw30739/args.gni b/examples/platform/infineon/cyw30739/args.gni similarity index 100% rename from examples/platform/cyw30739/args.gni rename to examples/platform/infineon/cyw30739/args.gni diff --git a/examples/platform/cyw30739/project_include/OpenThreadConfig.h b/examples/platform/infineon/cyw30739/project_include/OpenThreadConfig.h similarity index 100% rename from examples/platform/cyw30739/project_include/OpenThreadConfig.h rename to examples/platform/infineon/cyw30739/project_include/OpenThreadConfig.h diff --git a/gn_build.sh b/gn_build.sh index 0615a1833ef40d..18473f34f6d517 100755 --- a/gn_build.sh +++ b/gn_build.sh @@ -106,7 +106,7 @@ for arg; do enable_p6_builds=true) p6_builds_enabled=1 ;; - p6_board=*) + psoc6_board=*) p6_board_selected=1 ;; esac @@ -141,13 +141,13 @@ fi echo -# P6 Build setup +# PSoC6 Build setup if [[ -z "$p6_builds_enabled" ]]; then echo "Hint: Pass enable_p6_builds=true to this script to enable building for PSoC6-43012" else - p6_sdk_args="" + psoc6_sdk_args="" if [[ -z "$p6_board_selected" ]]; then - p6_sdk_args="p6_board=\"CY8CKIT-062S2-43012\"" + psoc6_sdk_args="psoc6_board=\"CY8CKIT-062S2-43012\"" fi fi diff --git a/scripts/build/builders/cyw30739.py b/scripts/build/builders/cyw30739.py index 5d4470fef17535..b0347750c6593a 100644 --- a/scripts/build/builders/cyw30739.py +++ b/scripts/build/builders/cyw30739.py @@ -44,7 +44,7 @@ def AppNamePrefix(self): raise Exception("Unknown app type: %r" % self) def BuildRoot(self, root): - return os.path.join(root, "examples", self.ExampleName(), "cyw30739") + return os.path.join(root, "examples", self.ExampleName(), "infineon/cyw30739") class Cyw30739Board(Enum): diff --git a/scripts/build/testdata/build_all_except_host.txt b/scripts/build/testdata/build_all_except_host.txt index 200fa965b9219d..7c255c2eb96d29 100644 --- a/scripts/build/testdata/build_all_except_host.txt +++ b/scripts/build/testdata/build_all_except_host.txt @@ -173,16 +173,16 @@ gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/exa gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/shell/cc13x2x7_26x2x7 '--args=ti_sysconfig_root="TEST_TI_SYSCONFIG_ROOT"' {out}/cc13x2x7_26x2x7-shell # Generating cyw30739-cyw930739m2evb_01-light -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/cyw30739 {out}/cyw30739-cyw930739m2evb_01-light +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/infineon/cyw30739 {out}/cyw30739-cyw930739m2evb_01-light # Generating cyw30739-cyw930739m2evb_01-lock -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/cyw30739 {out}/cyw30739-cyw930739m2evb_01-lock +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lock-app/infineon/cyw30739 {out}/cyw30739-cyw930739m2evb_01-lock # Generating cyw30739-cyw930739m2evb_01-ota-requestor -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/ota-requestor-app/cyw30739 {out}/cyw30739-cyw930739m2evb_01-ota-requestor +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/ota-requestor-app/infineon/cyw30739 {out}/cyw30739-cyw930739m2evb_01-ota-requestor # Generating cyw30739-cyw930739m2evb_01-ota-requestor-no-progress-logging -gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/ota-requestor-app/cyw30739 --args=chip_progress_logging=false {out}/cyw30739-cyw930739m2evb_01-ota-requestor-no-progress-logging +gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/ota-requestor-app/infineon/cyw30739 --args=chip_progress_logging=false {out}/cyw30739-cyw930739m2evb_01-ota-requestor-no-progress-logging # Generating efr32-brd4161a-light gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/efr32 '--args=efr32_board="BRD4161A"' {out}/efr32-brd4161a-light diff --git a/scripts/checkout_submodules.py b/scripts/checkout_submodules.py index e767fd679b334c..ae0d2f044b6a91 100755 --- a/scripts/checkout_submodules.py +++ b/scripts/checkout_submodules.py @@ -30,7 +30,6 @@ 'bl602', 'cc13x2_26x2', 'cc32xx', - 'cyw30739', 'darwin', 'efr32', 'esp32', diff --git a/scripts/examples/gn_psoc6_example.sh b/scripts/examples/gn_psoc6_example.sh index 746c2d743779e4..403063ff575f0d 100755 --- a/scripts/examples/gn_psoc6_example.sh +++ b/scripts/examples/gn_psoc6_example.sh @@ -43,7 +43,7 @@ env EXAMPLE_DIR=$1 shift OUTPUT_DIR=out/example_app -P6_BOARD=CY8CKIT-062S2-43012 +PSOC6_BOARD=CY8CKIT-062S2-43012 if [[ ! -z "$1" ]]; then OUTPUT_DIR=$1 @@ -70,7 +70,7 @@ for arg; do esac done -gn gen --check --fail-on-unused-args "$OUTPUT_DIR" --root="$EXAMPLE_DIR" --args="p6_board=\"$P6_BOARD\" ${GN_ARGS[*]}" +gn gen --check --fail-on-unused-args "$OUTPUT_DIR" --root="$EXAMPLE_DIR" --args="psoc6_board=\"$PSOC6_BOARD\" ${GN_ARGS[*]}" ninja -C "$OUTPUT_DIR" "${NINJA_ARGS[@]}" #print stats arm-none-eabi-size -A "$OUTPUT_DIR"/*.out diff --git a/scripts/flashing/psoc6_firmware_utils.py b/scripts/flashing/psoc6_firmware_utils.py index ae82a4ad407c7a..aeef78030a1d74 100755 --- a/scripts/flashing/psoc6_firmware_utils.py +++ b/scripts/flashing/psoc6_firmware_utils.py @@ -12,18 +12,18 @@ # 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. -"""Flash an P6 device. +"""Flash an Infineon PSoC6 device. This is layered so that a caller can perform individual operations through an `Flasher` instance, or operations according to a command line. For `Flasher`, see the class documentation. For the parse_command() interface or standalone execution: -usage: p6_firmware_utils.py [-h] [--verbose] [--erase] [--application FILE] +usage: psoc6_firmware_utils.py [-h] [--verbose] [--erase] [--application FILE] [--verify_application] [--reset] [--skip_reset] [--device DEVICE] -Flash P6 device +Flash PSoC6 device optional arguments: -h, --help show this help message and exit @@ -77,14 +77,14 @@ }, 'device': { 'help': 'Device family or platform to target', - 'default': 'P6', + 'default': 'PSoC6', 'alias': ['-d'], 'argparse': { 'metavar': 'DEVICE' }, }, 'sdk_path': { - 'help': 'Path to p6 sdk', + 'help': 'Path to psoc6 sdk', 'default': 'third_party/infineon/psoc6/psoc6_sdk', 'alias': ['-p'], 'argparse': { @@ -96,7 +96,7 @@ class Flasher(firmware_utils.Flasher): - """Manage P6 flashing.""" + """Manage PSoC6 flashing.""" def __init__(self, **options): super().__init__(platform='PSOC6', module=__name__, **options) diff --git a/scripts/tools/check_includes_config.py b/scripts/tools/check_includes_config.py index 7f05448588ce76..3ab64a2f9250be 100644 --- a/scripts/tools/check_includes_config.py +++ b/scripts/tools/check_includes_config.py @@ -40,7 +40,7 @@ '/platform/Ameba/', '/platform/android/', '/platform/Beken/', - '/platform/CYW30739/', + '/platform/Infineon/CYW30739/', '/platform/Darwin/', '/platform/EFR32/', '/platform/ESP32/', diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn index 66761352e93816..e5758593538fde 100644 --- a/src/platform/BUILD.gn +++ b/src/platform/BUILD.gn @@ -242,7 +242,7 @@ if (chip_device_platform != "none" && chip_device_platform != "external") { } else if (chip_device_platform == "cyw30739") { defines += [ "CHIP_DEVICE_LAYER_TARGET_CYW30739=1", - "CHIP_DEVICE_LAYER_TARGET=CYW30739", + "CHIP_DEVICE_LAYER_TARGET=Infineon/CYW30739", ] } else if (chip_device_platform == "webos") { defines += [ @@ -432,7 +432,7 @@ if (chip_device_platform != "none") { } else if (chip_device_platform == "fake") { _platform_target = "fake" } else if (chip_device_platform == "cyw30739") { - _platform_target = "CYW30739" + _platform_target = "Infineon/CYW30739" } else if (chip_device_platform == "mw320") { _platform_target = "nxp/mw320" } else if (chip_device_platform == "zephyr") { diff --git a/src/platform/CYW30739/BLEManagerImpl.cpp b/src/platform/Infineon/CYW30739/BLEManagerImpl.cpp similarity index 100% rename from src/platform/CYW30739/BLEManagerImpl.cpp rename to src/platform/Infineon/CYW30739/BLEManagerImpl.cpp diff --git a/src/platform/CYW30739/BLEManagerImpl.h b/src/platform/Infineon/CYW30739/BLEManagerImpl.h similarity index 100% rename from src/platform/CYW30739/BLEManagerImpl.h rename to src/platform/Infineon/CYW30739/BLEManagerImpl.h diff --git a/src/platform/CYW30739/BUILD.gn b/src/platform/Infineon/CYW30739/BUILD.gn similarity index 94% rename from src/platform/CYW30739/BUILD.gn rename to src/platform/Infineon/CYW30739/BUILD.gn index 50d3f464057e74..623cd188bd8343 100644 --- a/src/platform/CYW30739/BUILD.gn +++ b/src/platform/Infineon/CYW30739/BUILD.gn @@ -24,7 +24,7 @@ if (chip_enable_openthread) { static_library("CYW30739") { sources = [ - "../SingletonConfigurationManager.cpp", + "../../SingletonConfigurationManager.cpp", "BLEManagerImpl.cpp", "BLEManagerImpl.h", "BlePlatformConfig.h", @@ -67,7 +67,7 @@ static_library("CYW30739") { if (chip_enable_openthread) { sources += [ - "../OpenThread/OpenThreadUtils.cpp", + "../../OpenThread/OpenThreadUtils.cpp", "ThreadStackManagerImpl.cpp", "ThreadStackManagerImpl.h", ] @@ -85,7 +85,7 @@ static_library("CYW30739") { } if (chip_mdns == "platform") { - sources += [ "../OpenThread/DnssdImpl.cpp" ] + sources += [ "../../OpenThread/DnssdImpl.cpp" ] deps += [ "${chip_root}/src/lib/dnssd:platform_header" ] } diff --git a/src/platform/CYW30739/BlePlatformConfig.h b/src/platform/Infineon/CYW30739/BlePlatformConfig.h similarity index 100% rename from src/platform/CYW30739/BlePlatformConfig.h rename to src/platform/Infineon/CYW30739/BlePlatformConfig.h diff --git a/src/platform/CYW30739/CHIPDevicePlatformConfig.h b/src/platform/Infineon/CYW30739/CHIPDevicePlatformConfig.h similarity index 100% rename from src/platform/CYW30739/CHIPDevicePlatformConfig.h rename to src/platform/Infineon/CYW30739/CHIPDevicePlatformConfig.h diff --git a/src/platform/CYW30739/CHIPDevicePlatformEvent.h b/src/platform/Infineon/CYW30739/CHIPDevicePlatformEvent.h similarity index 100% rename from src/platform/CYW30739/CHIPDevicePlatformEvent.h rename to src/platform/Infineon/CYW30739/CHIPDevicePlatformEvent.h diff --git a/src/platform/CYW30739/CHIPPlatformConfig.h b/src/platform/Infineon/CYW30739/CHIPPlatformConfig.h similarity index 100% rename from src/platform/CYW30739/CHIPPlatformConfig.h rename to src/platform/Infineon/CYW30739/CHIPPlatformConfig.h diff --git a/src/platform/CYW30739/CYW30739Config.cpp b/src/platform/Infineon/CYW30739/CYW30739Config.cpp similarity index 99% rename from src/platform/CYW30739/CYW30739Config.cpp rename to src/platform/Infineon/CYW30739/CYW30739Config.cpp index 2d84fd0703c798..651b4fb3cb40b4 100644 --- a/src/platform/CYW30739/CYW30739Config.cpp +++ b/src/platform/Infineon/CYW30739/CYW30739Config.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include namespace chip { diff --git a/src/platform/CYW30739/CYW30739Config.h b/src/platform/Infineon/CYW30739/CYW30739Config.h similarity index 100% rename from src/platform/CYW30739/CYW30739Config.h rename to src/platform/Infineon/CYW30739/CYW30739Config.h diff --git a/src/platform/CYW30739/ConfigurationManagerImpl.cpp b/src/platform/Infineon/CYW30739/ConfigurationManagerImpl.cpp similarity index 99% rename from src/platform/CYW30739/ConfigurationManagerImpl.cpp rename to src/platform/Infineon/CYW30739/ConfigurationManagerImpl.cpp index a706ceec55e492..5489a58441c3ff 100644 --- a/src/platform/CYW30739/ConfigurationManagerImpl.cpp +++ b/src/platform/Infineon/CYW30739/ConfigurationManagerImpl.cpp @@ -27,9 +27,9 @@ #include #include -#include #include #include +#include #include namespace chip { diff --git a/src/platform/CYW30739/ConfigurationManagerImpl.h b/src/platform/Infineon/CYW30739/ConfigurationManagerImpl.h similarity index 100% rename from src/platform/CYW30739/ConfigurationManagerImpl.h rename to src/platform/Infineon/CYW30739/ConfigurationManagerImpl.h diff --git a/src/platform/CYW30739/ConnectivityManagerImpl.cpp b/src/platform/Infineon/CYW30739/ConnectivityManagerImpl.cpp similarity index 100% rename from src/platform/CYW30739/ConnectivityManagerImpl.cpp rename to src/platform/Infineon/CYW30739/ConnectivityManagerImpl.cpp diff --git a/src/platform/CYW30739/ConnectivityManagerImpl.h b/src/platform/Infineon/CYW30739/ConnectivityManagerImpl.h similarity index 100% rename from src/platform/CYW30739/ConnectivityManagerImpl.h rename to src/platform/Infineon/CYW30739/ConnectivityManagerImpl.h diff --git a/src/platform/CYW30739/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/Infineon/CYW30739/DeviceNetworkProvisioningDelegateImpl.cpp similarity index 100% rename from src/platform/CYW30739/DeviceNetworkProvisioningDelegateImpl.cpp rename to src/platform/Infineon/CYW30739/DeviceNetworkProvisioningDelegateImpl.cpp diff --git a/src/platform/CYW30739/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/Infineon/CYW30739/DeviceNetworkProvisioningDelegateImpl.h similarity index 100% rename from src/platform/CYW30739/DeviceNetworkProvisioningDelegateImpl.h rename to src/platform/Infineon/CYW30739/DeviceNetworkProvisioningDelegateImpl.h diff --git a/src/platform/CYW30739/DiagnosticDataProviderImpl.cpp b/src/platform/Infineon/CYW30739/DiagnosticDataProviderImpl.cpp similarity index 98% rename from src/platform/CYW30739/DiagnosticDataProviderImpl.cpp rename to src/platform/Infineon/CYW30739/DiagnosticDataProviderImpl.cpp index 2af3114c1ad148..2deec6df8b4646 100644 --- a/src/platform/CYW30739/DiagnosticDataProviderImpl.cpp +++ b/src/platform/Infineon/CYW30739/DiagnosticDataProviderImpl.cpp @@ -23,8 +23,8 @@ #include -#include #include +#include #include #include diff --git a/src/platform/CYW30739/DiagnosticDataProviderImpl.h b/src/platform/Infineon/CYW30739/DiagnosticDataProviderImpl.h similarity index 100% rename from src/platform/CYW30739/DiagnosticDataProviderImpl.h rename to src/platform/Infineon/CYW30739/DiagnosticDataProviderImpl.h diff --git a/src/platform/CYW30739/InetPlatformConfig.h b/src/platform/Infineon/CYW30739/InetPlatformConfig.h similarity index 100% rename from src/platform/CYW30739/InetPlatformConfig.h rename to src/platform/Infineon/CYW30739/InetPlatformConfig.h diff --git a/src/platform/CYW30739/KeyValueStoreManagerImpl.cpp b/src/platform/Infineon/CYW30739/KeyValueStoreManagerImpl.cpp similarity index 100% rename from src/platform/CYW30739/KeyValueStoreManagerImpl.cpp rename to src/platform/Infineon/CYW30739/KeyValueStoreManagerImpl.cpp diff --git a/src/platform/CYW30739/KeyValueStoreManagerImpl.h b/src/platform/Infineon/CYW30739/KeyValueStoreManagerImpl.h similarity index 100% rename from src/platform/CYW30739/KeyValueStoreManagerImpl.h rename to src/platform/Infineon/CYW30739/KeyValueStoreManagerImpl.h diff --git a/src/platform/CYW30739/Logging.cpp b/src/platform/Infineon/CYW30739/Logging.cpp similarity index 100% rename from src/platform/CYW30739/Logging.cpp rename to src/platform/Infineon/CYW30739/Logging.cpp diff --git a/src/platform/CYW30739/OTAImageProcessorImpl.cpp b/src/platform/Infineon/CYW30739/OTAImageProcessorImpl.cpp similarity index 100% rename from src/platform/CYW30739/OTAImageProcessorImpl.cpp rename to src/platform/Infineon/CYW30739/OTAImageProcessorImpl.cpp diff --git a/src/platform/CYW30739/OTAImageProcessorImpl.h b/src/platform/Infineon/CYW30739/OTAImageProcessorImpl.h similarity index 100% rename from src/platform/CYW30739/OTAImageProcessorImpl.h rename to src/platform/Infineon/CYW30739/OTAImageProcessorImpl.h diff --git a/src/platform/CYW30739/PlatformManagerImpl.cpp b/src/platform/Infineon/CYW30739/PlatformManagerImpl.cpp similarity index 99% rename from src/platform/CYW30739/PlatformManagerImpl.cpp rename to src/platform/Infineon/CYW30739/PlatformManagerImpl.cpp index 41e91ea0a205a6..c2da0a1efc8414 100644 --- a/src/platform/CYW30739/PlatformManagerImpl.cpp +++ b/src/platform/Infineon/CYW30739/PlatformManagerImpl.cpp @@ -23,7 +23,7 @@ /* this file behaves like a config.h, comes first */ #include -#include +#include #include #include diff --git a/src/platform/CYW30739/PlatformManagerImpl.h b/src/platform/Infineon/CYW30739/PlatformManagerImpl.h similarity index 100% rename from src/platform/CYW30739/PlatformManagerImpl.h rename to src/platform/Infineon/CYW30739/PlatformManagerImpl.h diff --git a/src/platform/CYW30739/SystemPlatformConfig.h b/src/platform/Infineon/CYW30739/SystemPlatformConfig.h similarity index 100% rename from src/platform/CYW30739/SystemPlatformConfig.h rename to src/platform/Infineon/CYW30739/SystemPlatformConfig.h diff --git a/src/platform/CYW30739/SystemTimeSupport.cpp b/src/platform/Infineon/CYW30739/SystemTimeSupport.cpp similarity index 100% rename from src/platform/CYW30739/SystemTimeSupport.cpp rename to src/platform/Infineon/CYW30739/SystemTimeSupport.cpp diff --git a/src/platform/CYW30739/ThreadStackManagerImpl.cpp b/src/platform/Infineon/CYW30739/ThreadStackManagerImpl.cpp similarity index 100% rename from src/platform/CYW30739/ThreadStackManagerImpl.cpp rename to src/platform/Infineon/CYW30739/ThreadStackManagerImpl.cpp diff --git a/src/platform/CYW30739/ThreadStackManagerImpl.h b/src/platform/Infineon/CYW30739/ThreadStackManagerImpl.h similarity index 100% rename from src/platform/CYW30739/ThreadStackManagerImpl.h rename to src/platform/Infineon/CYW30739/ThreadStackManagerImpl.h diff --git a/src/platform/CYW30739/args.gni b/src/platform/Infineon/CYW30739/args.gni similarity index 94% rename from src/platform/CYW30739/args.gni rename to src/platform/Infineon/CYW30739/args.gni index 20266d8f86f825..a0d31c75f4c49b 100644 --- a/src/platform/CYW30739/args.gni +++ b/src/platform/Infineon/CYW30739/args.gni @@ -17,7 +17,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/cyw30739_sdk.gni") import("//build_overrides/pigweed.gni") -import("${chip_root}/examples/platform/cyw30739/args.gni") +import("${chip_root}/examples/platform/infineon/cyw30739/args.gni") custom_toolchain = "${build_root}/toolchain/arm_gcc" @@ -51,7 +51,7 @@ mbedtls_target = "${cyw30739_sdk_build_root}:mbedtls" openthread_external_mbedtls = mbedtls_target openthread_project_core_config_file = "OpenThreadConfig.h" -openthread_core_config_deps = [ "${chip_root}/examples/platform/cyw30739:openthread_core_config_ifx_chip_examples" ] +openthread_core_config_deps = [ "${chip_root}/examples/platform/infineon/cyw30739:openthread_core_config_ifx_chip_examples" ] openthread_external_platform = "${chip_root}/third_party/openthread/platforms/ifx:libopenthread-ifx" diff --git a/src/platform/CYW30739/cycfg_gatt_db.c b/src/platform/Infineon/CYW30739/cycfg_gatt_db.c similarity index 100% rename from src/platform/CYW30739/cycfg_gatt_db.c rename to src/platform/Infineon/CYW30739/cycfg_gatt_db.c diff --git a/src/platform/CYW30739/cycfg_gatt_db.h b/src/platform/Infineon/CYW30739/cycfg_gatt_db.h similarity index 100% rename from src/platform/CYW30739/cycfg_gatt_db.h rename to src/platform/Infineon/CYW30739/cycfg_gatt_db.h diff --git a/src/platform/CYW30739/cyw30739-chip-mbedtls-config.h b/src/platform/Infineon/CYW30739/cyw30739-chip-mbedtls-config.h similarity index 100% rename from src/platform/CYW30739/cyw30739-chip-mbedtls-config.h rename to src/platform/Infineon/CYW30739/cyw30739-chip-mbedtls-config.h diff --git a/src/platform/device.gni b/src/platform/device.gni index 191809e4e62c51..87330499cbca6e 100755 --- a/src/platform/device.gni +++ b/src/platform/device.gni @@ -131,7 +131,7 @@ if (chip_device_platform == "cc13x2_26x2") { } else if (chip_device_platform == "bl602") { _chip_device_layer = "bouffalolab/BL602" } else if (chip_device_platform == "cyw30739") { - _chip_device_layer = "CYW30739" + _chip_device_layer = "Infineon/CYW30739" } else if (chip_device_platform == "webos") { _chip_device_layer = "webos" } else if (chip_device_platform == "mw320") { diff --git a/third_party/cyw30739_sdk/BUILD.gn b/third_party/infineon/cyw30739_sdk/BUILD.gn similarity index 94% rename from third_party/cyw30739_sdk/BUILD.gn rename to third_party/infineon/cyw30739_sdk/BUILD.gn index a64a0293f54305..75b9e272840b63 100644 --- a/third_party/cyw30739_sdk/BUILD.gn +++ b/third_party/infineon/cyw30739_sdk/BUILD.gn @@ -32,7 +32,7 @@ group("cyw30739_sdk") { config("mbedtls_cyw30739_config") { defines = [ "MBEDTLS_CONFIG_FILE=", - "MBEDTLS_USER_CONFIG_FILE=", + "MBEDTLS_USER_CONFIG_FILE=", ] include_dirs = [ chip_root ] diff --git a/third_party/cyw30739_sdk/bsp_design_modus/cycfg_notices.h b/third_party/infineon/cyw30739_sdk/bsp_design_modus/cycfg_notices.h similarity index 100% rename from third_party/cyw30739_sdk/bsp_design_modus/cycfg_notices.h rename to third_party/infineon/cyw30739_sdk/bsp_design_modus/cycfg_notices.h diff --git a/third_party/cyw30739_sdk/bsp_design_modus/cycfg_pins.c b/third_party/infineon/cyw30739_sdk/bsp_design_modus/cycfg_pins.c similarity index 100% rename from third_party/cyw30739_sdk/bsp_design_modus/cycfg_pins.c rename to third_party/infineon/cyw30739_sdk/bsp_design_modus/cycfg_pins.c diff --git a/third_party/cyw30739_sdk/bsp_design_modus/cycfg_pins.h b/third_party/infineon/cyw30739_sdk/bsp_design_modus/cycfg_pins.h similarity index 100% rename from third_party/cyw30739_sdk/bsp_design_modus/cycfg_pins.h rename to third_party/infineon/cyw30739_sdk/bsp_design_modus/cycfg_pins.h diff --git a/third_party/cyw30739_sdk/bsp_design_modus/cycfg_routing.h b/third_party/infineon/cyw30739_sdk/bsp_design_modus/cycfg_routing.h similarity index 100% rename from third_party/cyw30739_sdk/bsp_design_modus/cycfg_routing.h rename to third_party/infineon/cyw30739_sdk/bsp_design_modus/cycfg_routing.h diff --git a/third_party/cyw30739_sdk/btp_reader.py b/third_party/infineon/cyw30739_sdk/btp_reader.py similarity index 100% rename from third_party/cyw30739_sdk/btp_reader.py rename to third_party/infineon/cyw30739_sdk/btp_reader.py diff --git a/third_party/cyw30739_sdk/compress_cgs_data.py b/third_party/infineon/cyw30739_sdk/compress_cgs_data.py similarity index 100% rename from third_party/cyw30739_sdk/compress_cgs_data.py rename to third_party/infineon/cyw30739_sdk/compress_cgs_data.py diff --git a/third_party/cyw30739_sdk/cyw30739_arm.gni b/third_party/infineon/cyw30739_sdk/cyw30739_arm.gni similarity index 100% rename from third_party/cyw30739_sdk/cyw30739_arm.gni rename to third_party/infineon/cyw30739_sdk/cyw30739_arm.gni diff --git a/third_party/cyw30739_sdk/cyw30739_executable.gni b/third_party/infineon/cyw30739_sdk/cyw30739_executable.gni similarity index 100% rename from third_party/cyw30739_sdk/cyw30739_executable.gni rename to third_party/infineon/cyw30739_sdk/cyw30739_executable.gni diff --git a/third_party/cyw30739_sdk/cyw30739_sdk.gni b/third_party/infineon/cyw30739_sdk/cyw30739_sdk.gni similarity index 100% rename from third_party/cyw30739_sdk/cyw30739_sdk.gni rename to third_party/infineon/cyw30739_sdk/cyw30739_sdk.gni diff --git a/third_party/cyw30739_sdk/flash.btp b/third_party/infineon/cyw30739_sdk/flash.btp similarity index 100% rename from third_party/cyw30739_sdk/flash.btp rename to third_party/infineon/cyw30739_sdk/flash.btp diff --git a/third_party/cyw30739_sdk/gen_ota_image.py b/third_party/infineon/cyw30739_sdk/gen_ota_image.py similarity index 100% rename from third_party/cyw30739_sdk/gen_ota_image.py rename to third_party/infineon/cyw30739_sdk/gen_ota_image.py diff --git a/third_party/cyw30739_sdk/include/auto_flags.h b/third_party/infineon/cyw30739_sdk/include/auto_flags.h similarity index 100% rename from third_party/cyw30739_sdk/include/auto_flags.h rename to third_party/infineon/cyw30739_sdk/include/auto_flags.h diff --git a/third_party/cyw30739_sdk/include/ota_fw_upgrade.h b/third_party/infineon/cyw30739_sdk/include/ota_fw_upgrade.h similarity index 100% rename from third_party/cyw30739_sdk/include/ota_fw_upgrade.h rename to third_party/infineon/cyw30739_sdk/include/ota_fw_upgrade.h diff --git a/third_party/cyw30739_sdk/include/wiced_button_manager.h b/third_party/infineon/cyw30739_sdk/include/wiced_button_manager.h similarity index 100% rename from third_party/cyw30739_sdk/include/wiced_button_manager.h rename to third_party/infineon/cyw30739_sdk/include/wiced_button_manager.h diff --git a/third_party/cyw30739_sdk/include/wiced_led_manager.h b/third_party/infineon/cyw30739_sdk/include/wiced_led_manager.h similarity index 100% rename from third_party/cyw30739_sdk/include/wiced_led_manager.h rename to third_party/infineon/cyw30739_sdk/include/wiced_led_manager.h diff --git a/third_party/cyw30739_sdk/merge_hex.py b/third_party/infineon/cyw30739_sdk/merge_hex.py similarity index 100% rename from third_party/cyw30739_sdk/merge_hex.py rename to third_party/infineon/cyw30739_sdk/merge_hex.py diff --git a/third_party/cyw30739_sdk/repos/30739A0 b/third_party/infineon/cyw30739_sdk/repos/30739A0 similarity index 100% rename from third_party/cyw30739_sdk/repos/30739A0 rename to third_party/infineon/cyw30739_sdk/repos/30739A0 diff --git a/third_party/cyw30739_sdk/repos/CYW930739M2EVB-01 b/third_party/infineon/cyw30739_sdk/repos/CYW930739M2EVB-01 similarity index 100% rename from third_party/cyw30739_sdk/repos/CYW930739M2EVB-01 rename to third_party/infineon/cyw30739_sdk/repos/CYW930739M2EVB-01 diff --git a/third_party/cyw30739_sdk/repos/btsdk-include b/third_party/infineon/cyw30739_sdk/repos/btsdk-include similarity index 100% rename from third_party/cyw30739_sdk/repos/btsdk-include rename to third_party/infineon/cyw30739_sdk/repos/btsdk-include diff --git a/third_party/cyw30739_sdk/repos/btsdk-tools b/third_party/infineon/cyw30739_sdk/repos/btsdk-tools similarity index 100% rename from third_party/cyw30739_sdk/repos/btsdk-tools rename to third_party/infineon/cyw30739_sdk/repos/btsdk-tools diff --git a/third_party/cyw30739_sdk/scripts/wiced-gen-ld.pl b/third_party/infineon/cyw30739_sdk/scripts/wiced-gen-ld.pl similarity index 100% rename from third_party/cyw30739_sdk/scripts/wiced-gen-ld.pl rename to third_party/infineon/cyw30739_sdk/scripts/wiced-gen-ld.pl diff --git a/third_party/cyw30739_sdk/src/ota_fw_upgrade.c b/third_party/infineon/cyw30739_sdk/src/ota_fw_upgrade.c similarity index 100% rename from third_party/cyw30739_sdk/src/ota_fw_upgrade.c rename to third_party/infineon/cyw30739_sdk/src/ota_fw_upgrade.c diff --git a/third_party/cyw30739_sdk/src/platform_retarget_lock.c b/third_party/infineon/cyw30739_sdk/src/platform_retarget_lock.c similarity index 100% rename from third_party/cyw30739_sdk/src/platform_retarget_lock.c rename to third_party/infineon/cyw30739_sdk/src/platform_retarget_lock.c diff --git a/third_party/cyw30739_sdk/src/wiced_button_manager.c b/third_party/infineon/cyw30739_sdk/src/wiced_button_manager.c similarity index 100% rename from third_party/cyw30739_sdk/src/wiced_button_manager.c rename to third_party/infineon/cyw30739_sdk/src/wiced_button_manager.c diff --git a/third_party/cyw30739_sdk/src/wiced_led_manager.c b/third_party/infineon/cyw30739_sdk/src/wiced_led_manager.c similarity index 100% rename from third_party/cyw30739_sdk/src/wiced_led_manager.c rename to third_party/infineon/cyw30739_sdk/src/wiced_led_manager.c