--no commit message

Imanol-Mikel Barba Sabariego
1 parent c352e167
Showing 23 changed files with 296 additions and 353 deletions
Project/applications/smartcities/adc.c
Project/applications/smartcities/buffer.c
Project/applications/smartcities/callbacks.c
Project/applications/smartcities/configServer.c
Project/applications/smartcities/flash.sh
Project/applications/smartcities/httpClient.c
Project/applications/smartcities/i2c.c
Project/applications/smartcities/include/adc.h
Project/applications/smartcities/include/buffer.h
Project/applications/smartcities/include/callbacks.h
Project/applications/smartcities/include/configServer.h
Project/applications/smartcities/include/globals.h
Project/applications/smartcities/include/httpClient.h
Project/applications/smartcities/include/i2c.h
Project/applications/smartcities/include/json.h
Project/applications/smartcities/include/ntp.h
Project/applications/smartcities/include/sensors.h
Project/applications/smartcities/include/timer-loop.h
Project/applications/smartcities/json.c
Project/applications/smartcities/main.c
@@ -12,7 +12,7 @@ uint32_t adc_batt_process()
 	adcRegisterValue = adc_batt_read();
 	analogValue = ADCbatt_VREF_MINUS + (((adcRegisterValue - ADCbatt_MIN_VALUE)*(ADCbatt_VREF_PLUS - ADCbatt_VREF_MINUS))/(ADCbatt_MAX_VALUE - ADCbatt_MIN_VALUE));
-	printf("Register value is %4u [%4u milliVolts are currently given to gpio %s]\r\n",adcRegisterValue, analogValue, ADCbatt_GPIO_STR);
+	DBG_ADC("Register value is %4u [%4u milliVolts are currently given to gpio %s]\r\n",adcRegisterValue, analogValue, ADCbatt_GPIO_STR);
 	return analogValue;
 }
@@ -66,7 +66,7 @@ uint32_t adc_sound_process()
 	adcRegisterValue = adc_sound_read();
 	analogValue = ADCsound_VREF_MINUS + (((adcRegisterValue - ADCsound_MIN_VALUE)*(ADCsound_VREF_PLUS - ADCsound_VREF_MINUS))/(ADCsound_MAX_VALUE - ADCsound_MIN_VALUE));
-	printf("Register value is %4u [%4u milliVolts are currently given to gpio %s]\r\n",adcRegisterValue, analogValue, ADCsound_GPIO_STR);
+	DBG_ADC("Register value is %4u [%4u milliVolts are currently given to gpio %s]\r\n",adcRegisterValue, analogValue, ADCsound_GPIO_STR);
 	return analogValue;
 }
@@ -7,20 +7,20 @@ char** put_message(char* info, char** buf,uint32_t *index, uint32_t *buf_len)
 	len=*buf_len;
 	if(len==*index)
 	{  
-		printf("Joining buffer...\r\n");
+		DBG_BUFFER("Joining buffer...\r\n");
 		char** buffer = join_buf(buf, buf_len);
-		printf("Joined buffer...\r\n");
+		DBG_BUFFER("Joined buffer...\r\n");
 		buffer[*index] = chHeapAlloc(NULL,strlen(info)+1);
-		printf("Memory allocated...\r\n");
+		DBG_BUFFER("Memory allocated...\r\n");
 		strcpy(buffer[*index],info);
-		printf("Data copied...\r\n");
+		DBG_BUFFER("Data copied...\r\n");
 		i = *index+1;
 		*index = i;
 		return buffer;
 	}
 	else
 	{
-		printf("WTF in put_message\r\n");
+		DBG_BUFFER("WTF in put_message\r\n");
 		buf[*index] = chHeapAlloc(NULL,strlen(info)+1);
 		buf[*index] = info;	
 		i = *index+1;
@@ -31,17 +31,18 @@ char** put_message(char* info, char** buf,uint32_t *index, uint32_t *buf_len)
 int check_memory()
 {
-	printf("Memòria disponible en bytes segons:\r\n");
-	int mem_free = libwismart_GetMemFree_Ram().free;
-	printf("- free:         %d     %d\r\n", libwismart_GetMemFree_Ram().free, MAX_RAM - libwismart_GetMemFree_Ram().free);
-	int mem = MAX_RAM - mem_free;
-	printf("mem ocupada=%d\r\n",mem);
+	DBG_BUFFER("Checking available memory...\r\n");
+	DBG_BUFFER("%c[1;36mAvailable memory: %d B%c[1;00m\r\n",0x1B,libwismart_GetMemFree_Ram().free,0x1B);
+	int mem = MAX_RAM - libwismart_GetMemFree_Ram().free;
+	DBG_BUFFER("%c[1;36mUsed memory: %d B%c[1;00m\r\n",0x1B,mem,0x1B);
 	if(mem >= HARD_LIMIT)
 	{
+		DBG_BUFFER("[WARNING] Hard limit reached\r\n");
 		return HARD_REACHED;
 	}
 	else if(mem >= SOFT_LIMIT)
 	{
+		DBG_BUFFER("[WARNING] Soft limit reached\r\n");
 		return SOFT_REACHED;
 	}
 	return MEMORY_OK;
@@ -49,21 +50,20 @@ int check_memory()
 int send(char** buf, uint32_t *index, uint32_t *size_buf, char *provider_ID, char *sensor_ID)
 {
-	printf("abans del JSON statement\r\n");
-	printf("index= %d \r\n",*index);
-	char* statement=prepare_json_observation_statement(buf, *index);
+	DBG_BUFFER("Preparing JSON statement...\r\n");
+	char* statement = prepare_json_observation_statement(buf, *index);
 	uint32_t size = strlen(statement);
 	if(buf==NULL)
 	{
+		DBG_BUFFER("[ERROR] Buffer not initialized!\r\n");
 		return 2;
 	}
-	printf("abans del JSON\r\n");
 	uint8_t res = send_json(statement, size, provider_ID, sensor_ID);
 	chHeapFree(statement);
 	int i;
-	printf("JSON_POST_OK ?  %d\r\n",res == JSON_POST_OK);
 	if(res==JSON_POST_OK)
 	{
+		DBG_BUFFER("Data sent successfully\r\n");
 		for(i=0;i<*index;i++)
 		{
 			chHeapFree(buf[i]);
@@ -72,7 +72,6 @@ int send(char** buf, uint32_t *index, uint32_t *size_buf, char *provider_ID, cha
 		{
 			chHeapFree(buf);
 		}
-		printf("posant la mida i l'index a 0\r\n");
 		*index=0;
 		*size_buf=0;
 	}
@@ -86,23 +85,23 @@ 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");
+	DBG_BUFFER("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));
+		DBG_BUFFER("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");
+		DBG_BUFFER("in join_buf for, Memory allocated...\r\n");
 		strcpy(n_buf[i],buf[i]);
-		printf("in join_buf for, Message copied...\r\n");
+		DBG_BUFFER("in join_buf for, Message copied...\r\n");
 		chHeapFree(buf[i]);
-		printf("in join_buf for, Memory cleared...\r\n");
+		DBG_BUFFER("in join_buf for, Memory cleared...\r\n");
 	}
-	printf("All data transferred\r\n");
+	DBG_BUFFER("All data transferred\r\n");
 	if(len != 0)
 	{
 		chHeapFree(buf);
 	}
-	printf("Old buffer cleared\r\n");
+	DBG_BUFFER("Old buffer cleared\r\n");
 	len++;
 	*buf_len=len;
 	return n_buf;
@@ -6,18 +6,18 @@ void dhcp_connect_result_cb(int result)
 	if(result==LIBWISMART_DHCP_ADDRESS_ASSIGNED)
 	{
 		libwismart_GetCurrentIP(&ip,NULL,NULL);
-		printf("IP: %d.%d.%d.%d \r\n",ip.addr[3],ip.addr[2],ip.addr[1],ip.addr[0]);
+		DBG_CALLBACKS("IP: %d.%d.%d.%d \r\n",ip.addr[3],ip.addr[2],ip.addr[1],ip.addr[0]);
 		connected = 1;
         retries = 0;
 	}
 	else if(result==LIBWISMART_DHCP_TIMEOUT)
 	{
-		printf("DHCP timeout\r\n");
+		DBG_CALLBACKS("DHCP timeout\r\n");
         timeout = 1;
 	}
 	else
 	{
-		printf("DHCP error\r\n");
+		DBG_CALLBACKS("DHCP error\r\n");
         timeout = 1;
 	}
@@ -29,7 +29,7 @@ void wifi_connect_result_cb(int result)
     {
 		timeout=1;
 	}
-    printf("WiFi Connect indication: ");
+    DBG_CALLBACKS("WiFi Connect indication: ");
     if(result == WISMART_WIFI_CONNECTED)
     {
         printf("Connected\r\n");
@@ -62,16 +62,16 @@ void softapMode_clientIndicationCb(wismart_softap_cb_t reason, const uint8_t *ma
     switch(reason)
     {
         case WISMART_WIFI_AP_CLIENT_CONNECTED:
-            printf("Client: "MACSTR" connected\r\n",MAC2STR(mac));
+            DBG_CALLBACKS("Client: "MACSTR" connected\r\n",MAC2STR(mac));
             break;
         case WISMART_WIFI_AP_CLIENT_DISCONNECTED:
-            printf("Client: "MACSTR" disconnected\r\n",MAC2STR(mac));
+            DBG_CALLBACKS("Client: "MACSTR" disconnected\r\n",MAC2STR(mac));
             break;
         case WISMART_WIFI_AP_CLIENT_EXPIRED:
-            printf("Client: "MACSTR" connection have expired\r\n",MAC2STR(mac));
+            DBG_CALLBACKS("Client: "MACSTR" connection have expired\r\n",MAC2STR(mac));
             break;
         case WISMART_WIFI_AP_CLIENT_GET_IP:
-            printf("Client: "MACSTR" got ip: %s\r\n", MAC2STR(mac), inet_ntoa(*ip));
+            DBG_CALLBACKS("Client: "MACSTR" got ip: %s\r\n", MAC2STR(mac), inet_ntoa(*ip));
             break;
     }
@@ -81,11 +81,11 @@ void softapMode_clientIndicationCb(wismart_softap_cb_t reason, const uint8_t *ma
 void printWifiInfo(uint8_t wifiMode)
 {   
-    printf("\r\n\r\n");
-    printf("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -\r\n");
-    printf("| Network Is Ready!\r\n");
-    printf("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -\r\n");
-    printf("| Mode : %s\r\n", (wifiMode == WIFI_MODE_CLIENT) ? "Client":"Soft Access Point");
-    printf("| IP   : 192.168.1.1\r\n");
-    printf("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -\r\n");
+    DBG_CALLBACKS("\r\n\r\n");
+    DBG_CALLBACKS("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -\r\n");
+    DBG_CALLBACKS("| Network Is Ready!\r\n");
+    DBG_CALLBACKS("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -\r\n");
+    DBG_CALLBACKS("| Mode : %s\r\n", (wifiMode == WIFI_MODE_CLIENT) ? "Client":"Soft Access Point");
+    DBG_CALLBACKS("| IP   : 192.168.1.1\r\n");
+    DBG_CALLBACKS("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -\r\n");
 }
 \ No newline at end of file
@@ -100,7 +100,7 @@ void configServer_setClientParameters()
             if(ret == 0)
             {
                 //successful conversion
-                printf("%d,%d,%d,%d,%d\r\n",asciiBuf[0],asciiBuf[1],asciiBuf[2],asciiBuf[3],asciiBuf[4]);
+                CONFIG_SERVER_DBG("%d,%d,%d,%d,%d\r\n",asciiBuf[0],asciiBuf[1],asciiBuf[2],asciiBuf[3],asciiBuf[4]);
                 memset(arg_passphraseStr, 0, sizeof(arg_passphraseStr));
                 memcpy(arg_passphraseStr, asciiBuf, 5);
             }
+#!/bin/bash
+
+make clean
+make all
+st-flash write build/smartcities.bin 0x8000000
@@ -24,14 +24,14 @@ int httpRequest(struct httpHeaders head, char* content, int content_size)
 	ip4_addr_set_u32(&remote_ip,ipaddr_addr(SERVER_IP));
 	// Check or default params
-	printf("httpRequest: Checking params\r\n");
+	DBG_HTTP("Checking params\r\n");
 	if (head.uri == NULL || head.host == NULL)
 	{
 		return 1;	
 	}
 	// Calculate header size
-	printf("httpRequest: Calculating header size\r\n");
+	DBG_HTTP("Calculating header size\r\n");
 	int head_size = strlen(reqMethod2text(head.method));
 	head_size += strlen(" ") + head.uri_size + strlen(" HTTP/1.1") + strlen(ENDL);
 	head_size += strlen("Host: ") + head.host_size + strlen(ENDL);
@@ -42,7 +42,7 @@ int httpRequest(struct httpHeaders head, char* content, int content_size)
 		head_size += strlen("Content-Length: ") + numberofdigits(content_size) + 2*(strlen(ENDL));
 	}
 	// Build request head
-	printf("httpRequest: Building request head\r\n");
+	DBG_HTTP("Building request head\r\n");
 	int request_size = head_size + content_size + 2*(strlen(ENDL));
 	request = (char *) chHeapAlloc(NULL,request_size);
 	strcpy(request, reqMethod2text(head.method));
@@ -70,56 +70,51 @@ int httpRequest(struct httpHeaders head, char* content, int content_size)
 	// Build request with content
 	if(content_size > 0)
 	{
-		printf("httpRequest: Adding content to request string\r\n");
+		DBG_HTTP("Adding content to request string\r\n");
 		strcat(request, content);
 	}
 	else
 	{
-		printf("httpRequest: Skipping void content\r\n");
+		DBG_HTTP("Skipping void content\r\n");
 	}
-	printf("packet: %s\r\n",request);
+	DBG_HTTP("Packet:\r\n\r\n%c[1;33m%s%c[1;00m \r\n\r\n",0x1B,request,0x1B);
 	// Set connection
-	/*while(connection_ok !=0) // != ERR_OK
-	{*/
-		printf("httpRequest: Setting connection\r\n");
-		neocon = netconn_new(NETCONN_TCP);
-		if(neocon == NULL)
-		{
-			printf("\\->Socket creation FAILED. Have you called libwismart_init_bsd_sockets ?\r\n");
-		}
-		/*local_ip.addr = 0;//getip
-		netconn_bind(neocon, IP_ADDR_ANY, LOCAL_PORT); //88 is provisional local port.*/
-		printf("httpRequest: Establishing connection\r\n");
-		netconn_connect(neocon, &remote_ip, DEFAULT_REMOTE_PORT);
+	DBG_HTTP("Setting connection\r\n");
+	neocon = netconn_new(NETCONN_TCP);
+	if(neocon == NULL)
+	{
+		DBG_HTTP("[ERROR] Socket creation FAILED. Have you called libwismart_EnableBsdSocketAPI()?\r\n");
+	}
+	/*local_ip.addr = 0;//getip
+	netconn_bind(neocon, IP_ADDR_ANY, LOCAL_PORT); //88 is provisional local port.*/
+	DBG_HTTP("Establishing connection\r\n");
+	netconn_connect(neocon, &remote_ip, DEFAULT_REMOTE_PORT);
+
+	// Send Request
+	DBG_HTTP("Sending request\r\n");
+	err_t err=netconn_write(neocon, request, request_size, NETCONN_NOCOPY);
+	DBG_HTTP("Write returned: %d\r\n",err);
+	chHeapFree(request);
-		// Send Request
-		printf("httpRequest: Sending request\r\n");
-		err_t err=netconn_write(neocon, request, request_size, NETCONN_NOCOPY);
-		printf("res write= %d\r\n",err);
-		chHeapFree(request);
-		
-		// Wait for Response
-		printf("httpRequest: Waiting for response\r\n");
-		//neocon->recv_timeout = 5000; // for 5s
-		connection_ok = netconn_recv(neocon, &netBufs);
-		printf("res recv= %d\r\n",connection_ok);
-
-		if(connection_ok !=0)
-		{
-			netbuf_delete(netBufs);
-			netconn_close(neocon);
-			netconn_delete(neocon);
-			return 0;
-		}
-	//}
+	// Wait for Response
+	DBG_HTTP("Waiting for response\r\n");
+	//neocon->recv_timeout = 5000; // for 5s
+	connection_ok = netconn_recv(neocon, &netBufs);
+	DBG_HTTP("Receive returned: %d\r\n",connection_ok);
+	if(connection_ok !=0)
+	{
+		netbuf_delete(netBufs);
+		netconn_close(neocon);
+		netconn_delete(neocon);
+		return 0;
+	}
 	// Manage Response
-	printf("httpRequest: Response received. Let's parse the information\r\n");
+	DBG_HTTP("Response received. Let's parse the information\r\n");
 	response = (char*)chHeapAlloc(NULL,4*sizeof(char));
 	netbuf_copy_partial(netBufs,response,3,9); // read 3B starting from 9th -> read response code. "HTTP/1.1 301 Moved Permanently"
-	printf("httpRequest: Unbelievablelybilbiyblyib successful! :D\r\nResponse code: %s\r\n",response);
+	DBG_HTTP("Response code: %s\r\n",response);
 	int http_response = response2int(response);
-	
-	// alliberem Mandela i Willy
+
 	netbuf_delete(netBufs);
 	netconn_close(neocon);
 	netconn_delete(neocon);	
@@ -127,32 +122,6 @@ int httpRequest(struct httpHeaders head, char* content, int content_size)
 	return http_response;
 }
-/*
-	err_t netconn_write ( struct netconn * aNetConn, const void * aData, size_t aSize, u8_t aApiFlags );
-
-    aNetConn : the netconn object the data is written to
-    aData : address of beginning of the data to write
-    aSize : the length of the data in bytes
-    aApiFlags : either of
-        NETCONN_NOCOPY if the data is stable for the time of the transmission (static data or heap)
-        NETCONN_COPY if the data is not stable for the time of the transmission (stack) 
-        
-    With the netconn API, netconn_recv() returns a netbuf which may contain a chain of pbufs. You have no control over how much data will be returned in a single request, which may be more or less than you want to deal with. You can use various netbuf functions to copy data out of the buffer. If you need more data, you must call netconn_recv() again to get the next netbuf. If you received more data than you wanted, you will have to manage the extra data yourself.
-
-
-	u16_t netbuf_copy_partial ( struct netbuf * aNetBuf, void * aData, u16_t aLen, u16_t aOffset );
-
-	Copy at most "aLen" bytes from the netbuf object to the destination location. The second alternative can start at an offset instead of 0.
-
-    in aNetBuf : netbuf object the data is copied from
-    out aData : address of the memory where the data is copied to
-    in aLen : the size of the buffer, or the length of data to copy
-    in aOffset : an offset to start the with copy operation. In "netbuf_copy" this value is 0
-    return : total number of copied bytes, might be 0 
-
-	Contray to using "netbuf_data" you don't have to fumble around with chained buffers. You get all the data out of the buffer. As a drawback you have an extra overhead of memory usage. 
-*/
-
 const char* reqMethod2text(enum reqMethod method)
 {
 	switch(method)
@@ -3,7 +3,7 @@
 void I2C_init(void)
 {
-	printf("Initializing I2C...\r\n");
+	DBG_I2C("Initializing I2C...\r\n");
 	GPIO_InitTypeDef GPIO_InitStruct;
 	I2C_InitTypeDef I2C_InitStruct;
@@ -30,28 +30,28 @@ void I2C_init(void)
 void I2C_start(I2C_TypeDef* I2Cx, uint8_t address, uint8_t direction)
 {
-	printf("Sending I2C Start...\r\n");
+	DBG_I2C("Sending I2C Start...\r\n");
 	while(I2C_GetFlagStatus(I2Cx, I2C_FLAG_BUSY))
 	{
 		// wait until I2C1 is not busy any more
 	}
-	printf("I2C ready\r\n");
+	DBG_I2C("I2C ready\r\n");
 	I2C_GenerateSTART(I2Cx, ENABLE);
-	printf("Start sent\r\n");
+	DBG_I2C("Start sent\r\n");
 	while(!I2C_CheckEvent(I2Cx, I2C_EVENT_MASTER_MODE_SELECT))
 	{
 		// wait for I2C1 EV5 --> Slave has acknowledged start condition
 	}
-	printf("Start ACK\r\n");
+	DBG_I2C("Start ACK\r\n");
 	I2C_Send7bitAddress(I2Cx, address, direction);
-	printf("Master -> Slave Address and R/W sent\r\n");
+	DBG_I2C("Master -> Slave Address and R/W sent\r\n");
 	if(direction == I2C_Direction_Transmitter)
 	{
 		while(!I2C_CheckEvent(I2Cx, I2C_EVENT_MASTER_TRANSMITTER_MODE_SELECTED))
 		{
 			// wait for I2Cx EV6, check if Slave has acknowledged Master transmitter mode
 		}
-		printf("Slave -> Master ACK\r\n");
+		DBG_I2C("Slave -> Master ACK\r\n");
 	}
 	else if(direction == I2C_Direction_Receiver)
 	{
@@ -59,29 +59,29 @@ void I2C_start(I2C_TypeDef* I2Cx, uint8_t address, uint8_t direction)
 		{
 			// wait for I2Cx EV6, check if Slave has acknowledged Master receiver mode
 		}
-		printf("Slave -> Master ACK\r\n");
+		DBG_I2C("Slave -> Master ACK\r\n");
 	}
 }
 void I2C_restart(I2C_TypeDef* I2Cx, uint8_t address, uint8_t direction)
 {
-	printf("Sending repeated I2C Start...\r\n");
+	DBG_I2C("Sending repeated I2C Start...\r\n");
 	I2C_GenerateSTART(I2Cx, ENABLE);
-	printf("Start sent\r\n");
+	DBG_I2C("Start sent\r\n");
 	while(!I2C_CheckEvent(I2Cx, I2C_EVENT_MASTER_MODE_SELECT))
 	{
 		// wait for I2C1 EV5 --> Slave has acknowledged start condition
 	}
-	printf("Start ACK\r\n");
+	DBG_I2C("Start ACK\r\n");
 	I2C_Send7bitAddress(I2Cx, address, direction);
-	printf("Master -> Slave Address and R/W sent\r\n");
+	DBG_I2C("Master -> Slave Address and R/W sent\r\n");
 	if(direction == I2C_Direction_Transmitter)
 	{
 		while(!I2C_CheckEvent(I2Cx, I2C_EVENT_MASTER_TRANSMITTER_MODE_SELECTED))
 		{
 			// wait for I2Cx EV6, check if Slave has acknowledged Master transmitter mode
 		}
-		printf("Slave -> Master ACK\r\n");
+		DBG_I2C("Slave -> Master ACK\r\n");
 	}
 	else if(direction == I2C_Direction_Receiver)
 	{
@@ -89,37 +89,37 @@ void I2C_restart(I2C_TypeDef* I2Cx, uint8_t address, uint8_t direction)
 		{
 			// wait for I2Cx EV6, check if Slave has acknowledged Master receiver mode
 		}
-		printf("Slave -> Master ACK\r\n");
+		DBG_I2C("Slave -> Master ACK\r\n");
 	}
 }
 void I2C_write(I2C_TypeDef* I2Cx, uint8_t data)
 {
-	printf("Sending I2C byte %02x...\r\n",data);
+	DBG_I2C("Sending I2C byte %02x...\r\n",data);
 	I2C_SendData(I2Cx, data);
 	while(!I2C_CheckEvent(I2Cx, I2C_EVENT_MASTER_BYTE_TRANSMITTED))
 	{
 		// wait for I2C1 EV8_2 --> last byte is transmitted
 	}
-	printf("Data sent\r\n");
+	DBG_I2C("Data sent\r\n");
 }
 uint8_t I2C_read_ack(I2C_TypeDef* I2Cx)
 {
-	printf("Listening for byte in I2C (ACK)\r\n");
+	DBG_I2C("Listening for byte in I2C (ACK)\r\n");
 	I2C_AcknowledgeConfig(I2Cx, ENABLE);
 	while( !I2C_CheckEvent(I2Cx, I2C_EVENT_MASTER_BYTE_RECEIVED))
 	{
 		// wait until one byte has been received
 	}
 	uint8_t data = I2C_ReceiveData(I2Cx);
-	printf("Received byte: %02x\r\n",data);
+	DBG_I2C("Received byte: %02x\r\n",data);
 	return data;
 }
 uint8_t I2C_read_nack(I2C_TypeDef* I2Cx)
 {
-	printf("Listening for byte in I2C (NACK)\r\n");
+	DBG_I2C("Listening for byte in I2C (NACK)\r\n");
 	I2C_AcknowledgeConfig(I2Cx, DISABLE);
 	//I2C_GenerateSTOP(I2Cx, ENABLE);
 	while( !I2C_CheckEvent(I2Cx, I2C_EVENT_MASTER_BYTE_RECEIVED))
@@ -127,19 +127,19 @@ uint8_t I2C_read_nack(I2C_TypeDef* I2Cx)
 		// wait until one byte has been received
 	}
 	uint8_t data = I2C_ReceiveData(I2Cx);
-	printf("Received byte: %02x\r\n",data);
+	DBG_I2C("Received byte: %02x\r\n",data);
 	return data;
 }
 void I2C_stop(I2C_TypeDef* I2Cx)
 {
-	printf("Sending I2C Stop...\r\n");
+	DBG_I2C("Sending I2C Stop...\r\n");
 	I2C_GenerateSTOP(I2Cx, ENABLE);
 	/*while(!I2C_CheckEvent(I2Cx, I2C_EVENT_MASTER_BYTE_TRANSMITTING))
 	{
 		// wait for I2C1 EV8_2 --> byte has been transmitted
 	}*/
-	printf("Stop sent\r\n");
+	DBG_I2C("Stop sent\r\n");
 }
 uint8_t I2C_check(I2C_TypeDef* I2Cx, uint8_t address)
@@ -153,14 +153,14 @@ uint8_t I2C_check(I2C_TypeDef* I2Cx, uint8_t address)
 	{
 		// wait for I2C1 EV5 --> Slave has acknowledged start condition
 	}
-	printf("Probing address %x ...\r\n",address);
+	DBG_I2C("Probing address %x ...\r\n",address);
 	I2C_Send7bitAddress(I2Cx, address, I2C_Direction_Transmitter);
 	chThdSleepMilliseconds(I2C_TIMEOUT);
 	if(!I2C_CheckEvent(I2Cx, I2C_EVENT_MASTER_TRANSMITTER_MODE_SELECTED))
 	{
 		return 1;
 	}
-	printf("I2C address detected: %x\r\n", address);
+	DBG_I2C("I2C address detected: %x\r\n", address);
 	I2C_write(I2Cx,0x00);
 	I2C_stop(I2Cx);
 	return 0;
@@ -168,7 +168,7 @@ uint8_t I2C_check(I2C_TypeDef* I2Cx, uint8_t address)
 void I2C_reset(I2C_TypeDef* I2Cx)
 {
-	printf("Resetting I2C...\r\n");
+	DBG_I2C("Resetting I2C...\r\n");
 	I2C_SoftwareResetCmd(I2Cx, ENABLE);
 	I2C_DeInit(I2Cx);
 	I2C_init();
@@ -177,6 +177,7 @@ void I2C_reset(I2C_TypeDef* I2Cx)
 void I2C_scan(I2C_TypeDef* I2Cx,uint8_t *addresses)
 {
+	DBG_I2C("Scanning sensors...\r\n");
 	uint8_t i, j = 0;
 	I2C_init();
 	for(i = 0; i < TOTAL_SENSORS; i++)
@@ -7,7 +7,7 @@
 #include "stm32f10x_gpio.h"
 #include "stm32f10x_adc.h"
-#define DBG(fmt,...)          		if(1){printf("[ADC] "fmt"\r\n", ##__VA_ARGS__);}else{({});}
+#define DBG_ADC(fmt,...)                printf("%c[1;31madc.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__)
 #define ADCbatt_MIN_VALUE		(0)
 #define ADCbatt_MAX_VALUE		(0xfff)
@@ -10,6 +10,8 @@
 #define	SOFT_REACHED	1
 #define HARD_REACHED	2
+#define DBG_BUFFER(fmt,...)                printf("%c[1;31mbuffer.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__)
+
 char** put_message(char* info, char** buf,uint32_t *index, uint32_t *buf_len);
 int check_memory(void);
 int send(char** buf, uint32_t *index, uint32_t *size, char *provider_ID, char *sensor_ID);
@@ -17,6 +17,8 @@ void softapMode_clientIndicationCb(wismart_softap_cb_t reason, const uint8_t *ma
 void softapMode_apStartedCb(int result);
 void printWifiInfo(uint8_t wifiMode);
+#define DBG_CALLBACKS(fmt,...)                printf("%c[1;31mcallbacks.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__)
+
 extern uint8_t connected;
 extern uint8_t timeout;
 extern uint8_t retries;
@@ -10,8 +10,8 @@
 #include "ch.h"
 #include "fsdata.c"
-#define CONFIG_SERVER_DBG(fmt,...)                  if(1){printf("[SRV]         "fmt"\r\n", ##__VA_ARGS__);}else{({});}
-#define CONFIG_SERVER_DBG_WARNING(fmt,...)          if(1){printf("[SRV_WARNING] "fmt"\r\n", ##__VA_ARGS__);}else{({});}
+#define CONFIG_SERVER_DBG(fmt,...)                  printf("%c[1;31mconfigServer.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__)
+#define CONFIG_SERVER_DBG_WARNING(fmt,...)          printf("%c[1;31mconfigServer.c:%c[1;00m [WARNING] "fmt,0x1B,0x1B, ##__VA_ARGS__)
 void configServer_start(uint8_t enableApScan);
 void configServer_connect(void);
@@ -5,13 +5,14 @@
 #define SERVER_HOSTNAME			SERVER_IP
 #define MODULE_ID_LENGTH		6
 #define BUFFER_LENGTH    		30
-#define MAX_RAM					30000
-#define MODULE_ID  				"123456"
+#define MAX_RAM					34704
+#define MODULE_ID  				"000001"
 #define WIFI_MODE               WIFI_MODE_CLIENT
 #define NETWORK_SSID_AP         "modularsense"
 #define NETWORK_KEY_AP          NULL
 #define NETWORK_CHANNEL_AP      1
-#define HARD_LIMIT_WAIT_TIME 10*1000 //5*60*1000
-
+#define HARD_LIMIT_WAIT_TIME 	10*1000 //5*60*1000
+#define SNTP_SERVER_ADDRESS     ipaddr_addr("81.184.154.182") /* your ntp server */
+#define SERVER_LEWIS
 #endif
@@ -22,6 +22,9 @@
 #define ENDL "\r\n"
 #define CONTENT_TYPE_HEADER "Content-Type: application/json; charset=UTF-8"
+#define DBG_HTTP(fmt,...)                printf("%c[1;31mhttpClient.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__)
+
+
 typedef enum reqMethod
 {
 	post,
@@ -9,6 +9,8 @@
 #define I2C_TIMEOUT 100
+#define DBG_I2C(fmt,...)                printf("%c[1;31mi2c.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__)
+
 void I2C_init(void);
 void I2C_start(I2C_TypeDef* I2Cx, uint8_t address, uint8_t direction);
 void I2C_stop(I2C_TypeDef* I2Cx);
@@ -18,6 +18,8 @@
 #define JOIN_NO_FREE		0
 #define JOIN_FREE_MEM		1
+#define DBG_JSON(fmt,...)                printf("%c[1;31mjson.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__)
+
 uint8_t register_sensor(sensor sens);
 char* prepare_json_observation_statement(char** data, uint32_t nObservations);
 char* prepare_json_register_statement(module mod, sensor sens, char *additional_info);
@@ -16,51 +16,17 @@
 #include "lwip/sys.h"
 #include "lwip/api.h"
 #include "ch.h"
+#include "globals.h"
-typedef struct {
-	int second;
-	int minute;
-	int hour;
-	int day;
-	int month;
-	int year;
-}Date;
-
-char* timestamp_data(char* value,Date time);
-unsigned long getSecsSince1900(void);
-Date getDate(unsigned long);
-void udpNtp_test(void);
+#define DBG_NTP(fmt,...)                printf("%c[1;31mntp.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__)
 #define LEAP_YEAR(Y) (((1970+Y)>0) && !((1970+Y)%4) && (((1970+Y)%100) || !((1970+Y)%400)))
-
 #define NTP_PACKET_LENGTH			48
-
-//cabecera de netconn api
-#ifndef SNTP_PORT
 #define SNTP_PORT                   123
-#endif
-
-/** SNTP server address as IPv4 address in "u32_t" format */
-#ifndef SNTP_SERVER_ADDRESS
-#define SNTP_SERVER_ADDRESS         ipaddr_addr("81.184.154.182") /* your ntp server */
-#endif
-
 /** SNTP receive timeout - in milliseconds */
-#ifndef SNTP_RECV_TIMEOUT
 #define SNTP_RECV_TIMEOUT           3000
-#endif
-
 /** SNTP update delay - in milliseconds */
-#ifndef SNTP_UPDATE_DELAY
 #define SNTP_UPDATE_DELAY           60000
-#endif
-
-/** SNTP macro to change system time and/or the update the RTC clock */
-#ifndef SNTP_SYSTEM_TIME
-#define SNTP_SYSTEM_TIME(t)
-#endif
-
-/* SNTP protocol defines */
 #define SNTP_MAX_DATA_LEN           48
 #define SNTP_RCV_TIME_OFS           32
 #define SNTP_LI_NO_WARNING          0x00
@@ -69,12 +35,24 @@ void udpNtp_test(void);
 #define SNTP_MODE_SERVER            0x04
 #define SNTP_MODE_BROADCAST         0x05
 #define SNTP_MODE_MASK              0x07
-
 /* number of seconds between 1900 and 1970 */
 #define DIFF_SEC_1900_1970         (2208988800LL)
-
 /*timezone from GMT*/
 #define TIME_ZONE					2
+typedef struct {
+	int second;
+	int minute;
+	int hour;
+	int day;
+	int month;
+	int year;
+}Date;
+
+char* timestamp_data(char* value,Date time);
+unsigned long getSecsSince1900(void);
+Date getDate(unsigned long);
+void udpNtp_test(void);
+
 #endif
@@ -19,6 +19,8 @@
 #define		BATTERY_ADDR		0x00 //SIEMPRE PRESENTE, NUNCA BUSCAR EN i2c_scan
+#define DBG_SENSORS(fmt,...)                printf("%c[1;31msensors.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__)
+
 typedef struct {
   uint8_t ID;
   char* description;
@@ -11,6 +11,8 @@
 #define LONG_PERIOD		60*3 //60*3 // for testing
 #define SHORT_PERIOD	60*1  //60*1 // for testing
+#define DBG_TIMER(fmt,...)                printf("%c[1;31mtimer-loop.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__)
+
 unsigned long getSystemTime(void);
 unsigned long getElapsedTime(unsigned long t);
@@ -2,14 +2,14 @@
 uint8_t register_sensor(sensor sens)
 {
-	printf("Registering sensor: %s\r\n",sens.description);
+	DBG_JSON("Registering sensor: %s\r\n",sens.description);
     uint8_t result;
     char *statement;
     if(sens.ID == PRESSURE_ADDR)
     {
-    	printf("Putting additional info for pressure sensor...\r\n");
+    	DBG_JSON("Putting additional info for pressure sensor...\r\n");
     	char *callibration_data = callibration_pressure_data_csv(get_pressure_callibration_data());
-    	printf("callibration_data is: %s\r\n",callibration_data);
+    	DBG_JSON("callibration_data is: %s\r\n",callibration_data);
         statement = prepare_json_register_statement(mod,sens,callibration_data);
     	chHeapFree(callibration_data);
     }
@@ -36,7 +36,6 @@ char* prepare_json_observation_statement(char** data, uint32_t nObservations)
 		observation_length = strlen(str_aux2);
 		str_aux = join_strings(str_aux,str_aux2,length,observation_length,JOIN_FREE_MEM);
 		length += observation_length;
-		printf("data=%s %d \r\n",data[i],i);
 	}
 	length--; //REMOVE LAST ','
 	json_statement = join_strings(str_aux,"]}\0",length,3,JOIN_NO_FREE);
@@ -80,7 +79,7 @@ char* prepare_json_register_statement(module mod, sensor sens, char *additional_
 	length += strlen(mod.geoloc);
 	if(additional_info != NULL)
 	{
-		printf("In prepare_json_register_statement: Detected additional_info\r\n");
+		DBG_JSON("In prepare_json_register_statement: Detected additional_info\r\n");
 		str_aux2 = join_strings(str_aux,"\",\"additionalInfo\":\"",length,20,JOIN_NO_FREE);
 		chHeapFree(str_aux);
 		length += 20;
@@ -99,14 +98,12 @@ char* prepare_observation(char* observation, uint32_t length)
 	int value_length = find_next_index(observation,length,',');
 	while(1)
 	{
-		printf("value_length = %d\r\n",value_length);
 		if(find_next_index(observation+value_length+1,length,','))
 		{
 			value_length +=  find_next_index(observation+value_length+1,length,',')+1;
 		}
 		else
 		{
-			printf("Comma in %d\r\n",value_length);
 			break;
 		}
 	}
@@ -140,29 +137,40 @@ uint8_t send_json(char* statement, uint32_t length, char* provider_ID, char* sen
 	{
 		URL = (char*) chHeapAlloc(NULL,1+strlen(SERVER_HOSTNAME));
 		strcpy(URL,SERVER_HOSTNAME);
+		#ifdef SERVER_VANILLA
 		//VANILLA SERVER (SENTILO)
-		/*PATH = (char*) chHeapAlloc(NULL,19);
-		strcpy(PATH,"/catalog/register");*/
+		DBG_JSON("Server is vanilla\r\n")
+		PATH = (char*) chHeapAlloc(NULL,19);
+		strcpy(PATH,"/catalog/register");
+		#endif
+		#ifdef SERVER_LEWIS
 		//FUCKING LEWIS...
+		DBG_JSON("Server is lewis.upc.es\r\n");
 		PATH = (char*) chHeapAlloc(NULL,50);
 		strcpy(PATH,"/modularsense/wordpress/opendata/catalog/register");
+		#endif
 	}
 	else //Post data
 	{
 		URL = (char*) chHeapAlloc(NULL,1+strlen(SERVER_HOSTNAME));
 		strcpy(URL,SERVER_HOSTNAME);
 		URL[strlen(SERVER_HOSTNAME)] = '\0';
+		#ifdef SERVER_VANILLA
 		//VANILLA SERVER (SENTILO)
-		/*PATH = (char*) chHeapAlloc(NULL,22+strlen(provider_ID)+strlen(sensor_ID));
+		DBG_JSON("Server is vanilla\r\n")
+		PATH = (char*) chHeapAlloc(NULL,22+strlen(provider_ID)+strlen(sensor_ID));
 		strcpy(PATH,"/data/modularupload/");
 		strcpy(PATH+20,provider_ID);
-		strcpy(PATH+20+strlen(provider_ID),sensor_ID);*/
-
+		strcpy(PATH+20+strlen(provider_ID),sensor_ID);
+		#endif
+		#ifdef SERVER_LEWIS
 		//FUCKING LEWIS...
+		DBG_JSON("Server is lewis.upc.es\r\n");
 		PATH = (char*) chHeapAlloc(NULL,54+strlen(provider_ID)+strlen(sensor_ID));
 		strcpy(PATH,"/modularsense/wordpress/opendata/data/modularupload/");
 		strcpy(PATH+52,provider_ID);
 		strcpy(PATH+52+strlen(provider_ID),sensor_ID);
+		#endif
 	}
 	struct httpHeaders server = { put,PATH,strlen(PATH),URL,strlen(URL)};
 	response_code = httpRequest(server, statement, length);
@@ -170,14 +178,17 @@ uint8_t send_json(char* statement, uint32_t length, char* provider_ID, char* sen
 	chHeapFree(URL);
 	if(response_code == 200)
 	{
+		DBG_JSON("Success: JSON_POST_OK\r\n");
 		return JSON_POST_OK;
 	}
 	else if((response_code >= 400) && (response_code < 500))
 	{
+		DBG_JSON("[ERROR] Communication with server FAILED: JSON_COMM_ERROR\r\n");
 		return JSON_COMM_ERROR;
 	}
 	else
 	{
+		DBG_JSON("[ERROR] Unspecified error: JSON_ERROR_OTHER\r\n");
 		return JSON_OTHER_ERROR;
 	}
 }
@@ -207,4 +218,4 @@ char* join_strings(char* str1, char* str2, uint32_t len1, uint32_t len2, uint8_t
 		chHeapFree(str2);
 	}
 	return str; 
 -}
+}
 \ No newline at end of file
@@ -12,6 +12,8 @@
 #include "ntp.h"
 #include "sensors.h"
+#define DBG(fmt,...)                printf("%c[1;31mmain.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__)
+
 uint8_t connected=0;
 uint8_t timeout=0;
 uint8_t retries=0;
@@ -29,13 +31,13 @@ void initLibwismart(void)
 void update_time(unsigned long *time)
 {
-    printf("Requesting new NTP time...\r\n");
+    DBG("Requesting new NTP time...\r\n");
     unsigned long new_time = getSecsSince1900();
     if(new_time)
     {
         *time = getSecsSince1900();
     }
-    printf("Time updated...\r\n");
+    DBG("Time updated\r\n");
 }
 void init_registry(void)
@@ -54,31 +56,31 @@ void init_registry(void)
         libwismart_RegistryGet(&geo,&config);
     }
-    printf("SSID = %s\r\n",config.ssid);
-    printf("Wep key = %s\r\n",config.wepkey);
-    printf("Passphrase = %s\r\n", config.passphrase);
-    printf("User = %s\r\n",config.user);
-    printf("Password = %s\r\n",config.password);
-    printf("Encryption type = %d\r\n",config.security);
-    printf("Geo Localization = %s\r\n", config.localization);
+    DBG("SSID = %s\r\n",config.ssid);
+    DBG("Wep key = %s\r\n",config.wepkey);
+    DBG("Passphrase = %s\r\n", config.passphrase);
+    DBG("User = %s\r\n",config.user);
+    DBG("Password = %s\r\n",config.password);
+    DBG("Encryption type = %d\r\n",config.security);
+    DBG("Geo Localization = %s\r\n", config.localization);
     strcpy(mod.geoloc,config.localization);
     strcpy(mod.ID,MODULE_ID);
     if(config.security == PROFILE_SECURITY_OPEN)
     {
-        printf("open detected\r\n");
+        DBG("Open network detected\r\n");
         libwismart_WiFiConnect(config.ssid,NULL,wifi_connect_result_cb);
     }
     else if(config.security == PROFILE_SECURITY_WPA_WPA2)
     {
         if(!strcmp(config.user,""))
         {
-            printf("wpa detected\r\n");
+            DBG("WPA network detected\r\n");
             libwismart_WiFiConnect(config.ssid,config.passphrase,wifi_connect_result_cb);
         }
         else
         {
-            printf("wpa Enterprise detected\r\n");
+            DBG("WPA Enterprise network detected\r\n");
             struct wpa_param wpa;
             wpa.eap_method = WISMART_EAP_METHOD_TTLS;
             wpa.u.ttls.identity = config.user;
@@ -89,7 +91,7 @@ void init_registry(void)
     }
     else
     {
-        printf("wep detected\r\n");
+        DBG("WEP network detected\r\n");
         //Is WEP
         libwismart_WiFiConnect(config.ssid,config.wepkey,wifi_connect_result_cb);
         libwismart_WiFiSetWep(config.wepkey,1);
@@ -104,67 +106,52 @@ void send_data(char** buffers[], uint32_t ind[], uint32_t sizes[], uint8_t senso
     int j;
     for(j=0;j<sensors_length;j++)
     {   
-        printf(" enviant buffer %d\r\n",j);
+        DBG("Sending buffer %d\r\n",j);
         char id[3];
         sprintf(id,"%x",sensors[j]);
-        int ok=send(buffers[j],&ind[j],&sizes[j], mod.ID, id);
-
-        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(buffers[j],&ind[j],&sizes[j], mod.ID, id);
     }
 }
 void put_buffers(char** buffers[],uint32_t ind[],uint32_t sizes[],char** cooked, uint8_t* sensors)
 {
+    DBG("Putting data in buffers...\r\n");
     int i;
     for(i=0;i<sensors_length;i++)
     {
-        printf("For %d and %d\n\r", ind[i],sizes[i]);
-        printf("Putting data: %s\n\r",cooked[i]);
+        DBG("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[i][ind[i]-1]);
+        DBG("Message put: %s\r\n",buffers[i][ind[i]-1]);
         chHeapFree(cooked[i]);
-        printf("Memory freed\n\r");
-        printf("Message put (assertion): %s with length %d\r\n",buffers[i][ind[i]-1] ,strlen(buffers[i][ind[i]-1]));
+        DBG("Memory freed\n\r");
+        DBG("[ASSERTION] Message put: %s with length %d\r\n",buffers[i][ind[i]-1] ,strlen(buffers[i][ind[i]-1]));
     }
-
 }
 char** timestamp_datas(char* value[],unsigned long timestamp, uint8_t* sensors)
 {
+    DBG("Timestamping data...\r\n");
     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\r\n",cooked_data[i]);
+        DBG("Data is: %s\r\n",cooked_data[i]);
         chHeapFree(value[i]);
         value[i] = NULL;
     }
-    printf("Returning timestamped data...\r\n");
+    DBG("Returning timestamped data...\r\n");
     return cooked_data;
 }
 void wifi_connect(void)
 {
+    DBG("Connecting wifi...\r\n");
     init_registry();
     if(timeout==1)
     {
-        printf("Creating AP\r\n");
+        DBG("Creating AP\r\n");
         configServer_start(1);
         libwismart_WiFi_SoftAP_Start(NETWORK_SSID_AP,NETWORK_CHANNEL_AP,NULL,softapMode_apStartedCb, softapMode_clientIndicationCb);
         for(;;)
@@ -176,7 +163,7 @@ void wifi_connect(void)
 void send_battery_level(unsigned long timestamp)
 {
-    uint8_t result;
+    DBG("Polling battery level...\r\n");
     char *batt_level = battery_value(get_battery_data());
     //char *batt_level = battery_value(3300);
     char *batt_data = timestamp_data(batt_level,getDate(timestamp));
@@ -185,30 +172,20 @@ void send_battery_level(unsigned long timestamp)
     chHeapFree(batt_data);
     char id[3];
     sprintf(id,"%02x",battery.ID);
-    result = send_json(statement,strlen(statement),mod.ID,id);
-    if(result)
-    {
-        if(result != 200)
-        {
-            printf("ERROR: SERVER RETURNED %d\r\n",result);
-        }
-    }
-    else
-    {
-            printf("ERROR: CONNECTION FAILED\r\n");
-    }
+    send_json(statement,strlen(statement),mod.ID,id);
     chHeapFree(statement);
 }
 void wifi_disconnect(void)
 {
+    DBG("Disconnecting wifi...\r\n");
     connected = 0;
     timeout = 0;
     uint8_t res=libwismart_WiFiDisconnect();
      if(res)
-        printf("WIFI_DISCONNECT_SUCCESS\r\n");
+        DBG("Disconnecting Successful: WIFI_DISCONNECT_SUCCESS\r\n");
      else
-        printf("WIFI_DISCONNECT_FAILURE\r\n");
+        DBG("Disconnecting Failed: WIFI_DISCONNECT_FAILURE\r\n");
 }
 int main(void)
@@ -220,88 +197,80 @@ int main(void)
     libwismart_WiFiInit();
     libwismart_SetScanRunsForConnTimeout(4); //Edit a 4
 	libwismart_EnableBsdSocketAPI();
-    
-    int i;
+    int i;
+    int j;
     uint8_t sensors[TOTAL_SENSORS];
-    memset (sensors, 0, TOTAL_SENSORS);
-
     char* valueSensors[TOTAL_SENSORS];
+    unsigned long time;
+    unsigned long timestamp;
+    unsigned long delay;
+    uint32_t ind[TOTAL_SENSORS]={0};
+    char** buffers[TOTAL_SENSORS];
+    uint32_t sizes[TOTAL_SENSORS]={0};
+    char** values;
+    int res;
+    char id[3];
+    memset (sensors, 0, TOTAL_SENSORS);
     for(i = 0; i < TOTAL_SENSORS; i++)
     {
         valueSensors[i] = NULL;
     }
-    printf("Connecting to wifi...\r\n");
+    DBG("%c[1;35m--------------WI-SENSE STARTED-------------%c[1;00m\r\n",0x1B,0x1B);
+
     wifi_connect();
+    check_memory();
     wakeup_sensors(0xFF);
-    printf("Scanning sensors...\r\n");
+
     //Escanea y registra
     I2C_scan(I2C1,sensors);
     sensors_length=strlen((char*)sensors);
-    printf("%d sensor detected...\r\n",sensors_length);
+    DBG("%d sensor detected...\r\n",sensors_length);
-    unsigned long time;
     update_time(&time);
     //desconectarwifi
-    printf("Disconecting wifi...\r\n");
     wifi_disconnect();
-    unsigned long timestamp = 0;
-    unsigned long delay = getSystemTime();
+    timestamp = 0;
+    delay = getSystemTime();
     sleep_thread(SHORT_PERIOD - time%SHORT_PERIOD);
-    uint32_t ind[TOTAL_SENSORS]={0};
-    char** buffers[TOTAL_SENSORS];
-    uint32_t sizes[TOTAL_SENSORS]={0};
-
     i = 1;
     while(1)
     {
         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);
-
+        DBG("Time (absolute):\t%ul\r\nTime LONG_PERIOD:\t%ul\r\nTime SHORT_PERIOD:\t%ul\r\n",time,time%LONG_PERIOD,time%SHORT_PERIOD);
         delay = getSystemTime();
         /* Collect data from sensors */
-        printf("Collecting data...\r\n");
         collectData(valueSensors, sensors);
-        printf("Data collected...\r\n");
         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);
+        DBG("Time (absolute):\t%ul\r\nTime LONG_PERIOD:\t%ul\r\nTime SHORT_PERIOD:\t%ul\r\n",time,time%LONG_PERIOD,time%SHORT_PERIOD);
         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);
+        DBG("Timestamp (absolute):\t%ul\r\nTimestamp LONG_PERIOD:\t%ul\r\nTimestamp SHORT_PERIOD:\t%ul\r\n",timestamp,timestamp%LONG_PERIOD,timestamp%SHORT_PERIOD);
         delay = getSystemTime();
-        printf("Timestamping data...\r\n");
-        char** values=timestamp_datas(valueSensors,timestamp,sensors);
-        printf("Putting data in buffer...\r\n");
+        values=timestamp_datas(valueSensors,timestamp,sensors);
         put_buffers(buffers,ind,sizes,values,sensors);
-        printf("Data is now in buffer...\n\r");
+        DBG("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");
+            DBG("Programmed send cycle...\r\n");
             wifi_connect();
-            /* Send data to server, empty the buffer */
             send_data(buffers, ind, sizes, sensors);
-            printf("Data sent!\r\n");
-            //Now sending battery level
             send_battery_level(timestamp);
             update_time(&time);
             delay = getSystemTime();
             wifi_disconnect();
-            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);
+            DBG("New NTP time (absolute):\t%ul\r\nTime LONG_PERIOD:\t%ul\r\nTime SHORT_PERIOD:\t%ul\r\n",time,time%LONG_PERIOD,time%SHORT_PERIOD);
             i = 0;
         }
-
-        printf("mirant memoria\r\n");
-        int res=check_memory();
+        res=check_memory();
         if(res==SOFT_REACHED)
         {
-            printf("--------------soft limit-------------\r\n");
+            DBG("%c[1;35m--------------SOFT LIMIT-------------%c[1;00m\r\n",0x1B,0x1B);
             wifi_connect();
             send_data(buffers, ind, sizes, sensors);
             //Now sending battery level
@@ -310,7 +279,7 @@ int main(void)
         }
         else if(res==HARD_REACHED)
         {
-            printf("--------------hard limit-------------\r\n");
+            DBG("%c[1;35m--------------HARD LIMIT-------------%c[1;00m\r\n",0x1B,0x1B);
             wifi_connect();
             char id_0[3];
             sprintf(id_0,"%x",sensors[0]);
@@ -320,37 +289,23 @@ int main(void)
                 // Intentem enviar un buffer sencer, a veure si ja podem buidar.
                 // No podem enviar només una mostra perquè json és rígid en aquest sentit.
-                printf("hard_reached and unable to sentd.\r\nLa biblia en vers: i Jesús digué: Aixeca't, Llàtzer!!\r\n");
+                DBG("[HARD LIMIT] unable to send\r\n");
                 chThdSleepMilliseconds(HARD_LIMIT_WAIT_TIME);
             }
-            int j;
             for(j=1;j<sensors_length;j++)
             {   
-                printf(" enviant buffer %d\r\n",j);
-                char id[3];
+                DBG("Sending buffer %d\r\n",j);
                 sprintf(id,"%x",sensors[j]);
-                int ok=send(buffers[j],&ind[j],&sizes[j], mod.ID, id);
-                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(buffers[j],&ind[j],&sizes[j], mod.ID, id);
             }
             //Now sending battery level
             send_battery_level(timestamp);
             wifi_disconnect();
         }
         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);
-        
+        DBG("Time (absolute):\t%ul\r\nTime LONG_PERIOD:\t%ul\r\nTime 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++;
     }  
@@ -361,4 +316,4 @@ int main(void)
  *
  * - Test distance
  * - Reset timer-related defines
- */
 \ No newline at end of file
+ */
@@ -113,38 +113,38 @@ unsigned long getSecsSince1900 (void)
 								memcpy(&timestamp, (sntp_response + SNTP_RCV_TIME_OFS), sizeof(timestamp));
 								timestamp=(ntohl(timestamp));
-								printf("Received timestamp %u\r\n", timestamp);
+								DBG_NTP("Received timestamp %u\r\n", timestamp);
 							}
 							else
 							{
-								printf("Received data did not match frame code\r\n");
+								DBG_NTP("[ERROR] Received data did not match frame code\r\n");
 							}
 						}
 						else
 						{
-							printf("Length of data did not match SNTP_MAX_DATA_LEN, received len %u\r\n", dataLen);
+							DBG_NTP("[ERROR] Length of data did not match SNTP_MAX_DATA_LEN, received len %u\r\n", dataLen);
 						}
 						// Deallocate space hold for netbuf structure.
 						netbuf_delete(receiveUDPNetBuf);
 					}
 					else
 					{
-						printf("Netconn receive failed with %d\r\n", netconn_err(sendUDPNetConn));
+						DBG_NTP("[ERROR] Netconn receive failed with %d\r\n", netconn_err(sendUDPNetConn));
 					}
 				}
 				else
 				{
-					printf("Netconn sendto failed with %d\r\n", errLWIP);
+					DBG_NTP("[ERROR] Netconn sendto failed with %d\r\n", errLWIP);
 				}
 			}
 			else
 			{
-				printf("Netconn connect to server %X, port %u failed with %d\r\n", sntp_server_address.addr, SNTP_PORT, errLWIP);
+				DBG_NTP("[ERROR] Netconn connect to server %X, port %u failed with %d\r\n", sntp_server_address.addr, SNTP_PORT, errLWIP);
 			}
 		}
 		else
 		{
-			printf("Netconn or netbuf or data allocation failed.\r\n");
+			DBG_NTP("[ERROR] Netconn or netbuf or data allocation failed.\r\n");
 		}
 		// Deallocate space hold for netconn and netbuf structure.
 		netbuf_delete(sendUDPNetBuf);
@@ -152,7 +152,7 @@ unsigned long getSecsSince1900 (void)
 	} //if (sntp_server_address != 0)
 	else
 	{
-		printf("Invalid NTP server address %X\r\n", SNTP_SERVER_ADDRESS);
+		DBG_NTP("[ERROR] Invalid NTP server address %X\r\n", SNTP_SERVER_ADDRESS);
 	}
 	return (unsigned long) timestamp;
@@ -14,7 +14,7 @@ void wakeup_sensors(uint8_t logic_address)
 	 // X 	X 	X	PA7 PA6 PA5 PA4 PA3
 	 // b7 	b6 	b5 	b4 	b3 	b2 	b1 	b0
-	printf("GRAB A BRUSH AND PUT A LITTLE MAKE-UP\r\n");
+	DBG_SENSORS("Waking up sensors...\r\n");
 	GPIO_InitTypeDef  GPIO_InitStructure;
 	RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOA, ENABLE);
 	GPIO_InitStructure.GPIO_Pin = GPIO_Pin_3|GPIO_Pin_4|GPIO_Pin_5|GPIO_Pin_6|GPIO_Pin_7;
@@ -24,47 +24,52 @@ void wakeup_sensors(uint8_t logic_address)
 	if(logic_address & 0x1)
 	{
-		printf("Woken Pin 3\r\n");
+		DBG_SENSORS("Woken Pin 3\r\n");
 		GPIO_SetBits(GPIOA,GPIO_Pin_3);
 	}
 	else
 	{
+		DBG_SENSORS("Pin 3 gone low\r\n");
 		GPIO_ResetBits(GPIOA,GPIO_Pin_3);
 	}
 	if(logic_address & 0x2)
 	{
-		printf("Woken Pin 4\r\n");
+		DBG_SENSORS("Woken Pin 4\r\n");
 		GPIO_SetBits(GPIOA,GPIO_Pin_4);		
 	}
 	else
 	{
+		DBG_SENSORS("Pin 4 gone low\r\n");
 		GPIO_ResetBits(GPIOA,GPIO_Pin_4);
 	}
 	if(logic_address & 0x4)
 	{
-		printf("Woken Pin 5\r\n");
+		DBG_SENSORS("Woken Pin 5\r\n");
 		GPIO_SetBits(GPIOA,GPIO_Pin_5);
 	}
 	else
 	{
+		DBG_SENSORS("Pin 5 gone low\r\n");
 		GPIO_ResetBits(GPIOA,GPIO_Pin_5);
 	}
 	if(logic_address & 0x8)
 	{
-		printf("Woken Pin 6\r\n");
+		DBG_SENSORS("Woken Pin 6\r\n");
 		GPIO_SetBits(GPIOA,GPIO_Pin_6);
 	}
 	else
 	{
+		DBG_SENSORS("Pin 6 gone low\r\n");
 		GPIO_ResetBits(GPIOA,GPIO_Pin_6);
 	}
 	if(logic_address & 0x10)
 	{
-		printf("Woken Pin 7\r\n");
+		DBG_SENSORS("Woken Pin 7\r\n");
 		GPIO_SetBits(GPIOA,GPIO_Pin_7);
 	}
 	else
 	{
+		DBG_SENSORS("Pin 7 gone low\r\n");
 		GPIO_ResetBits(GPIOA,GPIO_Pin_7);
 	}
 }
@@ -74,10 +79,10 @@ uint32_t get_light_data(void)
 	uint32_t data = 0;
 	data = get_light_ch1();
-	printf("LIGHT: Got ch1\r\n");
+	DBG_SENSORS("[LIGHT] Got ch1\r\n");
 	data = data << 16;
 	data = data | get_light_ch0();
-	printf("LIGHT: Got ch0\r\n");
+	DBG_SENSORS("[LIGHT] Got ch0\r\n");
 	return data;
 }
 uint16_t get_light_ch0(void)
@@ -86,13 +91,13 @@ uint16_t get_light_ch0(void)
 	I2C_start(I2C1,LIGHT_ADDR << 1, I2C_Direction_Transmitter);
 	I2C_write(I2C1, 0x0C);
-	printf("LIGHT: Sent fetch command for CH1\r\n");
+	DBG_SENSORS("[LIGHT] Sent fetch command for CH1\r\n");
 	I2C_restart(I2C1, LIGHT_ADDR << 1, I2C_Direction_Receiver);
  	data = I2C_read_ack(I2C1);
- 	printf("LIGHT: Got low byte for CH1\r\n");
+ 	DBG_SENSORS("[LIGHT] Got low byte for CH1\r\n");
  	data = data | (I2C_read_nack(I2C1) << 8);
- 	printf("LIGHT: Got high byte for CH1\r\n");
+ 	DBG_SENSORS("[LIGHT] Got high byte for CH1\r\n");
  	I2C_stop(I2C1);	
  	return data;
@@ -103,13 +108,13 @@ uint16_t get_light_ch1(void)
 	I2C_start(I2C1,LIGHT_ADDR << 1, I2C_Direction_Transmitter);
 	I2C_write(I2C1, 0x0E);
-	printf("LIGHT: Sent fetch command for CH1\r\n");
+	DBG_SENSORS("[LIGHT] Sent fetch command for CH1\r\n");
 	I2C_restart(I2C1, LIGHT_ADDR << 1, I2C_Direction_Receiver);
  	data = I2C_read_ack(I2C1);
- 	printf("LIGHT: Got low byte for CH1\r\n");
+ 	DBG_SENSORS("[LIGHT] Got low byte for CH1\r\n");
  	data = data | (I2C_read_nack(I2C1) << 8);
- 	printf("LIGHT: Got high byte for CH1\r\n");
+ 	DBG_SENSORS("[LIGHT] Got high byte for CH1\r\n");
  	I2C_stop(I2C1);
  	return data;
@@ -135,7 +140,7 @@ void init_ultrasound(void)
 uint16_t get_distance_data(void)
 {
 	init_ultrasound();
-	printf("DISTANCE: Initialized\r\n");
+	DBG_SENSORS("[DISTANCE] Initialized\r\n");
 	uint16_t data;
 	I2C_start(I2C1,DISTANCE_ADDR << 1, I2C_Direction_Transmitter);
@@ -143,10 +148,10 @@ uint16_t get_distance_data(void)
 	I2C_restart(I2C1, DISTANCE_ADDR << 1, I2C_Direction_Receiver);
  	data = I2C_read_ack(I2C1);
- 	printf("DISTANCE: Got high byte\r\n");
+ 	DBG_SENSORS("[DISTANCE] Got high byte\r\n");
  	data = data << 8;
 	data = data | I2C_read_nack(I2C1);
-	printf("DISTANCE: Got low byte\r\n");
+	DBG_SENSORS("[DISTANCE] Got low byte\r\n");
  	I2C_stop(I2C1);
  	return data;
 }
@@ -180,7 +185,7 @@ void init_pressure_temperature(void)
 bmp085_callibration get_pressure_callibration_data(void)
 {
-	printf("PRESSURE: Fetching callibration data\r\n");
+	DBG_SENSORS("[PRESSURE] Fetching callibration data\r\n");
 	bmp085_callibration calib_data;
 	I2C_start(I2C1,PRESSURE_ADDR << 1, I2C_Direction_Transmitter);
@@ -260,7 +265,7 @@ bmp085_callibration get_pressure_callibration_data(void)
  	calib_data.MD |= I2C_read_nack(I2C1);
  	I2C_stop(I2C1);
- 	printf("PRESSURE: Got callibration data\r\n");
+ 	DBG_SENSORS("[PRESSURE] Got callibration data\r\n");
  	return calib_data;
 }
@@ -286,16 +291,16 @@ uint16_t get_pressure_data(void)
 {
 	uint16_t data;
 	init_pressure();
-	printf("PRESSURE: Initialized\r\n");
+	DBG_SENSORS("[PRESSURE] Initialized\r\n");
 	I2C_start(I2C1,PRESSURE_ADDR << 1, I2C_Direction_Transmitter);
 	I2C_write(I2C1, 0xF6);
 	I2C_restart(I2C1, PRESSURE_ADDR << 1, I2C_Direction_Receiver);
  	data = I2C_read_ack(I2C1);
- 	printf("PRESSURE: Got high byte\r\n");
+ 	DBG_SENSORS("[PRESSURE] Got high byte\r\n");
  	data = data << 8;
  	data = data | I2C_read_nack(I2C1);
- 	printf("PRESSURE: Got low byte\r\n");
+ 	DBG_SENSORS("[PRESSURE] Got low byte\r\n");
  	I2C_stop(I2C1);
 	return data;
 }
@@ -304,16 +309,16 @@ uint16_t get_pressure_temperature_data(void)
 {
 	uint16_t data;
 	init_pressure_temperature();
-	printf("PRESSURE: Initialized temperature\r\n");
+	DBG_SENSORS("[PRESSURE] Initialized temperature\r\n");
 	I2C_start(I2C1,PRESSURE_ADDR << 1, I2C_Direction_Transmitter);
 	I2C_write(I2C1, 0xF6);
 	I2C_restart(I2C1, PRESSURE_ADDR << 1, I2C_Direction_Receiver);
  	data = I2C_read_ack(I2C1);
- 	printf("PRESSURE: Got temperature high byte\r\n");
+ 	DBG_SENSORS("[PRESSURE] Got temperature high byte\r\n");
  	data = data << 8;
  	data = data | I2C_read_nack(I2C1);
- 	printf("PRESSURE: Got temperature low byte\r\n");
+ 	DBG_SENSORS("[PRESSURE] Got temperature low byte\r\n");
  	 I2C_stop(I2C1);
 	return data;
 }
@@ -327,39 +332,39 @@ char* pressure_value(uint16_t pressure, uint16_t temperature)
 void init_humidity_temp(void)
 {
-	printf("HUMIDITY: Initializing sensor\r\n");
+	DBG_SENSORS("[HUMIDITY_TEMP] Initializing sensor\r\n");
 	I2C_start(I2C1,HUMIDITY_TEMP_ADDR << 1, I2C_Direction_Transmitter);
 	I2C_stop(I2C1);
 }
 uint16_t get_humidity_data(void)
 {
 	init_humidity_temp();
-	printf("HUMIDITY_TEMP: Initialized humidity\r\n");
+	DBG_SENSORS("[HUMIDITY_TEMP] Initialized humidity\r\n");
 	uint16_t data = 0;
 	I2C_start(I2C1,HUMIDITY_TEMP_ADDR << 1, I2C_Direction_Receiver);
 	data = I2C_read_ack(I2C1) & 0x3F;
-	printf("HUMIDITY_TEMP: Got humidity high byte\r\n");
+	DBG_SENSORS("[HUMIDITY_TEMP] Got humidity high byte\r\n");
 	data = data << 8;
 	data |= I2C_read_nack(I2C1);
-	printf("HUMIDITY_TEMP: Got humidity low byte\r\n");
+	DBG_SENSORS("[HUMIDITY_TEMP] Got humidity low byte\r\n");
 	I2C_stop(I2C1);
 	return data;
 }
 uint16_t get_temperature_data(void)
 {
 	init_humidity_temp();
-	printf("HUMIDITY_TEMP: Initialized temperature\r\n");
+	DBG_SENSORS("[HUMIDITY_TEMP] Initialized temperature\r\n");
 	uint16_t data = 0;
 	I2C_start(I2C1,HUMIDITY_TEMP_ADDR << 1, I2C_Direction_Receiver);
 	I2C_read_ack(I2C1);
-	printf("HUMIDITY_TEMP: Discarded first humidity byte\r\n");
+	DBG_SENSORS("[HUMIDITY_TEMP] Discarded first humidity byte\r\n");
 	I2C_read_ack(I2C1);
-	printf("HUMIDITY_TEMP: Discarded second humidity byte\r\n");
+	DBG_SENSORS("[HUMIDITY_TEMP] Discarded second humidity byte\r\n");
 	data = I2C_read_ack(I2C1);
-	printf("HUMIDITY_TEMP: Got temperature high byte\r\n");
+	DBG_SENSORS("[HUMIDITY_TEMP] Got temperature high byte\r\n");
 	data = data << 8;
 	data |= I2C_read_nack(I2C1) & 0xFC ;
-	printf("HUMIDITY_TEMP: Got temperature low byte\r\n");
+	DBG_SENSORS("[HUMIDITY_TEMP] Got temperature low byte\r\n");
 	data = data >> 2;
 	I2C_stop(I2C1);
 	return data;
@@ -406,45 +411,48 @@ char* battery_value(uint32_t battery)
 	return value;
 }
-void collectData(char* valueSensors[], uint8_t* sensors){
+void collectData(char* valueSensors[], uint8_t* sensors)
+{
+	DBG_SENSORS("Collecting data...\r\n");
 	uint8_t i;
 	for(i=0;i<strlen((char*)sensors);i++)
 	{
 		if(valueSensors[i]!=NULL)
 		{
-			printf("Freeing memory from previous entry on index %d\r\n",i);
+			DBG_SENSORS("Freeing memory from previous entry on index %d\r\n",i);
 			chHeapFree(valueSensors[i]);
 		}
 		else
 		{
-			printf("Not freeing memory on index %d\r\n",i);
+			DBG_SENSORS("Not freeing memory on index %d\r\n",i);
 		}
 		if(sensors[i]==LIGHT_ADDR)
 		{
-			printf("Fetching data from light sensor\r\n");
+			DBG_SENSORS("Fetching data from light sensor\r\n");
 			valueSensors[i]=light_value(get_light_data());
 		}
 		else if(sensors[i]==DISTANCE_ADDR)
 		{
-			printf("Fetching data from distance sensor\r\n");
+			DBG_SENSORS("Fetching data from distance sensor\r\n");
 			valueSensors[i]=distance_value(get_distance_data());
 		}
 		else if(sensors[i]==SOUND_ADDR)
 		{
-			printf("Fetching data from sound sensor\r\n");
+			DBG_SENSORS("Fetching data from sound sensor\r\n");
 			valueSensors[i]=sound_value(get_sound_data());
 		}
 		else if(sensors[i]==PRESSURE_ADDR)
 		{
-			printf("Fetching data from pressure sensor\r\n");
+			DBG_SENSORS("Fetching data from pressure sensor\r\n");
 			valueSensors[i]=pressure_value(get_pressure_data(), get_pressure_temperature_data());
 		}
 		else if(sensors[i]==HUMIDITY_TEMP_ADDR)
 		{
-			printf("Fetching data from humidity and temperature sensor\r\n");
+			DBG_SENSORS("Fetching data from humidity and temperature sensor\r\n");
 			valueSensors[i]=temp_humidity_value(get_temperature_data(),get_humidity_data());
 		}
 	}
+	DBG_SENSORS("Data collected...\r\n");
 }
 \ No newline at end of file
@@ -30,5 +30,6 @@ unsigned long getElapsedTime(unsigned long t)
 void sleep_thread(unsigned long seconds)
 {
+	DBG_TIMER("Time to sleep! for %d seconds\r\n", seconds);
 	chThdSleepMilliseconds( (unsigned int)seconds*1000 );
 }
 \ No newline at end of file