Aligned debugging names with file names

EnviroDIY · May 2, 2019 · ad21080 · ad21080
1 parent 7061a7f
commit ad21080
Show file tree

Hide file tree

Showing 44 changed files with 227 additions and 62 deletions.
diff --git a/src/LoggerBase.h b/src/LoggerBase.h
@@ -13,9 +13,9 @@
 #define LoggerBase_h
 
 // Debugging Statement
-// #define MS_LOGGER_DEBUG
+// #define MS_LOGGERBASE_DEBUG
 
-#ifdef MS_LOGGER_DEBUG
+#ifdef MS_LOGGERBASE_DEBUG
 #define MS_DEBUGGING_STD
 #endif
 

diff --git a/src/LoggerModem.h b/src/LoggerModem.h
@@ -13,12 +13,17 @@
 #define LoggerModem_h
 
 // FOR DEBUGGING
-// #define MS_MODEM_DEBUG
+// #define MS_LOGGERMODEM_DEBUG
+// #define MS_LOGGERMODEM_DEBUG_DEEP
 
-#ifdef MS_MODEM_DEBUG
+#ifdef MS_LOGGERMODEM_DEBUG
 #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"

diff --git a/src/dataPublisherBase.h b/src/dataPublisherBase.h
@@ -12,9 +12,9 @@
 #define dataPublisherBase_h
 
 // Debugging Statement
-// #define MS_PUBLISHER_DEBUG
+// #define MS_DATAPUBLISHERBASE_DEBUG
 
-#ifdef MS_PUBLISHER_DEBUG
+#ifdef MS_DATAPUBLISHERBASE_DEBUG
 #define MS_DEBUGGING_STD
 #endif
 

diff --git a/src/publishers/DreamHostPublisher.h b/src/publishers/DreamHostPublisher.h
@@ -12,9 +12,9 @@
 #define DreamHostPublisher_h
 
 // Debugging Statement
-// #define MS_DHPUBLISHER_DEBUG
+// #define MS_DREAMHOSTPUBLISHER_DEBUG
 
-#ifdef MS_DHPUBLISHER_DEBUG
+#ifdef MS_DREAMHOSTPUBLISHER_DEBUG
 #define MS_DEBUGGING_STD
 #endif
 

diff --git a/src/publishers/EnviroDIYPublisher.h b/src/publishers/EnviroDIYPublisher.h
@@ -13,9 +13,9 @@
 #define EnviroDIYPublisher_h
 
 // Debugging Statement
-// #define MS_EDIYPUBLISHER_DEBUG
+// #define MS_ENVIRODIYPUBLISHER_DEBUG
 
-#ifdef MS_EDIYPUBLISHER_DEBUG
+#ifdef MS_ENVIRODIYPUBLISHER_DEBUG
 #define MS_DEBUGGING_STD
 #endif
 

diff --git a/src/publishers/ThingSpeakPublisher.h b/src/publishers/ThingSpeakPublisher.h
@@ -12,9 +12,9 @@
 #define ThingSpeakPublisher_h
 
 // Debugging Statement
-// #define MS_TSPUBLISHER_DEBUG
+// #define MS_THINGSPEAKPUBLISHER_DEBUG
 
-#ifdef MS_TSPUBLISHER_DEBUG
+#ifdef MS_THINGSPEAKPUBLISHER_DEBUG
 #define MS_DEBUGGING_STD
 #endif
 

diff --git a/src/sensors/AOSongAM2315.h b/src/sensors/AOSongAM2315.h
@@ -27,9 +27,9 @@
 #define AOSongAM2315_h
 
 // Debugging Statement
-// #define MS_DEBUGGING_STD
+// #define MS_AOSONGAM2315_DEBUG
 
-#ifdef MS_AM2315_DEBUG
+#ifdef MS_AOSONGAM2315_DEBUG
 #define MS_DEBUGGING_STD
 #endif
 

diff --git a/src/sensors/AOSongDHT.h b/src/sensors/AOSongDHT.h
@@ -29,9 +29,9 @@
 #define AOSongDHT_h
 
 // Debugging Statement
-// #define MS_DEBUGGING_STD
+// #define MS_AOSONGDHT_DEBUG
 
-#ifdef MSDHT_DEBUG
+#ifdef MS_AOSONGDHT_DEBUG
 #define MS_DEBUGGING_STD
 #endif
 

diff --git a/src/sensors/ApogeeSQ212.h b/src/sensors/ApogeeSQ212.h
@@ -34,9 +34,9 @@
 #define ApogeeSQ212_h
 
 // Debugging Statement
-// #define MS_DEBUGGING_STD
+// #define MS_APOGEESQ212_DEBUG
 
-#ifdef MS_SQ212_DEBUG
+#ifdef MS_APOGEESQ212_DEBUG
 #define MS_DEBUGGING_STD
 #endif
 

diff --git a/src/sensors/AtlasParent.h b/src/sensors/AtlasParent.h
@@ -17,9 +17,9 @@
 #define AtlasParent_h
 
 // Debugging Statement
-// #define MS_ATLAS_DEBUG
+// #define MS_ATLASPARENT_DEBUG
 
-#ifdef MS_ATLAS_DEBUG
+#ifdef MS_ATLASPARENT_DEBUG
 #define MS_DEBUGGING_STD
 #endif
 

diff --git a/src/sensors/AtlasScientificCO2.h b/src/sensors/AtlasScientificCO2.h
@@ -16,9 +16,9 @@
 #define AtlasScientificCO2_h
 
 // Debugging Statement
-// #define MS_DEBUGGING_STD
+// #define MS_ATLASSCIENTIFICCO2_DEBUG
 
-#ifdef MS_ATLASCO2_DEBUG
+#ifdef MS_ATLASSCIENTIFICCO2_DEBUG
 #define MS_DEBUGGING_STD
 #endif
 

diff --git a/src/sensors/AtlasScientificDO.h b/src/sensors/AtlasScientificDO.h
@@ -16,9 +16,9 @@
 #define AtlasScientificDO_h
 
 // Debugging Statement
-// #define MS_ATLASDO_DEBUG
+// #define MS_ATLASSCIENTIFICDO_DEBUG
 
-#ifdef MS_ATLASDO_DEBUG
+#ifdef MS_ATLASSCIENTIFICDO_DEBUG
 #define MS_DEBUGGING_STD
 #endif
 

diff --git a/src/sensors/AtlasScientificEC.h b/src/sensors/AtlasScientificEC.h
@@ -17,9 +17,9 @@
 #define AtlasScientificEC_h
 
 // Debugging Statement
-// #define MS_ATLASEC_DEBUG
+// #define MS_ATLASSCIENTIFICEC_DEBUG
 
-#ifdef MS_ATLASEC_DEBUG
+#ifdef MS_ATLASSCIENTIFICEC_DEBUG
 #define MS_DEBUGGING_STD
 #endif
 

diff --git a/src/sensors/AtlasScientificRTD.h b/src/sensors/AtlasScientificRTD.h
@@ -16,9 +16,9 @@
 #define AtlasScientificRTD_h
 
 // Debugging Statement
-// #define MS_ATLASRTD_DEBUG
+// #define MS_ATLASSCIENTIFICRTD_DEBUG
 
-#ifdef MS_ATLASRTD_DEBUG
+#ifdef MS_ATLASSCIENTIFICRTD_DEBUG
 #define MS_DEBUGGING_STD
 #endif
 

diff --git a/src/sensors/AtlasScientificpH.h b/src/sensors/AtlasScientificpH.h
@@ -16,9 +16,9 @@
 #define AtlasScientificpH_h
 
 // Debugging Statement
-// #define MS_ATLASPH_DEBUG
+// #define MS_ATLASSCIENTIFICPH_DEBUG
 
-#ifdef MS_ATLASPH_DEBUG
+#ifdef MS_ATLASSCIENTIFICPH_DEBUG
 #define MS_DEBUGGING_STD
 #endif
 

diff --git a/src/sensors/BoschBME280.h b/src/sensors/BoschBME280.h
@@ -35,9 +35,9 @@
 #define BoschBME280_h
 
 // Debugging Statement
-// #define MS_DEBUGGING_STD
+// #define MS_BOSCHBME280_DEBUG
 
-#ifdef MS_BME280_DEBUG
+#ifdef MS_BOSCHBME280_DEBUG
 #define MS_DEBUGGING_STD
 #endif
 

diff --git a/src/sensors/CampbellOBS3.h b/src/sensors/CampbellOBS3.h
@@ -30,9 +30,9 @@
 #define CampbellOBS3_h
 
 // Debugging Statement
-// #define MS_DEBUGGING_STD
+// #define MS_CAMPBELLOBS3_DEBUG
 
-#ifdef MS_OBS3_DEBUG
+#ifdef MS_CAMPBELLOBS3_DEBUG
 #define MS_DEBUGGING_STD
 #endif
 

diff --git a/src/sensors/Decagon5TM.h b/src/sensors/Decagon5TM.h
@@ -30,6 +30,13 @@
 #ifndef Decagon5TM_h
 #define Decagon5TM_h
 
+// Debugging Statement
+// #define MS_DECAGON5TM_DEBUG
+
+#ifdef MS_DECAGON5TM_DEBUG
+#define MS_DEBUGGING_STD
+#endif
+
 // Included Dependencies
 #include "VariableBase.h"
 #include "sensors/SDI12Sensors.h"

diff --git a/src/sensors/DecagonCTD.h b/src/sensors/DecagonCTD.h
@@ -34,6 +34,13 @@
 #ifndef DecagonCTD_h
 #define DecagonCTD_h
 
+// Debugging Statement
+// #define MS_DECAGONCTD_DEBUG
+
+#ifdef MS_DECAGONCTD_DEBUG
+#define MS_DEBUGGING_STD
+#endif
+
 // Included Dependencies
 #include "VariableBase.h"
 #include "sensors/SDI12Sensors.h"

diff --git a/src/sensors/DecagonES2.h b/src/sensors/DecagonES2.h
@@ -29,6 +29,13 @@
 #ifndef DecagonES2_h
 #define DecagonES2_h
 
+// Debugging Statement
+// #define MS_DECAGONES2_DEBUG
+
+#ifdef MS_DECAGONES2_DEBUG
+#define MS_DEBUGGING_STD
+#endif
+
 // Included Dependencies
 #include "VariableBase.h"
 #include "sensors/SDI12Sensors.h"

diff --git a/src/sensors/ExternalVoltage.h b/src/sensors/ExternalVoltage.h
@@ -55,9 +55,9 @@
 #define ExternalVoltage_h
 
 // Debugging Statement
-// #define MS_EXTVOLT_DEBUG
+// #define MS_EXTERNALVOLTAGE_DEBUG
 
-#ifdef MS_EXTVOLT_DEBUG
+#ifdef MS_EXTERNALVOLTAGE_DEBUG
 #define MS_DEBUGGING_STD
 #endif
 

diff --git a/src/sensors/FreescaleMPL115A2.h b/src/sensors/FreescaleMPL115A2.h
@@ -26,9 +26,9 @@
 #define FreescaleMPL115A2_h
 
 // Debugging Statement
-// #define MS_DEBUGGING_STD
+// #define MS_FREESCALEMPL115A2_DEBUG
 
-#ifdef MS_MPL115A2_DEBUG
+#ifdef MS_FREESCALEMPL115A2_DEBUG
 #define MS_DEBUGGING_STD
 #endif
 

diff --git a/src/sensors/KellerAcculevel.h b/src/sensors/KellerAcculevel.h
@@ -18,6 +18,18 @@
 #ifndef KellerAcculevel_h
 #define KellerAcculevel_h
 
+// Debugging Statement
+// #define MS_KELLERACCULEVEL_DEBUG
+// #define MS_KELLERACCULEVEL_DEBUG_DEEP
+
+#ifdef MS_KELLERACCULEVEL_DEBUG
+#define MS_DEBUGGING_STD
+#endif
+
+#ifdef MS_KELLERACCULEVEL_DEBUG_DEEP
+#define MS_DEBUGGING_DEEP
+#endif
+
 // Included Dependencies
 #include "VariableBase.h"
 #include "sensors/KellerParent.h"

diff --git a/src/sensors/KellerNanolevel.h b/src/sensors/KellerNanolevel.h
@@ -18,6 +18,18 @@
 #ifndef KellerNanolevel_h
 #define KellerNanolevel_h
 
+// Debugging Statement
+// #define MS_KELLERNANOLEVEL_DEBUG
+// #define MS_KELLERNANOLEVEL_DEBUG_DEEP
+
+#ifdef MS_KELLERNANOLEVEL_DEBUG
+#define MS_DEBUGGING_STD
+#endif
+
+#ifdef MS_KELLERNANOLEVEL_DEBUG_DEEP
+#define MS_DEBUGGING_DEEP
+#endif
+
 // Included Dependencies
 #include "VariableBase.h"
 #include "sensors/KellerParent.h"

diff --git a/src/sensors/KellerParent.h b/src/sensors/KellerParent.h
@@ -20,14 +20,14 @@
 #define KellerParent_h
 
 // Debugging Statement
-// #define MS_KELLER_DEBUG
-// #define MS_KELLER_DEBUG_DEEP
+// #define MS_KELLERPARENT_DEBUG
+// #define MS_KELLERPARENT_DEBUG_DEEP
 
-#ifdef MS_KELLER_DEBUG
+#ifdef MS_KELLERPARENT_DEBUG
 #define MS_DEBUGGING_STD
 #endif
 
-#ifdef MS_KELLER_DEBUG_DEEP
+#ifdef MS_KELLERPARENT_DEBUG_DEEP
 #define MS_DEBUGGING_DEEP
 #endif
 

diff --git a/src/sensors/MaxBotixSonar.h b/src/sensors/MaxBotixSonar.h
@@ -18,9 +18,9 @@
 #define MaxBotixSonar_h
 
 // Debugging Statement
-// #define MS_MAXBOTIX_DEBUG
+// #define MS_MAXBOTIXSONAR_DEBUG
 
-#ifdef MS_MAXBOTIX_DEBUG
+#ifdef MS_MAXBOTIXSONAR_DEBUG
 #define MS_DEBUGGING_STD
 #endif
 

diff --git a/src/sensors/MaximDS18.h b/src/sensors/MaximDS18.h
@@ -26,9 +26,9 @@
 #define MaximDS18_h
 
 // Debugging Statement
-// #define MS_DEBUGGING_STD
+// #define MS_MAXIMDS18_DEBUG
 
-#ifdef MS_DS18_DEBUG
+#ifdef MS_MAXIMDS18_DEBUG
 #define MS_DEBUGGING_STD
 #endif
 

diff --git a/src/sensors/MaximDS3231.h b/src/sensors/MaximDS3231.h
@@ -22,9 +22,9 @@
 #define MaximDS3231_h
 
 // Debugging Statement
-// #define MS_DEBUGGING_STD
+// #define MS_MAXIMDS3231_DEBUG
 
-#ifdef MS_DS3231_DEBUG
+#ifdef MS_MAXIMDS3231_DEBUG
 #define MS_DEBUGGING_STD
 #endif
 

diff --git a/src/sensors/MeaSpecMS5803.h b/src/sensors/MeaSpecMS5803.h
@@ -46,9 +46,9 @@
 #define MeaSpecMS5803_h
 
 // Debugging Statement
-// #define MS_DEBUGGING_STD
+// #define MS_MEASSPECMS5803_DEBUG
 
-#ifdef MS_MS5803_DEBUG
+#ifdef MS_MEASSPECMS5803_DEBUG
 #define MS_DEBUGGING_STD
 #endif
 

diff --git a/src/sensors/ProcessorStats.h b/src/sensors/ProcessorStats.h
@@ -17,9 +17,9 @@
 #define ProcessorStats_h
 
 // Debugging Statement
-// #define MS_PROCSTATS_DEBUG
+// #define MS_PROCESSORSTATS_DEBUG
 
-#ifdef MS_PROCSTATS_DEBUG
+#ifdef MS_PROCESSORSTATS_DEBUG
 #define MS_DEBUGGING_STD
 #endif