Skip to content

Commit 213dd9f

Browse files
jepenven-silabserwinpan1
authored andcommitted
Quick cleanup of unused type (project-chip#32009)
1 parent fcccd9a commit 213dd9f

File tree

7 files changed

+8
-34
lines changed

7 files changed

+8
-34
lines changed

examples/pump-app/cc13x2x7_26x2x7/main/AppTask.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ void AppTask::DispatchEvent(AppEvent * aEvent)
459459
void AppTask::InitOnOffClusterState()
460460
{
461461

462-
EmberStatus status;
462+
EmberAfStatus status;
463463

464464
ChipLogProgress(NotSpecified, "Init On/Off clusterstate");
465465

@@ -482,7 +482,7 @@ void AppTask::UpdateClusterState(void)
482482

483483
void AppTask::UpdateCluster(intptr_t context)
484484
{
485-
EmberStatus status;
485+
EmberAfStatus status;
486486
BitMask<PumpConfigurationAndControl::PumpStatusBitmap> pumpStatus;
487487

488488
ChipLogProgress(NotSpecified, "Update Cluster State");

examples/pump-app/cc13x4_26x4/main/AppTask.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ void AppTask::DispatchEvent(AppEvent * aEvent)
456456
void AppTask::InitOnOffClusterState()
457457
{
458458

459-
EmberStatus status;
459+
EmberAfStatus status;
460460

461461
ChipLogProgress(NotSpecified, "Init On/Off clusterstate");
462462

@@ -479,7 +479,7 @@ void AppTask::UpdateClusterState(void)
479479

480480
void AppTask::UpdateCluster(intptr_t context)
481481
{
482-
EmberStatus status;
482+
EmberAfStatus status;
483483
BitMask<PumpConfigurationAndControl::PumpStatusBitmap> pumpStatus;
484484

485485
ChipLogProgress(NotSpecified, "Update Cluster State");

examples/pump-app/nrfconnect/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ void AppTask::DispatchEvent(const AppEvent & event)
562562

563563
void AppTask::UpdateClusterState()
564564
{
565-
EmberStatus status;
565+
EmberAfStatus status;
566566

567567
ChipLogProgress(NotSpecified, "UpdateClusterState");
568568

examples/pump-app/silabs/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ void AppTask::ActionCompleted(PumpManager::Action_t aAction, int32_t aActor)
242242
void AppTask::UpdateClusterState(intptr_t context)
243243
{
244244
// Set On/Off state
245-
EmberStatus status;
245+
EmberAfStatus status;
246246
bool onOffState = !PumpMgr().IsStopped();
247247
status = chip::app::Clusters::OnOff::Attributes::OnOff::Set(PCC_CLUSTER_ENDPOINT, onOffState);
248248
if (status != EMBER_ZCL_STATUS_SUCCESS)

examples/pump-app/telink/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ void AppTask::UpdateClusterState()
131131
// Write the new values
132132
bool onOffState = !PumpMgr().IsStopped();
133133

134-
EmberStatus status = Clusters::OnOff::Attributes::OnOff::Set(kOnOffClusterEndpoint, onOffState);
134+
EmberAfStatus status = Clusters::OnOff::Attributes::OnOff::Set(kOnOffClusterEndpoint, onOffState);
135135
if (status != EMBER_ZCL_STATUS_SUCCESS)
136136
{
137137
LOG_ERR("ERR: Updating On/Off state %x", status);

src/app/clusters/level-control/level-control.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ static void writeRemainingTime(EndpointId endpoint, uint16_t remainingTimeMs)
470470
// This is done to ensure that the attribute, in tenths of a second, only
471471
// goes to zero when the remaining time in milliseconds is actually zero.
472472
uint16_t remainingTimeDs = static_cast<uint16_t>((remainingTimeMs + 99) / 100);
473-
EmberStatus status = LevelControl::Attributes::RemainingTime::Set(endpoint, remainingTimeDs);
473+
EmberAfStatus status = LevelControl::Attributes::RemainingTime::Set(endpoint, remainingTimeDs);
474474
if (status != EMBER_ZCL_STATUS_SUCCESS)
475475
{
476476
ChipLogProgress(Zcl, "ERR: writing remaining time %x", status);

src/app/util/types_stub.h

-26
Original file line numberDiff line numberDiff line change
@@ -149,32 +149,6 @@ struct EmberBindingTableEntry
149149
}
150150
};
151151

152-
#ifdef DOXYGEN_SHOULD_SKIP_THIS
153-
enum EmberStatus
154-
#else
155-
typedef uint8_t EmberStatus;
156-
enum
157-
#endif // DOXYGEN_SHOULD_SKIP_THIS
158-
{
159-
/**
160-
* @name Generic Messages
161-
* These messages are system wide.
162-
*/
163-
//@{
164-
165-
/**
166-
* @brief The generic "no error" message.
167-
*/
168-
EMBER_SUCCESS = 0x00,
169-
170-
/**
171-
* @brief An invalid value was passed as an argument to a function.
172-
*/
173-
EMBER_BAD_ARGUMENT = 0x02,
174-
175-
//@} // END Generic Messages
176-
};
177-
178152
/**
179153
* @brief Function pointer for timer callback
180154
*/

0 commit comments

Comments
 (0)