From: saerome kim Date: Wed, 1 Feb 2017 10:55:14 +0000 (+0900) Subject: Implement ZCL Color Control Cluster X-Git-Tag: submit/tizen/20170512.045637~36 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fconnectivity%2Fzigbee-manager.git;a=commitdiff_plain;h=f4239843efca0ab66ccb6de0ca8199cef8bd4db2 Implement ZCL Color Control Cluster Change-Id: I220faf5a1cb9e644e5f1b6dc34a3e5064743a670 Signed-off-by: saerome kim --- diff --git a/common/include/zigbee_zcl_color_control_type.h b/common/include/zigbee_zcl_color_control_type.h index ac125a3..b896cb8 100644 --- a/common/include/zigbee_zcl_color_control_type.h +++ b/common/include/zigbee_zcl_color_control_type.h @@ -21,6 +21,10 @@ #include +/* -------------------------------------------------------------------------------------- + * For Request + * -------------------------------------------------------------------------------------*/ + /** * @brief Definition for ZCL color control move to hue structure. * @since_tizen 3.0 @@ -132,8 +136,8 @@ typedef struct { typedef struct { short node_id; /**< Node ID */ char dest_ep; /**< Destination endpoint */ - short rate_x; /**< Rate X */ - short rate_y; /**< Rate Y */ + short step_x; /**< Step X */ + short step_y; /**< Step Y */ short transition_time; /**< Transition time */ } ZigbeeZclColorControlStepColor_t; diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_color_control.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_color_control.c index 1b35239..08f4206 100644 --- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_color_control.c +++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_color_control.c @@ -20,17 +20,60 @@ #include +static void *_service_interface_ref_zigbee_zcl_color_control( + ZigBeeServiceInterface *service_interface) +{ + ZigbeeObjectSkeleton *zigbee_object = NULL; + ZigbeeCustomData_t *custom_data = NULL; + ZigbeeZcl_color_control *color_object = NULL; + + custom_data = (ZigbeeCustomData_t *)zblib_service_interface_ref_user_data(service_interface); + if (NULL == custom_data) { + Z_LOGE("D-BUS service interface custom_data is NULL!"); + return NULL; + } + + /* Get zigbee object */ + zigbee_object = g_hash_table_lookup(custom_data->objects, ZIGBEE_SERVICE_PATH); + if (NULL == zigbee_object) { + Z_LOGW("Cannot find ZigBee D-BUS interface object!", zigbee_object); + return NULL; + } + + color_object = zigbee_object_get_zcl_color_control(ZIGBEE_OBJECT(zigbee_object)); + return color_object; +} + static void on_zcl_color_move_to_hue_resp(ZigBeeServiceInterface *service_interface, guint request_id, gpointer resp_data, guint resp_data_len, gpointer resp_cb_data) { ZigbeeServiceInterfaceRespCbData_t *cb_data = (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data; - NOT_USED(cb_data); + ZigbeeZcl_color_control *zcl_color_object = NULL; + GDBusMethodInvocation *invocation = NULL; + + ZigbeeGeneralResp_t *payload = (ZigbeeGeneralResp_t *)resp_data; + NOT_USED(service_interface); NOT_USED(request_id); - NOT_USED(resp_data); - NOT_USED(resp_data_len); + + if (NULL == resp_data || 0 == resp_data_len) { + Z_LOGE("resp_data=%p or resp_data_len=%d is null", resp_data, resp_data_len); + g_free(cb_data); + return; + } + + zcl_color_object = zigbee_service_dbus_interface_ref_interface_object(cb_data); + zblib_check_null_free_and_ret("zcl_color_object", zcl_color_object, cb_data); + + invocation = zigbee_service_dbus_interface_ref_invocation(cb_data); + zblib_check_null_free_and_ret("invocation", invocation, cb_data); + + zigbee_zcl_color_control_complete_move_to_hue(zcl_color_object, invocation, + payload->result); + + g_free(cb_data); } static gboolean on_zcl_color_move_to_hue(ZigbeeZcl_color_control *zcl_color_object, @@ -97,11 +140,30 @@ static void on_zcl_color_move_hue_resp(ZigBeeServiceInterface *service_interface ZigbeeServiceInterfaceRespCbData_t *cb_data = (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data; - NOT_USED(cb_data); + ZigbeeZcl_color_control *zcl_color_object = NULL; + GDBusMethodInvocation *invocation = NULL; + + ZigbeeGeneralResp_t *payload = (ZigbeeGeneralResp_t *)resp_data; + NOT_USED(service_interface); NOT_USED(request_id); - NOT_USED(resp_data); - NOT_USED(resp_data_len); + + if (NULL == resp_data || 0 == resp_data_len) { + Z_LOGE("resp_data=%p or resp_data_len=%d is null", resp_data, resp_data_len); + g_free(cb_data); + return; + } + + zcl_color_object = zigbee_service_dbus_interface_ref_interface_object(cb_data); + zblib_check_null_free_and_ret("zcl_color_object", zcl_color_object, cb_data); + + invocation = zigbee_service_dbus_interface_ref_invocation(cb_data); + zblib_check_null_free_and_ret("invocation", invocation, cb_data); + + zigbee_zcl_color_control_complete_move_hue(zcl_color_object, invocation, + payload->result); + + g_free(cb_data); } static gboolean on_zcl_color_move_hue(ZigbeeZcl_color_control *zcl_color_object, @@ -166,11 +228,30 @@ static void on_zcl_color_step_hue_resp(ZigBeeServiceInterface *service_interface ZigbeeServiceInterfaceRespCbData_t *cb_data = (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data; - NOT_USED(cb_data); + ZigbeeZcl_color_control *zcl_color_object = NULL; + GDBusMethodInvocation *invocation = NULL; + + ZigbeeGeneralResp_t *payload = (ZigbeeGeneralResp_t *)resp_data; + NOT_USED(service_interface); NOT_USED(request_id); - NOT_USED(resp_data); - NOT_USED(resp_data_len); + + if (NULL == resp_data || 0 == resp_data_len) { + Z_LOGE("resp_data=%p or resp_data_len=%d is null", resp_data, resp_data_len); + g_free(cb_data); + return; + } + + zcl_color_object = zigbee_service_dbus_interface_ref_interface_object(cb_data); + zblib_check_null_free_and_ret("zcl_color_object", zcl_color_object, cb_data); + + invocation = zigbee_service_dbus_interface_ref_invocation(cb_data); + zblib_check_null_free_and_ret("invocation", invocation, cb_data); + + zigbee_zcl_color_control_complete_step_hue(zcl_color_object, invocation, + payload->result); + + g_free(cb_data); } static gboolean on_zcl_color_step_hue(ZigbeeZcl_color_control *zcl_color_object, @@ -237,11 +318,30 @@ static void on_zcl_color_move_to_saturation_resp(ZigBeeServiceInterface *service ZigbeeServiceInterfaceRespCbData_t *cb_data = (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data; - NOT_USED(cb_data); + ZigbeeZcl_color_control *zcl_color_object = NULL; + GDBusMethodInvocation *invocation = NULL; + + ZigbeeGeneralResp_t *payload = (ZigbeeGeneralResp_t *)resp_data; + NOT_USED(service_interface); NOT_USED(request_id); - NOT_USED(resp_data); - NOT_USED(resp_data_len); + + if (NULL == resp_data || 0 == resp_data_len) { + Z_LOGE("resp_data=%p or resp_data_len=%d is null", resp_data, resp_data_len); + g_free(cb_data); + return; + } + + zcl_color_object = zigbee_service_dbus_interface_ref_interface_object(cb_data); + zblib_check_null_free_and_ret("zcl_color_object", zcl_color_object, cb_data); + + invocation = zigbee_service_dbus_interface_ref_invocation(cb_data); + zblib_check_null_free_and_ret("invocation", invocation, cb_data); + + zigbee_zcl_color_control_complete_move_to_saturation(zcl_color_object, invocation, + payload->result); + + g_free(cb_data); } static gboolean on_zcl_color_move_to_saturation(ZigbeeZcl_color_control *zcl_color_object, @@ -306,11 +406,30 @@ static void on_zcl_color_move_saturation_resp(ZigBeeServiceInterface *service_in ZigbeeServiceInterfaceRespCbData_t *cb_data = (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data; - NOT_USED(cb_data); + ZigbeeZcl_color_control *zcl_color_object = NULL; + GDBusMethodInvocation *invocation = NULL; + + ZigbeeGeneralResp_t *payload = (ZigbeeGeneralResp_t *)resp_data; + NOT_USED(service_interface); NOT_USED(request_id); - NOT_USED(resp_data); - NOT_USED(resp_data_len); + + if (NULL == resp_data || 0 == resp_data_len) { + Z_LOGE("resp_data=%p or resp_data_len=%d is null", resp_data, resp_data_len); + g_free(cb_data); + return; + } + + zcl_color_object = zigbee_service_dbus_interface_ref_interface_object(cb_data); + zblib_check_null_free_and_ret("zcl_color_object", zcl_color_object, cb_data); + + invocation = zigbee_service_dbus_interface_ref_invocation(cb_data); + zblib_check_null_free_and_ret("invocation", invocation, cb_data); + + zigbee_zcl_color_control_complete_move_saturation(zcl_color_object, invocation, + payload->result); + + g_free(cb_data); } static gboolean on_zcl_color_move_saturation(ZigbeeZcl_color_control *zcl_color_object, @@ -375,11 +494,30 @@ static void on_zcl_color_step_saturation_resp(ZigBeeServiceInterface *service_in ZigbeeServiceInterfaceRespCbData_t *cb_data = (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data; - NOT_USED(cb_data); + ZigbeeZcl_color_control *zcl_color_object = NULL; + GDBusMethodInvocation *invocation = NULL; + + ZigbeeGeneralResp_t *payload = (ZigbeeGeneralResp_t *)resp_data; + NOT_USED(service_interface); NOT_USED(request_id); - NOT_USED(resp_data); - NOT_USED(resp_data_len); + + if (NULL == resp_data || 0 == resp_data_len) { + Z_LOGE("resp_data=%p or resp_data_len=%d is null", resp_data, resp_data_len); + g_free(cb_data); + return; + } + + zcl_color_object = zigbee_service_dbus_interface_ref_interface_object(cb_data); + zblib_check_null_free_and_ret("zcl_color_object", zcl_color_object, cb_data); + + invocation = zigbee_service_dbus_interface_ref_invocation(cb_data); + zblib_check_null_free_and_ret("invocation", invocation, cb_data); + + zigbee_zcl_color_control_complete_step_saturation(zcl_color_object, invocation, + payload->result); + + g_free(cb_data); } static gboolean on_zcl_color_step_saturation(ZigbeeZcl_color_control *zcl_color_object, @@ -446,11 +584,30 @@ static void on_zcl_color_move_to_hue_and_saturation_resp(ZigBeeServiceInterface ZigbeeServiceInterfaceRespCbData_t *cb_data = (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data; - NOT_USED(cb_data); + ZigbeeZcl_color_control *zcl_color_object = NULL; + GDBusMethodInvocation *invocation = NULL; + + ZigbeeGeneralResp_t *payload = (ZigbeeGeneralResp_t *)resp_data; + NOT_USED(service_interface); NOT_USED(request_id); - NOT_USED(resp_data); - NOT_USED(resp_data_len); + + if (NULL == resp_data || 0 == resp_data_len) { + Z_LOGE("resp_data=%p or resp_data_len=%d is null", resp_data, resp_data_len); + g_free(cb_data); + return; + } + + zcl_color_object = zigbee_service_dbus_interface_ref_interface_object(cb_data); + zblib_check_null_free_and_ret("zcl_color_object", zcl_color_object, cb_data); + + invocation = zigbee_service_dbus_interface_ref_invocation(cb_data); + zblib_check_null_free_and_ret("invocation", invocation, cb_data); + + zigbee_zcl_color_control_complete_move_to_hue_and_saturation(zcl_color_object, + invocation, payload->result); + + g_free(cb_data); } static gboolean on_zcl_color_move_to_hue_and_saturation(ZigbeeZcl_color_control *zcl_color_object, @@ -517,11 +674,30 @@ static void on_zcl_color_move_to_color_resp(ZigBeeServiceInterface *service_inte ZigbeeServiceInterfaceRespCbData_t *cb_data = (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data; - NOT_USED(cb_data); + ZigbeeZcl_color_control *zcl_color_object = NULL; + GDBusMethodInvocation *invocation = NULL; + + ZigbeeGeneralResp_t *payload = (ZigbeeGeneralResp_t *)resp_data; + NOT_USED(service_interface); NOT_USED(request_id); - NOT_USED(resp_data); - NOT_USED(resp_data_len); + + if (NULL == resp_data || 0 == resp_data_len) { + Z_LOGE("resp_data=%p or resp_data_len=%d is null", resp_data, resp_data_len); + g_free(cb_data); + return; + } + + zcl_color_object = zigbee_service_dbus_interface_ref_interface_object(cb_data); + zblib_check_null_free_and_ret("zcl_color_object", zcl_color_object, cb_data); + + invocation = zigbee_service_dbus_interface_ref_invocation(cb_data); + zblib_check_null_free_and_ret("invocation", invocation, cb_data); + + zigbee_zcl_color_control_complete_move_to_color(zcl_color_object, invocation, + payload->result); + + g_free(cb_data); } static gboolean on_zcl_color_move_to_color(ZigbeeZcl_color_control *zcl_color_object, @@ -588,11 +764,30 @@ static void on_zcl_color_move_color_resp(ZigBeeServiceInterface *service_interfa ZigbeeServiceInterfaceRespCbData_t *cb_data = (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data; - NOT_USED(cb_data); + ZigbeeZcl_color_control *zcl_color_object = NULL; + GDBusMethodInvocation *invocation = NULL; + + ZigbeeGeneralResp_t *payload = (ZigbeeGeneralResp_t *)resp_data; + NOT_USED(service_interface); NOT_USED(request_id); - NOT_USED(resp_data); - NOT_USED(resp_data_len); + + if (NULL == resp_data || 0 == resp_data_len) { + Z_LOGE("resp_data=%p or resp_data_len=%d is null", resp_data, resp_data_len); + g_free(cb_data); + return; + } + + zcl_color_object = zigbee_service_dbus_interface_ref_interface_object(cb_data); + zblib_check_null_free_and_ret("zcl_color_object", zcl_color_object, cb_data); + + invocation = zigbee_service_dbus_interface_ref_invocation(cb_data); + zblib_check_null_free_and_ret("invocation", invocation, cb_data); + + zigbee_zcl_color_control_complete_move_color(zcl_color_object, invocation, + payload->result); + + g_free(cb_data); } static gboolean on_zcl_color_move_color(ZigbeeZcl_color_control *zcl_color_object, @@ -657,19 +852,38 @@ static void on_zcl_color_step_color_resp(ZigBeeServiceInterface *service_interfa ZigbeeServiceInterfaceRespCbData_t *cb_data = (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data; - NOT_USED(cb_data); + ZigbeeZcl_color_control *zcl_color_object = NULL; + GDBusMethodInvocation *invocation = NULL; + + ZigbeeGeneralResp_t *payload = (ZigbeeGeneralResp_t *)resp_data; + NOT_USED(service_interface); NOT_USED(request_id); - NOT_USED(resp_data); - NOT_USED(resp_data_len); + + if (NULL == resp_data || 0 == resp_data_len) { + Z_LOGE("resp_data=%p or resp_data_len=%d is null", resp_data, resp_data_len); + g_free(cb_data); + return; + } + + zcl_color_object = zigbee_service_dbus_interface_ref_interface_object(cb_data); + zblib_check_null_free_and_ret("zcl_color_object", zcl_color_object, cb_data); + + invocation = zigbee_service_dbus_interface_ref_invocation(cb_data); + zblib_check_null_free_and_ret("invocation", invocation, cb_data); + + zigbee_zcl_color_control_complete_step_color(zcl_color_object, invocation, + payload->result); + + g_free(cb_data); } static gboolean on_zcl_color_step_color(ZigbeeZcl_color_control *zcl_color_object, GDBusMethodInvocation *invocation, gshort node_id, gchar endpoint, - gshort rate_x, - gshort rate_y, + gshort step_x, + gshort step_y, gshort transition_time, gpointer user_data) { @@ -684,8 +898,8 @@ static gboolean on_zcl_color_step_color(ZigbeeZcl_color_control *zcl_color_objec /* Update request structure */ req.node_id = node_id; req.dest_ep = endpoint; - req.rate_x = rate_x; - req.rate_y = rate_y; + req.step_x = step_x; + req.step_y = step_y; req.transition_time = transition_time; /* Allocate response callback data */ @@ -728,11 +942,30 @@ static void on_zcl_color_move_color_temperature_resp(ZigBeeServiceInterface *ser ZigbeeServiceInterfaceRespCbData_t *cb_data = (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data; - NOT_USED(cb_data); + ZigbeeZcl_color_control *zcl_color_object = NULL; + GDBusMethodInvocation *invocation = NULL; + + ZigbeeGeneralResp_t *payload = (ZigbeeGeneralResp_t *)resp_data; + NOT_USED(service_interface); NOT_USED(request_id); - NOT_USED(resp_data); - NOT_USED(resp_data_len); + + if (NULL == resp_data || 0 == resp_data_len) { + Z_LOGE("resp_data=%p or resp_data_len=%d is null", resp_data, resp_data_len); + g_free(cb_data); + return; + } + + zcl_color_object = zigbee_service_dbus_interface_ref_interface_object(cb_data); + zblib_check_null_free_and_ret("zcl_color_object", zcl_color_object, cb_data); + + invocation = zigbee_service_dbus_interface_ref_invocation(cb_data); + zblib_check_null_free_and_ret("invocation", invocation, cb_data); + + zigbee_zcl_color_control_complete_move_color_temperature(zcl_color_object, invocation, + payload->result); + + g_free(cb_data); } static gboolean on_zcl_color_move_color_temperature(ZigbeeZcl_color_control *zcl_color_object, @@ -794,15 +1027,28 @@ static gboolean on_zcl_color_move_color_temperature(ZigbeeZcl_color_control *zcl void zigbee_service_dbus_interface_zcl_color_control_notification(ZigBeeServiceInterface *service_interface, guint noti_id, gpointer noti_data, guint noti_data_len, gpointer noti_cb_data) { - if (NULL == service_interface) { - Z_LOGE("service_interface is NULL"); + ZigbeeZcl_color_control *color_object; + + zblib_check_null_ret("service_interface", service_interface); + + if (NULL == noti_data || 0 == noti_data_len) { + Z_LOGE("noti_data is NULL"); return; } - NOT_USED(noti_id); - NOT_USED(noti_data); - NOT_USED(noti_data_len); + color_object = _service_interface_ref_zigbee_zcl_color_control(service_interface); + zblib_check_null_ret("color_object", color_object); + NOT_USED(noti_cb_data); + + switch(noti_id) { + default: + Z_LOGE("Unexpected notification [%x]", noti_id); + break; + } + + /* ZigbeeZcl_color_control should be dereferenced */ + g_object_unref(color_object); } gboolean zigbee_service_dbus_interface_zcl_color_control_init(ZigBeeServiceInterface *service_interface, diff --git a/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_zcl_color_control.c b/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_zcl_color_control.c index 8f61a01..2350086 100644 --- a/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_zcl_color_control.c +++ b/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_zcl_color_control.c @@ -18,6 +18,7 @@ #include #include +#include #include #include "zblib_driver_zcl_color_control.h" @@ -170,6 +171,7 @@ ZigBeeDriver *zblib_driver_zcl_color_control_new(ZigBeePlugin *plugin, ZblibDriverZclColorControlOps_t *ops) { ZigBeeDriver *driver = NULL; + ZigBeeService *service = NULL; ZblibDriverZclColorControlPrivData_t *priv_data = NULL; gboolean ret; @@ -185,6 +187,19 @@ ZigBeeDriver *zblib_driver_zcl_color_control_new(ZigBeePlugin *plugin, /* Update private data */ priv_data->ops = ops; + /* Link service to driver */ + service = zblib_plugin_ref_service(plugin); + if (NULL == service) { + Z_LOGE("zblib_plugin_ref_service failed!"); + + /* Free allocated resources */ + g_free(priv_data); + g_free(driver); + + return NULL; + } + zblib_driver_link_service(driver, service); + /* Link private data to driver */ ret = zblib_driver_link_object(driver, priv_data); if (FALSE == ret) { diff --git a/zigbee-daemon/zigbee-lib/src/zblib_request.c b/zigbee-daemon/zigbee-lib/src/zblib_request.c index b739646..e222e6a 100644 --- a/zigbee-daemon/zigbee-lib/src/zblib_request.c +++ b/zigbee-daemon/zigbee-lib/src/zblib_request.c @@ -2077,8 +2077,8 @@ static gpointer __zblib_request_create_zcl_color_control_request_data(guint requ /* Copy data */ req->node_id = in_req->node_id; req->dest_ep = in_req->dest_ep; - req->rate_x = in_req->rate_x; - req->rate_y = in_req->rate_y; + req->step_x = in_req->step_x; + req->step_y = in_req->step_y; req->transition_time = in_req->transition_time; }