Adjust output strings of test app

- Add error string for each API return value.
- Arrange some output string.

Change-Id: Ie1816ac4123d1711bc9af588c979afa7a07d9829
Signed-off-by: Jiwan Kim <ji-wan.kim@samsung.com>

diff --git a/test/main.c b/test/main.c
index a6e4563..5349d15 100644 (file)
--- a/test/main.c
+++ b/test/main.c
@@ -277,6 +277,7 @@ static void zigbee_event_cb(nwk_addr addr16, ieee_addr addr64, zb_event_e e, zb_
        unsigned char status, count, ep, command_id;
        unsigned short cluster_id;
        msg("");
+       msg("");
        msgp("Event received = %s [0x%02X]", zb_event_str[e], e);
 
        switch (e) {
@@ -516,7 +517,7 @@ static int run_enable(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_set_event_cb() ret: [0x%X]", ret);
+       msg(" - zb_set_event_cb() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
 
        /* Enable */
        ret = zb_enable(handle);
@@ -525,7 +526,7 @@ static int run_enable(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_enable() ret: [0x%X]", ret);
+       msg(" - zb_enable() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
 
        return RET_SUCCESS;
 }
@@ -541,7 +542,7 @@ static int run_disable(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_disable() ret: [0x%X]", ret);
+       msg(" - zb_disable() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
 
        return RET_SUCCESS;
 }
@@ -556,7 +557,7 @@ static int run_hw_reset(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_hw_reset() ret: [0x%X]", ret);
+       msg(" - zb_hw_reset() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
 
        return RET_SUCCESS;
 }
@@ -572,7 +573,7 @@ static int run_coex_start(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_coex_start() ret: [0x%X]", ret);
+       msg(" - zb_coex_start() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
 
        return RET_SUCCESS;
 }
@@ -587,7 +588,7 @@ static int run_coex_stop(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_coex_stop() ret: [0x%X]", ret);
+       msg(" - zb_coex_stop() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
 
        return RET_SUCCESS;
 }
@@ -606,7 +607,7 @@ static int run_get_network_info(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_get_network_info() ret: [0x%X]", ret);
+       msg(" - zb_get_network_info() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("  IEEE ADDR : %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X",
                        co_addr64[0], co_addr64[1], co_addr64[2],
                        co_addr64[3], co_addr64[4], co_addr64[5],
@@ -628,8 +629,8 @@ static int run_get_controller_mac_address(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_get_controller_mac_address() ret: [0x%X]", ret);
-       msg("IEEE ADDR 0x%02X:0x%02X:0x%02X:0x%02X:0x%02X:0x%02X:0x%02X:0x%02X",
+       msg(" - zb_get_controller_mac_address() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
+       msg("  IEEE ADDR : %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X",
                co_addr64[0], co_addr64[1], co_addr64[2], co_addr64[3],
                co_addr64[4], co_addr64[5], co_addr64[6], co_addr64[7]);
 
@@ -647,30 +648,32 @@ static int run_get_end_device_list(MManager *mm, struct menu_data *menu)
        unsigned char ep_list[10];
        zb_end_device_info_h *list = NULL;
 
+       msg("");
        ret = zb_get_all_device_list(handle, &count, &list);
        for (i = 0; i < count && list; i++) {
                zb_get_network_address(list[i], &addr16);
                zb_get_ieee_address((list)[i], addr64);
 
+               msgb("[# %02d]", (i+1));
                if (!strncmp((char *)sj_addr64, (char *)addr64, sizeof(addr64))) {
                        sj_addr16 = addr16;
-                       msgb("Samjin Power Outlet Find!!");
+                       msgb("   Found [Samjin Power Outlet] !!");
                }
                if (!strncmp((char *)st_addr64, (char *)addr64, sizeof(addr64))) {
                        st_addr16 = addr16;
-                       msgb("ST Open/Close Sensor Find!!");
+                       msgb("   Found [ST Open/Close Sensor] !!");
                }
-               msg("network address = 0x%02X", addr16);
-               msg("   ieee address = %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X",
+               msg("   network address = 0x%02X", addr16);
+               msg("      IEEE address = %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X",
                        addr64[0], addr64[1], addr64[2], addr64[3],
                        addr64[4], addr64[5], addr64[6], addr64[7]);
 
                zb_get_num_of_ep((list)[i], &num_of_ep);
-               msg("number of end-points = 0x%04X", num_of_ep);
+               msg("   number of end-points = 0x%04X", num_of_ep);
 
                memset(ep_list, 0, sizeof(ep_list));
                zb_get_ep_list((list)[i], ep_list);
-               msgn("  ");
+               msgn("     ");
                for (j = 0; j < num_of_ep; j++)
                        msgn("%04x ", ep_list[j]);
                msg("\n");
@@ -756,22 +759,22 @@ static int run_choose_end_device_list(MManager *mm, struct menu_data *menu)
 
        ret = zb_get_all_device_list(handle, &target_list_count, &target_list);
        msg(" - zb_get_all_device_list() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
-
+       msg("");
        for (i = 0; i < target_list_count && target_list; i++) {
                zb_get_network_address(target_list[i], &addr16);
                zb_get_ieee_address((target_list)[i], addr64);
 
-               msgb("End device [%d]", (i+1));
+               msgb("[# %02d] End device", (i+1));
                if (!strncmp((char *)sj_addr64, (char *)addr64, sizeof(addr64))) {
                        sj_addr16 = addr16;
-                       msgb("   Samjin Power Outlet Find!!");
+                       msgb("   Found [Samjin Power Outlet] !!");
                }
                if (!strncmp((char *)st_addr64, (char *)addr64, sizeof(addr64))) {
                        st_addr16 = addr16;
-                       msgb("ST Open/Close Sensor Find!!");
+                       msgb("   Found [ST Open/Close Sensor] !!");
                }
-               msg("    nwk address = 0x%02X", addr16);
-               msg("   ieee address = %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X",
+               msg("   network address = 0x%02X", addr16);
+               msg("      IEEE address = %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X",
                        addr64[0], addr64[1], addr64[2], addr64[3],
                        addr64[4], addr64[5], addr64[6], addr64[7]);
 
@@ -841,7 +844,7 @@ static int run_form_network(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_form_network() ret: [0x%X]", ret);
+       msg(" - zb_form_network() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
 
        return RET_SUCCESS;
 }
@@ -856,7 +859,7 @@ static int run_disable_network(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_disable_network() ret: [0x%X]", ret);
+       msg(" - zb_disable_network() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
 
        return RET_SUCCESS;
 }
@@ -883,7 +886,7 @@ static int run_leave_device(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_leave_device() ret: [0x%X]", ret);
+       msg(" - zb_leave_device() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
 
        return RET_SUCCESS;
 }
@@ -902,7 +905,7 @@ static int run_permit_join(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_permit_join() ret: [0x%X]", ret);
+       msg(" - zb_permit_join() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
 
        return RET_SUCCESS;
 }

diff --git a/test/zcl_cluster_alarm.c b/test/zcl_cluster_alarm.c
index 702aed9..17f8c48 100644 (file)
--- a/test/zcl_cluster_alarm.c
+++ b/test/zcl_cluster_alarm.c
@@ -63,7 +63,7 @@ static int run_alarm_reset_alarm(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_alarm_reset_alarm() ret: [0x%X]", ret);
+       msg(" - zb_zcl_alarm_reset_alarm() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -79,7 +79,7 @@ static int run_alarm_reset_all_alarm(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_alarm_reset_all_alarm() ret: [0x%X]", ret);
+       msg(" - zb_zcl_alarm_reset_all_alarm() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -96,7 +96,7 @@ static int run_alarm_get_alarm(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_alarm_get_alarm() ret: [0x%X]", ret);
+       msg(" - zb_zcl_alarm_get_alarm() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -112,7 +112,7 @@ static int run_alarm_reset_all_alarm_log(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_alarm_reset_all_alarm_log() ret: [0x%X]", ret);
+       msg(" - zb_zcl_alarm_reset_all_alarm_log() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;

diff --git a/test/zcl_cluster_basic.c b/test/zcl_cluster_basic.c
index e43963d..597da17 100644 (file)
--- a/test/zcl_cluster_basic.c
+++ b/test/zcl_cluster_basic.c
@@ -43,7 +43,7 @@ static int run_reset_factory_default(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_basic_reset_factory_default() ret: [0x%X]", ret);
+       msg(" - zb_zcl_basic_reset_factory_default() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;

diff --git a/test/zcl_cluster_colorctrl.c b/test/zcl_cluster_colorctrl.c
index d6eb3b2..9e1e9b0 100644 (file)
--- a/test/zcl_cluster_colorctrl.c
+++ b/test/zcl_cluster_colorctrl.c
@@ -71,7 +71,7 @@ static int run_move_to_hue(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_ccontrol_move_to_hue() ret: [0x%X]", ret);
+       msg(" - zb_zcl_ccontrol_move_to_hue() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -95,7 +95,7 @@ static int run_move_hue(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_ccontrol_move_hue() ret: [0x%X]", ret);
+       msg(" - zb_zcl_ccontrol_move_hue() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -122,7 +122,7 @@ static int run_step_hue(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_ccontrol_step_hue() ret: [0x%X]", ret);
+       msg(" - zb_zcl_ccontrol_step_hue() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -146,7 +146,7 @@ static int run_move_to_saturation(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_ccontrol_move_to_saturation() ret: [0x%X]", ret);
+       msg(" - zb_zcl_ccontrol_move_to_saturation() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -170,7 +170,7 @@ static int run_move_saturation(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_ccontrol_move_saturation() ret: [0x%X]", ret);
+       msg(" - zb_zcl_ccontrol_move_saturation() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -197,7 +197,7 @@ static int run_step_saturation(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_ccontrol_step_saturation() ret: [0x%X]", ret);
+       msg(" - zb_zcl_ccontrol_step_saturation() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -224,7 +224,7 @@ static int run_move_to_hue_and_saturation(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_ccontrol_move_to_hue_and_saturation() ret: [0x%X]", ret);
+       msg(" - zb_zcl_ccontrol_move_to_hue_and_saturation() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -251,7 +251,7 @@ static int run_move_to_color(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_ccontrol_move_to_color() ret: [0x%X]", ret);
+       msg(" - zb_zcl_ccontrol_move_to_color() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -275,7 +275,7 @@ static int run_move_color(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_ccontrol_move_color() ret: [0x%X]", ret);
+       msg(" - zb_zcl_ccontrol_move_color() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -302,7 +302,7 @@ static int run_step_color(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_ccontrol_step_color() ret: [0x%X]", ret);
+       msg(" - zb_zcl_ccontrol_step_color() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -326,7 +326,7 @@ static int run_move_to_color_temperature(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_ccontrol_move_to_color_temperature() ret: [0x%X]", ret);
+       msg(" - zb_zcl_ccontrol_move_to_color_temperature() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;

diff --git a/test/zcl_cluster_group.c b/test/zcl_cluster_group.c
index 68b6d19..c155068 100644 (file)
--- a/test/zcl_cluster_group.c
+++ b/test/zcl_cluster_group.c
@@ -104,7 +104,7 @@ static int run_group_add_group(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_group_add_group() ret: [0x%X]", ret);
+       msg(" - zb_zcl_group_add_group() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -125,7 +125,7 @@ static int run_group_view_group(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_group_view_group() ret: [0x%X]", ret);
+       msg(" - zb_zcl_group_view_group() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -145,7 +145,7 @@ static int run_group_get_group_membership(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_group_get_group_membership() ret: [0x%X]", ret);
+       msg(" - zb_zcl_group_get_group_membership() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -166,7 +166,7 @@ static int run_group_remove_group(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_group_remove_group() ret: [0x%X]", ret);
+       msg(" - zb_zcl_group_remove_group() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -182,7 +182,7 @@ static int run_group_remove_all_group(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_group_remove_all_group() ret: [0x%X]", ret);
+       msg(" - zb_zcl_group_remove_all_group() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -203,7 +203,7 @@ static int run_group_add_group_if_identifying(MManager *mm, struct menu_data *me
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_group_add_group_if_identifying() ret: [0x%X]", ret);
+       msg(" - zb_zcl_group_add_group_if_identifying() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;

diff --git a/test/zcl_cluster_ias_zone.c b/test/zcl_cluster_ias_zone.c
index 318daeb..4b45d9e 100644 (file)
--- a/test/zcl_cluster_ias_zone.c
+++ b/test/zcl_cluster_ias_zone.c
@@ -55,7 +55,7 @@ static int run_enroll_response(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_zone_enroll_response() ret: [0x%X]", ret);
+       msg(" - zb_zcl_zone_enroll_response() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;

diff --git a/test/zcl_cluster_identity.c b/test/zcl_cluster_identity.c
index fd9cdb3..6ea9180 100644 (file)
--- a/test/zcl_cluster_identity.c
+++ b/test/zcl_cluster_identity.c
@@ -59,7 +59,7 @@ static int run_identify(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_identify() ret: [0x%X]", ret);
+       msg(" - zb_zcl_identify() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -76,7 +76,7 @@ static int run_identify_query(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_identify_query() ret: [0x%X]", ret);
+       msg(" - zb_zcl_identify_query() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;

diff --git a/test/zcl_cluster_levelctrl.c b/test/zcl_cluster_levelctrl.c
index ef476fb..dd3389b 100644 (file)
--- a/test/zcl_cluster_levelctrl.c
+++ b/test/zcl_cluster_levelctrl.c
@@ -58,7 +58,7 @@ static int run_move_to_level(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_levelctrl_move_to_level() ret: [0x%X]", ret);
+       msg(" - zb_zcl_levelctrl_move_to_level() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -82,7 +82,7 @@ static int run_move(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_levelctrl_move() ret: [0x%X]", ret);
+       msg(" - zb_zcl_levelctrl_move() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -109,7 +109,7 @@ static int run_step(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_levelctrl_step() ret: [0x%X]", ret);
+       msg(" - zb_zcl_levelctrl_step() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -125,7 +125,7 @@ static int run_stop(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_levelctrl_stop() ret: [0x%X]", ret);
+       msg(" - zb_zcl_levelctrl_stop() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -149,7 +149,7 @@ static int run_move_with_on_off(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_levelctrl_move_with_on_off() ret: [0x%X]", ret);
+       msg(" - zb_zcl_levelctrl_move_with_on_off() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -173,7 +173,7 @@ static int run_move_to_level_with_on_off(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_levelctrl_move_to_level_with_on_off() ret: [0x%X]", ret);
+       msg(" - zb_zcl_levelctrl_move_to_level_with_on_off() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -200,7 +200,7 @@ static int run_step_with_on_off(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_levelctrl_step_with_on_off() ret: [0x%X]", ret);
+       msg(" - zb_zcl_levelctrl_step_with_on_off() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;

diff --git a/test/zcl_cluster_onoff.c b/test/zcl_cluster_onoff.c
index 057c7c1..c6a32eb 100644 (file)
--- a/test/zcl_cluster_onoff.c
+++ b/test/zcl_cluster_onoff.c
@@ -43,7 +43,7 @@ static int run_on(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_onoff_control() ret: [0x%X]", ret);
+       msg(" - zb_zcl_onoff_control() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -59,7 +59,7 @@ static int run_off(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_onoff_control() ret: [0x%X]", ret);
+       msg(" - zb_zcl_onoff_control() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -75,7 +75,7 @@ static int run_toggle(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_onoff_control() ret: [0x%X]", ret);
+       msg(" - zb_zcl_onoff_control() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;

diff --git a/test/zcl_cluster_pollctrl.c b/test/zcl_cluster_pollctrl.c
index 503d8d2..08aa784 100644 (file)
--- a/test/zcl_cluster_pollctrl.c
+++ b/test/zcl_cluster_pollctrl.c
@@ -65,7 +65,7 @@ static int run_check_in_response(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_pollctrl_check_in_response() ret: [0x%X]", ret);
+       msg(" - zb_zcl_pollctrl_check_in_response() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -81,7 +81,7 @@ static int run_fast_poll_stop(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_pollctrl_fast_poll_stop() ret: [0x%X]", ret);
+       msg(" - zb_zcl_pollctrl_fast_poll_stop() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -102,7 +102,7 @@ static int run_set_long_poll_interval(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_pollctrl_set_long_poll_interval() ret: [0x%X]", ret);
+       msg(" - zb_zcl_pollctrl_set_long_poll_interval() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -123,7 +123,7 @@ static int run_set_short_poll_interval(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_pollctrl_set_short_poll_interval() ret: [0x%X]", ret);
+       msg(" - zb_zcl_pollctrl_set_short_poll_interval() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;

diff --git a/test/zcl_cluster_scene.c b/test/zcl_cluster_scene.c
index 25723f9..1eb4879 100644 (file)
--- a/test/zcl_cluster_scene.c
+++ b/test/zcl_cluster_scene.c
@@ -149,7 +149,7 @@ static int run_scene_add_scene(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_scene_add_scene() ret: [0x%X]", ret);
+       msg(" - zb_zcl_scene_add_scene() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -173,7 +173,7 @@ static int run_scene_view_scene(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_scene_view_scene() ret: [0x%X]", ret);
+       msg(" - zb_zcl_scene_view_scene() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -194,7 +194,7 @@ static int run_scene_get_scene_membership(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_scene_get_scene_membership() ret: [0x%X]", ret);
+       msg(" - zb_zcl_scene_get_scene_membership() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -218,7 +218,7 @@ static int run_scene_remove_scene(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_scene_remove_scene() ret: [0x%X]", ret);
+       msg(" - zb_zcl_scene_remove_scene() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -239,7 +239,7 @@ static int run_scene_remove_all_scene(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_scene_remove_all_scene() ret: [0x%X]", ret);
+       msg(" - zb_zcl_scene_remove_all_scene() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -263,7 +263,7 @@ static int run_scene_store_scene(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_scene_store_scene() ret: [0x%X]", ret);
+       msg(" - zb_zcl_scene_store_scene() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -287,7 +287,7 @@ static int run_scene_recall_scene(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_scene_recall_scene() ret: [0x%X]", ret);
+       msg(" - zb_zcl_scene_recall_scene() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;

diff --git a/test/zcl_cluster_thermostat.c b/test/zcl_cluster_thermostat.c
index a9b78d3..1fea0f3 100644 (file)
--- a/test/zcl_cluster_thermostat.c
+++ b/test/zcl_cluster_thermostat.c
@@ -54,7 +54,7 @@ static int run_adjust_setpoint(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_thermostat_adjust_setpoint() ret: [0x%X]", ret);
+       msg(" - zb_zcl_thermostat_adjust_setpoint() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;

diff --git a/test/zcl_global_cmd.c b/test/zcl_global_cmd.c
index f937947..3c767c0 100644 (file)
--- a/test/zcl_global_cmd.c
+++ b/test/zcl_global_cmd.c
@@ -402,7 +402,7 @@ static int run_global_read_attr(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_global_read_attr() ret: [0x%X]", ret);
+       msg(" - zb_zcl_global_read_attr() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -451,7 +451,7 @@ static int run_global_write_attr(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_global_write_attr() ret: [0x%X]", ret);
+       msg(" - zb_zcl_global_write_attr() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -484,7 +484,7 @@ static int run_global_write_attr_undivided(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_global_write_attr_undivided() ret: [0x%X]", ret);
+       msg(" - zb_zcl_global_write_attr_undivided() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -516,7 +516,7 @@ static int run_global_write_attr_no_rsp(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_global_write_attr_no_rsp() ret: [0x%X]", ret);
+       msg(" - zb_zcl_global_write_attr_no_rsp() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -595,7 +595,7 @@ static int run_global_config_report(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_global_config_report() ret: [0x%X]", ret);
+       msg(" - zb_zcl_global_config_report() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -627,7 +627,7 @@ static int run_global_read_config_report(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_global_read_config_report() ret: [0x%X]", ret);
+       msg(" - zb_zcl_global_read_config_report() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -652,7 +652,7 @@ static int run_global_discover_attr(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_global_discover_attr() ret: [0x%X]", ret);
+       msg(" - zb_zcl_global_discover_attr() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -670,7 +670,7 @@ static int run_global_discover_cmds_received(MManager *mm, struct menu_data *men
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_global_discover_cmds_received() ret: [0x%X]", ret);
+       msg(" - zb_zcl_global_discover_cmds_received() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -687,7 +687,7 @@ static int run_global_discover_cmds_generated(MManager *mm, struct menu_data *me
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_global_discover_cmds_generated() ret: [0x%X]", ret);
+       msg(" - zb_zcl_global_discover_cmds_generated() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -705,7 +705,7 @@ static int run_global_discover_attr_extended(MManager *mm, struct menu_data *men
                return RET_FAILURE;
        }
 
-       msg(" - zb_zcl_global_discover_attr_extended() ret: [0x%X]", ret);
+       msg(" - zb_zcl_global_discover_attr_extended() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;

diff --git a/test/zdo_binding.c b/test/zdo_binding.c
index 8aaf36d..3886e86 100644 (file)
--- a/test/zdo_binding.c
+++ b/test/zdo_binding.c
@@ -78,7 +78,7 @@ static int run_bind_req(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zdo_bind_req() ret: [0x%X]", ret);
+       msg(" - zb_zdo_bind_req() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -100,7 +100,7 @@ static int run_unbind_req(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zdo_unbind_req() ret: [0x%X]", ret);
+       msg(" - zb_zdo_unbind_req() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;

diff --git a/test/zdo_device.c b/test/zdo_device.c
index 09bdbb8..e4ac2bd 100644 (file)
--- a/test/zdo_device.c
+++ b/test/zdo_device.c
@@ -258,7 +258,7 @@ static int run_nwk_addr_req(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zdo_nwk_addr_req() ret: [0x%X]", ret);
+       msg(" - zb_zdo_nwk_addr_req() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -274,7 +274,7 @@ static int run_ieee_addr_req(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zdo_ieee_addr_req() ret: [0x%X]", ret);
+       msg(" - zb_zdo_ieee_addr_req() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -290,7 +290,7 @@ static int run_active_ep(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zdo_active_ep() ret: [0x%X]", ret);
+       msg(" - zb_zdo_active_ep() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -307,7 +307,7 @@ static int run_simple_desc_req(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zdo_simple_desc_req() ret: [0x%X]", ret);
+       msg(" - zb_zdo_simple_desc_req() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -333,7 +333,7 @@ static int run_match_desc_req(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zdo_match_desc_req() ret: [0x%X]", ret);
+       msg(" - zb_zdo_match_desc_req() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -350,7 +350,7 @@ static int run_power_desc_req(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zdo_power_desc_req() ret: [0x%X]", ret);
+       msg(" - zb_zdo_power_desc_req() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -367,7 +367,7 @@ static int run_complex_desc_req(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zdo_complex_desc_req() ret: [0x%X]", ret);
+       msg(" - zb_zdo_complex_desc_req() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -384,7 +384,7 @@ static int run_user_desc_req(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zdo_user_desc_req() ret: [0x%X]", ret);
+       msg(" - zb_zdo_user_desc_req() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -401,7 +401,7 @@ static int run_user_desc_set(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zdo_user_desc_set() ret: [0x%X]", ret);
+       msg(" - zb_zdo_user_desc_set() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -418,7 +418,7 @@ static int run_node_desc_req(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zdo_node_desc_req() ret: [0x%X]", ret);
+       msg(" - zb_zdo_node_desc_req() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -437,7 +437,7 @@ static int run_device_annce(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zdo_device_annce() ret: [0x%X]", ret);
+       msg(" - zb_zdo_device_annce() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;

diff --git a/test/zdo_network.c b/test/zdo_network.c
index b900719..c3fc68b 100644 (file)
--- a/test/zdo_network.c
+++ b/test/zdo_network.c
@@ -239,7 +239,7 @@ static int run_mgmt_nwk_disc_req(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zdo_mgmt_nwk_disc_req() ret: [0x%X]", ret);
+       msg(" - zb_zdo_mgmt_nwk_disc_req() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -267,7 +267,7 @@ static int run_mgmt_nwk_update_req(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zdo_mgmt_nwk_update_req() ret: [0x%X]", ret);
+       msg(" - zb_zdo_mgmt_nwk_update_req() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -288,7 +288,7 @@ static int run_mgmt_lqi_req(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zdo_mgmt_lqi_req() ret: [0x%X]", ret);
+       msg(" - zb_zdo_mgmt_lqi_req() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -309,7 +309,7 @@ static int run_mgmt_rtg_req(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zdo_mgmt_rtg_req() ret: [0x%X]", ret);
+       msg(" - zb_zdo_mgmt_rtg_req() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -330,7 +330,7 @@ static int run_mgmt_bind_req(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zdo_mgmt_bind_req() ret: [0x%X]", ret);
+       msg(" - zb_zdo_mgmt_bind_req() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -359,7 +359,7 @@ static int run_mgmt_leave_req(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zdo_mgmt_leave_req() ret: [0x%X]", ret);
+       msg(" - zb_zdo_mgmt_leave_req() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;
@@ -384,7 +384,7 @@ static int run_mgmt_permit_joining_req(MManager *mm, struct menu_data *menu)
                return RET_FAILURE;
        }
 
-       msg(" - zb_zdo_mgmt_permit_joining_req() ret: [0x%X]", ret);
+       msg(" - zb_zdo_mgmt_permit_joining_req() ret: [0x%X] [%s]", ret, zigbee_error_to_string(ret));
        msg("");
 
        return RET_SUCCESS;