From b0c12c0a9510b085a0de0bedb648dac5682c69aa Mon Sep 17 00:00:00 2001
From: Maria Jorba Brosa <maria.jorba.brosa@gmail.com>
Date: Thu, 22 May 2014 08:17:37 +0000
Subject: [PATCH] 

---
 Project/applications/smartcities/main2.c | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/Project/applications/smartcities/main2.c b/Project/applications/smartcities/main2.c
index b570ff2..17579d9 100644
--- a/Project/applications/smartcities/main2.c
+++ b/Project/applications/smartcities/main2.c
@@ -108,13 +108,26 @@ void send_data(char** buffers[j], uint32_t ind[], uint32_t sizes[j], uint8_t sen
     }
 }
 
-void put_buffers(char** buffers,uint32_t ind[],uint32_t sizes[],char* valueSensors[]){
-int i;
+void put_buffers(char** buffers,uint32_t ind[],uint32_t sizes[],char** cooked){
+    int i;
     for(i=0;i<TOTAL_SENSORS;i++){
-        put_message(valueSensors[i], buffers[i] ,&ind[i],&sizes[i]);
+        put_message(cooked[i], buffers[i] ,&ind[i],&sizes[i]);
+        chHeapFree(cooked[i]);
     }
 
 }
+char** timestamp_datas(char* value[],unsigned long timestamp){
+
+    char** cooked_data;
+    Date t=getDate(timestamp);
+    int i;
+    for(i=0;i<TOTAL_SENSORS;i++){
+        cooked_data[i]=timestamp_data(value[i], t);
+        chHeapFree(value[i]);
+    }
+    return cooked_data;
+}
+
 
 int main(void)
 {
@@ -135,14 +148,15 @@ int main(void)
     //unsigned int time = getNTPTime();
     unsigned int time = getSecsSince1900();
 
-    unsigned int timestamp = 0;
-    unsigned int delay = getSystemTime();
-    unsigned int delay2 = 0;
+    unsigned long timestamp = 0;
+    unsigned long delay = getSystemTime();
+    unsigned long delay2 = 0;
     sleep_thread(SHORT_PERIOD - time%SHORT_PERIOD);
 
     uint32_t ind[4]={0};
     char** buffers[4];
     uint32_t sizes[4]={0};
+    char* cooked_data[TOTAL_SENSORS];
 
     init_registry();
     
@@ -192,7 +206,8 @@ int main(void)
         /* Add data to the buffer with timestamp*/
         
         //a_cookedData = format_data(a_rawData, timestamp);
-        put_buffers(buffers,ind,sizes,valueSensors);
+        char** values=timestamp_datas(valueSensors,timestamp);
+        put_buffers(buffers,ind,sizes,values);
         printf("mirant memoria\r\n");
         int res=check_memory();
         if(res==SOFT_REACHED){
--
libgit2 0.22.2