Skip to content

Commit 79fcb91

Browse files
soares-sergiosoares-sergio
authored
lighting-app: Remove OccupancySensing Server (project-chip#35893)
* lighting-app: Remove OccupancySensing Server This change removes the OccupancySensing server from this app as this is against the spec and causes test_TC_IDM_10_1 to fail. With this change, now TC_DeviceBasicComposition.py passes for this example app. * Remove OccupancySensing server from ESP32 example app
1 parent 3ffe083 commit 79fcb91

File tree

3 files changed

+7
-170
lines changed

3 files changed

+7
-170
lines changed

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

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ set(SRC_DIRS_LIST
5151
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/time-format-localization-server"
5252
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/level-control"
5353
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/network-commissioning"
54-
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/occupancy-sensor-server"
5554
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/on-off-server"
5655
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/operational-credentials-server"
5756
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/ota-requestor"

‎examples/lighting-app/lighting-common/lighting-app.matter

-72
Original file line numberDiff line numberDiff line change
@@ -2576,70 +2576,6 @@ cluster ColorControl = 768 {
25762576
command StepColorTemperature(StepColorTemperatureRequest): DefaultSuccess = 76;
25772577
}
25782578

2579-
/** The server cluster provides an interface to occupancy sensing functionality based on one or more sensing modalities, including configuration and provision of notifications of occupancy status. */
2580-
cluster OccupancySensing = 1030 {
2581-
revision 5;
2582-
2583-
enum OccupancySensorTypeEnum : enum8 {
2584-
kPIR = 0;
2585-
kUltrasonic = 1;
2586-
kPIRAndUltrasonic = 2;
2587-
kPhysicalContact = 3;
2588-
}
2589-
2590-
bitmap Feature : bitmap32 {
2591-
kOther = 0x1;
2592-
kPassiveInfrared = 0x2;
2593-
kUltrasonic = 0x4;
2594-
kPhysicalContact = 0x8;
2595-
kActiveInfrared = 0x10;
2596-
kRadar = 0x20;
2597-
kRFSensing = 0x40;
2598-
kVision = 0x80;
2599-
}
2600-
2601-
bitmap OccupancyBitmap : bitmap8 {
2602-
kOccupied = 0x1;
2603-
}
2604-
2605-
bitmap OccupancySensorTypeBitmap : bitmap8 {
2606-
kPIR = 0x1;
2607-
kUltrasonic = 0x2;
2608-
kPhysicalContact = 0x4;
2609-
}
2610-
2611-
struct HoldTimeLimitsStruct {
2612-
int16u holdTimeMin = 0;
2613-
int16u holdTimeMax = 1;
2614-
int16u holdTimeDefault = 2;
2615-
}
2616-
2617-
info event OccupancyChanged = 0 {
2618-
OccupancyBitmap occupancy = 0;
2619-
}
2620-
2621-
readonly attribute OccupancyBitmap occupancy = 0;
2622-
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
2623-
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;
2624-
attribute access(write: manage) optional int16u holdTime = 3;
2625-
readonly attribute optional HoldTimeLimitsStruct holdTimeLimits = 4;
2626-
attribute access(write: manage) optional int16u PIROccupiedToUnoccupiedDelay = 16;
2627-
attribute access(write: manage) optional int16u PIRUnoccupiedToOccupiedDelay = 17;
2628-
attribute access(write: manage) optional int8u PIRUnoccupiedToOccupiedThreshold = 18;
2629-
attribute access(write: manage) optional int16u ultrasonicOccupiedToUnoccupiedDelay = 32;
2630-
attribute access(write: manage) optional int16u ultrasonicUnoccupiedToOccupiedDelay = 33;
2631-
attribute access(write: manage) optional int8u ultrasonicUnoccupiedToOccupiedThreshold = 34;
2632-
attribute access(write: manage) optional int16u physicalContactOccupiedToUnoccupiedDelay = 48;
2633-
attribute access(write: manage) optional int16u physicalContactUnoccupiedToOccupiedDelay = 49;
2634-
attribute access(write: manage) optional int8u physicalContactUnoccupiedToOccupiedThreshold = 50;
2635-
readonly attribute command_id generatedCommandList[] = 65528;
2636-
readonly attribute command_id acceptedCommandList[] = 65529;
2637-
readonly attribute event_id eventList[] = 65530;
2638-
readonly attribute attrib_id attributeList[] = 65531;
2639-
readonly attribute bitmap32 featureMap = 65532;
2640-
readonly attribute int16u clusterRevision = 65533;
2641-
}
2642-
26432579
endpoint 0 {
26442580
device type ma_rootdevice = 22, version 1;
26452581

@@ -3127,14 +3063,6 @@ endpoint 1 {
31273063
handle command MoveColorTemperature;
31283064
handle command StepColorTemperature;
31293065
}
3130-
3131-
server cluster OccupancySensing {
3132-
ram attribute occupancy;
3133-
ram attribute occupancySensorType;
3134-
ram attribute occupancySensorTypeBitmap;
3135-
callback attribute featureMap;
3136-
ram attribute clusterRevision default = 5;
3137-
}
31383066
}
31393067

31403068

‎examples/lighting-app/lighting-common/lighting-app.zap

+7-97
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@
1919
"package": [
2020
{
2121
"pathRelativity": "relativeToZap",
22-
"path": "../../../src/app/zap-templates/zcl/zcl.json",
23-
"type": "zcl-properties",
22+
"path": "../../../src/app/zap-templates/app-templates.json",
23+
"type": "gen-templates-json",
2424
"category": "matter",
25-
"version": 1,
26-
"description": "Matter SDK ZCL data"
25+
"version": "chip-v1"
2726
},
2827
{
2928
"pathRelativity": "relativeToZap",
30-
"path": "../../../src/app/zap-templates/app-templates.json",
31-
"type": "gen-templates-json",
29+
"path": "../../../src/app/zap-templates/zcl/zcl.json",
30+
"type": "zcl-properties",
3231
"category": "matter",
33-
"version": "chip-v1"
32+
"version": 1,
33+
"description": "Matter SDK ZCL data"
3434
}
3535
],
3636
"endpointTypes": [
@@ -5638,96 +5638,6 @@
56385638
"reportableChange": 0
56395639
}
56405640
]
5641-
},
5642-
{
5643-
"name": "Occupancy Sensing",
5644-
"code": 1030,
5645-
"mfgCode": null,
5646-
"define": "OCCUPANCY_SENSING_CLUSTER",
5647-
"side": "server",
5648-
"enabled": 1,
5649-
"attributes": [
5650-
{
5651-
"name": "Occupancy",
5652-
"code": 0,
5653-
"mfgCode": null,
5654-
"side": "server",
5655-
"type": "OccupancyBitmap",
5656-
"included": 1,
5657-
"storageOption": "RAM",
5658-
"singleton": 0,
5659-
"bounded": 0,
5660-
"defaultValue": "",
5661-
"reportable": 1,
5662-
"minInterval": 0,
5663-
"maxInterval": 65344,
5664-
"reportableChange": 0
5665-
},
5666-
{
5667-
"name": "OccupancySensorType",
5668-
"code": 1,
5669-
"mfgCode": null,
5670-
"side": "server",
5671-
"type": "OccupancySensorTypeEnum",
5672-
"included": 1,
5673-
"storageOption": "RAM",
5674-
"singleton": 0,
5675-
"bounded": 0,
5676-
"defaultValue": "",
5677-
"reportable": 1,
5678-
"minInterval": 0,
5679-
"maxInterval": 65344,
5680-
"reportableChange": 0
5681-
},
5682-
{
5683-
"name": "OccupancySensorTypeBitmap",
5684-
"code": 2,
5685-
"mfgCode": null,
5686-
"side": "server",
5687-
"type": "OccupancySensorTypeBitmap",
5688-
"included": 1,
5689-
"storageOption": "RAM",
5690-
"singleton": 0,
5691-
"bounded": 0,
5692-
"defaultValue": "",
5693-
"reportable": 1,
5694-
"minInterval": 0,
5695-
"maxInterval": 65344,
5696-
"reportableChange": 0
5697-
},
5698-
{
5699-
"name": "FeatureMap",
5700-
"code": 65532,
5701-
"mfgCode": null,
5702-
"side": "server",
5703-
"type": "bitmap32",
5704-
"included": 1,
5705-
"storageOption": "External",
5706-
"singleton": 0,
5707-
"bounded": 0,
5708-
"defaultValue": null,
5709-
"reportable": 1,
5710-
"minInterval": 1,
5711-
"maxInterval": 65534,
5712-
"reportableChange": 0
5713-
},
5714-
{
5715-
"name": "ClusterRevision",
5716-
"code": 65533,
5717-
"mfgCode": null,
5718-
"side": "server",
5719-
"type": "int16u",
5720-
"included": 1,
5721-
"storageOption": "RAM",
5722-
"singleton": 0,
5723-
"bounded": 0,
5724-
"defaultValue": "5",
5725-
"reportable": 1,
5726-
"minInterval": 0,
5727-
"maxInterval": 65344,
5728-
"reportableChange": 0
5729-
}
5730-
]
57315641
}
57325642
]
57335643
}

0 commit comments

Comments
 (0)