--no commit message

Maria Jorba Brosa
1 parent bf3c8796
Showing 2 changed files with 22 additions and 110 deletions
Project/applications/smartcities/include/globals.h
Project/applications/smartcities/main2.c
@@ -5,7 +5,6 @@
 #define SERVER_HOSTNAME			SERVER_IP
 #define MODULE_ID_LENGTH		6
 #define BUFFER_LENGTH    		30
-
 #define MAX_RAM					30000
 #endif
 \ No newline at end of file
@@ -8,6 +8,7 @@
 #include "buffer.h"
 #include "i2c.h"
 #include "configServer.h"
+#include "timer-loop.h"
 #define WIFI_MODE               WIFI_MODE_CLIENT
 #define NETWORK_SSID_AP         "modularsens"
@@ -15,7 +16,6 @@
 #define NETWORK_CHANNEL_AP      1
 #define HARD_LIMIT_WAIT_TIME 10*1000 //5*60*1000
-#define NUMSENSORS 4
 wismart_registryKey_t geo;
@@ -29,6 +29,7 @@ void initLibwismart(void)
 uint8_t connected=0;
 uint8_t timeout=0;
 uint8_t retries=0;
+uint8_t total_sensors=0;
 void init_registry(void)
 {
@@ -88,7 +89,7 @@ void init_registry(void)
 void send_data(char** buffers[j], uint32_t ind[], uint32_t sizes[j], uint8_t sensors[]);
 {
     int j;
-    for(j=0;j<TOTAL_SENSORS;j++)
+    for(j=0;j<total_sensors;j++)
     {
         printf(" enviant buffer %d\r\n",j);
@@ -110,7 +111,7 @@ void send_data(char** buffers[j], uint32_t ind[], uint32_t sizes[j], uint8_t sen
 void put_buffers(char** buffers,uint32_t ind[],uint32_t sizes[],char** cooked){
     int i;
-    for(i=0;i<TOTAL_SENSORS;i++){
+    for(i=0;i<total_sensors;i++){
         put_message(cooked[i], buffers[i] ,&ind[i],&sizes[i]);
         chHeapFree(cooked[i]);
     }
@@ -121,13 +122,22 @@ char** timestamp_datas(char* value[],unsigned long timestamp){
     char** cooked_data;
     Date t=getDate(timestamp);
     int i;
-    for(i=0;i<TOTAL_SENSORS;i++){
+    for(i=0;i<total_sensors;i++){
         cooked_data[i]=timestamp_data(value[i], t);
         chHeapFree(value[i]);
     }
     return cooked_data;
 }
+void sensor_scan(){
+    I2C_scan(sensors);
+    int i;
+    for(i=0;i<TOTAL_SENSORS;i++){
+        if(sensors[i]!=0){
+            total_sensors++;
+        }
+    }
+}
 int main(void)
 {
@@ -141,12 +151,14 @@ int main(void)
     //Escanea los sensores -> retorna un vector con las direcciones en cada posición del vector, si la posición del vector retorna un cero -> no existe el sensor
     uint8_t sensors[TOTAL_SENSORS];
-    char* valueSensors[TOTAL_SENSORS];
+    sensor_scan();
+    char* valueSensors[total_sensors];
     I2C_scan(sensors);
-    
+    //conectar wifi
     //unsigned int time = getNTPTime();
     unsigned int time = getSecsSince1900();
+    //desconectarwifi
     unsigned long timestamp = 0;
     unsigned long delay = getSystemTime();
@@ -156,7 +168,7 @@ int main(void)
     uint32_t ind[4]={0};
     char** buffers[4];
     uint32_t sizes[4]={0};
-    char* cooked_data[TOTAL_SENSORS];
+    char* cooked_data[total_sensors];
     init_registry();
@@ -194,6 +206,7 @@ int main(void)
             send_data();
             //time = getNTPTime();
             time = getSecsSince1900();
+            //desconectar wifi
             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);
             i = 0;
         }
@@ -228,7 +241,7 @@ int main(void)
                 chThdSleepMilliseconds(HARD_LIMIT_WAIT_TIME);
             }
             int j;
-            for(j=1;j<TOTAL_SENSORS;j++)
+            for(j=1;j<total_sensors;j++)
             {
                 printf(" enviant buffer %d\r\n",j);
@@ -252,105 +265,5 @@ int main(void)
         delay = getSystemTime();
         sleep_thread(SHORT_PERIOD - time%SHORT_PERIOD);
         i++;
-    }
-
-
-
-    
-
-
-//A partir de aquí se debe integrar arriba, preferiblemente con funciones María
-    uint32_t ind[4]={0};
-    char** buffers[4];
-    uint32_t sizes[4]={0};
-	char* sensor_id[4];
-    int i;
-    
-    
-   init_registry();
-    
-    if(timeout==1)
-    {
-        printf("Creating AP\r\n");
-        //corroborar los parametros del AP
-        configServer_start(1);
-        libwismart_WiFi_SoftAP_Start(NETWORK_SSID_AP,NETWORK_CHANNEL_AP,NULL,softapMode_apStartedCb, softapMode_clientIndicationCb);
-        for(;;)
-        {
-            chThdSleepMilliseconds(1000);
-        }
-    }
-    for(;;)
-    {
-        // i2c gets the data and combines it with the time stamp
-            char* data="message,0";
-            char* data2="message,1";
-            char* data3="message,2";
-            for(i=0;i<NUMSENSORS;i++){
-
-                printf("------------------BUFFER %d ----------------------\r\n",i);
-                printf("index=%d\r\n",ind[i]);
-				
-				// 3 missatges de prova a cada buffer
-                buffers[i]=put_message(data, buffers[i] ,&ind[i],&sizes[i]);
-                buffers[i]=put_message(data2, buffers[i] ,&ind[i],&sizes[i]);
-                buffers[i]=put_message(data3, buffers[i] ,&ind[i],&sizes[i]);
-                printf("mirant memoria\r\n");
-                int res=check_memory();
-                /*if(res==SOFT_REACHED){
-                    printf("--------------soft limit-------------\r\n");
-					int j;
-					for(j=0;j<NUMSENSORS;j++)
-					{
-						printf(" enviant buffer %d\r\n",j);
-						
-						// fem servir 085 de prova, però haurem de fer servir sensor_id[j]
-						int ok=send(buffers[j],&ind[j],&sizes[j], "bmp", "085");
-						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(res==HARD_REACHED){
-					printf("--------------hard limit-------------\r\n");
-                    
-					// fem servir 085 de prova, però haurem de fer servir sensor_id[0]
-					while( send(buffers[0],&ind[0],&sizes[0], "bmp", "085") != JSON_POST_OK )
-					{
-						// El servidor no ens sap dir si tenim permisos o no sense registrar una mostra.
-						// 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");
-						chThdSleepMilliseconds(HARD_LIMIT_WAIT_TIME);
-					}
-					int j;
-					for(j=1;j<NUMSENSORS;j++)
-					{
-						printf(" enviant buffer %d\r\n",j);
-						
-						// fem servir 085 de prova, però haurem de fer servir sensor_id[j]
-						int ok=send(buffers[j],&ind[j],&sizes[j], "bmp", "085");
-						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");
-						}
-					}
-                }*/
-            }
-        //chThdSleepMilliseconds(100);
-    }
+    }  
 }