Skip to content

Commit 1408490

Browse files
ReneJosefsenpull[bot]
ReneJosefsen
authored and
pull[bot]
committed
[Pump] Fix device manager and update zap (#18988)
* Removed mask parameter frin device manager functions * Updated pump app zap and ran regen-all * Regen zap * Regen zap
1 parent 936c367 commit 1408490

13 files changed

+802
-1835
lines changed

‎examples/pump-app/cc13x2x7_26x2x7/main/CHIPDeviceManager.cpp

+7-8
Original file line numberDiff line numberDiff line change
@@ -64,28 +64,27 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb)
6464
} // namespace DeviceManager
6565
} // namespace chip
6666

67-
void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type,
68-
uint16_t size, uint8_t * value)
67+
void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
68+
uint8_t * value)
6969
{
7070
chip::DeviceManager::CHIPDeviceManagerCallbacks * cb =
7171
chip::DeviceManager::CHIPDeviceManager::GetInstance().GetCHIPDeviceManagerCallbacks();
7272
if (cb != nullptr)
7373
{
74-
cb->PostAttributeChangeCallback(attributePath.mEndpointId, attributePath.mClusterId, attributePath.mAttributeId, mask, type,
75-
size, value);
74+
cb->PostAttributeChangeCallback(attributePath.mEndpointId, attributePath.mClusterId, attributePath.mAttributeId, type, size,
75+
value);
7676
}
7777
}
7878

7979
chip::Protocols::InteractionModel::Status MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath,
80-
uint8_t mask, uint8_t type, uint16_t size,
81-
uint8_t * value)
80+
uint8_t type, uint16_t size, uint8_t * value)
8281
{
8382
chip::DeviceManager::CHIPDeviceManagerCallbacks * cb =
8483
chip::DeviceManager::CHIPDeviceManager::GetInstance().GetCHIPDeviceManagerCallbacks();
8584
if (cb != nullptr)
8685
{
87-
return cb->PreAttributeChangeCallback(attributePath.mEndpointId, attributePath.mClusterId, attributePath.mAttributeId, mask,
88-
type, size, value);
86+
return cb->PreAttributeChangeCallback(attributePath.mEndpointId, attributePath.mClusterId, attributePath.mAttributeId, type,
87+
size, value);
8988
}
9089

9190
return chip::Protocols::InteractionModel::Status::Success;

‎examples/pump-app/cc13x2x7_26x2x7/main/DeviceCallbacks.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_
105105

106106
chip::Protocols::InteractionModel::Status DeviceCallbacks::PreAttributeChangeCallback(chip::EndpointId endpointId,
107107
chip::ClusterId clusterId,
108-
chip::AttributeId attributeId, uint8_t mask,
109-
uint8_t type, uint16_t size, uint8_t * value)
108+
chip::AttributeId attributeId, uint8_t type,
109+
uint16_t size, uint8_t * value)
110110
{
111111
PLAT_LOG("PreAttributeChangeCallback - Cluster ID: '0x%04x', EndPoint ID: '0x%02x', Attribute ID: '0x%04x'", clusterId,
112112
endpointId, attributeId);
@@ -130,8 +130,8 @@ chip::Protocols::InteractionModel::Status DeviceCallbacks::PreAttributeChangeCal
130130
return chip::Protocols::InteractionModel::Status::Success;
131131
}
132132

133-
void DeviceCallbacks::PostAttributeChangeCallback(EndpointId endpointId, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
134-
uint8_t type, uint16_t size, uint8_t * value)
133+
void DeviceCallbacks::PostAttributeChangeCallback(EndpointId endpointId, ClusterId clusterId, AttributeId attributeId, uint8_t type,
134+
uint16_t size, uint8_t * value)
135135
{
136136
PLAT_LOG("PostAttributeChangeCallback - Cluster ID: '0x%04x', EndPoint ID: '0x%02x', Attribute ID: '0x%04x'", clusterId,
137137
endpointId, attributeId);

‎examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPDeviceManager.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class DLL_EXPORT CHIPDeviceManagerCallbacks
7272
* @param value pointer to the new value
7373
*/
7474
virtual void PostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId,
75-
uint8_t mask, uint8_t type, uint16_t size, uint8_t * value)
75+
uint8_t type, uint16_t size, uint8_t * value)
7676
{}
7777
/**
7878
* @brief
@@ -91,8 +91,8 @@ class DLL_EXPORT CHIPDeviceManagerCallbacks
9191
*/
9292
virtual chip::Protocols::InteractionModel::Status PreAttributeChangeCallback(chip::EndpointId endpoint,
9393
chip::ClusterId clusterId,
94-
chip::AttributeId attributeId, uint8_t mask,
95-
uint8_t type, uint16_t size, uint8_t * value)
94+
chip::AttributeId attributeId, uint8_t type,
95+
uint16_t size, uint8_t * value)
9696
{
9797
return chip::Protocols::InteractionModel::Status::Success;
9898
}

‎examples/pump-app/cc13x2x7_26x2x7/main/include/DeviceCallbacks.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ class DeviceCallbacks : public chip::DeviceManager::CHIPDeviceManagerCallbacks
3535
virtual void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg);
3636
virtual chip::Protocols::InteractionModel::Status PreAttributeChangeCallback(chip::EndpointId endpointId,
3737
chip::ClusterId clusterId,
38-
chip::AttributeId attributeId, uint8_t mask,
39-
uint8_t type, uint16_t size, uint8_t * value);
38+
chip::AttributeId attributeId, uint8_t type,
39+
uint16_t size, uint8_t * value);
4040
virtual void PostAttributeChangeCallback(chip::EndpointId endpointId, chip::ClusterId clusterId, chip::AttributeId attributeId,
41-
uint8_t mask, uint8_t type, uint16_t size, uint8_t * value);
41+
uint8_t type, uint16_t size, uint8_t * value);
4242

4343
private:
4444
void OnInternetConnectivityChange(const chip::DeviceLayer::ChipDeviceEvent * event);

0 commit comments

Comments
 (0)