From 232c771364521f1ddea8b219595993dbab1a1519 Mon Sep 17 00:00:00 2001
From: Maria Jorba Brosa <maria.jorba.brosa@gmail.com>
Date: Thu, 22 May 2014 07:46:14 +0000
Subject: [PATCH] 

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

diff --git a/Project/applications/smartcities/main2.c b/Project/applications/smartcities/main2.c
index 4461a1d..b570ff2 100644
--- a/Project/applications/smartcities/main2.c
+++ b/Project/applications/smartcities/main2.c
@@ -85,7 +85,7 @@ void init_registry(void)
 
 }
 
-void send_data()
+void send_data(char** buffers[j], uint32_t ind[], uint32_t sizes[j], uint8_t sensors[]);
 {
     int j;
     for(j=0;j<TOTAL_SENSORS;j++)
@@ -190,30 +190,14 @@ int main(void)
         printf("timestamp (absolute):\t%d\r\ntimestamp mod LONG_PERIOD:\t%d\r\ntimestamp mod SHORT_PERIOD:\t%d\r\n",timestamp,timestamp%LONG_PERIOD,timestamp%SHORT_PERIOD);
         
         /* Add data to the buffer with timestamp*/
+        
+        //a_cookedData = format_data(a_rawData, timestamp);
         put_buffers(buffers,ind,sizes,valueSensors);
         printf("mirant memoria\r\n");
         int res=check_memory();
         if(res==SOFT_REACHED){
             printf("--------------soft limit-------------\r\n");
-            int j;
-            for(j=0;j<TOTAL_SENSORS;j++)
-            {
-                printf(" enviant buffer %d\r\n",j);
-                
-                // fem servir 085 de prova, però haurem de fer servir sensor_id[j]
-                int ok=send(buffers[j],&ind[j],&sizes[j], mod.ID, sensor_id[j]);
-
-                if(ok==JSON_COMM_ERROR)
-                {
-                    printf("wismart is not connected\r\n");
-                }
-                else if( ok==JSON_OTHER_ERROR){
-                    printf("some error ocurred\r\n");
-                }
-                else if(ok ==JSON_POST_OK){
-                    printf(" send OK \r\n");
-                }
-            }
+            send_data();
         }
         else if(res==HARD_REACHED){
             printf("--------------hard limit-------------\r\n");
@@ -247,8 +231,6 @@ int main(void)
                 }
             }
         }
-        //a_cookedData = format_data(a_rawData, timestamp);
-
         time += getElapsedTime(delay);
         printf("time (absolute):\t%d\r\ntime mod LONG_PERIOD:\t%d\r\ntime mod SHORT_PERIOD:\t%d\r\n",time,time%LONG_PERIOD,time%SHORT_PERIOD);
         
--
libgit2 0.22.2