From 101d5db8f396612933ab12fbb66bcc72c73adf71 Mon Sep 17 00:00:00 2001 From: Leif Sandstrom Date: Mon, 11 Jan 2021 09:37:14 +0100 Subject: [PATCH] Improve client disp command Remove #WITH_LOGS guard that caused non-debug build to suppress output. Signed-off-by: Leif Sandstrom --- examples/client/object_device.c | 2 -- examples/client/object_firmware.c | 2 -- examples/client/object_location.c | 2 -- examples/client/object_security.c | 2 -- examples/client/object_server.c | 2 -- examples/client/test_object.c | 2 -- 6 files changed, 12 deletions(-) diff --git a/examples/client/object_device.c b/examples/client/object_device.c index 169d79149..c49f9d45a 100644 --- a/examples/client/object_device.c +++ b/examples/client/object_device.c @@ -606,7 +606,6 @@ static uint8_t prv_device_execute(uint16_t instanceId, void display_device_object(lwm2m_object_t * object) { -#ifdef WITH_LOGS device_data_t * data = (device_data_t *)object->userData; fprintf(stdout, " /%u: Device object:\r\n", object->objID); if (NULL != data) @@ -614,7 +613,6 @@ void display_device_object(lwm2m_object_t * object) fprintf(stdout, " time: %lld, time_offset: %s\r\n", (long long) data->time, data->time_offset); } -#endif } lwm2m_object_t * get_object_device() diff --git a/examples/client/object_firmware.c b/examples/client/object_firmware.c index ecbe3e387..c240a70c1 100644 --- a/examples/client/object_firmware.c +++ b/examples/client/object_firmware.c @@ -289,7 +289,6 @@ static uint8_t prv_firmware_execute(uint16_t instanceId, void display_firmware_object(lwm2m_object_t * object) { -#ifdef WITH_LOGS firmware_data_t * data = (firmware_data_t *)object->userData; fprintf(stdout, " /%u: Firmware object:\r\n", object->objID); if (NULL != data) @@ -297,7 +296,6 @@ void display_firmware_object(lwm2m_object_t * object) fprintf(stdout, " state: %u, result: %u\r\n", data->state, data->result); } -#endif } lwm2m_object_t * get_object_firmware(void) diff --git a/examples/client/object_location.c b/examples/client/object_location.c index a1f8bb774..a6c5a8192 100644 --- a/examples/client/object_location.c +++ b/examples/client/object_location.c @@ -220,7 +220,6 @@ static uint8_t prv_location_read(uint16_t objInstId, void display_location_object(lwm2m_object_t * object) { -#ifdef WITH_LOGS location_data_t * data = (location_data_t *)object->userData; fprintf(stdout, " /%u: Location object:\r\n", object->objID); if (NULL != data) @@ -228,7 +227,6 @@ void display_location_object(lwm2m_object_t * object) fprintf(stdout, " latitude: %.6f, longitude: %.6f, altitude: %.6f, radius: %.6f, timestamp: %lu, speed: %.6f\r\n", data->latitude, data->longitude, data->altitude, data->radius, data->timestamp, data->speed); } -#endif } /** diff --git a/examples/client/object_security.c b/examples/client/object_security.c index 85e1f862a..cd979502f 100644 --- a/examples/client/object_security.c +++ b/examples/client/object_security.c @@ -500,7 +500,6 @@ void copy_security_object(lwm2m_object_t * objectDest, lwm2m_object_t * objectSr void display_security_object(lwm2m_object_t * object) { -#ifdef WITH_LOGS fprintf(stdout, " /%u: Security object, instances:\r\n", object->objID); security_instance_t * instance = (security_instance_t *)object->instanceList; while (instance != NULL) @@ -511,7 +510,6 @@ void display_security_object(lwm2m_object_t * object) instance->shortID, instance->clientHoldOffTime); instance = (security_instance_t *)instance->next; } -#endif } void clean_security_object(lwm2m_object_t * objectP) diff --git a/examples/client/object_server.c b/examples/client/object_server.c index 013283f4a..012f0811f 100644 --- a/examples/client/object_server.c +++ b/examples/client/object_server.c @@ -1039,7 +1039,6 @@ void copy_server_object(lwm2m_object_t * objectDest, lwm2m_object_t * objectSrc) void display_server_object(lwm2m_object_t * object) { -#ifdef WITH_LOGS fprintf(stdout, " /%u: Server object, instances:\r\n", object->objID); server_instance_t * serverInstance = (server_instance_t *)object->instanceList; while (serverInstance != NULL) @@ -1071,7 +1070,6 @@ void display_server_object(lwm2m_object_t * object) fprintf(stdout, "\r\n"); serverInstance = (server_instance_t *)serverInstance->next; } -#endif } lwm2m_object_t * get_server_object(int serverId, diff --git a/examples/client/test_object.c b/examples/client/test_object.c index 422a21659..373c9a3ca 100644 --- a/examples/client/test_object.c +++ b/examples/client/test_object.c @@ -353,7 +353,6 @@ static uint8_t prv_exec(uint16_t instanceId, void display_test_object(lwm2m_object_t * object) { -#ifdef WITH_LOGS fprintf(stdout, " /%u: Test object, instances:\r\n", object->objID); prv_instance_t * instance = (prv_instance_t *)object->instanceList; while (instance != NULL) @@ -363,7 +362,6 @@ void display_test_object(lwm2m_object_t * object) instance->shortID, instance->test); instance = (prv_instance_t *)instance->next; } -#endif } lwm2m_object_t * get_test_object(void)