Skip to content

Commit d3c0a59

Browse files
Fix advertised device type for all-clusters-app to match data model.
We were claiming a device type of 0x0101 in the Descriptor DeviceTypeList on endpoint 1, but claiming a device type of 0xFFFF (not even a valid value) via DNS-SD advertising. Align our advertising behavior with the data model values. Fixes project-chip#33697
1 parent f49e684 commit d3c0a59

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

examples/all-clusters-app/linux/include/CHIPProjectAppConfig.h

+4
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,7 @@
4747
#define CHIP_CONFIG_MAX_PATHS_PER_INVOKE 5
4848

4949
#define CHIP_CONFIG_ENABLE_BDX_LOG_TRANSFER 1
50+
51+
// Claim a device type while advertising that matches the device type on our
52+
// endpoint 1.
53+
#define CHIP_DEVICE_CONFIG_DEVICE_TYPE 0x0101

examples/all-clusters-app/tizen/include/CHIPProjectAppConfig.h

+4
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,7 @@
3333
// All clusters app has 3 group endpoints. This needs to defined here so that
3434
// CHIP_CONFIG_MAX_GROUPS_PER_FABRIC is properly configured.
3535
#define CHIP_CONFIG_MAX_GROUP_ENDPOINTS_PER_FABRIC 3
36+
37+
// Claim a device type while advertising that matches the device type on our
38+
// endpoint 1.
39+
#define CHIP_DEVICE_CONFIG_DEVICE_TYPE 0x0101

src/app/tests/suites/TestDiscovery.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ name: Test Discovery
1717
config:
1818
nodeId: 0x12344321
1919
endpoint: 0
20+
# These defaults correspond to the behavior of all-clusters-app, and
21+
# different values should be passed on the command line when testing
22+
# against any other server.
2023
discriminator:
2124
type: int16u
2225
defaultValue: 3840
@@ -31,7 +34,7 @@ config:
3134
defaultValue: 32769
3235
deviceType:
3336
type: int16u
34-
defaultValue: 65535
37+
defaultValue: 0x0101
3538

3639
tests:
3740
- label: "Stop target device"

0 commit comments

Comments
 (0)