From a96db49a0c3262dcdf76aabd8aa21048ec34df64 Mon Sep 17 00:00:00 2001 From: chendejin Date: Wed, 12 Feb 2025 14:44:41 +0800 Subject: [PATCH] components/esp_matter: remove application clusters from cluster command table --- components/esp_matter/esp_matter_cluster.cpp | 117 +++++++++ components/esp_matter/esp_matter_command.cpp | 246 +------------------ 2 files changed, 118 insertions(+), 245 deletions(-) diff --git a/components/esp_matter/esp_matter_cluster.cpp b/components/esp_matter/esp_matter_cluster.cpp index 7120910e8..8647d1a11 100644 --- a/components/esp_matter/esp_matter_cluster.cpp +++ b/components/esp_matter/esp_matter_cluster.cpp @@ -309,6 +309,13 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags) global::attribute::create_cluster_revision(cluster, cluster_revision); } + /* Commands */ + command::create_query_image(cluster); + command::create_query_image_response(cluster); + command::create_apply_update_request(cluster); + command::create_apply_update_response(cluster); + command::create_notify_update_applied(cluster); + return cluster; } } /* ota_provider */ @@ -347,6 +354,9 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags) event::create_state_transition(cluster); event::create_version_applied(cluster); + /* Commands */ + command::create_announce_ota_provider(cluster); + return cluster; } } /* ota_requestor */ @@ -939,6 +949,9 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags) uint16_t endpoint_id = endpoint::get_id(endpoint); identification::init(endpoint_id, config->identify_type); + /* Commands */ + command::create_identify(cluster); + return cluster; } } /* identify */ @@ -976,6 +989,18 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags) server_cluster_count++; } + /* Commands */ + command::create_add_group(cluster); + command::create_view_group(cluster); + command::create_get_group_membership(cluster); + command::create_remove_group(cluster); + command::create_remove_all_groups(cluster); + command::create_add_group_if_identifying(cluster); + command::create_add_group_response(cluster); + command::create_view_group_response(cluster); + command::create_get_group_membership_response(cluster); + command::create_remove_group_response(cluster); + return cluster; } } /* groups */ @@ -1011,6 +1036,21 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags) } } + /* Commands */ + command::create_add_scene(cluster); + command::create_view_scene(cluster); + command::create_remove_scene(cluster); + command::create_remove_all_scenes(cluster); + command::create_store_scene(cluster); + command::create_recall_scene(cluster); + command::create_get_scene_membership(cluster); + command::create_add_scene_response(cluster); + command::create_view_scene_response(cluster); + command::create_remove_scene_response(cluster); + command::create_remove_all_scenes_response(cluster); + command::create_store_scene_response(cluster); + command::create_get_scene_membership_response(cluster); + return cluster; } } /* scenes_management */ @@ -1059,6 +1099,7 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags, uint32_ } /* Commands */ + command::create_off(cluster); if (!(features & feature::off_only::get_id())) { command::create_on(cluster); command::create_toggle(cluster); @@ -1100,6 +1141,16 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags, uint32_ } } + /* Commands */ + command::create_move_to_level(cluster); + command::create_move(cluster); + command::create_step(cluster); + command::create_stop(cluster); + command::create_move_to_level_with_on_off(cluster); + command::create_move_with_on_off(cluster); + command::create_step_with_on_off(cluster); + command::create_stop_with_on_off(cluster); + /* Features */ if (features & feature::on_off::get_id()) { feature::on_off::add(cluster); @@ -1261,6 +1312,9 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags, uint32_ create_default_binding_cluster(endpoint); } + /* Commands */ + command::create_setpoint_raise_lower(cluster); + /* Features */ if (!(features & (feature::heating::get_id() | feature::cooling::get_id()))) { ESP_LOGE(TAG, "Cluster shall support at least one of heating or cooling features."); @@ -1865,6 +1919,10 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags) event::create_lock_operation(cluster); event::create_lock_operation_error(cluster); + /* Commands */ + command::create_lock_door(cluster); + command::create_unlock_door(cluster); + return cluster; } } /* door_lock */ @@ -1910,6 +1968,11 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags, uint32_ create_default_binding_cluster(endpoint); } + /* Commands */ + command::create_up_or_open(cluster); + command::create_down_or_close(cluster); + command::create_stop_motion(cluster); + /* Features */ if (features & feature::lift::get_id()) { feature::lift::add(cluster, &(config->lift)); @@ -2493,6 +2556,9 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags, uint32_ create_default_binding_cluster(endpoint); } + /* Commands */ + command::create_change_to_mode(cluster); + /* Features */ if (features & feature::on_off::get_id()) { feature::on_off::add(cluster, &(config->on_off)); @@ -2525,6 +2591,10 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags) create_default_binding_cluster(endpoint); } + /* commands */ + command::create_retrieve_logs_request(cluster); + command::create_retrieve_logs_response(cluster); + return cluster; } } /* diagnostic_logs */ @@ -2579,6 +2649,9 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags, uint32_ global::attribute::create_cluster_revision(cluster, cluster_revision); } + /* Commands */ + command::create_set_temperature(cluster); + /* Features */ if (features & feature::temperature_number::get_id()) { feature::temperature_number::add(cluster, &(config->temperature_number)); @@ -2797,6 +2870,9 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags, uint32_ global::attribute::create_cluster_revision(cluster, cluster_revision); } + /* Commands */ + command::create_set_cooking_parameters(cluster); + if (features & feature::power_as_number::get_id()) { feature::power_as_number::add(cluster); } @@ -2872,6 +2948,10 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags) global::attribute::create_cluster_revision(cluster, cluster_revision); } + /* Commands */ + command::create_send_key(cluster); + command::create_send_key_response(cluster); + return cluster; } } /* keypad_input */ @@ -3109,6 +3189,10 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags, uint32_ feature::v2x::add(cluster); } + /* Commands */ + command::create_disable(cluster); + command::create_enable_charging(cluster); + return cluster; } } /* energy_evse */ @@ -3150,6 +3234,10 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags, uint32_ create_default_binding_cluster(endpoint); } + /* Commands */ + command::create_open(cluster); + command::create_close(cluster); + /* Features */ if (features & feature::time_sync::get_id()) { feature::time_sync::add(cluster, &(config->time_sync)); @@ -3332,6 +3420,12 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags, uint32_ global::attribute::create_cluster_revision(cluster, cluster_revision); } + /* Commands */ + command::create_get_active_dataset_request(cluster); + command::create_get_pending_dataset_request(cluster); + command::create_dataset_response(cluster); + command::create_set_active_dataset_request(cluster); + if (features & feature::pan_change::get_id()) { feature::pan_change::add(cluster); } @@ -3366,6 +3460,10 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags, uint32_ global::attribute::create_cluster_revision(cluster, cluster_revision); } + /* Commands */ + command::create_network_passphrase_request(cluster); + command::create_network_passphrase_response(cluster); + return cluster; } @@ -3397,6 +3495,12 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags, uint32_ global::attribute::create_cluster_revision(cluster, cluster_revision); } + /* Commands */ + command::create_add_network(cluster); + command::create_remove_network(cluster); + command::create_get_operational_dataset(cluster); + command::create_operational_dataset_response(cluster); + return cluster; } } /* thread_network_directory */ @@ -3440,6 +3544,10 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags, uint32_ feature::maps::add(cluster); } + /* Commands */ + command::create_select_areas(cluster); + command::create_select_areas_response(cluster); + return cluster; } } /* service_area */ @@ -3481,6 +3589,10 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags, uint32_ feature::tank_percent::add(cluster, &(config->tank_percent)); } + /* Commands */ + command::create_boost(cluster); + command::create_cancel_boost(cluster); + event::create_boost_started(cluster); event::create_boost_ended(cluster); return cluster; @@ -3603,6 +3715,11 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags, uint32_ create_default_binding_cluster(endpoint); } + /* Commands */ + command::create_request_commissioning_approval(cluster); + command::create_commission_node(cluster); + command::create_reverse_open_commissioning_window(cluster); + event::create_commissioning_request_result(cluster); return cluster; } diff --git a/components/esp_matter/esp_matter_command.cpp b/components/esp_matter/esp_matter_command.cpp index ac83df77a..de40ff22a 100644 --- a/components/esp_matter/esp_matter_command.cpp +++ b/components/esp_matter/esp_matter_command.cpp @@ -1698,13 +1698,6 @@ command_t *create_reset_counts(cluster_t *cluster) namespace ethernet_network_diagnostics { namespace command { -constexpr const command_entry_t accepted_command_list[] = { - {EthernetNetworkDiagnostics::Commands::ResetCounts::Id, COMMAND_FLAG_ACCEPTED, - esp_matter_command_callback_ethernet_reset_counts}, -}; - -constexpr const command_entry_t generated_command_list[] = {}; - command_t *create_reset_counts(cluster_t *cluster) { return esp_matter::command::create(cluster, EthernetNetworkDiagnostics::Commands::ResetCounts::Id, COMMAND_FLAG_ACCEPTED, @@ -1717,15 +1710,6 @@ command_t *create_reset_counts(cluster_t *cluster) namespace diagnostic_logs { namespace command { -constexpr const command_entry_t accepted_command_list[] = { - {DiagnosticLogs::Commands::RetrieveLogsRequest::Id, COMMAND_FLAG_ACCEPTED, - esp_matter_command_callback_retrieve_logs_request}, -}; - -constexpr const command_entry_t generated_command_list[] = { - {DiagnosticLogs::Commands::RetrieveLogsResponse::Id, COMMAND_FLAG_GENERATED, NULL}, -}; - command_t *create_retrieve_logs_request(cluster_t *cluster) { return esp_matter::command::create(cluster, DiagnosticLogs::Commands::RetrieveLogsRequest::Id, COMMAND_FLAG_ACCEPTED, @@ -2114,20 +2098,6 @@ command_t *create_noc_response(cluster_t *cluster) namespace ota_provider { namespace command { -constexpr const command_entry_t accepted_command_list[] = { - {OtaSoftwareUpdateProvider::Commands::QueryImage::Id, COMMAND_FLAG_ACCEPTED, - esp_matter_command_callback_query_image}, - {OtaSoftwareUpdateProvider::Commands::ApplyUpdateRequest::Id, COMMAND_FLAG_ACCEPTED, - esp_matter_command_callback_apply_update_request}, - {OtaSoftwareUpdateProvider::Commands::NotifyUpdateApplied::Id, COMMAND_FLAG_ACCEPTED, - esp_matter_command_callback_notify_update_applied}, -}; - -constexpr const command_entry_t generated_command_list[] = { - {OtaSoftwareUpdateProvider::Commands::QueryImageResponse::Id, COMMAND_FLAG_GENERATED, NULL}, - {OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::Id, COMMAND_FLAG_GENERATED, NULL}, -}; - command_t *create_query_image(cluster_t *cluster) { return esp_matter::command::create(cluster, OtaSoftwareUpdateProvider::Commands::QueryImage::Id, @@ -2164,13 +2134,6 @@ command_t *create_apply_update_response(cluster_t *cluster) namespace ota_requestor { namespace command { -constexpr const command_entry_t accepted_command_list[] = { - {OtaSoftwareUpdateRequestor::Commands::AnnounceOTAProvider::Id, COMMAND_FLAG_ACCEPTED, - esp_matter_command_callback_announce_ota_provider}, -}; - -constexpr const command_entry_t generated_command_list[] = {}; - command_t *create_announce_ota_provider(cluster_t *cluster) { return esp_matter::command::create(cluster, OtaSoftwareUpdateRequestor::Commands::AnnounceOTAProvider::Id, @@ -2183,12 +2146,6 @@ command_t *create_announce_ota_provider(cluster_t *cluster) namespace identify { namespace command { -constexpr const command_entry_t accepted_command_list[] = { - {Identify::Commands::Identify::Id, COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_identify}, -}; - -constexpr const command_entry_t generated_command_list[] = {}; - command_t *create_identify(cluster_t *cluster) { return esp_matter::command::create(cluster, Identify::Commands::Identify::Id, COMMAND_FLAG_ACCEPTED, @@ -2207,23 +2164,6 @@ command_t *create_trigger_effect(cluster_t *cluster) namespace groups { namespace command { -constexpr const command_entry_t accepted_command_list[] = { - {Groups::Commands::AddGroup::Id, COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_add_group}, - {Groups::Commands::ViewGroup::Id, COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_view_group}, - {Groups::Commands::GetGroupMembership::Id, COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_get_group_membership}, - {Groups::Commands::RemoveGroup::Id, COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_remove_group}, - {Groups::Commands::RemoveAllGroups::Id, COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_remove_all_groups}, - {Groups::Commands::AddGroupIfIdentifying::Id, COMMAND_FLAG_ACCEPTED, - esp_matter_command_callback_add_group_if_identifying}, -}; - -constexpr const command_entry_t generated_command_list[] = { - {Groups::Commands::AddGroupResponse::Id, COMMAND_FLAG_GENERATED, NULL}, - {Groups::Commands::ViewGroupResponse::Id, COMMAND_FLAG_GENERATED, NULL}, - {Groups::Commands::GetGroupMembershipResponse::Id, COMMAND_FLAG_GENERATED, NULL}, - {Groups::Commands::RemoveGroupResponse::Id, COMMAND_FLAG_GENERATED, NULL}, -}; - command_t *create_add_group(cluster_t *cluster) { return esp_matter::command::create(cluster, Groups::Commands::AddGroup::Id, COMMAND_FLAG_ACCEPTED, @@ -2317,25 +2257,6 @@ command_t *create_stay_active_request(cluster_t *cluster) namespace scenes_management { namespace command { -constexpr const command_entry_t accepted_command_list[] = { - {ScenesManagement::Commands::AddScene::Id, COMMAND_FLAG_ACCEPTED, NULL}, - {ScenesManagement::Commands::ViewScene::Id, COMMAND_FLAG_ACCEPTED, NULL}, - {ScenesManagement::Commands::RemoveScene::Id, COMMAND_FLAG_ACCEPTED, NULL}, - {ScenesManagement::Commands::RemoveAllScenes::Id, COMMAND_FLAG_ACCEPTED, NULL}, - {ScenesManagement::Commands::StoreScene::Id, COMMAND_FLAG_ACCEPTED, NULL}, - {ScenesManagement::Commands::RecallScene::Id, COMMAND_FLAG_ACCEPTED, NULL}, - {ScenesManagement::Commands::GetSceneMembership::Id, COMMAND_FLAG_ACCEPTED, NULL}, -}; - -constexpr const command_entry_t generated_command_list[] = { - {ScenesManagement::Commands::AddSceneResponse::Id, COMMAND_FLAG_GENERATED, NULL}, - {ScenesManagement::Commands::ViewSceneResponse::Id, COMMAND_FLAG_GENERATED, NULL}, - {ScenesManagement::Commands::RemoveSceneResponse::Id, COMMAND_FLAG_GENERATED, NULL}, - {ScenesManagement::Commands::RemoveAllScenesResponse::Id, COMMAND_FLAG_GENERATED, NULL}, - {ScenesManagement::Commands::StoreSceneResponse::Id, COMMAND_FLAG_GENERATED, NULL}, - {ScenesManagement::Commands::GetSceneMembershipResponse::Id, COMMAND_FLAG_GENERATED, NULL}, -}; - command_t *create_add_scene(cluster_t *cluster) { return esp_matter::command::create(cluster, ScenesManagement::Commands::AddScene::Id, COMMAND_FLAG_ACCEPTED, NULL); @@ -2420,12 +2341,6 @@ command_t *create_copy_scene_response(cluster_t *cluster) namespace on_off { namespace command { -constexpr const command_entry_t accepted_command_list[] = { - {OnOff::Commands::Off::Id, COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_off}, -}; - -constexpr const command_entry_t generated_command_list[] = {}; - command_t *create_off(cluster_t *cluster) { return esp_matter::command::create(cluster, OnOff::Commands::Off::Id, COMMAND_FLAG_ACCEPTED, @@ -2468,23 +2383,6 @@ command_t *create_on_with_timed_off(cluster_t *cluster) namespace level_control { namespace command { -constexpr const command_entry_t accepted_command_list[] = { - {LevelControl::Commands::MoveToLevel::Id, COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_move_to_level}, - {LevelControl::Commands::Move::Id, COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_move}, - {LevelControl::Commands::Step::Id, COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_step}, - {LevelControl::Commands::Stop::Id, COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_stop}, - {LevelControl::Commands::MoveToLevelWithOnOff::Id, COMMAND_FLAG_ACCEPTED, - esp_matter_command_callback_move_to_level_with_on_off}, - {LevelControl::Commands::MoveWithOnOff::Id, COMMAND_FLAG_ACCEPTED, - esp_matter_command_callback_move_with_on_off}, - {LevelControl::Commands::StepWithOnOff::Id, COMMAND_FLAG_ACCEPTED, - esp_matter_command_callback_step_with_on_off}, - {LevelControl::Commands::StopWithOnOff::Id, COMMAND_FLAG_ACCEPTED, - esp_matter_command_callback_stop_with_on_off}, -}; - -constexpr const command_entry_t generated_command_list[] = {}; - command_t *create_move_to_level(cluster_t *cluster) { return esp_matter::command::create(cluster, LevelControl::Commands::MoveToLevel::Id, COMMAND_FLAG_ACCEPTED, @@ -2665,13 +2563,6 @@ command_t *create_color_loop_set(cluster_t *cluster) namespace thermostat { namespace command { -constexpr const command_entry_t accepted_command_list[] = { - {Thermostat::Commands::SetpointRaiseLower::Id, COMMAND_FLAG_ACCEPTED, - esp_matter_command_callback_setpoint_raise_lower}, -}; - -constexpr const command_entry_t generated_command_list[] = {}; - command_t *create_setpoint_raise_lower(cluster_t *cluster) { return esp_matter::command::create(cluster, Thermostat::Commands::SetpointRaiseLower::Id, COMMAND_FLAG_ACCEPTED, @@ -2762,13 +2653,6 @@ command_t *create_self_test_request(cluster_t *cluster) namespace door_lock { namespace command { -constexpr const command_entry_t accepted_command_list[] = { - {DoorLock::Commands::LockDoor::Id, COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_lock_door}, - {DoorLock::Commands::UnlockDoor::Id, COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_unlock_door}, -}; - -constexpr const command_entry_t generated_command_list[] = {}; - command_t *create_lock_door(cluster_t *cluster) { return esp_matter::command::create(cluster, DoorLock::Commands::LockDoor::Id, COMMAND_FLAG_ACCEPTED, @@ -2937,14 +2821,6 @@ command_t *create_clear_aliro_reader_config(cluster_t *cluster) namespace window_covering { namespace command { -constexpr const command_entry_t accepted_command_list[] = { - {WindowCovering::Commands::UpOrOpen::Id, COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_up_or_open}, - {WindowCovering::Commands::DownOrClose::Id, COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_down_or_close}, - {WindowCovering::Commands::StopMotion::Id, COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_stop_motion}, -}; - -constexpr const command_entry_t generated_command_list[] = {}; - command_t *create_up_or_open(cluster_t *cluster) { return esp_matter::command::create(cluster, WindowCovering::Commands::UpOrOpen::Id, COMMAND_FLAG_ACCEPTED, @@ -2993,12 +2869,6 @@ command_t *create_go_to_tilt_percentage(cluster_t *cluster) namespace mode_select { namespace command { -constexpr const command_entry_t accepted_command_list[] = { - {ModeSelect::Commands::ChangeToMode::Id, COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_change_to_mode}, -}; - -constexpr const command_entry_t generated_command_list[] = {}; - command_t *create_change_to_mode(cluster_t *cluster) { return esp_matter::command::create(cluster, ModeSelect::Commands::ChangeToMode::Id, COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_change_to_mode); @@ -3010,13 +2880,6 @@ command_t *create_change_to_mode(cluster_t *cluster) namespace temperature_control { namespace command { -constexpr const command_entry_t accepted_command_list[] = { - {TemperatureControl::Commands::SetTemperature::Id, COMMAND_FLAG_ACCEPTED, - esp_matter_command_callback_set_temperature}, -}; - -constexpr const command_entry_t generated_command_list[] = {}; - command_t *create_set_temperature(cluster_t *cluster) { return esp_matter::command::create(cluster, TemperatureControl::Commands::SetTemperature::Id, COMMAND_FLAG_ACCEPTED, @@ -3077,14 +2940,6 @@ command_t *create_change_to_mode_response(cluster_t *cluster) namespace keypad_input { namespace command { -constexpr const command_entry_t accepted_command_list[] = { - {KeypadInput::Commands::SendKey::Id, COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_send_key}, -}; - -constexpr const command_entry_t generated_command_list[] = { - {KeypadInput::Commands::SendKeyResponse::Id, COMMAND_FLAG_GENERATED, NULL}, -}; - command_t *create_send_key(cluster_t *cluster) { return esp_matter::command::create(cluster, KeypadInput::Commands::SendKey::Id, COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_send_key); @@ -3116,13 +2971,6 @@ command_t *create_enable_disable_alarm(cluster_t *cluster) namespace energy_evse { namespace command { -constexpr const command_entry_t accepted_command_list[] = { - {EnergyEvse::Commands::Disable::Id, COMMAND_FLAG_ACCEPTED, NULL}, - {EnergyEvse::Commands::EnableCharging::Id, COMMAND_FLAG_ACCEPTED, NULL}, -}; - -constexpr const command_entry_t generated_command_list[] = {}; - command_t *create_disable(cluster_t *cluster) { return esp_matter::command::create(cluster, EnergyEvse::Commands::Disable::Id, COMMAND_FLAG_ACCEPTED, NULL); @@ -3169,12 +3017,6 @@ command_t *create_get_targets_response(cluster_t *cluster) namespace microwave_oven_control { namespace command { -constexpr const command_entry_t accepted_command_list[] = { - {MicrowaveOvenControl::Commands::SetCookingParameters::Id, COMMAND_FLAG_ACCEPTED, NULL}, -}; - -constexpr const command_entry_t generated_command_list[] = {}; - command_t *create_set_cooking_parameters(cluster_t *cluster) { return esp_matter::command::create(cluster, MicrowaveOvenControl::Commands::SetCookingParameters::Id, COMMAND_FLAG_ACCEPTED, NULL); @@ -3191,13 +3033,6 @@ command_t *create_add_more_time(cluster_t *cluster) namespace valve_configuration_and_control { namespace command { -constexpr const command_entry_t accepted_command_list[] = { - {ValveConfigurationAndControl::Commands::Open::Id, COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_open}, - {ValveConfigurationAndControl::Commands::Close::Id, COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_close}, -}; - -constexpr const command_entry_t generated_command_list[] = {}; - command_t *create_open(cluster_t *cluster) { return esp_matter::command::create(cluster, ValveConfigurationAndControl::Commands::Open::Id, COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_open); @@ -3259,16 +3094,6 @@ command_t *create_cancel_request(cluster_t *cluster) namespace thread_border_router_management { namespace command { -constexpr const command_entry_t accepted_command_list[] = { - {ThreadBorderRouterManagement::Commands::GetActiveDatasetRequest::Id, COMMAND_FLAG_ACCEPTED, NULL}, - {ThreadBorderRouterManagement::Commands::GetPendingDatasetRequest::Id, COMMAND_FLAG_ACCEPTED, NULL}, - {ThreadBorderRouterManagement::Commands::SetActiveDatasetRequest::Id, COMMAND_FLAG_ACCEPTED, NULL}, -}; - -constexpr const command_entry_t generated_command_list[] = { - {ThreadBorderRouterManagement::Commands::DatasetResponse::Id, COMMAND_FLAG_GENERATED, NULL}, -}; - command_t *create_get_active_dataset_request(cluster_t *cluster) { return esp_matter::command::create(cluster, ThreadBorderRouterManagement::Commands::GetActiveDatasetRequest::Id, @@ -3305,14 +3130,6 @@ command_t *create_set_pending_dataset_request(cluster_t *cluster) namespace wifi_network_management { namespace command { -constexpr const command_entry_t accepted_command_list[] = { - {WiFiNetworkManagement::Commands::NetworkPassphraseRequest::Id, COMMAND_FLAG_ACCEPTED, NULL}, -}; - -constexpr const command_entry_t generated_command_list[] = { - {WiFiNetworkManagement::Commands::NetworkPassphraseResponse::Id, COMMAND_FLAG_GENERATED, NULL}, -}; - command_t *create_network_passphrase_request(cluster_t *cluster) { return esp_matter::command::create(cluster, WiFiNetworkManagement::Commands::NetworkPassphraseRequest::Id, @@ -3331,16 +3148,6 @@ command_t *create_network_passphrase_response(cluster_t *cluster) namespace thread_network_directory { namespace command { -constexpr const command_entry_t accepted_command_list[] = { - {ThreadNetworkDirectory::Commands::AddNetwork::Id, COMMAND_FLAG_ACCEPTED, NULL}, - {ThreadNetworkDirectory::Commands::RemoveNetwork::Id, COMMAND_FLAG_ACCEPTED, NULL}, - {ThreadNetworkDirectory::Commands::GetOperationalDataset::Id, COMMAND_FLAG_ACCEPTED, NULL}, -}; - -constexpr const command_entry_t generated_command_list[] = { - {ThreadNetworkDirectory::Commands::OperationalDatasetResponse::Id, COMMAND_FLAG_GENERATED, NULL}, -}; - command_t *create_add_network(cluster_t *cluster) { return esp_matter::command::create(cluster, ThreadNetworkDirectory::Commands::AddNetwork::Id, @@ -3371,14 +3178,6 @@ command_t *create_operational_dataset_response(cluster_t *cluster) namespace service_area { namespace command { -constexpr const command_entry_t accepted_command_list[] = { - {ServiceArea::Commands::SelectAreas::Id, COMMAND_FLAG_ACCEPTED, NULL}, -}; - -constexpr const command_entry_t generated_command_list[] = { - {ServiceArea::Commands::SelectAreasResponse::Id, COMMAND_FLAG_GENERATED, NULL}, -}; - command_t *create_select_areas(cluster_t *cluster) { return esp_matter::command::create(cluster, ServiceArea::Commands::SelectAreas::Id, COMMAND_FLAG_ACCEPTED, NULL); @@ -3404,16 +3203,10 @@ command_t *create_skip_area_response(cluster_t *cluster) namespace water_heater_management { namespace command { -constexpr const command_entry_t accepted_command_list[] = { - {WaterHeaterManagement::Commands::Boost::Id, COMMAND_FLAG_ACCEPTED, NULL}, - {WaterHeaterManagement::Commands::CancelBoost::Id, COMMAND_FLAG_ACCEPTED, NULL}, -}; - -constexpr const command_entry_t generated_command_list[] = {}; command_t *create_boost(cluster_t *cluster) { - return esp_matter::command::create(cluster, WaterHeaterManagement::Commands::CancelBoost::Id, + return esp_matter::command::create(cluster, WaterHeaterManagement::Commands::Boost::Id, COMMAND_FLAG_ACCEPTED, NULL); } @@ -3428,14 +3221,6 @@ command_t *create_cancel_boost(cluster_t *cluster) namespace commissioner_control { namespace command { -constexpr const command_entry_t accepted_command_list[] = { - {CommissionerControl::Commands::RequestCommissioningApproval::Id, COMMAND_FLAG_ACCEPTED, NULL}, - {CommissionerControl::Commands::CommissionNode::Id, COMMAND_FLAG_ACCEPTED, NULL}, -}; - -constexpr const command_entry_t generated_command_list[] = { - {CommissionerControl::Commands::ReverseOpenCommissioningWindow::Id, COMMAND_FLAG_GENERATED, NULL}, -}; command_t *create_request_commissioning_approval(cluster_t *cluster) { @@ -3460,11 +3245,6 @@ command_t *create_reverse_open_commissioning_window(cluster_t *cluster) namespace time_synchronization { namespace command { -constexpr const command_entry_t accepted_command_list[] = { - {TimeSynchronization::Commands::SetUTCTime::Id, COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_set_utc_time}, -}; - -constexpr const command_entry_t generated_command_list[] = {}; command_t *create_set_utc_time(cluster_t *cluster) { @@ -3524,36 +3304,12 @@ namespace command { /* Instead of adding the standard commands dynamically, place them in the .rodata section to save RAM. */ constexpr const cluster_command_t cluster_command_table[] = { - {OtaSoftwareUpdateProvider::Id, GET_COMMAND_COUNT_LIST(cluster::ota_provider)}, - {OtaSoftwareUpdateRequestor::Id, GET_COMMAND_COUNT_LIST(cluster::ota_requestor)}, {GeneralCommissioning::Id, GET_COMMAND_COUNT_LIST(cluster::general_commissioning)}, {NetworkCommissioning::Id, GET_COMMAND_COUNT_LIST(cluster::network_commissioning)}, {GeneralDiagnostics::Id, GET_COMMAND_COUNT_LIST(cluster::general_diagnostics)}, {AdministratorCommissioning::Id, GET_COMMAND_COUNT_LIST(cluster::administrator_commissioning)}, {OperationalCredentials::Id, GET_COMMAND_COUNT_LIST(cluster::operational_credentials)}, {GroupKeyManagement::Id, GET_COMMAND_COUNT_LIST(cluster::group_key_management)}, - {EthernetNetworkDiagnostics::Id, GET_COMMAND_COUNT_LIST(cluster::ethernet_network_diagnostics)}, - {Identify::Id, GET_COMMAND_COUNT_LIST(cluster::identify)}, - {Groups::Id, GET_COMMAND_COUNT_LIST(cluster::groups)}, - {ScenesManagement::Id, GET_COMMAND_COUNT_LIST(cluster::scenes_management)}, - {OnOff::Id, GET_COMMAND_COUNT_LIST(cluster::on_off)}, - {LevelControl::Id, GET_COMMAND_COUNT_LIST(cluster::level_control)}, - {Thermostat::Id, GET_COMMAND_COUNT_LIST(cluster::thermostat)}, - {DoorLock::Id, GET_COMMAND_COUNT_LIST(cluster::door_lock)}, - {WindowCovering::Id, GET_COMMAND_COUNT_LIST(cluster::window_covering)}, - {ModeSelect::Id, GET_COMMAND_COUNT_LIST(cluster::mode_select)}, - {DiagnosticLogs::Id, GET_COMMAND_COUNT_LIST(cluster::diagnostic_logs)}, - {TemperatureControl::Id, GET_COMMAND_COUNT_LIST(cluster::temperature_control)}, - {MicrowaveOvenControl::Id, GET_COMMAND_COUNT_LIST(cluster::microwave_oven_control)}, - {KeypadInput::Id, GET_COMMAND_COUNT_LIST(cluster::keypad_input)}, - {EnergyEvse::Id, GET_COMMAND_COUNT_LIST(cluster::energy_evse)}, - {ValveConfigurationAndControl::Id, GET_COMMAND_COUNT_LIST(cluster::valve_configuration_and_control)}, - {ThreadBorderRouterManagement::Id, GET_COMMAND_COUNT_LIST(cluster::thread_border_router_management)}, - {WiFiNetworkManagement::Id, GET_COMMAND_COUNT_LIST(cluster::wifi_network_management)}, - {ThreadNetworkDirectory::Id, GET_COMMAND_COUNT_LIST(cluster::thread_network_directory)}, - {WaterHeaterManagement::Id, GET_COMMAND_COUNT_LIST(cluster::water_heater_management)}, - {CommissionerControl::Id, GET_COMMAND_COUNT_LIST(cluster::commissioner_control)}, - {TimeSynchronization::Id, GET_COMMAND_COUNT_LIST(cluster::time_synchronization)}, }; #if defined(CONFIG_ESP_MATTER_ENABLE_MATTER_SERVER) && defined(CONFIG_ESP_MATTER_ENABLE_DATA_MODEL)