From 3576493b07a4097674abe9d82f754f0a1fa35af8 Mon Sep 17 00:00:00 2001 From: Imanol-Mikel Barba Sabariego Date: Sun, 8 Jun 2014 04:20:37 +0000 Subject: [PATCH] --- Project/applications/smartcities/include/buffer.h | 2 +- Project/applications/smartcities/include/callbacks.h | 9 +++++++++ Project/applications/smartcities/main.c | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Project/applications/smartcities/include/buffer.h b/Project/applications/smartcities/include/buffer.h index 593f903..e4761bc 100644 --- a/Project/applications/smartcities/include/buffer.h +++ b/Project/applications/smartcities/include/buffer.h @@ -42,7 +42,7 @@ int check_memory(void); //! Buffer data send function /*! This function sends the data in a specified buffer to the server. If successful, it frees the memory used by it. */ -int send(char** buf /*! Buffer to send */, uint32_t *index /*! Current buffer index */, uint32_t *size /*! Buffer size */, char *provider_ID /*! Current module ID */, char *sensor_ID /*! Sensor ID for the data stored in that buffer */); +int send(char** buf /*! Buffer to send */, uint32_t *index /*! Current buffer index */, uint32_t *size_buf /*! Buffer size */, char *provider_ID /*! Current module ID */, char *sensor_ID /*! Sensor ID for the data stored in that buffer */); //! Buffer join function /*! This function returns a copy of the buffer passed by argument with one more slot to store another piece of data from the sensors */ diff --git a/Project/applications/smartcities/include/callbacks.h b/Project/applications/smartcities/include/callbacks.h index 833a857..b71f16e 100644 --- a/Project/applications/smartcities/include/callbacks.h +++ b/Project/applications/smartcities/include/callbacks.h @@ -1,3 +1,12 @@ + +/**@file + * @brief Declaration for the network callback functions + * @author Imanol Barba Sabariego, Maria Jorba Brosa + * @date 08/06/2014 + * + * The functions declared in this file are used as callbacks by the network functions in the libwismart library. + */ + #ifndef CALLBACKS_H #define CALLBACKS_H diff --git a/Project/applications/smartcities/main.c b/Project/applications/smartcities/main.c index ec1cba9..ba3bd0e 100644 --- a/Project/applications/smartcities/main.c +++ b/Project/applications/smartcities/main.c @@ -160,7 +160,7 @@ void send_data(char** buffers[] /*! Array of in-memory buffers containing the da //! Buffer data insertion function /*! This function inserts processed data in the memory */ -void put_buffers(char** buffers[],/*! Array of in-memory buffers containing the data */, uint32_t ind[] /*! Buffer indexes */ , uint32_t sizes[] /*! Buffer sizes */,char** cooked /*! Array of processed data from the sensors */, uint8_t* sensors /*! Array of sensors addresses currently connected to the device */) +void put_buffers(char** buffers[]/*! Array of in-memory buffers containing the data */, uint32_t ind[] /*! Buffer indexes */ , uint32_t sizes[] /*! Buffer sizes */,char** cooked /*! Array of processed data from the sensors */, uint8_t* sensors /*! Array of sensors addresses currently connected to the device */) { DBG("Putting data in buffers...\r\n"); int i; @@ -178,7 +178,7 @@ void put_buffers(char** buffers[],/*! Array of in-memory buffers containing the //! Data timestamping function /*! This function timestamps de collected data using the methods defined in ntp.h */ -char** timestamp_datas(char* value[] /*! Raw data collected from the sensors */,unsigned long timestamp /* Current timestamp to add to the measurements*/, uint8_t* sensors /*! Array of sensors addresses currently connected to the device */) +char** timestamp_datas(char* value[] /*! Raw data collected from the sensors */,unsigned long timestamp /*! Current timestamp to add to the measurements*/, uint8_t* sensors /*! Array of sensors addresses currently connected to the device */) { DBG("Timestamping data...\r\n"); char** cooked_data; -- libgit2 0.22.2