Remove debug parameter to use macro instead

carrascoacd · Dec 12, 2019 · 49487b3 · 49487b3
1 parent e6d0539
commit 49487b3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 15 deletions.
diff --git a/Ftp.h b/Ftp.h
@@ -38,8 +38,7 @@ class FTP : public SIM800
   FTP(unsigned int baudRate,
       unsigned int rxPin,
       unsigned int txPin,
-      unsigned int rstPin,
-      bool debug = TRUE) : SIM800(baudRate, rxPin, txPin, rstPin, debug){};
+      unsigned int rstPin) : SIM800(baudRate, rxPin, txPin, rstPin){};
 
   Result putBegin(const char *apn,
                   const char *fileName,

diff --git a/Geo.h b/Geo.h
@@ -37,8 +37,7 @@ class Geo : public SIM800
   Geo(unsigned int baudRate,
       unsigned int rxPin,
       unsigned int txPin,
-      unsigned int rstPin,
-      bool debug = TRUE) : SIM800(baudRate, rxPin, txPin, rstPin, debug){};
+      unsigned int rstPin) : SIM800(baudRate, rxPin, txPin, rstPin){};
   void readGpsLocation(char *gps);
 };
 

diff --git a/Http.h b/Http.h
@@ -38,8 +38,7 @@ class HTTP : public SIM800
   HTTP(unsigned int baudRate,
        unsigned int rxPin,
        unsigned int txPin,
-       unsigned int rstPin,
-       bool debug = TRUE) : SIM800(baudRate, rxPin, txPin, rstPin, debug){};
+       unsigned int rstPin) : SIM800(baudRate, rxPin, txPin, rstPin){};
   Result connect(const char *apn);
   Result disconnect();
   Result get(const char *uri, char *response);

diff --git a/Sim800.cpp b/Sim800.cpp
@@ -122,9 +122,11 @@ int SIM800::waitForResp(const char *resp, unsigned int timeout)
         if (serialSIM800.available())
         {
             char c = serialSIM800.read();
-            if (debugMode)
-                Serial.print(c);
-
+
+            #ifdef DEBUG
+              Serial.print(c);
+            #endif
+
             sum = (c == resp[sum] || resp[sum] == 'X') ? sum + 1 : 0;
             if (sum == len)
                 break;
@@ -157,7 +159,7 @@ int SIM800::sendCmdAndWaitForResp(const char *cmd, const char *resp, unsigned ti
 
 int SIM800::sendCmdAndWaitForResp_P(const char *cmd, const char *resp, unsigned timeout)
 {
-    char cmdBuff[128]; // TODO check if I can reduce this to 64
+    char cmdBuff[128];
     char respBuff[32];
     strcpy_P(cmdBuff, cmd);
     strcpy_P(respBuff, resp);

diff --git a/Sim800.h b/Sim800.h
@@ -36,6 +36,9 @@
 #define FALSE 0
 #define DEFAULT_TIMEOUT 5000
 
+// Comment or uncomment this to debug the library
+#define DEBUG true
+
 /** SIM800 class.
  *  Used for SIM800 communication. attention that SIM800 module communicate with MCU in serial protocol
  */
@@ -48,16 +51,13 @@ class SIM800
      *  @param baudRate baud rate of uart communication
      *  @param rxPin uart receive pin to communicate with SIM800
      *  @param txPin uart transmit pin to communicate with SIM800
-     *  @param debug indicates if print the AT command sequence
      */
     SIM800(unsigned int baudRate,
            unsigned int rxPin,
            unsigned int txPin,
-           unsigned int rstPin,
-           bool debug) : serialSIM800(txPin, rxPin)
+           unsigned int rstPin) : serialSIM800(txPin, rxPin)
     {
         serialSIM800.begin(baudRate);
-        debugMode = debug;
         resetPin = rstPin;
     };
 
@@ -139,7 +139,6 @@ class SIM800
 
 protected:
     SoftwareSerial serialSIM800;
-    bool debugMode;
     unsigned int resetPin;
 };