Skip to content

Commit 745c18c

Browse files
jadhavrohit924jadhavrohit924
committed
Some example changes
1 parent 066dde5 commit 745c18c

File tree

8 files changed

+39
-47
lines changed

8 files changed

+39
-47
lines changed

‎examples/all-clusters-app/all-clusters-common/include/bridged-actions-stub.h

+12-18
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,6 @@
2525
#include <lib/support/CodeUtils.h>
2626
#include <lib/support/logging/CHIPLogging.h>
2727

28-
using namespace chip;
29-
using namespace chip::app;
30-
using namespace chip::app::Clusters;
31-
using namespace chip::app::Clusters::Actions;
32-
using namespace chip::app::Clusters::Actions::Attributes;
33-
3428
namespace chip {
3529
namespace app {
3630
namespace Clusters {
@@ -91,18 +85,18 @@ class ActionsDelegateImpl : public Delegate
9185
CHIP_ERROR ReadEndpointListAtIndex(uint16_t index, EndpointListStructType & epList) override;
9286
CHIP_ERROR FindActionIdInActionList(uint16_t actionId) override;
9387

94-
Status HandleInstantAction(uint16_t actionId, Optional<uint32_t> invokeId) override;
95-
Status HandleInstantActionWithTransition(uint16_t actionId, uint16_t transitionTime, Optional<uint32_t> invokeId) override;
96-
Status HandleStartAction(uint16_t actionId, Optional<uint32_t> invokeId) override;
97-
Status HandleStartActionWithDuration(uint16_t actionId, uint32_t duration, Optional<uint32_t> invokeId) override;
98-
Status HandleStopAction(uint16_t actionId, Optional<uint32_t> invokeId) override;
99-
Status HandlePauseAction(uint16_t actionId, Optional<uint32_t> invokeId) override;
100-
Status HandlePauseActionWithDuration(uint16_t actionId, uint32_t duration, Optional<uint32_t> invokeId) override;
101-
Status HandleResumeAction(uint16_t actionId, Optional<uint32_t> invokeId) override;
102-
Status HandleEnableAction(uint16_t actionId, Optional<uint32_t> invokeId) override;
103-
Status HandleEnableActionWithDuration(uint16_t actionId, uint32_t duration, Optional<uint32_t> invokeId) override;
104-
Status HandleDisableAction(uint16_t actionId, Optional<uint32_t> invokeId) override;
105-
Status HandleDisableActionWithDuration(uint16_t actionId, uint32_t duration, Optional<uint32_t> invokeId) override;
88+
Protocols::InteractionModel::Status HandleInstantAction(uint16_t actionId, Optional<uint32_t> invokeId) override;
89+
Protocols::InteractionModel::Status HandleInstantActionWithTransition(uint16_t actionId, uint16_t transitionTime, Optional<uint32_t> invokeId) override;
90+
Protocols::InteractionModel::Status HandleStartAction(uint16_t actionId, Optional<uint32_t> invokeId) override;
91+
Protocols::InteractionModel::Status HandleStartActionWithDuration(uint16_t actionId, uint32_t duration, Optional<uint32_t> invokeId) override;
92+
Protocols::InteractionModel::Status HandleStopAction(uint16_t actionId, Optional<uint32_t> invokeId) override;
93+
Protocols::InteractionModel::Status HandlePauseAction(uint16_t actionId, Optional<uint32_t> invokeId) override;
94+
Protocols::InteractionModel::Status HandlePauseActionWithDuration(uint16_t actionId, uint32_t duration, Optional<uint32_t> invokeId) override;
95+
Protocols::InteractionModel::Status HandleResumeAction(uint16_t actionId, Optional<uint32_t> invokeId) override;
96+
Protocols::InteractionModel::Status HandleEnableAction(uint16_t actionId, Optional<uint32_t> invokeId) override;
97+
Protocols::InteractionModel::Status HandleEnableActionWithDuration(uint16_t actionId, uint32_t duration, Optional<uint32_t> invokeId) override;
98+
Protocols::InteractionModel::Status HandleDisableAction(uint16_t actionId, Optional<uint32_t> invokeId) override;
99+
Protocols::InteractionModel::Status HandleDisableActionWithDuration(uint16_t actionId, uint32_t duration, Optional<uint32_t> invokeId) override;
106100
};
107101
} // namespace Actions
108102
} // namespace Clusters

‎examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ using namespace chip::app;
2222
using namespace chip::app::Clusters;
2323
using namespace chip::app::Clusters::Actions;
2424
using namespace chip::app::Clusters::Actions::Attributes;
25+
using namespace chip::Protocols::InteractionModel;
2526

2627
CHIP_ERROR ActionsDelegateImpl::ReadActionAtIndex(uint16_t index, ActionListStructType & action)
2728
{

‎examples/all-clusters-minimal-app/esp32/main/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ set(SRC_DIRS_LIST
5050
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/level-control"
5151
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/identify-server"
5252
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/access-control-server"
53+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/actions-server"
5354
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/account-login-server"
5455
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/application-launcher-server"
5556
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/audio-output-server"

‎examples/bridge-app/asr/src/bridged-actions-stub.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ CHIP_ERROR ActionsAttrAccess::Read(const ConcreteReadAttributePath & aPath, Attr
9595
}
9696
} // anonymous namespace
9797

98-
void MatterActionsPluginServerInitCallback(void)
99-
{
100-
AttributeAccessInterfaceRegistry::Instance().Register(&gAttrAccess);
101-
}
98+
//void MatterActionsPluginServerInitCallback(void)
99+
//{
100+
// AttributeAccessInterfaceRegistry::Instance().Register(&gAttrAccess);
101+
//}

‎examples/bridge-app/linux/bridged-actions-stub.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ CHIP_ERROR ActionsAttrAccess::Read(const ConcreteReadAttributePath & aPath, Attr
131131
}
132132
} // anonymous namespace
133133

134-
void MatterActionsPluginServerInitCallback()
135-
{
136-
AttributeAccessInterfaceRegistry::Instance().Register(&gAttrAccess);
137-
}
134+
//void MatterActionsPluginServerInitCallback()
135+
//{
136+
// AttributeAccessInterfaceRegistry::Instance().Register(&gAttrAccess);
137+
//}

‎examples/bridge-app/telink/src/DeviceCallbacks.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ CHIP_ERROR ActionsAttrAccess::Read(const ConcreteReadAttributePath & aPath, Attr
9999
}
100100
} // anonymous namespace
101101

102-
void MatterActionsPluginServerInitCallback(void)
103-
{
104-
AttributeAccessInterfaceRegistry::Instance().Register(&gAttrAccess);
105-
}
102+
//void MatterActionsPluginServerInitCallback(void)
103+
//{
104+
// AttributeAccessInterfaceRegistry::Instance().Register(&gAttrAccess);
105+
//}

‎src/app/clusters/actions-server/actions-server.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ using namespace chip::app;
3030
using namespace chip::app::Clusters;
3131
using namespace chip::app::Clusters::Actions;
3232
using namespace chip::app::Clusters::Actions::Attributes;
33+
using namespace chip::Protocols::InteractionModel;
3334

3435
Instance Instance::instance;
3536
Instance * Instance::GetInstance()

‎src/app/clusters/actions-server/actions-server.h

+12-17
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@
2222
#include <app/CommandHandlerInterface.h>
2323
#include <protocols/interaction_model/StatusCode.h>
2424

25-
using namespace chip;
26-
using namespace chip::app;
27-
using namespace chip::app::Clusters;
28-
using namespace chip::Protocols::InteractionModel;
29-
3025
namespace chip {
3126
namespace app {
3227
namespace Clusters {
@@ -126,7 +121,7 @@ class Delegate
126121
* @param actionId The id of an action on which an action shall takes place.
127122
* @return Returns a Success if an action took place successfully otherwise, suitable error.
128123
*/
129-
virtual Status HandleInstantAction(uint16_t actionId, Optional<uint32_t> invokeId);
124+
virtual Protocols::InteractionModel::Status HandleInstantAction(uint16_t actionId, Optional<uint32_t> invokeId);
130125

131126
/**
132127
* When an InstantActionWithTransition command is recieved, an action (state change) on the involved endpoints shall trigger,
@@ -137,7 +132,7 @@ class Delegate
137132
* @param transitionTime The time for transition from the current state to the new state.
138133
* @return Returns a Success if an action took place successfully otherwise, suitable error.
139134
*/
140-
virtual Status HandleInstantActionWithTransition(uint16_t actionId, uint16_t transitionTime, Optional<uint32_t> invokeId);
135+
virtual Protocols::InteractionModel::Status HandleInstantActionWithTransition(uint16_t actionId, uint16_t transitionTime, Optional<uint32_t> invokeId);
141136

142137
/**
143138
* When a StartAction command is recieved, the commencement of an action on the involved endpoints shall trigger. Afterwards,
@@ -146,7 +141,7 @@ class Delegate
146141
* @param actionId The id of an action on which an action shall takes place.
147142
* @return Returns a Success if an action took place successfully otherwise, suitable error.
148143
*/
149-
virtual Status HandleStartAction(uint16_t actionId, Optional<uint32_t> invokeId);
144+
virtual Protocols::InteractionModel::Status HandleStartAction(uint16_t actionId, Optional<uint32_t> invokeId);
150145

151146
/**
152147
* When a StartActionWithDuration command is recieved, the commencement of an action on the involved endpoints shall trigger,
@@ -157,7 +152,7 @@ class Delegate
157152
* @param duration The time for which an action shall be in start state.
158153
* @return Returns a Success if an action took place successfully otherwise, suitable error.
159154
*/
160-
virtual Status HandleStartActionWithDuration(uint16_t actionId, uint32_t duration, Optional<uint32_t> invokeId);
155+
virtual Protocols::InteractionModel::Status HandleStartActionWithDuration(uint16_t actionId, uint32_t duration, Optional<uint32_t> invokeId);
161156

162157
/**
163158
* When a StopAction command is recieved, the ongoing action on the involved endpoints shall stop. Afterwards, the action’s
@@ -166,7 +161,7 @@ class Delegate
166161
* @param actionId The id of an action on which an action shall takes place.
167162
* @return Returns a Success if an action took place successfully otherwise, suitable error.
168163
*/
169-
virtual Status HandleStopAction(uint16_t actionId, Optional<uint32_t> invokeId);
164+
virtual Protocols::InteractionModel::Status HandleStopAction(uint16_t actionId, Optional<uint32_t> invokeId);
170165

171166
/**
172167
* When a PauseAction command is recieved, the ongoing action on the involved endpoints shall pause and SHALL change the
@@ -175,7 +170,7 @@ class Delegate
175170
* @param actionId The id of an action on which an action shall takes place.
176171
* @return Returns a Success if an action took place successfully otherwise, suitable error.
177172
*/
178-
virtual Status HandlePauseAction(uint16_t actionId, Optional<uint32_t> invokeId);
173+
virtual Protocols::InteractionModel::Status HandlePauseAction(uint16_t actionId, Optional<uint32_t> invokeId);
179174

180175
/**
181176
* When a PauseActionWithDuration command is recieved, pauses an ongoing action, and SHALL change the action’s state to Paused.
@@ -186,7 +181,7 @@ class Delegate
186181
* @param duration The time for which an action shall be in pause state.
187182
* @return Returns a Success if an action took place successfully otherwise, suitable error.
188183
*/
189-
virtual Status HandlePauseActionWithDuration(uint16_t actionId, uint32_t duration, Optional<uint32_t> invokeId);
184+
virtual Protocols::InteractionModel::Status HandlePauseActionWithDuration(uint16_t actionId, uint32_t duration, Optional<uint32_t> invokeId);
190185

191186
/**
192187
* When a ResumeAction command is recieved, the previously paused action shall resume and SHALL change the action’s state to
@@ -195,7 +190,7 @@ class Delegate
195190
* @param actionId The id of an action on which an action shall takes place.
196191
* @return Returns a Success if an action took place successfully otherwise, suitable error.
197192
*/
198-
virtual Status HandleResumeAction(uint16_t actionId, Optional<uint32_t> invokeId);
193+
virtual Protocols::InteractionModel::Status HandleResumeAction(uint16_t actionId, Optional<uint32_t> invokeId);
199194

200195
/**
201196
* When an EnableAction command is recieved, it enables a certain action or automation. Afterwards, the action’s state SHALL be
@@ -204,7 +199,7 @@ class Delegate
204199
* @param actionId The id of an action on which an action shall takes place.
205200
* @return Returns a Success if an action took place successfully otherwise, suitable error.
206201
*/
207-
virtual Status HandleEnableAction(uint16_t actionId, Optional<uint32_t> invokeId);
202+
virtual Protocols::InteractionModel::Status HandleEnableAction(uint16_t actionId, Optional<uint32_t> invokeId);
208203

209204
/**
210205
* When an EnableActionWithDuration command is recieved, it enables a certain action or automation, and SHALL change the
@@ -215,7 +210,7 @@ class Delegate
215210
* @param duration The time for which an action shall be in active state.
216211
* @return Returns a Success if an action took place successfully otherwise, suitable error.
217212
*/
218-
virtual Status HandleEnableActionWithDuration(uint16_t actionId, uint32_t duration, Optional<uint32_t> invokeId);
213+
virtual Protocols::InteractionModel::Status HandleEnableActionWithDuration(uint16_t actionId, uint32_t duration, Optional<uint32_t> invokeId);
219214

220215
/**
221216
* When a DisableAction command is recieved, it disables a certain action or automation, and SHALL change the action’s state to
@@ -224,7 +219,7 @@ class Delegate
224219
* @param actionId The id of an action on which an action shall takes place.
225220
* @return Returns a Success if an action took place successfully otherwise, suitable error.
226221
*/
227-
virtual Status HandleDisableAction(uint16_t actionId, Optional<uint32_t> invokeId);
222+
virtual Protocols::InteractionModel::Status HandleDisableAction(uint16_t actionId, Optional<uint32_t> invokeId);
228223

229224
/**
230225
* When a DisableActionWithDuration command is recieved, it disables a certain action or automation, and SHALL change the
@@ -235,7 +230,7 @@ class Delegate
235230
* @param duration The time for which an action shall be in disable state.
236231
* @return Returns a Success if an action took place successfully otherwise, suitable error.
237232
*/
238-
virtual Status HandleDisableActionWithDuration(uint16_t actionId, uint32_t duration, Optional<uint32_t> invokeId);
233+
virtual Protocols::InteractionModel::Status HandleDisableActionWithDuration(uint16_t actionId, uint32_t duration, Optional<uint32_t> invokeId);
239234
};
240235

241236
} // namespace Actions

0 commit comments

Comments
 (0)