diff --git a/globoSonda/examples/globoSonda/globoSonda.ino b/globoSonda/examples/globoSonda/globoSonda.ino index 952b20a..7fcdfc2 100644 --- a/globoSonda/examples/globoSonda/globoSonda.ino +++ b/globoSonda/examples/globoSonda/globoSonda.ino @@ -1,7 +1,7 @@ //librerias externas-------------------- #include -#include +//#include #include "stdio.h" /* diff --git a/globoSonda/src/ArchivoSD.cpp b/globoSonda/src/ArchivoSD.cpp index 5563019..378f3a1 100644 --- a/globoSonda/src/ArchivoSD.cpp +++ b/globoSonda/src/ArchivoSD.cpp @@ -1,4 +1,4 @@ -#include + #include "ArchivoSD.h" const char * colNames[] = {"Milis", "TempExt", "Hum", "TempInt", "Alt", "Pres", "AcelX", "AcelY", "AcelZ", "MagX", "MagY", "MagZ", "gpsVal", "nSatelites", "PDOP", "HDOP", "VDOP" , "Fecha", "lat", "lon", "Alt(GPS)", "Direccion", "Velocidad" }; diff --git a/globoSonda/src/ArchivoSD.h b/globoSonda/src/ArchivoSD.h index 8017859..5a23c08 100644 --- a/globoSonda/src/ArchivoSD.h +++ b/globoSonda/src/ArchivoSD.h @@ -1,6 +1,7 @@ #ifndef ArchivoSD_define #define ArchivoSD_define 1 +#include #include "utiles.h" #define TIMER_SMS_DATA 60000//cada 1 min diff --git a/globoSonda/src/ReporteManager.cpp b/globoSonda/src/ReporteManager.cpp index 82e4776..7f45ca2 100644 --- a/globoSonda/src/ReporteManager.cpp +++ b/globoSonda/src/ReporteManager.cpp @@ -1,4 +1,3 @@ -#include #include "ArchivoSD.h" #include "Sim808Manager.h" diff --git a/globoSonda/src/SIM808Manager.cpp b/globoSonda/src/SIM808Manager.cpp index 82c913d..94abfdb 100644 --- a/globoSonda/src/SIM808Manager.cpp +++ b/globoSonda/src/SIM808Manager.cpp @@ -236,13 +236,13 @@ char* Sim808Manager::recibe() return buff; } -void Sim808Manager::envia(char* dat) +void Sim808Manager::envia(const char* dat) { pSeria->println(dat); //Utiles::printCOM(dat); } -void Sim808Manager::enviaSolo(char* dat, int ndata) +void Sim808Manager::enviaSolo(const char* dat, int ndata) { for ( int i = 0; i < ndata; i++) { diff --git a/globoSonda/src/SIM808Manager.h b/globoSonda/src/SIM808Manager.h index 0092571..1039de4 100644 --- a/globoSonda/src/SIM808Manager.h +++ b/globoSonda/src/SIM808Manager.h @@ -51,7 +51,7 @@ class Sim808Manager public: Sim808Manager(); - bool inicia(HardwareSerial *mySerial, int powerKey = -1, int baud=0); + bool inicia(HardwareSerial *mySerial, int powerKey, int baud);//int powerKey = -1, int baud=0 bool EnviaSMS(char* tlf, char *sms); @@ -63,7 +63,7 @@ class Sim808Manager DataGPSSimManager* GetGPS(); //envio de datos - bool IniciaNetwork(const char* apn = 0, const char* userName = 0, const char* passWord = 0); + bool IniciaNetwork(const char* apn, const char* userName , const char* passWord); bool connect(ProtocolSimManager ptl, const char* host, int port); bool send(char* str, int len); char* recibeDatos(); @@ -78,8 +78,8 @@ class Sim808Manager bool iniciaSIM(); char* recibe(); - void envia(char* dat); - void enviaSolo(char* dat, int ndata); + void envia(const char* dat); + void enviaSolo(const char* dat, int ndata); bool CheckAt(); void enciende(); bool reciveOK(); diff --git a/globoSonda/src/StatusManager.h b/globoSonda/src/StatusManager.h index fffaac5..12fcb14 100644 --- a/globoSonda/src/StatusManager.h +++ b/globoSonda/src/StatusManager.h @@ -14,7 +14,7 @@ class StatusManager int ledGPS; int ledSMS; public: - StatusManager(int pinLedSD = -1, int pinLedGPS = -1, int pinLedSMS = -1); + StatusManager(int pinLedSD , int pinLedGPS, int pinLedSMS); void EmpiezaInicio(); void FinInicio(); void SetStatusSD(bool ok); diff --git a/globoSonda/src/utiles.cpp b/globoSonda/src/utiles.cpp index 8acd27f..f900f60 100644 --- a/globoSonda/src/utiles.cpp +++ b/globoSonda/src/utiles.cpp @@ -21,13 +21,13 @@ bool Utiles::isTime( unsigned long *tt, unsigned long timer) return true; } -void Utiles::printCOM(char *line) +void Utiles::printCOM(const char *line) { if(UtilesDebug) Serial.println(line); } -void Utiles::printCOM2(char *line) +void Utiles::printCOM2(const char *line) { if(UtilesDebug) Serial.print(line); diff --git a/globoSonda/src/utiles.h b/globoSonda/src/utiles.h index 40c2724..1b8b3fb 100644 --- a/globoSonda/src/utiles.h +++ b/globoSonda/src/utiles.h @@ -24,8 +24,8 @@ class Utiles /* Para imprimir por el puerto COM si esta en modo DEBUG */ - static void printCOM(char *line); - static void printCOM2(char *line); + static void printCOM(const char *line); + static void printCOM2(const char *line); };