Skip to content

Commit d592c3f

Browse files
chshuchshu
committed
Merge branch 'client_only_commissioner' into 'main'
Add client-only controller and commissioner See merge request app-frameworks/esp-matter!636
2 parents 2418e66 + e39a21e commit d592c3f

39 files changed

+1154
-554
lines changed

‎components/esp_matter/esp_matter_client.cpp

+9-4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#if CONFIG_ESP_MATTER_ENABLE_DATA_MODEL
2323
#include <zap-generated/CHIPClusters.h>
2424
#include "app/CASESessionManager.h"
25+
#include "app/CommandSender.h"
2526
#include "app/InteractionModelEngine.h"
2627
#endif // CONFIG_ESP_MATTER_ENABLE_DATA_MODEL
2728

@@ -242,7 +243,8 @@ esp_err_t send_command(void *ctx, peer_device_t *remote_device, const CommandPat
242243
ESP_LOGE(TAG, "No memory for command sender");
243244
return ESP_ERR_NO_MEM;
244245
}
245-
if (command_sender->PrepareCommand(command_path, /* aStartDataStruct */ false) != CHIP_NO_ERROR) {
246+
chip::app::CommandSender::PrepareCommandParameters prepare_command_params;
247+
if (command_sender->PrepareCommand(command_path, prepare_command_params) != CHIP_NO_ERROR) {
246248
ESP_LOGE(TAG, "Failed to prepare command");
247249
return ESP_FAIL;
248250
}
@@ -256,7 +258,8 @@ esp_err_t send_command(void *ctx, peer_device_t *remote_device, const CommandPat
256258
ESP_LOGE(TAG, "Failed to convert json string to TLV");
257259
return err;
258260
}
259-
if (command_sender->FinishCommand(timed_invoke_timeout_ms) != CHIP_NO_ERROR) {
261+
chip::app::CommandSender::FinishCommandParameters finish_command_params(timed_invoke_timeout_ms);
262+
if (command_sender->FinishCommand(finish_command_params) != CHIP_NO_ERROR) {
260263
ESP_LOGE(TAG, "Failed to finish command");
261264
return ESP_FAIL;
262265
}
@@ -284,7 +287,8 @@ esp_err_t send_group_command(const uint8_t fabric_index, const CommandPathParams
284287
ESP_LOGE(TAG, "No memory for command sender");
285288
return ESP_ERR_NO_MEM;
286289
}
287-
if (command_sender->PrepareCommand(command_path, /* aStartDataStruct */ false) != CHIP_NO_ERROR) {
290+
chip::app::CommandSender::PrepareCommandParameters prepare_command_params;
291+
if (command_sender->PrepareCommand(command_path, prepare_command_params) != CHIP_NO_ERROR) {
288292
ESP_LOGE(TAG, "Failed to prepare command");
289293
return ESP_FAIL;
290294
}
@@ -298,7 +302,8 @@ esp_err_t send_group_command(const uint8_t fabric_index, const CommandPathParams
298302
ESP_LOGE(TAG, "Failed to convert json string to TLV");
299303
return err;
300304
}
301-
if (command_sender->FinishCommand(chip::NullOptional) != CHIP_NO_ERROR) {
305+
chip::app::CommandSender::FinishCommandParameters finish_command_params;
306+
if (command_sender->FinishCommand(finish_command_params) != CHIP_NO_ERROR) {
302307
ESP_LOGE(TAG, "Failed to finish command");
303308
return ESP_FAIL;
304309
}

‎components/esp_matter/esp_matter_core.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -1037,6 +1037,7 @@ static esp_err_t chip_init(event_callback_t callback, intptr_t callback_arg)
10371037
// Wait for the matter stack to be initialized
10381038
xTaskNotifyWait(0, 0, NULL, portMAX_DELAY);
10391039
#endif // CONFIG_ESP_MATTER_ENABLE_MATTER_SERVER
1040+
10401041
return ESP_OK;
10411042
}
10421043

@@ -1068,11 +1069,14 @@ esp_err_t start(event_callback_t callback, intptr_t callback_arg)
10681069
return err;
10691070
}
10701071
esp_matter_started = true;
1072+
#ifdef CONFIG_ESP_MATTER_ENABLE_MATTER_SERVER
1073+
// If Matter server is not enabled. we will never use minimum unused endpoint id.
10711074
err = node::read_min_unused_endpoint_id();
10721075
// If the min_unused_endpoint_id is not found, we will write the current min_unused_endpoint_id in nvs.
10731076
if (err == ESP_ERR_NVS_NOT_FOUND) {
10741077
err = node::store_min_unused_endpoint_id();
10751078
}
1079+
#endif
10761080
return err;
10771081
}
10781082

‎components/esp_matter_controller/CMakeLists.txt

+18-7
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,29 @@ set(include_dirs_list )
33
set(exclude_srcs_list )
44

55
if (CONFIG_ESP_MATTER_CONTROLLER_ENABLE)
6-
list(APPEND src_dirs_list "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/logger/zap-generated")
7-
list(APPEND include_dirs_list "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/logger")
6+
list(APPEND src_dirs_list "${CMAKE_CURRENT_SOURCE_DIR}/core"
7+
"${CMAKE_CURRENT_SOURCE_DIR}/commands"
8+
"${CMAKE_CURRENT_SOURCE_DIR}/logger/zap-generated")
9+
list(APPEND include_dirs_list "${CMAKE_CURRENT_SOURCE_DIR}/core"
10+
"${CMAKE_CURRENT_SOURCE_DIR}/commands"
11+
"${CMAKE_CURRENT_SOURCE_DIR}/logger")
812

913
if (CONFIG_ESP_MATTER_CONTROLLER_CUSTOM_CLUSTER_ENABLE)
1014
list(APPEND src_dirs_list "${CMAKE_CURRENT_SOURCE_DIR}/controller_custom_cluster")
1115
list(APPEND include_dirs_list "${CMAKE_CURRENT_SOURCE_DIR}/controller_custom_cluster")
1216
endif()
13-
if (NOT CONFIG_ESP_MATTER_COMMISSIONER_ENABLE)
14-
list(APPEND exclude_srcs_list "${CMAKE_CURRENT_SOURCE_DIR}/esp_matter_commissioner.cpp"
15-
"${CMAKE_CURRENT_SOURCE_DIR}/esp_matter_controller_pairing_command.cpp"
16-
"${CMAKE_CURRENT_SOURCE_DIR}/esp_matter_attestation_trust_store.cpp"
17-
"${CMAKE_CURRENT_SOURCE_DIR}/esp_matter_controller_group_settings.cpp")
17+
18+
if (CONFIG_ESP_MATTER_ENABLE_MATTER_SERVER)
19+
list(APPEND exclude_srcs_list "${CMAKE_CURRENT_SOURCE_DIR}/core/esp_matter_controller_client.cpp"
20+
"${CMAKE_CURRENT_SOURCE_DIR}/core/esp_matter_controller_credentials_issuer.cpp"
21+
"${CMAKE_CURRENT_SOURCE_DIR}/core/esp_matter_controller_group_settings.cpp")
22+
endif()
23+
24+
if (CONFIG_ESP_MATTER_COMMISSIONER_ENABLE)
25+
list(APPEND src_dirs_list "${CMAKE_CURRENT_SOURCE_DIR}/attestation_store")
26+
list(APPEND include_dirs_list "${CMAKE_CURRENT_SOURCE_DIR}/attestation_store")
27+
else()
28+
list(APPEND exclude_srcs_list "${CMAKE_CURRENT_SOURCE_DIR}/commands/esp_matter_controller_pairing_command.cpp")
1829
endif()
1930
endif()
2031

‎components/esp_matter_controller/Kconfig

+34-10
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ menu "ESP Matter Controller"
66
help
77
Enable the controller.
88

9+
config ESP_MATTER_CONTROLLER_VENDOR_ID
10+
int "Matter Controller Vendor ID"
11+
depends on ESP_MATTER_CONTROLLER_ENABLE && !ESP_MATTER_ENABLE_MATTER_SERVER
12+
default 4891
13+
help
14+
Vendor ID for the controller
15+
916
config ESP_MATTER_COMMISSIONER_ENABLE
1017
bool "Enable matter commissioner"
11-
depends on ESP_MATTER_CONTROLLER_ENABLE
18+
depends on ESP_MATTER_CONTROLLER_ENABLE && !ESP_MATTER_ENABLE_MATTER_SERVER
1219
default y
1320
help
1421
Enable the matter commissioner in the ESP Matter controller.
1522

16-
config ESP_MATTER_COMMISSIONER_MAX_ACTIVE_DEVICES
17-
int "Max active device"
18-
depends on ESP_MATTER_COMMISSIONER_ENABLE
19-
default 5
20-
help
21-
Maximum number of active device the commissioner supports.
22-
2323
config ESP_MATTER_CONTROLLER_JSON_STRING_BUFFER_LEN
2424
int "Max JSON string buffer length"
2525
depends on ESP_MATTER_CONTROLLER_ENABLE
@@ -30,8 +30,8 @@ menu "ESP Matter Controller"
3030

3131
config ESP_MATTER_CONTROLLER_CUSTOM_CLUSTER_ENABLE
3232
bool "Enable controller custom cluster"
33-
depends on ESP_MATTER_CONTROLLER_ENABLE && !ESP_MATTER_COMMISSIONER_ENABLE
34-
default y
33+
depends on ESP_MATTER_CONTROLLER_ENABLE && ESP_MATTER_ENABLE_MATTER_SERVER
34+
default n
3535
help
3636
Enable the custom cluster of matter controller in the ESP Matter controller for Rainmaker Fabric suppport.
3737

@@ -52,6 +52,30 @@ menu "ESP Matter Controller"
5252
help
5353
Read the PAA root certificates from the spiffs partition
5454

55+
config CUSTOM_ATTESTATION_TRUST_STORE
56+
bool "Attestation Trust Store - Custom"
57+
help
58+
Use the custom Attestation Trust Store
59+
60+
endchoice
61+
62+
choice ESP_MATTER_COMMISSIONER_OPERATIONAL_CREDS_ISSUER
63+
prompt "Operational Credentials Issuer"
64+
depends on !ESP_MATTER_ENABLE_MATTER_SERVER
65+
default TEST_OPERATIONAL_CREDS_ISSUER
66+
help
67+
This option determines how the commissioner generates the NOC chains for the end-devices and itself.
68+
69+
config TEST_OPERATIONAL_CREDS_ISSUER
70+
bool "Operational Credentials Issuer - Test"
71+
help
72+
Use the ExampleOperationalCredentialsIssuer from Matter controller Code
73+
74+
config CUSTOM_OPERATIONAL_CREDS_ISSUER
75+
bool "Operational Credentials Issuer - Custom"
76+
help
77+
Use the custom OperationalCredentialsIssuer
78+
5579
endchoice
5680

5781
endmenu

‎components/esp_matter_controller/esp_matter_attestation_trust_store.cpp ‎components/esp_matter_controller/attestation_store/esp_matter_attestation_trust_store.cpp

File renamed without changes.

‎components/esp_matter_controller/esp_matter_attestation_trust_store.h ‎components/esp_matter_controller/attestation_store/esp_matter_attestation_trust_store.h

File renamed without changes.

‎components/esp_matter_controller/esp_matter_controller_cluster_command.cpp ‎components/esp_matter_controller/commands/esp_matter_controller_cluster_command.cpp

+29-18
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,14 @@
1414

1515
#include <DataModelLogger.h>
1616
#include <controller/CommissioneeDeviceProxy.h>
17-
#if CONFIG_ESP_MATTER_COMMISSIONER_ENABLE
18-
#include <esp_matter_commissioner.h>
19-
#else
20-
#include <app/server/Server.h>
21-
#endif
2217
#include <esp_check.h>
18+
#include <esp_matter_controller_client.h>
2319
#include <esp_matter_controller_cluster_command.h>
2420
#include <esp_matter_controller_utils.h>
2521
#include <esp_matter_mem.h>
2622
#include <json_parser.h>
2723

24+
#include <app/server/Server.h>
2825
#include <crypto/CHIPCryptoPAL.h>
2926
#include <setup_payload/ManualSetupPayloadGenerator.h>
3027
#include <setup_payload/QRCodeSetupPayloadGenerator.h>
@@ -101,7 +98,8 @@ void decode_response(const ConcreteCommandPath &command_path, TLVReader *reader)
10198
} else if (command_path.mCommandId == ScenesManagement::Commands::StoreSceneResponse::Id) {
10299
decode_command_response<ScenesManagement::Commands::StoreScene::Type::ResponseType>(command_path, reader);
103100
} else if (command_path.mCommandId == ScenesManagement::Commands::GetSceneMembershipResponse::Id) {
104-
decode_command_response<ScenesManagement::Commands::GetSceneMembership::Type::ResponseType>(command_path, reader);
101+
decode_command_response<ScenesManagement::Commands::GetSceneMembership::Type::ResponseType>(command_path,
102+
reader);
105103
}
106104
}
107105

@@ -209,11 +207,15 @@ esp_err_t cluster_command::dispatch_group_command(void *context)
209207
esp_err_t err = ESP_OK;
210208
cluster_command *cmd = reinterpret_cast<cluster_command *>(context);
211209
uint16_t group_id = cmd->m_destination_id & 0xFFFF;
212-
#if CONFIG_ESP_MATTER_COMMISSIONER_ENABLE
213-
uint8_t fabric_index = commissioner::get_device_commissioner()->GetFabricIndex();
214-
#else
210+
#ifdef CONFIG_ESP_MATTER_ENABLE_MATTER_SERVER
215211
uint8_t fabric_index = get_fabric_index();
216-
#endif
212+
#else
213+
#ifdef CONFIG_ESP_MATTER_COMMISSIONER_ENABLE
214+
uint8_t fabric_index = matter_controller_client::get_instance().get_commissioner()->GetFabricIndex();
215+
#else
216+
uint8_t fabric_index = matter_controller_client::get_instance().get_controller()->GetFabricIndex();
217+
#endif // CONFIG_ESP_MATTER_COMMISSIONER_ENABLE
218+
#endif // CONFIG_ESP_MATTER_ENABLE_MATTER_SERVER
217219
chip::app::CommandPathParams command_path = {cmd->m_endpoint_id, group_id, cmd->m_cluster_id, cmd->m_command_id,
218220
chip::app::CommandPathFlags::kGroupIdValid};
219221
err = custom::command::send_group_command(fabric_index, command_path, cmd->m_command_data_field);
@@ -226,18 +228,27 @@ esp_err_t cluster_command::send_command()
226228
if (is_group_command()) {
227229
return dispatch_group_command(reinterpret_cast<void *>(this));
228230
}
229-
#if CONFIG_ESP_MATTER_COMMISSIONER_ENABLE
231+
#ifdef CONFIG_ESP_MATTER_ENABLE_MATTER_SERVER
232+
chip::Server &server = chip::Server::GetInstance();
233+
server.GetCASESessionManager()->FindOrEstablishSession(ScopedNodeId(m_destination_id, get_fabric_index()),
234+
&on_device_connected_cb, &on_device_connection_failure_cb);
235+
return ESP_OK;
236+
#else
237+
auto &controller_instance = esp_matter::controller::matter_controller_client::get_instance();
238+
#ifdef CONFIG_ESP_MATTER_COMMISSIONER_ENABLE
230239
if (CHIP_NO_ERROR ==
231-
commissioner::get_device_commissioner()->GetConnectedDevice(m_destination_id, &on_device_connected_cb,
232-
&on_device_connection_failure_cb)) {
240+
controller_instance.get_commissioner()->GetConnectedDevice(m_destination_id, &on_device_connected_cb,
241+
&on_device_connection_failure_cb)) {
233242
return ESP_OK;
234243
}
235244
#else
236-
chip::Server *server = &(chip::Server::GetInstance());
237-
server->GetCASESessionManager()->FindOrEstablishSession(ScopedNodeId(m_destination_id, get_fabric_index()),
238-
&on_device_connected_cb, &on_device_connection_failure_cb);
239-
return ESP_OK;
240-
#endif
245+
if (CHIP_NO_ERROR ==
246+
controller_instance.get_controller()->GetConnectedDevice(m_destination_id, &on_device_connected_cb,
247+
&on_device_connection_failure_cb)) {
248+
return ESP_OK;
249+
}
250+
#endif // CONFIG_ESP_MATTER_COMMISSIONER_ENABLE
251+
#endif // CONFIG_ESP_MATTER_ENABLE_MATTER_SERVER
241252
chip::Platform::Delete(this);
242253
return ESP_FAIL;
243254
}

‎components/esp_matter_controller/esp_matter_controller_cluster_command.h ‎components/esp_matter_controller/commands/esp_matter_controller_cluster_command.h

+18-2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ using esp_matter::cluster::custom::command::custom_command_callback;
3434
constexpr char k_empty_command_data_field[] = "{}";
3535
constexpr size_t k_command_data_field_buffer_size = CONFIG_ESP_MATTER_CONTROLLER_JSON_STRING_BUFFER_LEN;
3636

37+
/** Cluster command class to send an invoke interaction command to a server **/
3738
class cluster_command {
3839
public:
3940
cluster_command(uint64_t destination_id, uint16_t endpoint_id, uint32_t cluster_id, uint32_t command_id,
@@ -89,8 +90,23 @@ class cluster_command {
8990
custom_command_callback::on_error_callback_t on_error_cb;
9091
};
9192

92-
esp_err_t send_invoke_cluster_command(uint64_t node_id, uint16_t endpoint_id, uint32_t cluster_id, uint32_t command_id,
93-
const char *command_data_field);
93+
/** Send cluster invoke command
94+
*
95+
* @note When the destination_id is a Matter GroupId, the endpoint_id parameter will be ignored.
96+
* @note When the command has no data field, command_data_field can be NULL.
97+
*
98+
* @param[in] destination_id NodeId or GroupId
99+
* @param[in] endpoint_id EndpointId
100+
* @param[in] cluster_id ClusterId
101+
* @param[in] command_id CommandId
102+
* @param[in] command_data_field Command data string with JSON format
103+
* (https://docs.espressif.com/projects/esp-matter/en/latest/esp32/developing.html#cluster-commands)
104+
*
105+
* @return ESP_OK on success.
106+
* @return error in case of failure.
107+
*/
108+
esp_err_t send_invoke_cluster_command(uint64_t destination_id, uint16_t endpoint_id, uint32_t cluster_id,
109+
uint32_t command_id, const char *command_data_field);
94110

95111
} // namespace controller
96112
} // namespace esp_matter

0 commit comments

Comments
 (0)