Fixed debug warnings

Author: SRGDamia1

src/LoggerModem.h

@@ -20,10 +20,6 @@
 #define MS_DEBUGGING_STD
 #endif
 
-#ifdef MS_LOGGERMODEM_DEBUG_DEEP
-#define TINY_GSM_DEBUG STANDARD_SERIAL_OUTPUT
-#endif
-
 // Included Dependencies
 #include "ModSensorDebugger.h"
 #include "VariableBase.h"

src/VariableArray.cpp

@@ -68,7 +68,7 @@ bool VariableArray::setupSensors(void)
 {
     bool success = true;
 
-    #ifdef DEEP_DEBUGGING_SERIAL_OUTPUT
+    #ifdef MS_VARIABLEARRAY_DEBUG_DEEP
     bool deepDebugTiming = true;
     #else
     bool deepDebugTiming = false;
@@ -187,7 +187,7 @@ bool VariableArray::sensorsWake(void)
     bool success = true;
     uint8_t nSensorsAwake = 0;
 
-    #ifdef DEEP_DEBUGGING_SERIAL_OUTPUT
+    #ifdef MS_VARIABLEARRAY_DEBUG_DEEP
     bool deepDebugTiming = true;
     #else
     bool deepDebugTiming = false;
@@ -300,7 +300,7 @@ bool VariableArray::updateAllSensors(void)
 {
     bool success = true;
 
-    #ifdef DEEP_DEBUGGING_SERIAL_OUTPUT
+    #ifdef MS_VARIABLEARRAY_DEBUG_DEEP
     bool deepDebugTiming = true;
     #else
     bool deepDebugTiming = false;
@@ -464,7 +464,7 @@ bool VariableArray::completeUpdate(void)
     bool success = true;
     uint8_t nSensorsCompleted = 0;
 
-    #ifdef DEEP_DEBUGGING_SERIAL_OUTPUT
+    #ifdef MS_VARIABLEARRAY_DEBUG_DEEP
     bool deepDebugTiming = true;
     #else
     bool deepDebugTiming = false;
@@ -563,7 +563,7 @@ bool VariableArray::completeUpdate(void)
     }
 
     // This is just for debugging
-    #ifdef DEEP_DEBUGGING_SERIAL_OUTPUT
+    #ifdef MS_VARIABLEARRAY_DEBUG_DEEP
     uint8_t arrayPositions[_variableCount];
     for (uint8_t i = 0; i < _variableCount; i++)
     {

src/VariableArray.h

@@ -94,7 +94,7 @@ class VariableArray
     bool isLastVarFromSensor(int arrayIndex);
     uint8_t countMaxToAverage(void);
 
-#ifdef DEEP_DEBUGGING_SERIAL_OUTPUT
+#ifdef MS_VARIABLEARRAY_DEBUG_DEEP
     template<typename T>
     void prettyPrintArray(T arrayToPrint[])
     {

src/dataPublisherBase.cpp

@@ -103,7 +103,7 @@ int dataPublisher::bufferFree(void)
 void dataPublisher::printTxBuffer(Stream *stream)
 {
     // Send the out buffer so far to the serial for debugging
-    #if defined(STANDARD_SERIAL_OUTPUT)
+    #if defined(MS_DATAPUBLISHERBASE_DEBUG)
         STANDARD_SERIAL_OUTPUT.write(txBuffer, strlen(txBuffer));
         PRINTOUT('\n');
         STANDARD_SERIAL_OUTPUT.flush();

src/publishers/ThingSpeakPublisher.cpp

@@ -187,7 +187,7 @@ int16_t ThingSpeakPublisher::sendData(Client *_outClient)
     // Make the MQTT connection
     // Note:  the client id and the user name do not mean anything for ThingSpeak
     MS_DBG(F("Opening MQTT Connection"));
-    #if defined(DEBUGGING_SERIAL_OUTPUT)
+    #if defined(MS_THINGSPEAKPUBLISHER_DEBUG)
         uint32_t start_timer = millis();
     #endif
     if (_mqttClient.connect(mqttClient, mqttUser, _thingSpeakMQTTKey))
@@ -213,7 +213,7 @@ int16_t ThingSpeakPublisher::sendData(Client *_outClient)
 
     // Disconnect from MQTT
     MS_DBG(F("Disconnecting from MQTT"));
-    #if defined(DEBUGGING_SERIAL_OUTPUT)
+    #if defined(MS_THINGSPEAKPUBLISHER_DEBUG)
         start_timer = millis();
     #endif
     _mqttClient.disconnect();