--no commit message

Imanol-Mikel Barba Sabariego
1 parent f98a930c
Showing 7 changed files with 52 additions and 64 deletions
Project/applications/smartcities/buffer.c
Project/applications/smartcities/buglist.txt
Project/applications/smartcities/include/sensors.h
Project/applications/smartcities/json.c
Project/applications/smartcities/main.c
Project/applications/smartcities/ntp.c
Project/applications/smartcities/sensors.c
@@ -7,13 +7,10 @@ char** put_message(char* info, char** buf,uint32_t *index, uint32_t *buf_len)
 	len=*buf_len;
 	if(len==*index)
 	{  
-		DBG_BUFFER("Joining buffer...\r\n");
 		char** buffer = join_buf(buf, buf_len);
-		DBG_BUFFER("Joined buffer...\r\n");
 		buffer[*index] = chHeapAlloc(NULL,strlen(info)+1);
-		DBG_BUFFER("Memory allocated...\r\n");
 		strcpy(buffer[*index],info);
-		DBG_BUFFER("Data copied...\r\n");
+		DBG_BUFFER("Data copied\r\n");
 		i = *index+1;
 		*index = i;
 		return buffer;
@@ -31,9 +28,10 @@ char** put_message(char* info, char** buf,uint32_t *index, uint32_t *buf_len)
 int check_memory()
 {
+	wismart_mem_stat_ram_t status = libwismart_GetMemFree_Ram();
 	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;36mAvailable memory: %d B%c[1;00m\r\n",0x1B,status.free,0x1B);
+	int mem = MAX_RAM - status.free;
 	DBG_BUFFER("%c[1;36mUsed memory: %d B%c[1;00m\r\n",0x1B,mem,0x1B);
 	if(mem >= HARD_LIMIT)
 	{
@@ -78,30 +76,23 @@ int send(char** buf, uint32_t *index, uint32_t *size_buf, char *provider_ID, cha
 	return res;
 }
-//realloc
 char** join_buf(char** buf, uint32_t *buf_len)
 {
+	DBG_BUFFER("Joining buffer...\r\n");
 	char** n_buf;
 	int len = *buf_len;
 	n_buf = chHeapAlloc (NULL,sizeof (char *) * (len+1));
 	int i;
-	DBG_BUFFER("Start buffer join...\r\n");
 	for(i=0; i<len;i++)
 	{
-		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);
-		DBG_BUFFER("in join_buf for, Memory allocated...\r\n");
 		strcpy(n_buf[i],buf[i]);
-		DBG_BUFFER("in join_buf for, Message copied...\r\n");
 		chHeapFree(buf[i]);
-		DBG_BUFFER("in join_buf for, Memory cleared...\r\n");
 	}
-	DBG_BUFFER("All data transferred\r\n");
 	if(len != 0)
 	{
 		chHeapFree(buf);
 	}
-	DBG_BUFFER("Old buffer cleared\r\n");
 	len++;
 	*buf_len=len;
 	return n_buf;
 - Investigate leaks
-- Pressure sensor memory
 - Test sound sensor
 - Test multiple sensors with DB9
 \ No newline at end of file
@@ -56,7 +56,8 @@ char* distance_value(uint16_t distance);
 //PRESSURE SENSOR
-typedef struct {
+typedef struct bmp085_callibration bmp085_callibration_t;
+struct bmp085_callibration {
 	uint16_t AC1;
 	uint16_t AC2;
 	uint16_t AC3;
@@ -68,14 +69,14 @@ typedef struct {
 	uint16_t MB;
 	uint16_t MC;
 	uint16_t MD;
-} bmp085_callibration;
+};
 void init_pressure(void);
 void init_pressure_temperature(void);
 uint16_t get_pressure_data(void);
 uint16_t get_pressure_temperature_data(void);
-bmp085_callibration get_pressure_callibration_data(void);
-char* callibration_pressure_data_csv(bmp085_callibration parameters);
+void get_pressure_callibration_data(bmp085_callibration_t *calib_data);
+char* callibration_pressure_data_csv(bmp085_callibration_t *parameters);
 char* pressure_value(uint16_t pressure,uint16_t temperature);
 //HUMIDITY AND TEMPERATURE SENSOR
@@ -8,7 +8,10 @@ uint8_t register_sensor(sensor sens)
     if(sens.ID == PRESSURE_ADDR)
     {
     	DBG_JSON("Putting additional info for pressure sensor...\r\n");
-    	char *callibration_data = callibration_pressure_data_csv(get_pressure_callibration_data());
+    	bmp085_callibration_t calib_data;
+    	get_pressure_callibration_data(&calib_data);
+    	DBG_JSON("Got callibration data\r\n");
+    	char *callibration_data = callibration_pressure_data_csv(&calib_data);
     	DBG_JSON("callibration_data is: %s\r\n",callibration_data);
         statement = prepare_json_register_statement(mod,sens,callibration_data);
     	chHeapFree(callibration_data);
@@ -132,7 +132,6 @@ void put_buffers(char** buffers[],uint32_t ind[],uint32_t sizes[],char** cooked,
         DBG("Message put: %s\r\n",buffers[i][ind[i]-1]);
         chHeapFree(cooked[i]);
         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]));
     }
     DBG("Data is now in buffer\n\r");
 }
@@ -196,7 +195,6 @@ void wifi_disconnect(void)
         connected |= CONNECTED_PAST;
     }
     connected = connected & CONNECTED_PAST ;
-    DBG("Connnected: %d\r\n",connected);
     timeout = 0;
     uint8_t res=libwismart_WiFiDisconnect();
      if(res)
@@ -212,7 +210,7 @@ int main(void)
     libwismart_PowerSave_HigherProfile(TRUE);
     libwismart_RegisterDhcpCB(dhcp_connect_result_cb);
     libwismart_WiFiInit();
-    libwismart_SetScanRunsForConnTimeout(4); //Edit a 4
+    libwismart_SetScanRunsForConnTimeout(4);
 	libwismart_EnableBsdSocketAPI();
     int i;
@@ -168,9 +168,7 @@ char* timestamp_data(char* value,Date time)
 	DBG_NTP("Writing timestamp...\r\n");
 	uint8_t length = strlen(value) + strlen(",00/00/0000T00:00:00") + 1;
 	char str_day[3],str_month[3],str_year[5],str_hour[3],str_minute[3],str_second[3];
-	DBG_NTP("Asking for %d bytes in timestamp_data\r\n", length);
 	char* data = chHeapAlloc(NULL,length*sizeof(char));
-	DBG_NTP("Data allocated in timestamp_data\r\n", length);
 	sprintf(str_day,"%d",time.day);
 	sprintf(str_month,"%d",time.month);
 	sprintf(str_year,"%d",time.year);
@@ -219,107 +219,105 @@ void init_pressure_temperature(void)
   	chThdSleepMilliseconds(5);
 }
-bmp085_callibration get_pressure_callibration_data(void)
+void get_pressure_callibration_data(bmp085_callibration_t *calib_data)
 {
 	DBG_SENSORS("[PRESSURE] Fetching callibration data\r\n");
-	bmp085_callibration calib_data;
 	I2C_start(I2C1,PRESSURE_ADDR << 1, I2C_Direction_Transmitter);
 	I2C_write(I2C1, 0xAA);
 	I2C_restart(I2C1, PRESSURE_ADDR << 1, I2C_Direction_Receiver);
- 	calib_data.AC1 = (I2C_read_ack(I2C1) << 8);
- 	calib_data.AC1 |= I2C_read_nack(I2C1);
+ 	calib_data->AC1 = (I2C_read_ack(I2C1) << 8);
+ 	calib_data->AC1 |= I2C_read_nack(I2C1);
  	I2C_stop(I2C1);
  	I2C_start(I2C1,PRESSURE_ADDR << 1, I2C_Direction_Transmitter);
 	I2C_write(I2C1, 0xAC);
 	I2C_restart(I2C1, PRESSURE_ADDR << 1, I2C_Direction_Receiver);
- 	calib_data.AC2 = (I2C_read_ack(I2C1) << 8);
- 	calib_data.AC2 |= I2C_read_nack(I2C1);
+ 	calib_data->AC2 = (I2C_read_ack(I2C1) << 8);
+ 	calib_data->AC2 |= I2C_read_nack(I2C1);
  	I2C_stop(I2C1);
  	I2C_start(I2C1,PRESSURE_ADDR << 1, I2C_Direction_Transmitter);
 	I2C_write(I2C1, 0xAE);
 	I2C_restart(I2C1, PRESSURE_ADDR << 1, I2C_Direction_Receiver);
- 	calib_data.AC3 = (I2C_read_ack(I2C1) << 8);
- 	calib_data.AC3 |= I2C_read_nack(I2C1);
+ 	calib_data->AC3 = (I2C_read_ack(I2C1) << 8);
+ 	calib_data->AC3 |= I2C_read_nack(I2C1);
  	I2C_stop(I2C1);
  	I2C_start(I2C1,PRESSURE_ADDR << 1, I2C_Direction_Transmitter);
 	I2C_write(I2C1, 0xB0);
 	I2C_restart(I2C1, PRESSURE_ADDR << 1, I2C_Direction_Receiver);
- 	calib_data.AC4 = (I2C_read_ack(I2C1) << 8);
- 	calib_data.AC4 |= I2C_read_nack(I2C1);
+ 	calib_data->AC4 = (I2C_read_ack(I2C1) << 8);
+ 	calib_data->AC4 |= I2C_read_nack(I2C1);
  	I2C_stop(I2C1);
  	I2C_start(I2C1,PRESSURE_ADDR << 1, I2C_Direction_Transmitter);
 	I2C_write(I2C1, 0xB2);
 	I2C_restart(I2C1, PRESSURE_ADDR << 1, I2C_Direction_Receiver);
- 	calib_data.AC5 = (I2C_read_ack(I2C1) << 8);
- 	calib_data.AC5 |= I2C_read_nack(I2C1);
+ 	calib_data->AC5 = (I2C_read_ack(I2C1) << 8);
+ 	calib_data->AC5 |= I2C_read_nack(I2C1);
  	I2C_stop(I2C1);
  	I2C_start(I2C1,PRESSURE_ADDR << 1, I2C_Direction_Transmitter);
 	I2C_write(I2C1, 0xB4);
 	I2C_restart(I2C1, PRESSURE_ADDR << 1, I2C_Direction_Receiver);
- 	calib_data.AC6 = (I2C_read_ack(I2C1) << 8);
- 	calib_data.AC6 |= I2C_read_nack(I2C1);
+ 	calib_data->AC6 = (I2C_read_ack(I2C1) << 8);
+ 	calib_data->AC6 |= I2C_read_nack(I2C1);
  	I2C_stop(I2C1);
  	I2C_start(I2C1,PRESSURE_ADDR << 1, I2C_Direction_Transmitter);
 	I2C_write(I2C1, 0xB6);
 	I2C_restart(I2C1, PRESSURE_ADDR << 1, I2C_Direction_Receiver);
- 	calib_data.B1 = (I2C_read_ack(I2C1) << 8);
- 	calib_data.B1 |= I2C_read_nack(I2C1);
+ 	calib_data->B1 = (I2C_read_ack(I2C1) << 8);
+ 	calib_data->B1 |= I2C_read_nack(I2C1);
  	I2C_stop(I2C1);
  	I2C_start(I2C1,PRESSURE_ADDR << 1, I2C_Direction_Transmitter);
 	I2C_write(I2C1, 0xB8);
 	I2C_restart(I2C1, PRESSURE_ADDR << 1, I2C_Direction_Receiver);
- 	calib_data.B2 = (I2C_read_ack(I2C1) << 8);
- 	calib_data.B2 |= I2C_read_nack(I2C1);
+ 	calib_data->B2 = (I2C_read_ack(I2C1) << 8);
+ 	calib_data->B2 |= I2C_read_nack(I2C1);
  	I2C_stop(I2C1);
  	I2C_start(I2C1,PRESSURE_ADDR << 1, I2C_Direction_Transmitter);
 	I2C_write(I2C1, 0xBA);
 	I2C_restart(I2C1, PRESSURE_ADDR << 1, I2C_Direction_Receiver);
- 	calib_data.MB = (I2C_read_ack(I2C1) << 8);
- 	calib_data.MB |= I2C_read_nack(I2C1);
+ 	calib_data->MB = (I2C_read_ack(I2C1) << 8);
+ 	calib_data->MB |= I2C_read_nack(I2C1);
  	I2C_stop(I2C1);
  	I2C_start(I2C1,PRESSURE_ADDR << 1, I2C_Direction_Transmitter);
 	I2C_write(I2C1, 0xBC);
 	I2C_restart(I2C1, PRESSURE_ADDR << 1, I2C_Direction_Receiver);
- 	calib_data.MC = (I2C_read_ack(I2C1) << 8);
- 	calib_data.MC |= I2C_read_nack(I2C1);
+ 	calib_data->MC = (I2C_read_ack(I2C1) << 8);
+ 	calib_data->MC |= I2C_read_nack(I2C1);
  	I2C_stop(I2C1);
  	I2C_start(I2C1,PRESSURE_ADDR << 1, I2C_Direction_Transmitter);
 	I2C_write(I2C1, 0xBE);
 	I2C_restart(I2C1, PRESSURE_ADDR << 1, I2C_Direction_Receiver);
- 	calib_data.MD = (I2C_read_ack(I2C1) << 8);
- 	calib_data.MD |= I2C_read_nack(I2C1);
+ 	calib_data->MD = (I2C_read_ack(I2C1) << 8);
+ 	calib_data->MD |= I2C_read_nack(I2C1);
  	I2C_stop(I2C1);
  	DBG_SENSORS("[PRESSURE] Got callibration data\r\n");
- 	return calib_data;
 }
-char* callibration_pressure_data_csv(bmp085_callibration parameters)
+char* callibration_pressure_data_csv(bmp085_callibration_t *parameters)
 {
-	char *str = chHeapAlloc(NULL,sizeof(char)*(11*11-1));
-	memset(str,0x00,sizeof(char)*(11*11));
-	sprintf(str + strlen(str),"%u,",parameters.AC1);
-	sprintf(str + strlen(str),"%u,",parameters.AC2);
-	sprintf(str + strlen(str),"%u,",parameters.AC3);
-	sprintf(str + strlen(str),"%u,",parameters.AC4);
-	sprintf(str + strlen(str),"%u,",parameters.AC5);
-	sprintf(str + strlen(str),"%u,",parameters.AC6);
-	sprintf(str + strlen(str),"%u,",parameters.B1);
-	sprintf(str + strlen(str),"%u,",parameters.B2);
-	sprintf(str + strlen(str),"%u,",parameters.MB);
-	sprintf(str + strlen(str),"%u,",parameters.MC);
-	sprintf(str + strlen(str),"%u",parameters.MD);
+	char *str = chHeapAlloc(NULL,(11*11-1));
+	memset(str,0x00,(11*11-1));
+	sprintf(str + strlen(str),"%u,",parameters->AC1);
+	sprintf(str + strlen(str),"%u,",parameters->AC2);
+	sprintf(str + strlen(str),"%u,",parameters->AC3);
+	sprintf(str + strlen(str),"%u,",parameters->AC4);
+	sprintf(str + strlen(str),"%u,",parameters->AC5);
+	sprintf(str + strlen(str),"%u,",parameters->AC6);
+	sprintf(str + strlen(str),"%u,",parameters->B1);
+	sprintf(str + strlen(str),"%u,",parameters->B2);
+	sprintf(str + strlen(str),"%u,",parameters->MB);
+	sprintf(str + strlen(str),"%u,",parameters->MC);
+	sprintf(str + strlen(str),"%u",parameters->MD);
 	return str;
 }