From 379a3fac2bb5dd26fa07b4ad54e35b3cd50dc3bf Mon Sep 17 00:00:00 2001 From: Joakim Eriksson Date: Thu, 26 Oct 2017 21:38:55 +0200 Subject: [PATCH] LWM2M fixed doxygen compile issues --- os/net/app-layer/coap/coap-separate.c | 2 +- os/services/ipso-objects/ipso-blockwise-test.c | 1 + os/services/ipso-objects/ipso-control-template.c | 1 + os/services/ipso-objects/ipso-sensor-template.c | 1 + os/services/ipso-objects/ipso-sensor-template.h | 1 + os/services/lwm2m/lwm2m-firmware.c | 3 ++- os/services/lwm2m/lwm2m-firmware.h | 2 +- os/services/lwm2m/lwm2m-rd-client.c | 6 ++++-- os/services/lwm2m/lwm2m-security.h | 3 ++- os/services/lwm2m/lwm2m-server.h | 3 ++- 10 files changed, 16 insertions(+), 7 deletions(-) diff --git a/os/net/app-layer/coap/coap-separate.c b/os/net/app-layer/coap/coap-separate.c index 45793f505..066dc74a7 100644 --- a/os/net/app-layer/coap/coap-separate.c +++ b/os/net/app-layer/coap/coap-separate.c @@ -71,7 +71,7 @@ coap_separate_reject() /*----------------------------------------------------------------------------*/ /** * \brief Initiate a separate response with an empty ACK - * \param request The request to accept + * \param coap_req The request to accept * \param separate_store A pointer to the data structure that will store the * relevant information for the response * diff --git a/os/services/ipso-objects/ipso-blockwise-test.c b/os/services/ipso-objects/ipso-blockwise-test.c index 532642969..3a557de2b 100644 --- a/os/services/ipso-objects/ipso-blockwise-test.c +++ b/os/services/ipso-objects/ipso-blockwise-test.c @@ -149,3 +149,4 @@ ipso_blockwise_test_init(void) lwm2m_engine_add_object(®_object); } +/** @} */ diff --git a/os/services/ipso-objects/ipso-control-template.c b/os/services/ipso-objects/ipso-control-template.c index 1383bcd78..23b53ef06 100644 --- a/os/services/ipso-objects/ipso-control-template.c +++ b/os/services/ipso-objects/ipso-control-template.c @@ -209,3 +209,4 @@ ipso_control_remove(ipso_control_t *control) return 1; } /*---------------------------------------------------------------------------*/ +/** @} */ diff --git a/os/services/ipso-objects/ipso-sensor-template.c b/os/services/ipso-objects/ipso-sensor-template.c index 02f930c60..bf46ed5ae 100644 --- a/os/services/ipso-objects/ipso-sensor-template.c +++ b/os/services/ipso-objects/ipso-sensor-template.c @@ -236,3 +236,4 @@ ipso_sensor_remove(const ipso_sensor_t *sensor) return 1; } /*---------------------------------------------------------------------------*/ +/** @} */ diff --git a/os/services/ipso-objects/ipso-sensor-template.h b/os/services/ipso-objects/ipso-sensor-template.h index 65213759f..375dbad7c 100644 --- a/os/services/ipso-objects/ipso-sensor-template.h +++ b/os/services/ipso-objects/ipso-sensor-template.h @@ -89,3 +89,4 @@ int ipso_sensor_add(const ipso_sensor_t *sensor); int ipso_sensor_remove(const ipso_sensor_t *sensor); #endif /* IPSO_SENSOR_TEMPLATE_H_ */ +/** @} */ diff --git a/os/services/lwm2m/lwm2m-firmware.c b/os/services/lwm2m/lwm2m-firmware.c index b51fb13ab..30c1a8229 100644 --- a/os/services/lwm2m/lwm2m-firmware.c +++ b/os/services/lwm2m/lwm2m-firmware.c @@ -29,7 +29,7 @@ */ /** - * \addtogroup + * \addtogroup lwm2m * @{ * * Code for firmware object of lwm2m @@ -165,3 +165,4 @@ lwm2m_firmware_init(void) lwm2m_engine_add_object(®_object); } /*---------------------------------------------------------------------------*/ +/** @} */ diff --git a/os/services/lwm2m/lwm2m-firmware.h b/os/services/lwm2m/lwm2m-firmware.h index fb291b635..2b83922cd 100644 --- a/os/services/lwm2m/lwm2m-firmware.h +++ b/os/services/lwm2m/lwm2m-firmware.h @@ -29,7 +29,7 @@ */ /** - * \addtogroup + * \addtogroup lwm2m * @{ * * Code for firmware object of lwm2m diff --git a/os/services/lwm2m/lwm2m-rd-client.c b/os/services/lwm2m/lwm2m-rd-client.c index 4df4217e0..25400025e 100644 --- a/os/services/lwm2m/lwm2m-rd-client.c +++ b/os/services/lwm2m/lwm2m-rd-client.c @@ -62,7 +62,7 @@ #include "rpl.h" #endif /* UIP_CONF_IPV6_RPL */ -#define DEBUG 0 +#define DEBUG 1 #if DEBUG #include #define PRINTF(...) printf(__VA_ARGS__) @@ -395,7 +395,8 @@ produce_more_rd(void) rd_more = lwm2m_engine_set_rd_data(&outbuf, rd_block1); coap_set_payload(request, rd_data, outbuf.len); - PRINTF("Setting block1 in request - block: %d more: %d\n", rd_block1, rd_more); + PRINTF("Setting block1 in request - block: %d more: %d\n", + (int) rd_block1, (int) rd_more); coap_set_header_block1(request, rd_block1, rd_more, sizeof(rd_data)); coap_send_request(&rd_request_state, &session_info.server_ep, request, rd_callback); @@ -727,3 +728,4 @@ check_periodic_observations(void) /* TODO */ } /*---------------------------------------------------------------------------*/ +/** @} */ diff --git a/os/services/lwm2m/lwm2m-security.h b/os/services/lwm2m/lwm2m-security.h index 7142c4a8e..3120388b7 100644 --- a/os/services/lwm2m/lwm2m-security.h +++ b/os/services/lwm2m/lwm2m-security.h @@ -29,7 +29,7 @@ */ /** - * \addtogroup oma-lwm2m + * \addtogroup lwm2m * @{ * */ @@ -71,3 +71,4 @@ int lwm2m_security_set_server_psk(lwm2m_security_server_t *server, void lwm2m_security_init(void); #endif /* LWM2M_SECURITY_H */ +/** @} */ diff --git a/os/services/lwm2m/lwm2m-server.h b/os/services/lwm2m/lwm2m-server.h index 9afaf547a..92968d138 100644 --- a/os/services/lwm2m/lwm2m-server.h +++ b/os/services/lwm2m/lwm2m-server.h @@ -29,7 +29,7 @@ */ /** - * \addtogroup oma-lwm2m + * \addtogroup lwm2m * @{ * */ @@ -57,3 +57,4 @@ lwm2m_server_t *lwm2m_server_add(uint16_t instance_id, void lwm2m_server_init(void); #endif /* LWM2M_SERVER_H */ +/** @} */