Skip to content

Commit

Permalink
Remove cluster-id.h again. (#24616)
Browse files Browse the repository at this point in the history
Someone added it back due to a merge conflict.
  • Loading branch information
bzbarsky-apple authored and pull[bot] committed Jul 18, 2023
1 parent d043ccc commit 4675977
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 243 deletions.
7 changes: 3 additions & 4 deletions examples/contact-sensor-app/telink/src/AppTask.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include <DeviceInfoProviderImpl.h>
#include <app-common/zap-generated/attribute-id.h>
#include <app-common/zap-generated/attribute-type.h>
#include <app-common/zap-generated/cluster-id.h>
#include <app/clusters/identify-server/identify-server.h>
#include <app/server/OnboardingCodesUtil.h>
#include <app/server/Server.h>
Expand Down Expand Up @@ -306,8 +305,8 @@ void AppTask::UpdateClusterStateInternal(intptr_t arg)
ChipLogProgress(NotSpecified, "emberAfWriteAttribute : %d", newValue);

// write the new boolean state value
EmberAfStatus status = emberAfWriteAttribute(1, ZCL_BOOLEAN_STATE_CLUSTER_ID, ZCL_STATE_VALUE_ATTRIBUTE_ID,
(uint8_t *) &newValue, ZCL_BOOLEAN_ATTRIBUTE_TYPE);
EmberAfStatus status = emberAfWriteAttribute(1, Clusters::BooleanState::Id, ZCL_STATE_VALUE_ATTRIBUTE_ID, (uint8_t *) &newValue,
ZCL_BOOLEAN_ATTRIBUTE_TYPE);
if (status != EMBER_ZCL_STATUS_SUCCESS)
{
ChipLogError(NotSpecified, "ERR: updating boolean status value %x", status);
Expand Down Expand Up @@ -517,7 +516,7 @@ void AppTask::UpdateDeviceStateInternal(intptr_t arg)
bool stateValueAttrValue = 0;

/* get boolean state attribute value */
(void) emberAfReadAttribute(1, ZCL_BOOLEAN_STATE_CLUSTER_ID, ZCL_STATE_VALUE_ATTRIBUTE_ID, (uint8_t *) &stateValueAttrValue, 1);
(void) emberAfReadAttribute(1, Clusters::BooleanState::Id, ZCL_STATE_VALUE_ATTRIBUTE_ID, (uint8_t *) &stateValueAttrValue, 1);

ChipLogProgress(NotSpecified, "emberAfReadAttribute : %d", stateValueAttrValue);
sContactSensorLED.Set(stateValueAttrValue);
Expand Down
239 changes: 0 additions & 239 deletions zzz_generated/app-common/app-common/zap-generated/cluster-id.h

This file was deleted.

0 comments on commit 4675977

Please sign in to comment.