Skip to content

Commit 62f75c4

Browse files
hastyhasty
committed
Merge branch 'master' of github.com:project-chip/connectedhomeip into granbery/preset_atomic_write_fabric_index
# Conflicts: # src/app/clusters/thermostat-server/thermostat-server.cpp # src/app/clusters/thermostat-server/thermostat-server.h # src/python_testing/TC_TSTAT_4_2.py
2 parents 520eb2f + 653a55f commit 62f75c4

File tree

68 files changed

+1473
-1868
lines changed

Some content is hidden

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

68 files changed

+1473
-1868
lines changed

‎.github/workflows/build.yaml

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

140140
container:
141-
image: ghcr.io/project-chip/chip-build:54
141+
image: ghcr.io/project-chip/chip-build:65
142142
volumes:
143143
- "/:/runner-root-volume"
144144
- "/tmp/log_output:/tmp/test_logs"

‎examples/fabric-bridge-app/fabric-bridge-common/src/ZCLCallbacks.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,9 @@ Protocols::InteractionModel::Status emberAfExternalAttributeReadCallback(Endpoin
3434
const EmberAfAttributeMetadata * attributeMetadata,
3535
uint8_t * buffer, uint16_t maxReadLength)
3636
{
37-
uint16_t endpointIndex = emberAfGetDynamicIndexFromEndpoint(endpoint);
3837
AttributeId attributeId = attributeMetadata->attributeId;
3938

40-
Device * dev = DeviceMgr().GetDevice(endpointIndex);
39+
Device * dev = DeviceMgr().GetDevice(endpoint);
4140
if (dev != nullptr && clusterId == app::Clusters::BridgedDeviceBasicInformation::Id)
4241
{
4342
using namespace app::Clusters::BridgedDeviceBasicInformation::Attributes;

‎examples/rvc-app/rvc-common/include/rvc-service-area-delegate.h

+18-18
Original file line numberDiff line numberDiff line change
@@ -35,39 +35,39 @@ class RvcServiceAreaDelegate : public Delegate
3535
{
3636
private:
3737
// containers for array attributes.
38-
std::vector<ServiceArea::LocationStructureWrapper> mSupportedLocations;
38+
std::vector<ServiceArea::AreaStructureWrapper> mSupportedAreas;
3939
std::vector<ServiceArea::MapStructureWrapper> mSupportedMaps;
40-
std::vector<uint32_t> mSelectedLocations;
40+
std::vector<uint32_t> mSelectedAreas;
4141
std::vector<ServiceArea::Structs::ProgressStruct::Type> mProgressList;
4242

4343
public:
4444
CHIP_ERROR Init() override;
4545

4646
// command support
47-
bool IsSetSelectedLocationsAllowed(MutableCharSpan statusText) override;
47+
bool IsSetSelectedAreasAllowed(MutableCharSpan statusText) override;
4848

49-
bool IsValidSelectLocationsSet(const ServiceArea::Commands::SelectLocations::DecodableType & req,
50-
ServiceArea::SelectLocationsStatus & locationStatus, MutableCharSpan statusText) override;
49+
bool IsValidSelectAreasSet(const ServiceArea::Commands::SelectAreas::DecodableType & req,
50+
ServiceArea::SelectAreasStatus & locationStatus, MutableCharSpan statusText) override;
5151

52-
bool HandleSkipCurrentLocation(MutableCharSpan skipStatusText) override;
52+
bool HandleSkipCurrentArea(MutableCharSpan skipStatusText) override;
5353

5454
//*************************************************************************
5555
// Supported Locations accessors
5656

57-
bool IsSupportedLocationsChangeAllowed() override;
57+
bool IsSupportedAreasChangeAllowed() override;
5858

59-
uint32_t GetNumberOfSupportedLocations() override;
59+
uint32_t GetNumberOfSupportedAreas() override;
6060

61-
bool GetSupportedLocationByIndex(uint32_t listIndex, ServiceArea::LocationStructureWrapper & supportedLocation) override;
61+
bool GetSupportedLocationByIndex(uint32_t listIndex, ServiceArea::AreaStructureWrapper & supportedLocation) override;
6262

63-
bool GetSupportedLocationById(uint32_t aLocationId, uint32_t & listIndex,
64-
ServiceArea::LocationStructureWrapper & supportedLocation) override;
63+
bool GetSupportedLocationById(uint32_t aAreaId, uint32_t & listIndex,
64+
ServiceArea::AreaStructureWrapper & supportedLocation) override;
6565

66-
bool AddSupportedLocation(const ServiceArea::LocationStructureWrapper & newLocation, uint32_t & listIndex) override;
66+
bool AddSupportedLocation(const ServiceArea::AreaStructureWrapper & newArea, uint32_t & listIndex) override;
6767

68-
bool ModifySupportedLocation(uint32_t listIndex, const ServiceArea::LocationStructureWrapper & modifiedLocation) override;
68+
bool ModifySupportedLocation(uint32_t listIndex, const ServiceArea::AreaStructureWrapper & modifiedLocation) override;
6969

70-
bool ClearSupportedLocations() override;
70+
bool ClearSupportedAreas() override;
7171

7272
//*************************************************************************
7373
// Supported Maps accessors
@@ -89,15 +89,15 @@ class RvcServiceAreaDelegate : public Delegate
8989
//*************************************************************************
9090
// Selected Locations accessors
9191

92-
uint32_t GetNumberOfSelectedLocations() override;
92+
uint32_t GetNumberOfSelectedAreas() override;
9393

9494
bool GetSelectedLocationByIndex(uint32_t listIndex, uint32_t & selectedLocation) override;
9595

9696
// IsSelectedLocation() no override
9797

98-
bool AddSelectedLocation(uint32_t aLocationId, uint32_t & listIndex) override;
98+
bool AddSelectedLocation(uint32_t aAreaId, uint32_t & listIndex) override;
9999

100-
bool ClearSelectedLocations() override;
100+
bool ClearSelectedAreas() override;
101101

102102
//*************************************************************************
103103
// Progress accessors
@@ -106,7 +106,7 @@ class RvcServiceAreaDelegate : public Delegate
106106

107107
bool GetProgressElementByIndex(uint32_t listIndex, ServiceArea::Structs::ProgressStruct::Type & aProgressElement) override;
108108

109-
bool GetProgressElementById(uint32_t aLocationId, uint32_t & listIndex,
109+
bool GetProgressElementById(uint32_t aAreaId, uint32_t & listIndex,
110110
ServiceArea::Structs::ProgressStruct::Type & aProgressElement) override;
111111

112112
bool AddProgressElement(const ServiceArea::Structs::ProgressStruct::Type & newProgressElement, uint32_t & listIndex) override;

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

+30-30
Original file line numberDiff line numberDiff line change
@@ -1432,17 +1432,17 @@ provisional cluster ServiceArea = 336 {
14321432
kCompleted = 3;
14331433
}
14341434

1435-
enum SelectLocationsStatus : enum8 {
1435+
enum SelectAreasStatus : enum8 {
14361436
kSuccess = 0;
1437-
kUnsupportedLocation = 1;
1438-
kDuplicatedLocations = 2;
1437+
kUnsupportedArea = 1;
1438+
kDuplicatedAreas = 2;
14391439
kInvalidInMode = 3;
14401440
kInvalidSet = 4;
14411441
}
14421442

1443-
enum SkipCurrentLocationStatus : enum8 {
1443+
enum SkipAreaStatus : enum8 {
14441444
kSuccess = 0;
1445-
kInvalidLocationList = 1;
1445+
kInvalidAreaList = 1;
14461446
kInvalidInMode = 2;
14471447
}
14481448

@@ -1451,17 +1451,17 @@ provisional cluster ServiceArea = 336 {
14511451
kSelectWhileRunning = 0x2;
14521452
}
14531453

1454-
struct LocationInfoStruct {
1454+
struct AreaInfoStruct {
14551455
nullable LocationDescriptorStruct locationInfo = 0;
14561456
nullable LandmarkTag landmarkTag = 1;
14571457
nullable PositionTag positionTag = 2;
14581458
nullable FloorSurfaceTag surfaceTag = 3;
14591459
}
14601460

1461-
struct LocationStruct {
1462-
int32u locationID = 0;
1461+
struct AreaStruct {
1462+
int32u areaID = 0;
14631463
nullable int8u mapID = 1;
1464-
LocationInfoStruct locationInfo = 2;
1464+
AreaInfoStruct areaDesc = 2;
14651465
}
14661466

14671467
struct MapStruct {
@@ -1470,16 +1470,16 @@ provisional cluster ServiceArea = 336 {
14701470
}
14711471

14721472
struct ProgressStruct {
1473-
int32u locationID = 0;
1473+
int32u areaID = 0;
14741474
OperationalStatusEnum status = 1;
14751475
optional nullable elapsed_s totalOperationalTime = 2;
14761476
optional nullable elapsed_s estimatedTime = 3;
14771477
}
14781478

1479-
readonly attribute LocationStruct supportedLocations[] = 0;
1479+
readonly attribute AreaStruct supportedAreas[] = 0;
14801480
readonly attribute nullable MapStruct supportedMaps[] = 1;
1481-
readonly attribute nullable int32u selectedLocations[] = 2;
1482-
readonly attribute optional nullable int32u currentLocation = 3;
1481+
readonly attribute nullable int32u selectedAreas[] = 2;
1482+
readonly attribute optional nullable int32u currentArea = 3;
14831483
readonly attribute optional nullable epoch_s estimatedEndTime = 4;
14841484
readonly attribute optional nullable ProgressStruct progress[] = 5;
14851485
readonly attribute command_id generatedCommandList[] = 65528;
@@ -1489,24 +1489,24 @@ provisional cluster ServiceArea = 336 {
14891489
readonly attribute bitmap32 featureMap = 65532;
14901490
readonly attribute int16u clusterRevision = 65533;
14911491

1492-
request struct SelectLocationsRequest {
1493-
nullable int32u newLocations[] = 0;
1492+
request struct SelectAreasRequest {
1493+
nullable int32u newAreas[] = 0;
14941494
}
14951495

1496-
response struct SelectLocationsResponse = 1 {
1497-
SelectLocationsStatus status = 0;
1496+
response struct SelectAreasResponse = 1 {
1497+
SelectAreasStatus status = 0;
14981498
optional char_string<256> statusText = 1;
14991499
}
15001500

1501-
response struct SkipCurrentLocationResponse = 3 {
1502-
SkipCurrentLocationStatus status = 0;
1501+
response struct SkipAreaResponse = 3 {
1502+
SkipAreaStatus status = 0;
15031503
optional char_string<256> statusText = 1;
15041504
}
15051505

1506-
/** Command used to select a set of device locations, where the device is to operate */
1507-
command SelectLocations(SelectLocationsRequest): SelectLocationsResponse = 0;
1508-
/** This command is used to skip the current location where the device operates. */
1509-
command SkipCurrentLocation(): SkipCurrentLocationResponse = 2;
1506+
/** Command used to select a set of device areas, where the device is to operate. */
1507+
command SelectAreas(SelectAreasRequest): SelectAreasResponse = 0;
1508+
/** This command is used to skip an area where the device operates. */
1509+
command SkipArea(): SkipAreaResponse = 2;
15101510
}
15111511

15121512
endpoint 0 {
@@ -1766,10 +1766,10 @@ endpoint 1 {
17661766
}
17671767

17681768
server cluster ServiceArea {
1769-
callback attribute supportedLocations;
1769+
callback attribute supportedAreas;
17701770
callback attribute supportedMaps;
1771-
callback attribute selectedLocations;
1772-
callback attribute currentLocation;
1771+
callback attribute selectedAreas;
1772+
callback attribute currentArea;
17731773
callback attribute estimatedEndTime;
17741774
callback attribute progress;
17751775
callback attribute generatedCommandList;
@@ -1779,10 +1779,10 @@ endpoint 1 {
17791779
callback attribute featureMap;
17801780
ram attribute clusterRevision default = 1;
17811781

1782-
handle command SelectLocations;
1783-
handle command SelectLocationsResponse;
1784-
handle command SkipCurrentLocation;
1785-
handle command SkipCurrentLocationResponse;
1782+
handle command SelectAreas;
1783+
handle command SelectAreasResponse;
1784+
handle command SkipArea;
1785+
handle command SkipAreaResponse;
17861786
}
17871787
}
17881788

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

+11-10
Original file line numberDiff line numberDiff line change
@@ -2885,33 +2885,34 @@
28852885
"define": "SERVICE_AREA_CLUSTER",
28862886
"side": "server",
28872887
"enabled": 1,
2888+
"apiMaturity": "provisional",
28882889
"commands": [
28892890
{
2890-
"name": "SelectLocations",
2891+
"name": "SelectAreas",
28912892
"code": 0,
28922893
"mfgCode": null,
28932894
"source": "client",
28942895
"isIncoming": 1,
28952896
"isEnabled": 1
28962897
},
28972898
{
2898-
"name": "SelectLocationsResponse",
2899+
"name": "SelectAreasResponse",
28992900
"code": 1,
29002901
"mfgCode": null,
29012902
"source": "server",
29022903
"isIncoming": 0,
29032904
"isEnabled": 1
29042905
},
29052906
{
2906-
"name": "SkipCurrent",
2907+
"name": "SkipArea",
29072908
"code": 2,
29082909
"mfgCode": null,
29092910
"source": "client",
29102911
"isIncoming": 1,
29112912
"isEnabled": 1
29122913
},
29132914
{
2914-
"name": "SkipCurrentResponse",
2915+
"name": "SkipAreaResponse",
29152916
"code": 3,
29162917
"mfgCode": null,
29172918
"source": "server",
@@ -2921,7 +2922,7 @@
29212922
],
29222923
"attributes": [
29232924
{
2924-
"name": "SupportedLocations",
2925+
"name": "SupportedAreas",
29252926
"code": 0,
29262927
"mfgCode": null,
29272928
"side": "server",
@@ -2953,7 +2954,7 @@
29532954
"reportableChange": 0
29542955
},
29552956
{
2956-
"name": "SelectedLocations",
2957+
"name": "SelectedAreas",
29572958
"code": 2,
29582959
"mfgCode": null,
29592960
"side": "server",
@@ -2969,7 +2970,7 @@
29692970
"reportableChange": 0
29702971
},
29712972
{
2972-
"name": "CurrentLocation",
2973+
"name": "CurrentArea",
29732974
"code": 3,
29742975
"mfgCode": null,
29752976
"side": "server",
@@ -2978,7 +2979,7 @@
29782979
"storageOption": "External",
29792980
"singleton": 0,
29802981
"bounded": 0,
2981-
"defaultValue": "",
2982+
"defaultValue": null,
29822983
"reportable": 1,
29832984
"minInterval": 1,
29842985
"maxInterval": 65534,
@@ -2994,7 +2995,7 @@
29942995
"storageOption": "External",
29952996
"singleton": 0,
29962997
"bounded": 0,
2997-
"defaultValue": "",
2998+
"defaultValue": null,
29982999
"reportable": 1,
29993000
"minInterval": 1,
30003001
"maxInterval": 65534,
@@ -3090,7 +3091,7 @@
30903091
"storageOption": "External",
30913092
"singleton": 0,
30923093
"bounded": 0,
3093-
"defaultValue": "0",
3094+
"defaultValue": null,
30943095
"reportable": 1,
30953096
"minInterval": 1,
30963097
"maxInterval": 65534,

0 commit comments

Comments
 (0)