diff --git a/pkg/wakaama/Makefile.dep b/pkg/wakaama/Makefile.dep index 48b43eb96e..c06b1143f2 100644 --- a/pkg/wakaama/Makefile.dep +++ b/pkg/wakaama/Makefile.dep @@ -17,6 +17,10 @@ ifneq (,$(filter wakaama_objects_barometer,$(USEMODULE))) USEMODULE += wakaama_objects_ipso_sensor_base endif +ifneq (,$(filter wakaama_objects_current,$(USEMODULE))) + USEMODULE += wakaama_objects_ipso_sensor_base +endif + USEMODULE += ztimer USEMODULE += ztimer_sec USEPKG += tlsf diff --git a/pkg/wakaama/contrib/objects/Kconfig.ipso b/pkg/wakaama/contrib/objects/Kconfig.ipso index 36ca6d65a0..bd2bcf6b56 100644 --- a/pkg/wakaama/contrib/objects/Kconfig.ipso +++ b/pkg/wakaama/contrib/objects/Kconfig.ipso @@ -14,4 +14,13 @@ config LWM2M_BAROMETER_INSTANCES_MAX endmenu +menu "IPSO current object" + depends on USEMODULE_WAKAAMA_OBJECTS_CURRENT + +config LWM2M_CURRENT_INSTANCES_MAX + int "Maximum number of current object instances" + default 1 + +endmenu + endmenu # "IPSO objects" diff --git a/pkg/wakaama/contrib/objects/current.c b/pkg/wakaama/contrib/objects/current.c new file mode 100644 index 0000000000..ccdde7cc1c --- /dev/null +++ b/pkg/wakaama/contrib/objects/current.c @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2024 HAW Hamburg + * + * This file is subject to the terms and conditions of the GNU Lesser + * General Public License v2.1. See the file LICENSE in the top level + * directory for more details. + */ +/** + * @{ + * @ingroup lwm2m_objects_current + * + * @file + * @brief Current sensor object implementation for LwM2M client using Wakaama + * + * @author Leandro Lanzieri + * @} + */ + +#include "liblwm2m.h" +#include "lwm2m_client.h" +#include "objects/current.h" +#include "objects/ipso_sensor_base.h" + +#define ENABLE_DEBUG 0 +#include "debug.h" + +/** + * @brief Current Sensor object implementation descriptor. + */ +static lwm2m_obj_ipso_sensor_base_t _current_object; + +/** + * @brief Pool of object instances. + */ +static lwm2m_obj_ipso_sensor_base_inst_t _instances[CONFIG_LWM2M_CURRENT_INSTANCES_MAX]; + +lwm2m_object_t *lwm2m_object_current_init(lwm2m_client_data_t *client_data) +{ + assert(client_data); + int res = lwm2m_object_ipso_sensor_base_init_derived(client_data, &_current_object, + LWM2M_CURRENT_OBJECT_ID, + _instances, + CONFIG_LWM2M_CURRENT_INSTANCES_MAX); + + if (res) { + DEBUG("[lwm2m:current]: failed to create object\n"); + return NULL; + } + + return &_current_object.object; +} + +int32_t lwm2m_object_current_instance_create(const lwm2m_obj_current_args_t *args) +{ + int32_t result = lwm2m_object_ipso_sensor_base_instance_create(&_current_object, args); + + if (result) { + DEBUG("[lwm2m:current]: failed to create instance\n"); + } + + return result; +} + +void lwm2m_object_current_update_value(const lwm2m_client_data_t *client_data, uint16_t instance_id, + int16_t value) +{ + lwm2m_object_ipso_sensor_base_update_value(client_data, &_current_object, instance_id, value); +} diff --git a/pkg/wakaama/include/objects/current.h b/pkg/wakaama/include/objects/current.h new file mode 100644 index 0000000000..797adf18ed --- /dev/null +++ b/pkg/wakaama/include/objects/current.h @@ -0,0 +1,159 @@ +/* + * Copyright (C) 2024 HAW Hamburg + * + * This file is subject to the terms and conditions of the GNU Lesser + * General Public License v2.1. See the file LICENSE in the top level + * directory for more details. + */ + +/** + * @ingroup lwm2m_objects + * @defgroup lwm2m_objects_current Current + * @brief Current Sensor object implementation for LwM2M client using Wakaama + * + * @experimental + * + * This implements the LwM2M Current Sensor object (ID 3301) as specified in the LwM2M registry. + * + * The sensor value can be updated by the application using the + * @ref lwm2m_object_current_update_value function, or polled when required if a callback is + * registered upon object instantiation via @ref lwm2m_obj_current_args_t::read_cb. + * + * To use this object add `USEMODULE += wakaama_objects_current` to the application Makefile. + * + * ## Resources + * + * For an XML description of the object see + * https://raw.githubusercontent.com/OpenMobileAlliance/lwm2m-registry/prod/version_history/3317-1_0.xml + * + * This object is based on the @ref lwm2m_objects_ipso_sensor_base, therefore it shares the same + * resources. Note that the optional resources "Current Calibration" (ID 5821) and + * "Application Type" (ID 5750) are not implemented. + * + * ## Usage + * + * 1. Initialize the LwM2M object with an initialized client pointer. + * + * ~~~~~~~~~~~~~~~{.c} + * lwm2m_object_t *obj = lwm2m_object_current_init(&client_data); + * ~~~~~~~~~~~~~~~ + * + * 2. Create a new instance of the object with a given configuration (@ref lwm2m_obj_current_args_t). + * Here, you can decide the way of updating the sensor values: polling or pushing. In this case, + * we register a callback function that is called whenever the sensor value is read. + * + * ~~~~~~~~~~~~~~~{.c} + * + * // callback function to read the sensor value + * int _read_cb(void *arg, int16_t *value) + * { + * (void)arg; + * + * // generate new value + * *value = 100; + * + * return 0; + * } + * + * // initialize an instance of current sensor object + * const lwm2m_obj_current_args_t current_args = { + * .min_range_value = 0.0, + * .max_range_value = 2000.0, + * .units = "mA", + * .units_len = sizeof("mA") - 1, + * .instance_id = 0, + * .read_cb = _read_cb, + * .read_cb_arg = NULL + * }; + * + * int32_t res = lwm2m_object_current_instance_create(¤t_args); + * + * if (res < 0) { + * puts("Could not create current object instance"); + * } + * ~~~~~~~~~~~~~~~ + * + * 3. You can now update the sensor values using the @ref lwm2m_object_current_update_value function. + * + * ~~~~~~~~~~~~~~~{.c} + * uint16_t instance_id = (uint16_t)res; + * lwm2m_object_current_update_value(&client_data, instance_id, new_value); + * ~~~~~~~~~~~~~~~ + * @{ + * + * @file + * + * @author Leandro Lanzieri + */ + +#ifndef OBJECTS_CURRENT_H +#define OBJECTS_CURRENT_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include "liblwm2m.h" +#include "lwm2m_client.h" +#include "objects/ipso_sensor_base.h" + +/** + * @defgroup lwm2m_objects_current_config LwM2M Current Sensor object compile configurations + * @ingroup lwm2m_client_config + * @{ + */ +/** + * @brief Maximum number of instances of the object + */ +#ifndef CONFIG_LWM2M_CURRENT_INSTANCES_MAX +#define CONFIG_LWM2M_CURRENT_INSTANCES_MAX (1U) +#endif +/** @} */ + +/** + * @brief LwM2M Current Sensor object ID + */ +#define LWM2M_CURRENT_OBJECT_ID 3317 + +/** + * @brief Arguments for the creation of a Current Sensor object instance. + */ +typedef lwm2m_obj_ipso_base_sensor_args_t lwm2m_obj_current_args_t; + +/** + * @brief Initialize the Current Sensor object handle + * + * @param[in] client_data Pointer to the LwM2M client data. + * + * @return Pointer to the global handle of the Current Sensor object. + */ +lwm2m_object_t *lwm2m_object_current_init(lwm2m_client_data_t *client_data); + +/** + * @brief Create a new Current Sensor instance. + * + * @param[in] args Initialize structure with the parameter for the instance. Must + * not be NULL. + * + * @return > 0 value representing the instance ID if the instance was created successfully. + * @return <0 otherwise + */ +int32_t lwm2m_object_current_instance_create(const lwm2m_obj_current_args_t *args); + +/** + * @brief Update the value of the current sensor and trigger a notification + * to the observing servers, if any. + * + * @param[in] client_data Pointer to the LwM2M client. + * @param[in] instance_id ID of the instance to update. + * @param[in] value New value for the sensor. + */ +void lwm2m_object_current_update_value(const lwm2m_client_data_t *client_data, + uint16_t instance_id, int16_t value); + +#ifdef __cplusplus +} +#endif + +#endif /* OBJECTS_CURRENT_H */ +/** @} */