Skip to content

Commit d47c423

Browse files
praveenCYandy31415
praveenCY
and
andy31415
authored
[Infineon] Update ModusToolbox version to 3.2 along with README.md update (#34681)
Co-authored-by: Andrei Litvin <andy314@gmail.com>
1 parent e8186eb commit d47c423

File tree

8 files changed

+56
-55
lines changed

8 files changed

+56
-55
lines changed

‎examples/all-clusters-app/infineon/psoc6/README.md

+6-4
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,11 @@ will then join the network.
3030

3131
## Building
3232

33-
- [Modustoolbox Software](https://www.cypress.com/products/modustoolbox)
33+
- Download and install
34+
[Modustoolbox Software v3.2](https://www.infineon.com/modustoolbox)
3435

35-
Refer to `integrations/docker/images/chip-build-infineon/Dockerfile` or
36-
`scripts/examples/gn_psoc6_example.sh` for downloading the Software and
36+
Refer to `integrations/docker/images/stage-2/chip-build-infineon/Dockerfile`
37+
or `scripts/examples/gn_psoc6_example.sh` for downloading the Software and
3738
related tools.
3839

3940
- Install some additional tools (likely already present for Matter
@@ -62,11 +63,12 @@ will then join the network.
6263
6364
- Put CY8CKIT-062S2-43012 board on KitProg3 CMSIS-DAP Mode by pressing the
6465
`MODE SELECT` button. `KITPROG3 STATUS` LED is ON confirms board is in
65-
proper mode.
66+
proper mode. (Modustoolbox Software needs to be installed)
6667
6768
- On the command line:
6869
6970
$ cd ~/connectedhomeip
71+
$ export CY_TOOLS_PATHS=<Modustoolbox install location>/tools_3.2
7072
$ python3 out/infineon-psoc6-all-clusters/chip-psoc6-clusters-example.flash.py
7173
7274
## Commissioning and cluster control

‎examples/all-clusters-minimal-app/infineon/psoc6/README.md

+6-4
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,11 @@ will then join the network.
3030

3131
## Building
3232

33-
- [Modustoolbox Software](https://www.cypress.com/products/modustoolbox)
33+
- Download and install
34+
[Modustoolbox Software v3.2](https://www.infineon.com/modustoolbox)
3435

35-
Refer to `integrations/docker/images/chip-build-infineon/Dockerfile` or
36-
`scripts/examples/gn_psoc6_example.sh` for downloading the Software and
36+
Refer to `integrations/docker/images/stage-2/chip-build-infineon/Dockerfile`
37+
or `scripts/examples/gn_psoc6_example.sh` for downloading the Software and
3738
related tools.
3839

3940
- Install some additional tools (likely already present for Matter
@@ -62,11 +63,12 @@ will then join the network.
6263
6364
- Put CY8CKIT-062S2-43012 board on KitProg3 CMSIS-DAP Mode by pressing the
6465
`MODE SELECT` button. `KITPROG3 STATUS` LED is ON confirms board is in
65-
proper mode.
66+
proper mode. (Modustoolbox Software needs to be installed)
6667
6768
- On the command line:
6869
6970
$ cd ~/connectedhomeip
71+
$ export CY_TOOLS_PATHS=<Modustoolbox install location>/tools_3.2
7072
$ python3 out/infineon-psoc6-all-clusters-minimal/chip-psoc6-clusters-minimal-example.flash.py
7173
7274
## Commissioning and cluster control

‎examples/lighting-app/infineon/psoc6/README.md

+7-5
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,11 @@ will then join the network.
3131

3232
## Building
3333

34-
- [Modustoolbox Software](https://www.cypress.com/products/modustoolbox)
34+
- Download and install
35+
[Modustoolbox Software v3.2](https://www.infineon.com/modustoolbox)
3536

36-
Refer to `integrations/docker/images/chip-build-infineon/Dockerfile` or
37-
`scripts/examples/gn_psoc6_example.sh` for downloading the Software and
37+
Refer to `integrations/docker/images/stage-2/chip-build-infineon/Dockerfile`
38+
or `scripts/examples/gn_psoc6_example.sh` for downloading the Software and
3839
related tools.
3940

4041
- Install some additional tools (likely already present for Matter
@@ -43,7 +44,7 @@ will then join the network.
4344
python3-pip
4445

4546
- Supported hardware:
46-
[CY8CKIT-062S2-43012](https://www.cypress.com/CY8CKIT-062S2-43012)
47+
[CY8CKIT-062S2-43012](https://www.infineon.com/CY8CKIT-062S2-43012)
4748

4849
* Build the example application:
4950

@@ -59,11 +60,12 @@ will then join the network.
5960

6061
- Put CY8CKIT-062S2-43012 board on KitProg3 CMSIS-DAP Mode by pressing the
6162
`MODE SELECT` button. `KITPROG3 STATUS` LED is ON confirms board is in
62-
proper mode.
63+
proper mode. (Modustoolbox Software needs to be installed)
6364

6465
- On the command line:
6566

6667
$ cd ~/connectedhomeip
68+
$ export CY_TOOLS_PATHS=<Modustoolbox install location>/tools_3.2
6769
$ python3 out/infineon-psoc6-light/chip-psoc6-lighting-example.flash.py
6870

6971
## Commissioning and cluster control

‎examples/lock-app/infineon/psoc6/README.md

+11-9
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,11 @@ will then join the network.
3333

3434
## Building
3535

36-
- [Modustoolbox Software](https://www.cypress.com/products/modustoolbox)
36+
- Download and install
37+
[Modustoolbox Software v3.2](https://www.infineon.com/modustoolbox)
3738

38-
Refer to `integrations/docker/images/chip-build-infineon/Dockerfile` or
39-
`scripts/examples/gn_psoc6_example.sh` for downloading the Software and
39+
Refer to `integrations/docker/images/stage-2/chip-build-infineon/Dockerfile`
40+
or `scripts/examples/gn_psoc6_example.sh` for downloading the Software and
4041
related tools.
4142

4243
- Install some additional tools (likely already present for Matter
@@ -45,7 +46,7 @@ will then join the network.
4546
python3-pip
4647

4748
- Supported hardware:
48-
[CY8CKIT-062S2-43012](https://www.cypress.com/CY8CKIT-062S2-43012)
49+
[CY8CKIT-062S2-43012](https://www.infineon.com/CY8CKIT-062S2-43012)
4950

5051
* Build the example application:
5152

@@ -66,11 +67,12 @@ more instructions_
6667

6768
- Put CY8CKIT-062S2-43012 board on KitProg3 CMSIS-DAP Mode by pressing the
6869
`MODE SELECT` button. `KITPROG3 STATUS` LED is ON confirms board is in
69-
proper mode.
70+
proper mode. (Modustoolbox Software needs to be installed)
7071

7172
- On the command line:
7273

7374
$ cd ~/connectedhomeip
75+
$ export CY_TOOLS_PATHS=<Modustoolbox install location>/tools_3.2
7476
$ python3 out/infineon-psoc6-lock/chip-psoc6-lock-example.flash.py
7577

7678
## Commissioning and cluster control
@@ -116,12 +118,12 @@ commands. These power cycle the BlueTooth hardware and disable BR/EDR mode.
116118

117119
### Cluster control
118120

119-
- After successful commissioning, use the OnOff cluster command to toggle
120-
device between On or Off states.
121+
- After successful commissioning, use the doorlock cluster command to toggle
122+
device between lock or Unlock states.
121123

122-
`$ ./out/debug/chip-tool onoff on 1234 1`
124+
`$ ./out/debug/chip-tool doorlock lock-door 1234 1 --timedInteractionTimeoutMs 100`
123125

124-
`$ ./out/debug/chip-tool onoff off 1234 1`
126+
`$ ./out/debug/chip-tool doorlock unlock-door 1234 1 --timedInteractionTimeoutMs 100`
125127

126128
- Cluster OnOff can also be done using the `USER_BTN1` button on the board.
127129
This button is configured with `APP_LOCK_BUTTON` in `include/AppConfig.h`.

‎integrations/docker/images/base/chip-build/version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
68 : [Bouffalo Lab] Update gcc toolchain and flash tool
1+
69 : [Infineon] Update ModusToolbox version to 3.2

‎integrations/docker/images/stage-2/chip-build-infineon/Dockerfile

+15-13
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,27 @@ RUN set -x \
1313
file \
1414
libglib2.0-0 \
1515
libusb-1.0-0 sudo \
16+
libxcb-xinerama0 \
17+
libxcb-icccm4 \
18+
libxcb-image0 \
19+
libxcb-keysyms1 \
20+
libxcb-render-util0 \
21+
libxkbcommon-x11-0 \
1622
&& rm -rf /var/lib/apt/lists/ \
1723
&& : # last line
1824

1925
# ------------------------------------------------------------------------------
20-
# Download and extract ModusToolbox 2.3
21-
RUN curl --fail --location --show-error \
22-
https://itoolspriv.infineon.com/itbhs/api/packages/com.ifx.tb.tool.modustoolbox/Versions/2.4.0.5972-public/artifacts/ModusToolbox_2.4.0.5972-linux-install.tar.gz/download?noredirect \
23-
-o /tmp/ModusToolbox_2.4.0.5972-linux-install.tar.gz \
24-
&& tar -C /opt -zxf /tmp/ModusToolbox_2.4.0.5972-linux-install.tar.gz \
25-
&& rm /tmp/ModusToolbox_2.4.0.5972-linux-install.tar.gz
26+
# Download ModusToolbox 3.2
27+
RUN curl --fail --location --silent --show-error https://itoolspriv.infineon.com/itbhs/api/packages/com.ifx.tb.tool.modustoolbox/Versions/3.2.0.16028-public/artifacts/ModusToolbox_3.2.0.16028-linux-install.deb/download?noredirect -o /tmp/ModusToolbox_3.2.0.16028-linux-install.deb
2628

2729
# ------------------------------------------------------------------------------
28-
# Execute post-build scripts
29-
RUN /opt/ModusToolbox/tools_2.4/modus-shell/postinstall
30+
# Install ModusToolbox 3.2
31+
RUN apt install /tmp/ModusToolbox_3.2.0.16028-linux-install.deb
3032

31-
# NOTE: udev rules are NOT installed:
32-
# /opt/ModusToolbox/tools_2.4/fw-loader/udev_rules/install_rules.sh
33-
# because docker containers do not support udev
33+
# ------------------------------------------------------------------------------
34+
# Remove ModusToolbox deb file
35+
RUN rm /tmp/ModusToolbox_3.2.0.16028-linux-install.deb
3436

3537
# ------------------------------------------------------------------------------
36-
# Set environment variable required by ModusToolbox application makefiles
37-
ENV CY_TOOLS_PATHS="/opt/ModusToolbox/tools_2.4"
38+
# Run below command to Initialize the CY_TOOLS_PATHS environment variable defined in the /etc/profile.d/modustoolbox_3.2.sh file
39+
RUN bash --login

‎integrations/docker/images/vscode/chip-build-vscode/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM ghcr.io/project-chip/chip-build-efr32:${VERSION} AS efr32
55
FROM ghcr.io/project-chip/chip-build-android:${VERSION} AS android
66
FROM ghcr.io/project-chip/chip-build-esp32-qemu:${VERSION} as esp32
77
FROM ghcr.io/project-chip/chip-build-telink:${VERSION} AS telink
8-
FROM ghcr.io/project-chip/chip-build-infineon:${VERSION} AS p6
8+
FROM ghcr.io/project-chip/chip-build-infineon:${VERSION} AS psoc6
99
FROM ghcr.io/project-chip/chip-build-tizen:${VERSION} AS tizen
1010
FROM ghcr.io/project-chip/chip-build-crosscompile:${VERSION} AS crosscompile
1111
FROM ghcr.io/project-chip/chip-build-ameba:${VERSION} AS ameba
@@ -36,7 +36,7 @@ COPY --from=android /opt/android/sdk /opt/android/sdk
3636
COPY --from=android /opt/android/android-ndk-r23c /opt/android/android-ndk-r23c
3737
COPY --from=android /usr/lib/kotlinc /usr/lib/kotlinc
3838

39-
COPY --from=p6 /opt/ModusToolbox /opt/ModusToolbox
39+
COPY --from=psoc6 /opt/Tools/ModusToolbox /opt/Tools/ModusToolbox
4040

4141
COPY --from=telink /opt/telink/zephyrproject /opt/telink/zephyrproject
4242
COPY --from=telink /opt/telink/zephyr-sdk-0.16.1 /opt/telink/zephyr-sdk-0.16.1
@@ -111,7 +111,7 @@ ENV PATH $PATH:/usr/lib/kotlinc/bin
111111
ENV AMEBA_PATH=/opt/ameba/ambd_sdk_with_chip_non_NDA
112112
ENV ANDROID_HOME=/opt/android/sdk
113113
ENV ANDROID_NDK_HOME=/opt/android/android-ndk-r23c
114-
ENV CY_TOOLS_PATHS="/opt/ModusToolbox/tools_2.4"
114+
ENV CY_TOOLS_PATHS="/opt/Tools/ModusToolbox/tools_3.2"
115115
ENV SILABS_BOARD=BRD4186C
116116
# Keep GSDK_ROOT name until rename transition to SISDK is completed
117117
ENV GSDK_ROOT=/opt/silabs/simplicity_sdk/

‎scripts/examples/gn_psoc6_example.sh

+7-16
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,17 @@
1616
# limitations under the License.
1717
#
1818

19+
# Install required software
20+
if [[ -z "${CY_TOOLS_PATHS}" ]]; then
21+
echo "*****************************************************************************************************"
22+
echo "Install ModusToolbox Software v3.2 from https://www.infineon.com/modustoolbox and set CY_TOOLS_PATHS"
23+
echo "*****************************************************************************************************"
24+
fi
25+
1926
set -e
2027
# Build script for GN PSOC6 examples GitHub workflow.
2128
source "$(dirname "$0")/../../scripts/activate.sh"
2229

23-
# Install required software
24-
if [ -d "/opt/ModusToolbox" ]; then
25-
export CY_TOOLS_PATHS="/opt/ModusToolbox/tools_2.4"
26-
elif [ -d "$HOME/ModusToolbox" ]; then
27-
# Set CY TOOLS PATH
28-
export CY_TOOLS_PATHS="$HOME/ModusToolbox/tools_2.4"
29-
else
30-
# Install Modustoolbox
31-
curl --fail --location --silent --show-error https://itoolspriv.infineon.com/itbhs/api/packages/com.ifx.tb.tool.modustoolbox/Versions/2.4.0.5972-public/artifacts/ModusToolbox_2.4.0.5972-linux-install.tar.gz/download?noredirect -o /tmp/ModusToolbox_2.4.0.5972-linux-install.tar.gz &&
32-
tar -C "$HOME" -zxf /tmp/ModusToolbox_2.4.0.5972-linux-install.tar.gz &&
33-
rm /tmp/ModusToolbox_2.4.0.5972-linux-install.tar.gz
34-
35-
# Set CY TOOLS PATH
36-
export CY_TOOLS_PATHS="$HOME/ModusToolbox/tools_2.4"
37-
fi
38-
3930
set -x
4031
env
4132

0 commit comments

Comments
 (0)