Skip to content

Commit 531adb7

Browse files
kliao-csakliao-csa
authored
Merge branch 'master' into 32735-cicd-run-slow-workflows-only-if-fast-workflows-pass
2 parents cf9c46c + 3fa70cf commit 531adb7

File tree

140 files changed

+4163
-2481
lines changed

Some content is hidden

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

140 files changed

+4163
-2481
lines changed

‎.github/.wordlist.txt

+1
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,7 @@ MoveWithOnOff
905905
MPSL
906906
MRP
907907
MTD
908+
MTR
908909
MTU
909910
Multiband
910911
Multicast

‎.github/workflows/darwin.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ jobs:
8383
-enableUndefinedBehaviorSanitizer YES
8484
- flavor: tsan
8585
arguments: -enableThreadSanitizer YES
86+
# "leaks" does not seem to be very compatible with asan or tsan
87+
- flavor: leaks
88+
defines: ENABLE_LEAK_DETECTION=1
8689
steps:
8790
- name: Checkout
8891
uses: actions/checkout@v4

‎.pullapprove.yml

+8
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,14 @@ groups:
173173
teams: [reviewers-samsung]
174174
reviews:
175175
request: 10
176+
shared-reviewers-eve:
177+
type: optional
178+
conditions:
179+
- files.include('*')
180+
reviewers:
181+
teams: [reviewers-eve]
182+
reviews:
183+
request: 10
176184
# shared-reviewers-signify disabled for now, because the reviewers-signify
177185
# team is empty and pullapprove seems to mis-handle that badly and treats
178186
# _all_ reviewers as being in this group.

‎docs/guides/infineon_trustm_provisioning.md

+13-7
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ can be used to perform provisioning by following the steps mentioned below.
3030

3131
```
3232
$ cd linux-optiga-trust-m/
33-
$ ./trustm_installation_aarch64_script.sh
33+
$ git checkout provider_dev
34+
$ git submodule update -f
35+
$ ./provider_installation_script.sh
3436
```
3537

3638
- Run the script to generate Matter test DAC for lock-app using the public key
@@ -39,13 +41,13 @@ can be used to perform provisioning by following the steps mentioned below.
3941

4042
```
4143
$ cd scripts/matter_provisioning/
42-
$ ./matter_dac_provisioning.sh
44+
$ ./matter_test_provisioning.sh
4345
```
4446

4547
_Note:_
4648

47-
_By running this example matter_dac_provisioning.sh, the steps shown below are
48-
executed:_
49+
_By running this example `matter_test_provisioning.sh`, the steps shown below
50+
are executed:_
4951

5052
_Step1: Extract the public key from the Infineon pre-provisioned
5153
Certificate(0xE0E0) using openssl command._
@@ -55,7 +57,11 @@ _Step2: Generate DAC test certificate using the extracted public key, Signed by
5557
Please note that production devices cannot re-use these test keys/certificates.
5658

5759
_Step3: Write DAC test certificate into OPTIGA™ Trust M certificate slot
58-
0xE0E0_
60+
0xE0E0._
5961

60-
\_Step4: Write Matter test PAI into OPTIGA™ Trust M certificate slot
61-
0xE0E8 and test CD into OPTIGA™ Trust M Arbitrary OID 0xF1E0.
62+
_Step4: Write Matter test PAI into OPTIGA™ Trust M certificate slot 0xE0E8
63+
and test CD into OPTIGA™ Trust M Arbitrary OID 0xF1E0._
64+
65+
For certificate claim and OPTIGA™ Trust M MTR provisioning, please refer
66+
to our
67+
[README for Late-stage Provisioning](https://github.com/Infineon/linux-optiga-trust-m/blob/provider_dev/scripts/matter_provisioning/README.md#certificate-claiming)

‎examples/all-clusters-app/esp32/main/CMakeLists.txt

+3-14
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ set(SRC_DIRS_LIST
9696
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/time-synchronization-server"
9797
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/valve-configuration-and-control-server"
9898
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/dishwasher-alarm-server"
99-
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/laundry-washer-controls-server"
100-
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/laundry-washer-controls-server"
99+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/laundry-washer-controls-server"
100+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/laundry-washer-controls-server"
101101
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/laundry-dryer-controls-server"
102102
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/all-clusters-app/all-clusters-common/src"
103103
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/energy-preference-server"
@@ -136,20 +136,9 @@ if (CONFIG_ENABLE_ICD_SERVER)
136136
list(APPEND SRC_DIRS_LIST "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/icd")
137137
endif()
138138

139-
set(PRIV_REQUIRES_LIST chip QRCode bt app_update nvs_flash spi_flash openthread)
140-
141-
if(${IDF_TARGET} STREQUAL "esp32")
142-
list(APPEND PRIV_REQUIRES_LIST spidriver screen-framework)
143-
endif()
144-
145-
if(CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM)
146-
list(APPEND PRIV_REQUIRES_LIST led_strip)
147-
endif()
148-
149139
idf_component_register(PRIV_INCLUDE_DIRS ${PRIV_INCLUDE_DIRS_LIST}
150140
SRC_DIRS ${SRC_DIRS_LIST}
151-
EXCLUDE_SRCS ${EXCLUDE_SRCS}
152-
PRIV_REQUIRES ${PRIV_REQUIRES_LIST})
141+
EXCLUDE_SRCS ${EXCLUDE_SRCS})
153142

154143
get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
155144

‎examples/all-clusters-minimal-app/esp32/main/CMakeLists.txt

+2-13
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ set(SRC_DIRS_LIST
8282
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/door-lock-server"
8383
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/occupancy-sensor-server"
8484
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/device-energy-management-server"
85-
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/energy-evse-server"
85+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/energy-evse-server"
8686
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/ethernet-network-diagnostics-server"
8787
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/localization-configuration-server"
8888
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/time-format-localization-server"
@@ -118,19 +118,8 @@ set(SRC_DIRS_LIST "${SRC_DIRS_LIST}"
118118
)
119119
endif (CONFIG_ENABLE_PW_RPC)
120120

121-
set(PRIV_REQUIRES_LIST chip QRCode bt driver app_update nvs_flash spi_flash openthread)
122-
123-
if(${IDF_TARGET} STREQUAL "esp32")
124-
list(APPEND PRIV_REQUIRES_LIST spidriver screen-framework)
125-
endif()
126-
127-
if(CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM)
128-
list(APPEND PRIV_REQUIRES_LIST led_strip)
129-
endif()
130-
131121
idf_component_register(PRIV_INCLUDE_DIRS ${PRIV_INCLUDE_DIRS_LIST}
132-
SRC_DIRS ${SRC_DIRS_LIST}
133-
PRIV_REQUIRES ${PRIV_REQUIRES_LIST})
122+
SRC_DIRS ${SRC_DIRS_LIST})
134123

135124
get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
136125

‎examples/bridge-app/esp32/main/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ idf_component_register(PRIV_INCLUDE_DIRS
4848
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/operational-credentials-server"
4949
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/general-commissioning-server"
5050
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/common"
51-
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/providers"
52-
PRIV_REQUIRES chip QRCode bt nvs_flash)
51+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/providers")
5352

5453
get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
5554

‎examples/chef/common/stubs.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -235,3 +235,7 @@ void emberAfWakeOnLanClusterInitCallback(EndpointId endpoint)
235235
WakeOnLan::SetDefaultDelegate(endpoint, &wakeOnLanManager);
236236
}
237237
#endif
238+
239+
// No-op function, used to force linking this file,
240+
// instead of the weak functions from other files
241+
extern "C" void chef_include_stubs_impl(void) {}

‎examples/chef/esp32/main/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,11 @@ endif (CONFIG_ENABLE_PW_RPC)
118118
idf_component_register(PRIV_INCLUDE_DIRS
119119
"${CHIP_SHELL_DIR}/shell_common/include"
120120
"${PRIV_INCLUDE_DIRS_LIST}"
121-
PRIV_REQUIRES chip nvs_flash bt console mbedtls QRCode tft screen-framework spidriver
122121
SRC_DIRS ${SRC_DIRS_LIST})
123122

123+
# Forces the linker to include common/stubs.cpp
124+
target_link_libraries(${COMPONENT_LIB} INTERFACE "-u chef_include_stubs_impl")
125+
124126
include("${CHIP_ROOT}/build/chip/esp32/esp32_codegen.cmake")
125127
chip_app_component_codegen("${CHEF}/devices/${SAMPLE_NAME}.matter")
126128
chip_app_component_zapgen("${CHEF}/devices/${SAMPLE_NAME}.zap")

‎examples/energy-management-app/esp32/main/CMakeLists.txt

+1-8
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,6 @@ set(SRC_DIRS_LIST
7272
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/electrical-power-measurement-server"
7373
)
7474

75-
set(PRIV_REQUIRES_LIST chip QRCode bt led_strip app_update openthread driver nvs_flash spi_flash)
76-
77-
if(${IDF_TARGET} STREQUAL "esp32")
78-
list(APPEND PRIV_REQUIRES_LIST spidriver screen-framework)
79-
endif()
80-
8175

8276
if (CONFIG_ENABLE_PW_RPC)
8377
# Append additional directories for RPC build
@@ -103,8 +97,7 @@ set(SRC_DIRS_LIST "${SRC_DIRS_LIST}"
10397
endif (CONFIG_ENABLE_PW_RPC)
10498

10599
idf_component_register(PRIV_INCLUDE_DIRS ${PRIV_INCLUDE_DIRS_LIST}
106-
SRC_DIRS ${SRC_DIRS_LIST}
107-
PRIV_REQUIRES ${PRIV_REQUIRES_LIST})
100+
SRC_DIRS ${SRC_DIRS_LIST})
108101
get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
109102

110103
include("${CHIP_ROOT}/build/chip/esp32/esp32_codegen.cmake")

‎examples/light-switch-app/esp32/main/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ idf_component_register(PRIV_INCLUDE_DIRS
5959
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/groups-server"
6060
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/group-key-mgmt-server"
6161
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/time-synchronization-server"
62-
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/icd-management-server"
63-
PRIV_REQUIRES chip QRCode bt app_update driver nvs_flash spi_flash)
62+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/icd-management-server")
63+
6464
get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
6565

6666
include("${CHIP_ROOT}/build/chip/esp32/esp32_codegen.cmake")

‎examples/light-switch-app/light-switch-common/light-switch-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -2792,7 +2792,7 @@ endpoint 0 {
27922792
callback attribute acceptedCommandList;
27932793
callback attribute attributeList;
27942794
ram attribute featureMap default = 0x0B;
2795-
ram attribute clusterRevision default = 1;
2795+
ram attribute clusterRevision default = 2;
27962796

27972797
handle command SetUTCTime;
27982798
handle command SetTrustedTimeSource;

‎examples/light-switch-app/light-switch-common/light-switch-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -3826,7 +3826,7 @@
38263826
"storageOption": "RAM",
38273827
"singleton": 0,
38283828
"bounded": 0,
3829-
"defaultValue": "1",
3829+
"defaultValue": "2",
38303830
"reportable": 1,
38313831
"minInterval": 1,
38323832
"maxInterval": 65534,

‎examples/lighting-app/esp32/main/CMakeLists.txt

+1-9
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,6 @@ set(SRC_DIRS_LIST
6767
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/scenes-server"
6868
)
6969

70-
set(PRIV_REQUIRES_LIST chip QRCode bt led_strip app_update openthread driver nvs_flash spi_flash)
71-
72-
if(${IDF_TARGET} STREQUAL "esp32")
73-
list(APPEND PRIV_REQUIRES_LIST spidriver screen-framework)
74-
endif()
75-
76-
7770
if (CONFIG_ENABLE_PW_RPC)
7871
# Append additional directories for RPC build
7972
set(PRIV_INCLUDE_DIRS_LIST "${PRIV_INCLUDE_DIRS_LIST}"
@@ -98,8 +91,7 @@ set(SRC_DIRS_LIST "${SRC_DIRS_LIST}"
9891
endif (CONFIG_ENABLE_PW_RPC)
9992

10093
idf_component_register(PRIV_INCLUDE_DIRS ${PRIV_INCLUDE_DIRS_LIST}
101-
SRC_DIRS ${SRC_DIRS_LIST}
102-
PRIV_REQUIRES ${PRIV_REQUIRES_LIST})
94+
SRC_DIRS ${SRC_DIRS_LIST})
10395
get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
10496

10597
include("${CHIP_ROOT}/build/chip/esp32/esp32_codegen.cmake")

‎examples/lock-app/esp32/main/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ idf_component_register(INCLUDE_DIRS
7474
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/door-lock-server"
7575
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/identify-server"
7676
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/groups-server"
77-
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/icd-management-server"
78-
PRIV_REQUIRES bt chip QRCode nvs_flash driver)
77+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/icd-management-server")
78+
7979
add_dependencies(${COMPONENT_LIB} app-codegen)
8080

8181
set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")

‎examples/minimal-mdns/advertiser.cpp

+15-14
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717
#include <cstdio>
1818
#include <memory>
19+
#include <optional>
1920

2021
#include <arpa/inet.h>
2122
#include <strings.h>
@@ -45,18 +46,18 @@ struct Options
4546
AdvertisingMode advertisingMode = AdvertisingMode::kCommissionableNode;
4647

4748
// commissionable node / commissioner params
48-
Optional<uint16_t> vendorId;
49-
Optional<uint16_t> productId;
50-
Optional<uint32_t> deviceType;
51-
Optional<const char *> deviceName;
49+
std::optional<uint16_t> vendorId;
50+
std::optional<uint16_t> productId;
51+
std::optional<uint32_t> deviceType;
52+
std::optional<const char *> deviceName;
5253

5354
// commissionable node params
5455
uint8_t shortDiscriminator = 52;
5556
uint16_t longDiscriminator = 840;
5657
Dnssd::CommissioningMode commissioningMode = Dnssd::CommissioningMode::kDisabled;
57-
Optional<const char *> rotatingId;
58-
Optional<const char *> pairingInstr;
59-
Optional<uint16_t> pairingHint;
58+
std::optional<const char *> rotatingId;
59+
std::optional<const char *> pairingInstr;
60+
std::optional<uint16_t> pairingHint;
6061

6162
// operational params
6263
uint64_t fabricId = 12345;
@@ -130,10 +131,10 @@ bool HandleOptions(const char * aProgram, OptionSet * aOptions, int aIdentifier,
130131
gOptions.longDiscriminator = static_cast<uint16_t>(atoi(aValue));
131132
return true;
132133
case kOptionCommissioningVendorId:
133-
gOptions.vendorId = Optional<uint16_t>::Value(static_cast<uint16_t>(atoi(aValue)));
134+
gOptions.vendorId = std::make_optional<uint16_t>(static_cast<uint16_t>(atoi(aValue)));
134135
return true;
135136
case kOptionCommissioningProductId:
136-
gOptions.productId = Optional<uint16_t>::Value(static_cast<uint16_t>(atoi(aValue)));
137+
gOptions.productId = std::make_optional<uint16_t>(static_cast<uint16_t>(atoi(aValue)));
137138
return true;
138139
case kOptionCommissioningMode:
139140
cm = static_cast<uint8_t>(atoi(aValue));
@@ -147,19 +148,19 @@ bool HandleOptions(const char * aProgram, OptionSet * aOptions, int aIdentifier,
147148
}
148149
return true;
149150
case kOptionCommissioningDeviceType:
150-
gOptions.deviceType = Optional<uint32_t>::Value(static_cast<uint32_t>(atoi(aValue)));
151+
gOptions.deviceType = std::make_optional<uint32_t>(static_cast<uint32_t>(atoi(aValue)));
151152
return true;
152153
case kOptionCommissioningDeviceName:
153-
gOptions.deviceName = Optional<const char *>::Value(static_cast<const char *>(aValue));
154+
gOptions.deviceName = std::make_optional<const char *>(static_cast<const char *>(aValue));
154155
return true;
155156
case kOptionCommissioningRotatingId:
156-
gOptions.rotatingId = Optional<const char *>::Value(static_cast<const char *>(aValue));
157+
gOptions.rotatingId = std::make_optional<const char *>(static_cast<const char *>(aValue));
157158
return true;
158159
case kOptionCommissioningPairingInstr:
159-
gOptions.pairingInstr = Optional<const char *>::Value(static_cast<const char *>(aValue));
160+
gOptions.pairingInstr = std::make_optional<const char *>(static_cast<const char *>(aValue));
160161
return true;
161162
case kOptionCommissioningPairingHint:
162-
gOptions.pairingHint = Optional<uint16_t>::Value(static_cast<uint16_t>(atoi(aValue)));
163+
gOptions.pairingHint = std::make_optional<uint16_t>(static_cast<uint16_t>(atoi(aValue)));
163164
return true;
164165
case kOptionOperationalFabricId:
165166
if (sscanf(aValue, "%" SCNx64, &gOptions.fabricId) != 1)

‎examples/ota-provider-app/esp32/main/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ idf_component_register(PRIV_INCLUDE_DIRS
5353
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/common"
5454
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/providers"
5555
EXCLUDE_SRCS
56-
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/ota-provider-app/ota-provider-common/BdxOtaSender.cpp"
57-
PRIV_REQUIRES chip QRCode bt console spiffs spi_flash nvs_flash)
56+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/ota-provider-app/ota-provider-common/BdxOtaSender.cpp")
5857

5958
get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
6059
include("${CHIP_ROOT}/build/chip/esp32/esp32_codegen.cmake")

‎examples/ota-requestor-app/esp32/main/CMakeLists.txt

+1-4
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ set(SRC_DIRS_LIST
6262
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/providers"
6363
)
6464

65-
set(PRIV_REQUIRES_LIST chip QRCode bt console app_update nvs_flash)
66-
6765
if (CONFIG_ENABLE_PW_RPC)
6866
# Append additional directories for RPC build
6967
set(PRIV_INCLUDE_DIRS_LIST "${PRIV_INCLUDE_DIRS_LIST}"
@@ -88,8 +86,7 @@ set(SRC_DIRS_LIST "${SRC_DIRS_LIST}"
8886
endif (CONFIG_ENABLE_PW_RPC)
8987

9088
idf_component_register(PRIV_INCLUDE_DIRS ${PRIV_INCLUDE_DIRS_LIST}
91-
SRC_DIRS ${SRC_DIRS_LIST}
92-
PRIV_REQUIRES ${PRIV_REQUIRES_LIST})
89+
SRC_DIRS ${SRC_DIRS_LIST})
9390

9491
include("${CHIP_ROOT}/build/chip/esp32/esp32_codegen.cmake")
9592
chip_app_component_codegen("${CHIP_ROOT}/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter")

‎examples/persistent-storage/esp32/main/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ idf_component_register(PRIV_INCLUDE_DIRS
2020
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/persistent-storage"
2121
SRC_DIRS
2222
"${CMAKE_CURRENT_LIST_DIR}"
23-
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/persistent-storage"
24-
PRIV_REQUIRES chip nvs_flash)
23+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/persistent-storage")
2524

2625
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
2726
target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")

‎examples/pigweed-app/esp32/main/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ idf_component_register(INCLUDE_DIRS
3333
"${CMAKE_CURRENT_LIST_DIR}"
3434
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32"
3535
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed"
36-
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed/esp32"
37-
PRIV_REQUIRES bt chip)
36+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed/esp32")
3837

3938
get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
4039
set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")

‎examples/shell/esp32/main/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,4 @@ set(CHIP_SHELL_DIR "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/she
2222
idf_component_register(SRCS main.cpp
2323
"${CHIP_SHELL_DIR}/shell_common/globals.cpp"
2424
PRIV_INCLUDE_DIRS
25-
"${CHIP_SHELL_DIR}/shell_common/include"
26-
PRIV_REQUIRES chip nvs_flash bt)
25+
"${CHIP_SHELL_DIR}/shell_common/include")

‎examples/shell/shell_common/include/Globals.h

+2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
#include <protocols/secure_channel/MessageCounterManager.h>
2525
#include <transport/SessionHolder.h>
2626
#include <transport/SessionManager.h>
27+
#if INET_CONFIG_ENABLE_TCP_ENDPOINT
2728
#include <transport/raw/TCP.h>
29+
#endif // INET_CONFIG_ENABLE_TCP_ENDPOINT
2830
#include <transport/raw/UDP.h>
2931

3032
#if INET_CONFIG_ENABLE_TCP_ENDPOINT

0 commit comments

Comments
 (0)