Diff: main.cpp

Revision:

10:7a1d1abb5172

Parent:

9:e501499af4ef

Child:

12:0f549dfba86c

--- a/main.cpp	Wed Jul 22 15:09:01 2015 +0000
+++ b/main.cpp	Thu Jul 23 22:46:18 2015 +0000
@@ -3,8 +3,9 @@
 static Watchdog wd;
 static Ticker tickerWd;
 SerialNumber sn;
-Parameters param ((unsigned char *)&APP_PARAMETERS, sizeof(APP_PARAMETERS));
-CommandExecutor exec(APP_PARAMETERS.INTERVALO_WD_NETWORK_S, APP_PARAMETERS.INTERVALO_SILENCIO_S);
+Parameters param ((char *)&APP_PARAMETERS, sizeof(APP_PARAMETERS));
+CommandExecutor exec;
+MemoriaMassa mm;
 
 int main()
 {
@@ -15,13 +16,17 @@
 
     param.loadParameters();
     printParameters();
+    
+    mm.iniciaLeituras(APP_PARAMETERS.INTERVALO_MM_S, APP_PARAMETERS.MM_SIZE);
+    
     ggsStream.baud(19200);
     exec.carregaEndereco(sn.get());
-    exec.iniciaExecutorComandos();
+    exec.iniciaExecutorComandos(APP_PARAMETERS.INTERVALO_WD_NETWORK_S, APP_PARAMETERS.INTERVALO_SILENCIO_S);
     detectaCargaSemCorte();
-
+    
     while(1){
         exec.trataPacoteGGS();
+        mm.executaLeitura();
     }
     
 }
@@ -51,7 +56,7 @@
 void printParameters(){
     printf("Parameters:");
     for(int i=0; i < sizeof(APP_PARAMETERS); i++){
-        printf(" %02x", ((unsigned char *)&APP_PARAMETERS)[i]);
+        printf(" %02x", ((char *)&APP_PARAMETERS)[i]);
     }
     printf("\r\n");
 }