Skip to content

Commit ef9cc3e

Browse files
jlatusekjlatusek
committed
Merge branch 'master' of https://github.com/project-chip/connectedhomeip into fix-clang-tidy-bump-ci
2 parents 8e68322 + 3bc5667 commit ef9cc3e

File tree

356 files changed

+18822
-11297
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

356 files changed

+18822
-11297
lines changed

‎.github/workflows/chef.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
if: github.actor != 'restyled-io[bot]'
9999

100100
container:
101-
image: ghcr.io/project-chip/chip-build-telink:57
101+
image: ghcr.io/project-chip/chip-build-telink:65
102102
options: --user root
103103

104104
steps:

‎.github/workflows/lint.yml

+1
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ jobs:
296296
':(exclude)src/app/util/attribute-table.cpp' \
297297
':(exclude)src/app/util/attribute-table.h' \
298298
':(exclude)src/app/util/ember-compatibility-functions.cpp' \
299+
':(exclude)src/app/util/mock/CodegenEmberMocks.cpp' \
299300
':(exclude)src/app/zap-templates/templates/app/attributes/Accessors-src.zapt' \
300301
':(exclude)zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp' \
301302
&& exit 1 || exit 0

‎.gitmodules

+24-17
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,6 @@
9797
path = third_party/infineon/psoc6/psoc6_sdk/libs/abstraction-rtos
9898
url = https://github.com/Infineon/abstraction-rtos
9999
platforms = infineon
100-
[submodule "p6/bluetooth-freertos"]
101-
path = third_party/infineon/psoc6/psoc6_sdk/libs/bluetooth-freertos
102-
url = https://github.com/Infineon/bluetooth-freertos
103-
branch = v2.X
104-
platforms = infineon
105100
[submodule "p6/btstack"]
106101
path = third_party/infineon/psoc6/psoc6_sdk/libs/btstack
107102
url = https://github.com/Infineon/btstack
@@ -134,10 +129,6 @@
134129
path = third_party/infineon/psoc6/psoc6_sdk/libs/mtb-pdl-cat1
135130
url = https://github.com/Infineon/mtb-pdl-cat1
136131
platforms = infineon
137-
[submodule "p6/psoc6cm0p"]
138-
path = third_party/infineon/psoc6/psoc6_sdk/libs/psoc6cm0p
139-
url = https://github.com/Infineon/psoc6cm0p
140-
platforms = infineon
141132
[submodule "p6/whd-bsp-integration"]
142133
path = third_party/infineon/psoc6/psoc6_sdk/libs/whd-bsp-integration
143134
url = https://github.com/Infineon/whd-bsp-integration
@@ -185,10 +176,6 @@
185176
[submodule "third_party/jsoncpp/repo"]
186177
path = third_party/jsoncpp/repo
187178
url = https://github.com/open-source-parsers/jsoncpp.git
188-
[submodule "third_party/p6/p6_sdk/libs/anycloud-ota"]
189-
path = third_party/infineon/psoc6/psoc6_sdk/libs/anycloud-ota
190-
url = https://github.com/Infineon/anycloud-ota
191-
platforms = infineon
192179
[submodule "third_party/mbed-mcu-boot/repo"]
193180
path = third_party/mbed-mcu-boot/repo
194181
url = https://github.com/ATmobica/mcuboot.git
@@ -312,10 +299,6 @@
312299
url = https://github.com/STMicroelectronics/STM32CubeWB.git
313300
branch = v1.18.0
314301
platforms = stm32
315-
[submodule "p6/lwip-network-interface-integration"]
316-
path = third_party/infineon/psoc6/psoc6_sdk/libs/lwip-network-interface-integration
317-
url = https://github.com/Infineon/lwip-network-interface-integration.git
318-
platforms = infineon
319302
[submodule "third_party/infineon/trustm/optiga-trust-m"]
320303
path = third_party/infineon/trustm/optiga-trust-m
321304
url = https://github.com/Infineon/optiga-trust-m.git
@@ -326,3 +309,27 @@
326309
url = https://github.com/NXP/nxp_matter_support.git
327310
branch = master
328311
platforms = nxp
312+
[submodule "third_party/infineon/psoc6/psoc6_sdk/libs/btstack-integration"]
313+
path = third_party/infineon/psoc6/psoc6_sdk/libs/btstack-integration
314+
url = https://github.com/Infineon/btstack-integration.git
315+
platforms = infineon
316+
[submodule "third_party/infineon/psoc6/psoc6_sdk/libs/cat1cm0p"]
317+
path = third_party/infineon/psoc6/psoc6_sdk/libs/cat1cm0p
318+
url = https://github.com/Infineon/cat1cm0p.git
319+
platforms = infineon
320+
[submodule "third_party/infineon/psoc6/psoc6_sdk/libs/cmsis"]
321+
path = third_party/infineon/psoc6/psoc6_sdk/libs/cmsis
322+
url = https://github.com/Infineon/cmsis.git
323+
platforms = infineon
324+
[submodule "third_party/infineon/psoc6/psoc6_sdk/libs/ota-bootloader-abstraction"]
325+
path = third_party/infineon/psoc6/psoc6_sdk/libs/ota-bootloader-abstraction
326+
url = https://github.com/Infineon/ota-bootloader-abstraction.git
327+
platforms = infineon
328+
[submodule "third_party/infineon/psoc6/psoc6_sdk/libs/ota-update"]
329+
path = third_party/infineon/psoc6/psoc6_sdk/libs/ota-update
330+
url = https://github.com/Infineon/ota-update.git
331+
platforms = infineon
332+
[submodule "third_party/infineon/psoc6/psoc6_sdk/libs/lwip-network-interface-integration"]
333+
path = third_party/infineon/psoc6/psoc6_sdk/libs/lwip-network-interface-integration
334+
url = https://github.com/Infineon/lwip-network-interface-integration.git
335+
platforms = infineon

‎config/telink/app/bootloader_usb.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616

1717
# USB DFU configuration
1818
CONFIG_USB_DFU_WILL_DETACH=n
19-
CONFIG_BOOT_USB_DFU_GPIO=y
20-
CONFIG_MCUBOOT_INDICATION_LED=y
19+
CONFIG_BOOT_USB_DFU_GPIO=n
20+
CONFIG_MCUBOOT_INDICATION_LED=n

‎docs/guides/infineon_psoc6_software_update.md

+10-3
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,30 @@ Infineon PSoC6 example applications by passing the
2525

2626
```
2727
$ scripts/build/build_examples.py --enable-flashbundle --target infineon-psoc6-lock-ota build
28-
$ third_party/infineon/psoc6/psoc6_sdk/ota/ota_base_build.sh out/infineon-psoc6-lock-ota chip-psoc6-lock-example
28+
$ third_party/infineon/psoc6/psoc6_sdk/ota/ota_base_build.sh psoc6-lock chip-psoc6-lock-example
2929
```
3030

3131
- Build the PSoC6 OTA Update application from the chip root dir and create OTA
3232
file
3333

3434
```
3535
$ scripts/build/build_examples.py --enable-flashbundle --no-log-timestamps --target infineon-psoc6-lock-ota-updateimage build
36-
$ third_party/infineon/psoc6/psoc6_sdk/ota/ota_update_build.sh out/infineon-psoc6-lock-ota-updateimage chip-psoc6-lock-example
36+
$ third_party/infineon/psoc6/psoc6_sdk/ota/ota_update_build.sh psoc6-lock chip-psoc6-lock-example
3737
```
3838

39-
* Additionally a pre-compiled bootloader must be flashed to the board using
39+
* Additionally a pre-compiled bootloader must be flashed to the board before
40+
flashing the application using
4041
[Cypress Programmer](https://softwaretools.infineon.com/tools/com.ifx.tb.tool.cypressprogrammer).
4142
This image can be found at:
4243

4344
$ ./third_party/infineon/psoc6/psoc6_sdk/ota/matter-psoc6-mcuboot-bootloader.hex
4445

46+
* Flash the application after putting the CY8CKIT-062S2-43012 board on
47+
KitProg3 CMSIS-DAP Mode by pressing the `MODE SELECT` button.
48+
49+
$ cd ~/connectedhomeip
50+
$ python3 out/infineon-psoc6-lock-ota/chip-psoc6-lock-example.flash.py
51+
4552
* In a terminal start the Provider app passing to it the path to the Matter
4653
OTA file created in the previous step:(output of ota_update_build step)
4754

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+8-4
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ deprecated cluster OnOffSwitchConfiguration = 7 {
288288

289289
/** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
290290
cluster LevelControl = 8 {
291-
revision 5;
291+
revision 6;
292292

293293
enum MoveModeEnum : enum8 {
294294
kUp = 0;
@@ -5441,7 +5441,7 @@ cluster ThermostatUserInterfaceConfiguration = 516 {
54415441

54425442
/** Attributes and commands for controlling the color properties of a color-capable light. */
54435443
cluster ColorControl = 768 {
5444-
revision 6;
5444+
revision 7;
54455445

54465446
enum ColorLoopAction : enum8 {
54475447
kDeactivate = 0;
@@ -7847,7 +7847,7 @@ endpoint 1 {
78477847
ram attribute defaultMoveRate default = 50;
78487848
persist attribute startUpCurrentLevel default = 255;
78497849
ram attribute featureMap default = 3;
7850-
ram attribute clusterRevision default = 5;
7850+
ram attribute clusterRevision default = 6;
78517851

78527852
handle command MoveToLevel;
78537853
handle command Move;
@@ -8476,6 +8476,8 @@ endpoint 1 {
84768476
server cluster EnergyEvseMode {
84778477
callback attribute supportedModes;
84788478
callback attribute currentMode;
8479+
ram attribute startUpMode;
8480+
ram attribute onMode;
84798481
callback attribute generatedCommandList;
84808482
callback attribute acceptedCommandList;
84818483
callback attribute eventList;
@@ -8490,6 +8492,8 @@ endpoint 1 {
84908492
server cluster DeviceEnergyManagementMode {
84918493
callback attribute supportedModes;
84928494
callback attribute currentMode;
8495+
ram attribute startUpMode;
8496+
ram attribute onMode;
84938497
callback attribute generatedCommandList;
84948498
callback attribute acceptedCommandList;
84958499
callback attribute eventList;
@@ -8698,7 +8702,7 @@ endpoint 1 {
86988702
ram attribute coupleColorTempToLevelMinMireds;
86998703
persist attribute startUpColorTemperatureMireds;
87008704
ram attribute featureMap default = 0x1F;
8701-
ram attribute clusterRevision default = 6;
8705+
ram attribute clusterRevision default = 7;
87028706

87038707
handle command MoveToHue;
87048708
handle command MoveHue;

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.zap

+73-9
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@
1717
}
1818
],
1919
"package": [
20-
{
21-
"pathRelativity": "relativeToZap",
22-
"path": "../../../src/app/zap-templates/app-templates.json",
23-
"type": "gen-templates-json",
24-
"category": "matter",
25-
"version": "chip-v1"
26-
},
2720
{
2821
"pathRelativity": "relativeToZap",
2922
"path": "../../../src/app/zap-templates/zcl/zcl-with-test-extensions.json",
3023
"type": "zcl-properties",
3124
"category": "matter",
3225
"version": 1,
3326
"description": "Matter SDK ZCL data with some extensions"
27+
},
28+
{
29+
"pathRelativity": "relativeToZap",
30+
"path": "../../../src/app/zap-templates/app-templates.json",
31+
"type": "gen-templates-json",
32+
"category": "matter",
33+
"version": "chip-v1"
3434
}
3535
],
3636
"endpointTypes": [
@@ -7303,7 +7303,7 @@
73037303
"storageOption": "RAM",
73047304
"singleton": 0,
73057305
"bounded": 0,
7306-
"defaultValue": "5",
7306+
"defaultValue": "6",
73077307
"reportable": 1,
73087308
"minInterval": 0,
73097309
"maxInterval": 65344,
@@ -14615,6 +14615,38 @@
1461514615
"maxInterval": 65534,
1461614616
"reportableChange": 0
1461714617
},
14618+
{
14619+
"name": "StartUpMode",
14620+
"code": 2,
14621+
"mfgCode": null,
14622+
"side": "server",
14623+
"type": "int8u",
14624+
"included": 1,
14625+
"storageOption": "RAM",
14626+
"singleton": 0,
14627+
"bounded": 0,
14628+
"defaultValue": "",
14629+
"reportable": 1,
14630+
"minInterval": 1,
14631+
"maxInterval": 65534,
14632+
"reportableChange": 0
14633+
},
14634+
{
14635+
"name": "OnMode",
14636+
"code": 3,
14637+
"mfgCode": null,
14638+
"side": "server",
14639+
"type": "int8u",
14640+
"included": 1,
14641+
"storageOption": "RAM",
14642+
"singleton": 0,
14643+
"bounded": 0,
14644+
"defaultValue": "",
14645+
"reportable": 1,
14646+
"minInterval": 1,
14647+
"maxInterval": 65534,
14648+
"reportableChange": 0
14649+
},
1461814650
{
1461914651
"name": "GeneratedCommandList",
1462014652
"code": 65528,
@@ -14772,6 +14804,38 @@
1477214804
"maxInterval": 65534,
1477314805
"reportableChange": 0
1477414806
},
14807+
{
14808+
"name": "StartUpMode",
14809+
"code": 2,
14810+
"mfgCode": null,
14811+
"side": "server",
14812+
"type": "int8u",
14813+
"included": 1,
14814+
"storageOption": "RAM",
14815+
"singleton": 0,
14816+
"bounded": 0,
14817+
"defaultValue": "",
14818+
"reportable": 1,
14819+
"minInterval": 1,
14820+
"maxInterval": 65534,
14821+
"reportableChange": 0
14822+
},
14823+
{
14824+
"name": "OnMode",
14825+
"code": 3,
14826+
"mfgCode": null,
14827+
"side": "server",
14828+
"type": "int8u",
14829+
"included": 1,
14830+
"storageOption": "RAM",
14831+
"singleton": 0,
14832+
"bounded": 0,
14833+
"defaultValue": "",
14834+
"reportable": 1,
14835+
"minInterval": 1,
14836+
"maxInterval": 65534,
14837+
"reportableChange": 0
14838+
},
1477514839
{
1477614840
"name": "GeneratedCommandList",
1477714841
"code": 65528,
@@ -17807,7 +17871,7 @@
1780717871
"storageOption": "RAM",
1780817872
"singleton": 0,
1780917873
"bounded": 0,
17810-
"defaultValue": "6",
17874+
"defaultValue": "7",
1781117875
"reportable": 1,
1781217876
"minInterval": 0,
1781317877
"maxInterval": 65344,

‎examples/all-clusters-app/infineon/psoc6/BUILD.gn

+26-20
Original file line numberDiff line numberDiff line change
@@ -45,32 +45,38 @@ config("psoc6_ota_config") {
4545

4646
ldflags = [ "-T" + rebase_path(linker_script, root_build_dir) ]
4747

48-
ldflags += [ "-Wl,--defsym,MCUBOOT_HEADER_SIZE=0x400,--defsym,MCUBOOT_BOOTLOADER_SIZE=0x18000,--defsym,CY_BOOT_PRIMARY_1_SIZE=0x1C0000" ]
48+
ldflags += [ "-Wl,--undefined=uxTopUsedPriority -Wl,--defsym,MCUBOOT_HEADER_SIZE=0x400,--defsym,FLASH_AREA_IMG_1_PRIMARY_START=0x028000,--defsym,FLASH_AREA_IMG_1_PRIMARY_SIZE=0x1c0000" ]
4949

5050
defines = [
5151
"P6_OTA",
52-
"OTA_SUPPORT ",
53-
"OTA_USE_EXTERNAL_FLASH",
54-
"CY_BOOT_USE_EXTERNAL_FLASH",
55-
"MCUBOOT_HEADER_SIZE=0x400",
56-
"MCUBOOT_MAX_IMG_SECTORS=3584",
57-
"CY_BOOT_SCRATCH_SIZE=0x00004000",
58-
"MCUBOOT_BOOTLOADER_SIZE=0x00018000",
59-
"CY_BOOT_BOOTLOADER_SIZE=0x00018000",
60-
"CY_BOOT_PRIMARY_1_START=0x00018000",
61-
"CY_BOOT_PRIMARY_1_SIZE=0x1C0000",
62-
"CY_BOOT_SECONDARY_1_START=0x00000000",
63-
"CY_BOOT_SECONDARY_1_SIZE=0x001C0000",
64-
"CY_FLASH_ERASE_VALUE=0xFF",
52+
"COMPONENT_MCUBOOT",
53+
"CY_BOOTLOADER=MCUBOOT",
54+
"OTA_SUPPORT=1",
55+
"COMPONENT_OTA_PSOC_062",
56+
"PSOC_062_2M",
57+
"OTA_USE_EXTERNAL_FLASH=1",
58+
"ENABLE_OTA_LOGS",
59+
"ENABLE_OTA_BOOTLOADER_ABSTRACTION_LOGS",
6560
"MCUBOOT_IMAGE_NUMBER=1",
66-
"MCUBOOT_SLOT_SIZE=0x1C0000",
67-
"MCUBOOT_SCRATCH_SIZE=0x4000",
68-
"MCUBOOT_SECTOR_SIZE = 512",
61+
"MCUBOOT_MAX_IMG_SECTORS=3584",
62+
"FLASH_AREA_BOOTLOADER_DEV_ID='FLASH_DEVICE_INTERNAL_FLASH'",
63+
"FLASH_AREA_BOOTLOADER_SIZE=0x028000",
64+
"FLASH_AREA_BOOTLOADER_START=0x000000",
65+
"FLASH_AREA_IMAGE_SCRATCH_DEV_ID='FLASH_DEVICE_EXTERNAL_FLASH(CY_BOOT_EXTERNAL_DEVICE_INDEX)'",
66+
"FLASH_AREA_IMAGE_SCRATCH_SIZE=0x080000",
67+
"FLASH_AREA_IMAGE_SCRATCH_START=0x440000",
68+
"FLASH_AREA_IMAGE_SWAP_STATUS_DEV_ID='FLASH_DEVICE_INTERNAL_FLASH'",
69+
"FLASH_AREA_IMAGE_SWAP_STATUS_SIZE=0x006c00",
70+
"FLASH_AREA_IMAGE_SWAP_STATUS_START=0x1e8000",
71+
"FLASH_AREA_IMG_1_PRIMARY_DEV_ID='FLASH_DEVICE_INTERNAL_FLASH'",
72+
"FLASH_AREA_IMG_1_PRIMARY_SIZE=0x1c0000",
73+
"FLASH_AREA_IMG_1_PRIMARY_START=0x028000",
74+
"FLASH_AREA_IMG_1_SECONDARY_DEV_ID='FLASH_DEVICE_EXTERNAL_FLASH(CY_BOOT_EXTERNAL_DEVICE_INDEX)'",
75+
"FLASH_AREA_IMG_1_SECONDARY_SIZE=0x1c0000",
76+
"FLASH_AREA_IMG_1_SECONDARY_START=0x000200",
6977
"APP_VERSION_MAJOR=1",
7078
"APP_VERSION_MINOR=0",
7179
"APP_VERSION_BUILD=0",
72-
"MCUBOOT_OVERWRITE_ONLY",
73-
"CY_ENABLE_XIP_PROGRAM",
7480
]
7581

7682
if (build_update_image) {
@@ -87,7 +93,7 @@ psoc6_sdk_sources("all_clusters_app_sdk_sources") {
8793

8894
defines = [
8995
"BOARD_ID=${psoc6_board}",
90-
"P6_LOG_ENABLED=1",
96+
"PSOC6_LOG_ENABLED=1",
9197
"CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE=${setup_pin_code}",
9298
]
9399

‎examples/all-clusters-app/infineon/psoc6/include/AppConfig.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@
4848
#define THREAD_ACTIVE_POLLING_INTERVAL_MS 100
4949
#define THREAD_INACTIVE_POLLING_INTERVAL_MS 1000
5050

51-
// P6 Logging
51+
// PSOC6 Logging
5252
#ifdef __cplusplus
5353
extern "C" {
5454
#endif
5555

5656
void appError(int err);
57-
void P6Log(const char * aFormat, ...);
58-
#define P6_LOG(...) P6Log(__VA_ARGS__)
57+
void PSOC6Log(const char * aFormat, ...);
58+
#define PSOC6_LOG(...) PSOC6Log(__VA_ARGS__)
5959

6060
#ifdef __cplusplus
6161
}

0 commit comments

Comments
 (0)