--no commit message

Imanol-Mikel Barba Sabariego
1 parent 84ae2579
Showing 3 changed files with 49 additions and 14 deletions
Project/applications/smartcities/buffer.c
Project/applications/smartcities/configServer.c
Project/applications/smartcities/main2.c
@@ -7,15 +7,20 @@ uint32_t i,len;
 len=*buf_len;
 if(len==*index)
 {  
-
+	printf("Joining buffer...\r\n");
 	char** buffer=join_buf(buf, buf_len);
+	printf("Joined buffer...\r\n");
 	buffer[*index]=chHeapAlloc(NULL,strlen(info)+1);
+	printf("Memory allocated...\r\n");
 	strcpy(buffer[*index],info);
+	printf("Data copied...\r\n");
 	i=*index+1;
 	*index = i;
 	return buffer;
 }
-else{
+else
+{
+	printf("WTF in put_message\r\n");
 	buf[*index] = chHeapAlloc(NULL,strlen(info)+1);
 	buf[*index]=info;	
 	i=*index+1;
@@ -81,13 +86,20 @@ char** join_buf(char** buf, uint32_t *buf_len){
 	int len= *buf_len;
 	n_buf=chHeapAlloc (NULL,sizeof (char *) * (len+1));
 	int i;
+	printf("Start buffer join...\r\n");
 	for(i=0; i<len;i++){
+		printf("in join_buf for, Asking for %d bytes...\r\n",strlen(buf[i]+1));
 		n_buf[i]=chHeapAlloc(NULL,strlen(buf[i])+1);
+		printf("in join_buf for, Memory allocated...\r\n");
 		strcpy(n_buf[i],buf[i]);
+		printf("in join_buf for, Message copied...\r\n");
 		chHeapFree(buf[i]);
+		printf("in join_buf for, Memory cleared...\r\n");
 	}
+	printf("All data transferred\r\n");
 	if(len!=0)
 	{	chHeapFree(buf);	}
+	printf("Old buffer cleared\r\n");
 	len++;
 	*buf_len=len;
 	return n_buf;
@@ -61,7 +61,6 @@ void configServer_setClientParameters()
     strcpy(config.password,arg_radPassStr);
     strcpy(config.localization,arg_geoLocalizationStr);
 	strcpy(config.ssid,arg_networkNameStr);
-	strcpy(config.wepkey,arg_passphraseStr);
 	strcpy(config.passphrase,arg_passphraseStr);
     /* Value validation */
@@ -13,7 +13,7 @@
 #include "sensors.h"
 #define WIFI_MODE               WIFI_MODE_CLIENT
-#define NETWORK_SSID_AP         "modularsens"
+#define NETWORK_SSID_AP         "modularsense"
 #define NETWORK_KEY_AP          NULL
 #define NETWORK_CHANNEL_AP      1
@@ -32,14 +32,30 @@ uint8_t connected=0;
 uint8_t timeout=0;
 uint8_t retries=0;
 uint8_t sensors_length=0;
+uint8_t registry_opened=0;
+
+void update_time(unsigned long *time)
+{
+    printf("Requesting new NTP time...\r\n");
+    unsigned long new_time = getSecsSince1900();
+    if(new_time)
+    {
+        *time = getSecsSince1900();
+    }
+    printf("Time updated...\r\n");
+}
 void init_registry(void)
 {
     config_params_t config;
     strcpy(config.localization,"none");
-    libwismart_RegistryCreateKey(&geo, 1, sizeof(config));
-    libwismart_RegistryOpen(1);
+    if(!registry_opened)
+    {
+        libwismart_RegistryCreateKey(&geo, 1, sizeof(config));
+        libwismart_RegistryOpen(1);
+        registry_opened = 1;
+    }
     if(!libwismart_RegistryIsValueEmpty(&geo))
     {
         libwismart_RegistryGet(&geo,&config);
@@ -117,8 +133,12 @@ void put_buffers(char** buffers[],uint32_t ind[],uint32_t sizes[],char** cooked,
     int 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]);
+        printf("Putting data: %s\n\r",cooked[i]);
+        buffers[i] = put_message(cooked[i], buffers[i] ,&ind[i],&sizes[i]);
+        printf("Message put: %s\r\n",buffers[0][ind[0]-1]);
         chHeapFree(cooked[i]);
+        printf("Memory freed\n\r");
+        printf("Message put (assertion): %s\r\n",buffers[0][ind[0]-1]);
     }
 }
@@ -192,7 +212,8 @@ int main(void)
     printf("Connecting to wifi...\r\n");
     wifi_connect();
     //unsigned int time = getNTPTime();
-    unsigned int time = getSecsSince1900();
+    unsigned long time;
+    update_time(&time);
     //desconectarwifi
     printf("Disconecting wifi...\r\n");
     wifi_disconnect();
@@ -224,16 +245,16 @@ int main(void)
         time += getElapsedTime(delay);
         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();
+        //delay = getSystemTime();
         //cada mitja hora
         //delay2 = getElapsedTime(delay);
-        delay = getSystemTime();
+        //delay = getSystemTime();
         //timestamp = time - delay2;
-        timestamp = time - delay;
+        timestamp = time;
         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);
-        
+        delay = getSystemTime();
         /* Add data to the buffer with timestamp*/
         //a_cookedData = format_data(a_rawData, timestamp);
@@ -242,6 +263,7 @@ int main(void)
         printf("Putting data in buffer...\r\n");
         put_buffers(buffers,ind,sizes,values,sensors);
         printf("Data is now in buffer...\n\r");
+        printf("Data stored in buffer: %s with index %d and size %d\r\n",buffers[0][ind[0]-1], ind[0],sizes[0]);
          if (i == LONG_PERIOD/SHORT_PERIOD ){
             printf("Programmed Send cycle...\r\n");
             /* Wi-Fi connect */
@@ -249,11 +271,13 @@ int main(void)
             wifi_connect();
             /* Send data to server, empty the buffer */
             send_data(buffers, ind, sizes, sensors);
+            printf("Data sent!\r\n");
             //time = getNTPTime();
-            time = getSecsSince1900();
+            update_time(&time);
+            delay = getSystemTime();
             //desconectar wifi
             wifi_disconnect();
-            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);
+            printf("new ntp 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;
         }