From 737124c7b279634d86422ea3e121de5d7d5ba5fb Mon Sep 17 00:00:00 2001
From: Imanol-Mikel Barba Sabariego <imanol@imanolbarba.net>
Date: Sat, 24 May 2014 13:51:36 +0000
Subject: [PATCH] 

---
 Project/applications/smartcities/include/timer-loop.h |  6 ++++--
 Project/applications/smartcities/main2.c              | 64 ++++++++++++++++++++++++++++++++++++++++++----------------------
 Project/applications/smartcities/test_timer-loop.c    |  2 +-
 3 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/Project/applications/smartcities/include/timer-loop.h b/Project/applications/smartcities/include/timer-loop.h
index d610907..c79f581 100644
--- a/Project/applications/smartcities/include/timer-loop.h
+++ b/Project/applications/smartcities/include/timer-loop.h
@@ -6,8 +6,10 @@
 
 #define HALF_HOUR	    60*30 // time in seconds
 #define FIVE_MIN	    60*5  // time in seconds 
-#define LONG_PERIOD		HALF_HOUR //60*3 // for testing
-#define SHORT_PERIOD	FIVE_MIN  //60*1 // for testing
+//#define LONG_PERIOD		HALF_HOUR //60*3 // for testing
+//#define SHORT_PERIOD	FIVE_MIN  //60*1 // for testing
+#define LONG_PERIOD		60*3 //60*3 // for testing
+#define SHORT_PERIOD	60*1  //60*1 // for testing
 
 unsigned long getSystemTime(void);
 
diff --git a/Project/applications/smartcities/main2.c b/Project/applications/smartcities/main2.c
index bf4a2d9..f595155 100644
--- a/Project/applications/smartcities/main2.c
+++ b/Project/applications/smartcities/main2.c
@@ -115,7 +115,8 @@ void send_data(char** buffers[], uint32_t ind[], uint32_t sizes[], uint8_t senso
 
 void put_buffers(char** buffers[],uint32_t ind[],uint32_t sizes[],char** cooked, uint8_t* sensors){
     int i;
-    for(i=0;i<sensors_length;i++){ 
+    for(i=0;i<sensors_length;i++){
+        printf("For %d and %d\n\r", ind[i],sizes[i]);
         put_message(cooked[i], buffers[i] ,&ind[i],&sizes[i]);
         chHeapFree(cooked[i]);
     }
@@ -124,14 +125,18 @@ void put_buffers(char** buffers[],uint32_t ind[],uint32_t sizes[],char** cooked,
 char** timestamp_datas(char* value[],unsigned long timestamp, uint8_t* sensors){
     char** cooked_data;
     cooked_data = (char**) chHeapAlloc(NULL,sensors_length * sizeof(char*));
+    printf("Data allocated...\r\n");
     Date t=getDate(timestamp);
     int i;
     for(i=0;i<sensors_length;i++){
-        
+        printf("Calling timestamp_data...\r\n");
         cooked_data[i]=timestamp_data(value[i], t);
+        printf("Finished timestamp_data...\r\n");
+        printf("Data is: %s",cooked_data[i]);
         chHeapFree(value[i]);
         
     }
+    printf("Returning timestamped data...\r\n");
     return cooked_data;
 }
 
@@ -177,15 +182,19 @@ int main(void)
 
     char* valueSensors[TOTAL_SENSORS];
     memset (valueSensors, 0, TOTAL_SENSORS);
-
-    I2C_scan(sensors);
+    printf("Scanning sensors...\r\n");
+    //I2C_scan(sensors);
+    sensors[0] = LIGHT_ADDR;
     sensors_length=strlen((char*)sensors);
+    printf("%d sensor detected...\r\n",sensors_length);
     //registrar sensores
     //Esta funcion esta mas arriba para no repetir código luego -- Imanol
+    printf("Connecting to wifi...\r\n");
     wifi_connect();
     //unsigned int time = getNTPTime();
     unsigned int time = getSecsSince1900();
     //desconectarwifi
+    printf("Disconecting wifi...\r\n");
     wifi_disconnect();
 
     unsigned long timestamp = 0;
@@ -201,21 +210,42 @@ int main(void)
 
     while(1){
         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);
+        printf("time (absolute):\t%ul\r\ntime mod LONG_PERIOD:\t%ul\r\ntime mod SHORT_PERIOD:\t%ul\r\n",time,time%LONG_PERIOD,time%SHORT_PERIOD);
 
         delay = getSystemTime();
         /* Collect data from sensors */
         //collect_data(/*a_rawData*/);
-        collectData(valueSensors, sensors);
-        
+        printf("Collecting data...\r\n");
+        //collectData(valueSensors, sensors);
+        valueSensors[0] = chHeapAlloc(NULL,6);
+        strcpy(valueSensors[0],"123456");
+        printf("Data collected...\r\n");
 
         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);
+        printf("time (absolute):\t%ul\r\ntime mod LONG_PERIOD:\t%ul\r\ntime mod SHORT_PERIOD:\t%ul\r\n",time,time%LONG_PERIOD,time%SHORT_PERIOD);
         
         delay = getSystemTime();
         //cada mitja hora
-        if (i == LONG_PERIOD/SHORT_PERIOD ){
+
+        //delay2 = getElapsedTime(delay);
+        
+        delay = getSystemTime();
+        //timestamp = time - delay2;
+        timestamp = time - delay;
+        printf("timestamp (absolute):\t%ul\r\ntimestamp mod LONG_PERIOD:\t%ul\r\ntimestamp mod SHORT_PERIOD:\t%ul\r\n",timestamp,timestamp%LONG_PERIOD,timestamp%SHORT_PERIOD);
+        
+        /* Add data to the buffer with timestamp*/
+        
+        //a_cookedData = format_data(a_rawData, timestamp);
+        printf("Timestamping data...\r\n");
+        char** values=timestamp_datas(valueSensors,timestamp,sensors);
+        printf("Putting data in buffer...\r\n");
+        put_buffers(buffers,ind,sizes,values,sensors);
+        printf("Data is now in buffer...\n\r");
+         if (i == LONG_PERIOD/SHORT_PERIOD ){
+            printf("Programmed Send cycle...\r\n");
             /* Wi-Fi connect */
+            printf("Connecting to wifi...\r\n");
             wifi_connect();
             /* Send data to server, empty the buffer */
             send_data(buffers, ind, sizes, sensors);
@@ -223,20 +253,9 @@ int main(void)
             time = getSecsSince1900();
             //desconectar wifi
             wifi_disconnect();
-            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);
+            printf("time (absolute):\t%ul\r\ntime mod LONG_PERIOD:\t%ul\r\ntime mod SHORT_PERIOD:\t%ul\r\n",time,time%LONG_PERIOD,time%SHORT_PERIOD);
             i = 0;
         }
-        delay2 = getElapsedTime(delay);
-        
-        delay = getSystemTime();
-        timestamp = time - delay2;
-        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);
-        char** values=timestamp_datas(valueSensors,timestamp,sensors);
-        put_buffers(buffers,ind,sizes,values,sensors);
 
         printf("mirant memoria\r\n");
         int res=check_memory();
@@ -286,9 +305,10 @@ int main(void)
             wifi_disconnect();
         }
         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);
+        printf("time (absolute):\t%ul\r\ntime mod LONG_PERIOD:\t%ul\r\ntime mod SHORT_PERIOD:\t%ul\r\n",time,time%LONG_PERIOD,time%SHORT_PERIOD);
         
         delay = getSystemTime();
+        printf("Time to sleep! for %d seconds\r\n", SHORT_PERIOD - time%SHORT_PERIOD);
         sleep_thread(SHORT_PERIOD - time%SHORT_PERIOD);
         i++;
     }  
diff --git a/Project/applications/smartcities/test_timer-loop.c b/Project/applications/smartcities/test_timer-loop.c
index 4edd549..1031574 100644
--- a/Project/applications/smartcities/test_timer-loop.c
+++ b/Project/applications/smartcities/test_timer-loop.c
@@ -9,7 +9,7 @@ void testf(unsigned long delay, const char* premesg, const char* postmesg)
 	printf("%s\r\n",postmesg);
 }
 unsigned long getNTPTime()
-{
+{ 
 	testf(1,"Asking for NTP time...", "NTP time received");
 	return getSystemTime();
 }
--
libgit2 0.22.2