--no commit message

Maria Jorba Brosa
1 parent a4db05fe
Showing 4 changed files with 171 additions and 118 deletions
Project/applications/smartcities/.dep/main.o.d
Project/applications/smartcities/buffer.c
Project/applications/smartcities/include/buffer.h
Project/applications/smartcities/main.c
 build/obj/main.o: main.c ../..//econais/libwismart.h \
  ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \
  ../..//os/ports/GCC/ARMCMx/chtypes.h \
- c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \
- c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \
- c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \
+ c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \
+ c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \
+ c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \
  ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \
  ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
  ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
@@ -20,28 +20,28 @@ build/obj/main.o: main.c ../..//econais/libwismart.h \
  ../..//os/kernel/include/chinline.h ../..//os/kernel/include/chqueues.h \
  ../..//os/kernel/include/chstreams.h ../..//os/kernel/include/chioch.h \
  ../..//os/kernel/include/chfiles.h ../..//os/kernel/include/chdebug.h \
- c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdio.h \
- c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h \
- c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/newlib.h \
- c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/config.h \
- c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/ieeefp.h \
- c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/features.h \
- c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdarg.h \
- c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/reent.h \
- c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h \
- c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/_types.h \
- c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/_types.h \
- c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/_default_types.h \
- c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/lock.h \
- c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/types.h \
- c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/types.h \
- c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/stdio.h \
- c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/string.h \
- c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/cdefs.h \
- c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/string.h \
- c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdlib.h \
- c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/stdlib.h \
- c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/alloca.h \
+ c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdio.h \
+ c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h \
+ c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/newlib.h \
+ c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/config.h \
+ c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/ieeefp.h \
+ c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/features.h \
+ c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdarg.h \
+ c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/reent.h \
+ c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h \
+ c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/_types.h \
+ c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/_types.h \
+ c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/_default_types.h \
+ c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/lock.h \
+ c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/types.h \
+ c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/types.h \
+ c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/stdio.h \
+ c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/string.h \
+ c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/cdefs.h \
+ c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/string.h \
+ c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdlib.h \
+ c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/stdlib.h \
+ c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/alloca.h \
  ../..//econais/libwismart_mcu.h \
  ../..//econais/inc/STM32F1/libwismart_irqs.h \
  ../..//econais/STM32_Libs/F1/CMSIS/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h \
@@ -83,7 +83,9 @@ build/obj/main.o: main.c ../..//econais/libwismart.h \
  ../..//externalModules/lwip_v141/src/include/lwip/sys.h \
  ../..//externalModules/lwip_v141/port/arch/sys_arch.h \
  ../..//externalModules/lwip_v141/src/include/lwip/api.h \
- ../..//externalModules/lwip_v141/src/include/lwip/netbuf.h
+ ../..//externalModules/lwip_v141/src/include/lwip/netbuf.h \
+ include/callbacks.h include/buffer.h include/json.h include/globals.h \
+ include/sensors.h include/module.h
 ../..//econais/libwismart.h:
@@ -93,11 +95,11 @@ build/obj/main.o: main.c ../..//econais/libwismart.h \
 ../..//os/ports/GCC/ARMCMx/chtypes.h:
-c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
+c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
-c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
+c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
-c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
+c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
 ../..//os/kernel/include/chlists.h:
@@ -153,49 +155,49 @@ c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
 ../..//os/kernel/include/chdebug.h:
-c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdio.h:
+c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdio.h:
-c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h:
+c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h:
-c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/newlib.h:
+c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/newlib.h:
-c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/config.h:
+c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/config.h:
-c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/ieeefp.h:
+c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/ieeefp.h:
-c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/features.h:
+c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/features.h:
-c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdarg.h:
+c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdarg.h:
-c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/reent.h:
+c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/reent.h:
-c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h:
+c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h:
-c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/_types.h:
+c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/_types.h:
-c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/_types.h:
+c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/_types.h:
-c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/_default_types.h:
+c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/_default_types.h:
-c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/lock.h:
+c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/lock.h:
-c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/types.h:
+c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/types.h:
-c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/types.h:
+c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/types.h:
-c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/stdio.h:
+c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/stdio.h:
-c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/string.h:
+c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/string.h:
-c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/cdefs.h:
+c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/cdefs.h:
-c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/string.h:
+c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/string.h:
-c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdlib.h:
+c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdlib.h:
-c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/stdlib.h:
+c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/stdlib.h:
-c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/alloca.h:
+c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/alloca.h:
 ../..//econais/libwismart_mcu.h:
@@ -282,3 +284,15 @@ include/httpClient.h:
 ../..//externalModules/lwip_v141/src/include/lwip/api.h:
 ../..//externalModules/lwip_v141/src/include/lwip/netbuf.h:
+
+include/callbacks.h:
+
+include/buffer.h:
+
+include/json.h:
+
+include/globals.h:
+
+include/sensors.h:
+
+include/module.h:
@@ -3,30 +3,31 @@
 #include "buffer.h"
 #include "globals.h"
-void put_message(char* info, char** buf,uint32_t* index){
+char** put_message(char* info, char** buf,uint32_t* index, uint32_t* buf_len){
 uint32_t i;
 i= *index;
-
-if((BUFFER_LENGTH-1)==i)
+if(buf_len==i)
 {
-	i=0;
-	p[i] = chHeapAlloc(NULL,strlen(info)+1);
-	buf[i]=info;
-	i++;
+	char** buffer=join_buf(buf, buf_len);
+	buffer[i]=chHeapAlloc(NULL,strlen(info)+1);
+	buffer[i]=info;
+	*index = i++;
+	return buffer;
 }
 else{
-	p[i] = chHeapAlloc(NULL,strlen(info)+1);
-	buf[i]=info;
-	i++;	
+	buf[i] = chHeapAlloc(NULL,strlen(info)+1);
+	buf[i]=info;	
+	*index = i++;
+	return buf;
 }
-*index = i++;
+
 }
 int check_memory(){
 	int mem_free=libwismart_GetMemFree_Ram().free;
-	int mem=20480-mem_free;
+	int mem=25600-mem_free;
 	if(mem>=HARD_LIMIT)
 	{
@@ -40,23 +41,44 @@ int check_memory(){
 int send(char** buf, uint32_t index, char *provider_ID, char *sensor_ID){
-	char* statement=prepare_json_observation_statement(buf, *index+1);
+	char* statement=prepare_json_observation_statement(buf, index+1);
 	uint32_t size = strlen(statement);
-	uint8_t res=send_json(statement, size, char* provider_ID, char* sensor_ID);
-	for(int i;i<*index+1;i++){
+	uint8_t res=send_json(statement, size, provider_ID, sensor_ID);
+	int i;
+	for(i=0;i<index+1;i++){
 		chHeapFree(buf[i]);
 	}
 	return res;
 }
-void destroy(char** buf){
+void destroy(char** master_buf[]){
+//[j] buffer index [i] string index
 int i=0; 
-
-while(check_memory()==HARD_LIMIT)
-{
-	chHeapFree(buf[i]);
+int j;
+while(check_memory()!=MEMORY_OK)
+{	
+for(j=0;j<4;j++){
+	if(master_buf[j]!=NULL)
+		chHeapFree(master_buf[j][i]);
+}
 	i++;
 }
 }
+
+char** join_buf(char** buf, int* buf_len){
+	char** n_buf;
+	int len= *buf_len;
+	n_buf=chHeapalloc (NULL,sizeof (char *) * (len+1));
+	int i;
+	for(i=0; i<len;i++){
+		char* aux=buf[i];
+		n_buf[i]=chHeapAlloc(NULL,strlen(aux)+1);
+		n_buf[i]=aux;
+		chHeapFree(buf[i]);
+	}
+	chHeapFree(buf);
+	*buf_len=len++;
+	return n_buf;
+}
@@ -10,9 +10,10 @@
 #define	SOFT_REACHED	1
 #define HARD_REACHED	2
-void put_message(char* info, char** buf,uint32_t* index);
+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, char *provider_ID, char *sensor_ID);
 void destroy(char** buf);
+char** join_buf(char** buf, int* buf_len);
 #endif
 \ No newline at end of file
@@ -5,6 +5,7 @@
 #include "httpClient.h"
 #include "callbacks.h"
 #include "buffer.h"
+#include "i2c.h"
 #define WIFI_MODE				WIFI_MODE_CLIENT
 #define NETWORK_SSID			"linksys"
@@ -20,60 +21,75 @@ void initLibwismart(void)
 int main(void)
 {
-	uint32_t ind=0;
-	char **buffer;
-	buffer = malloc (sizeof (char *) * BUFFER_LENGTH);
-	struct wpa_param wpa;
-	wpa.eap_method = WISMART_EAP_METHOD_TTLS;
-	wpa.u.ttls.identity=WPA_USER;
-	wpa.u.ttls.password=WPA_PASS;
-	wpa.u.ttls.ca_cert=NULL;
+	//if(libwismart_RegistryIsValueEmpty(wismart_registryKey_t* key)){
-	struct httpHeaders head200 = { get,	"/", 1, "http://www.w3.org/", 19 };
-	struct httpHeaders head301 = { get, "/", 1, "w3.org", 6	};
-	struct httpHeaders head404 = { get, "/errorerrorerror", 15, "www.w3.org" };
-	
-	initLibwismart();
-	libwismart_PowerSave_Enable();
-	libwismart_PowerSave_HigherProfile(TRUE);
+	//}
+	//else {
+		uint32_t ind[4]={0};
+		char** buffers[4];
+		int sizes[4]={0};
+		int i;
+		for(i=0;i<4;i++){
-	libwismart_RegisterDhcpCB(dhcp_connect_result_cb);	
+			buffers[i]=NULL;
+		}
+		struct wpa_param wpa;
+		wpa.eap_method = WISMART_EAP_METHOD_TTLS;
+		wpa.u.ttls.identity=WPA_USER;
+		wpa.u.ttls.password=WPA_PASS;
+		wpa.u.ttls.ca_cert=NULL;
+
+		struct httpHeaders head200 = { get,	"/", 1, "http://www.w3.org/", 19 };
+		struct httpHeaders head301 = { get, "/", 1, "w3.org", 6	};
+		struct httpHeaders head404 = { get, "/errorerrorerror", 15, "www.w3.org" };
+		
+		initLibwismart();
+		libwismart_PowerSave_Enable();
+		libwismart_PowerSave_HigherProfile(TRUE);
+
+		libwismart_RegisterDhcpCB(dhcp_connect_result_cb);	
-	libwismart_WiFiInit();
-	//falta definir les variables de la xarxa
-	libwismart_WiFiConnectEnterprise(NETWORK_SSID, &wpa, wifi_connect_result_cb);
+		libwismart_WiFiInit();
+		//falta definir les variables de la xarxa
+		libwismart_WiFiConnectEnterprise(NETWORK_SSID, &wpa, wifi_connect_result_cb);
-	//int httpRequest(struct httpHeaders head, char* content, int content_size)
-	//chThdSleepMilliseconds(5000);
-	
-	//httpRequest(head200, NULL, 0);
-	/*httpRequest(head301, NULL, 0);
-	httpRequest(head404, NULL, 0);*/
+		//int httpRequest(struct httpHeaders head, char* content, int content_size)
+		//chThdSleepMilliseconds(5000);
-	for(;;)
-	{
-		// i2c get info= data
-		char* data=NULL;
-		put_message(data, buffer ,&ind);
-		int res=check_memory();
-		if(res==SOFT_REACHED){
+		//httpRequest(head200, NULL, 0);
+		/*httpRequest(head301, NULL, 0);
+		httpRequest(head404, NULL, 0);*/
+		// i2c scans the sensors active and returns how many thay are
-			int ok=send(buffer, ind, "", "");
-			if(ok==JSON_COMM_ERROR)
-			{
-				printf("wismart is not connected\r\n");
+		for(;;)
+		{
+
+			for(i=0;i<4;i++){
+			// i2c gets the data and combines it with the time stamp
+				char* data=NULL;
+			put_message(data, buffers[i] ,&ind[i],sizes[i]);
+			int res=check_memory();
+			if(res==SOFT_REACHED){
+
+				int ok=send(buffers[i], ind[i], "", "");
+				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");
+				}
 			}
-			else if( ok==JSON_OTHER_ERROR){
-				printf("some error ocurred\r\n");
+			else if(res==HARD_REACHED){
+				destroy(buffer[i]);
 			}
-			else if(ok ==JSON_POST_OK){
-				printf(" send OK \r\n");
 			}
+			
+			
+			chThdSleepMilliseconds(500);
 		}
-		else if(res==HARD_REACHED){
-			destroy(buffer);
-		}
-		chThdSleepMilliseconds(500);
-	}
+	//}
 }
-