Changed logging interval from uint8_t to uint16_t

Hopefully fixes #142
EnviroDIY · May 8, 2018 · c6f1956 · c6f1956
1 parent c9306cc
commit c6f1956
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/LoggerBase.cpp b/src/LoggerBase.cpp
@@ -49,7 +49,7 @@ void Logger::init(int8_t SDCardPin, int8_t mcuWakePin,
     _SDCardPin = SDCardPin;
     _mcuWakePin = mcuWakePin;
     _loggingIntervalMinutes = loggingIntervalMinutes;
-    _interruptRate = round(_loggingIntervalMinutes*60);  // convert to even seconds
+    _loggingIntervalSeconds = round(_loggingIntervalMinutes*60);  // convert to even seconds
     _loggerID = loggerID;
     _autoFileName = false;
     _isFileNameSet = false;
@@ -247,10 +247,11 @@ bool Logger::checkInterval(void)
     bool retval;
     uint32_t checkTime = getNowEpoch();
     MS_DBG(F("Current Unix Timestamp: "), checkTime, F("\n"));
-    MS_DBG(F("Mod of Logging Interval: "), checkTime % _interruptRate, F("\n"));
+    MS_DBG(F("Logging interval in seconds: "), _loggingIntervalSeconds, F("\n"));
+    MS_DBG(F("Mod of Logging Interval: "), checkTime % _loggingIntervalSeconds, F("\n"));
     MS_DBG(F("Number of Readings so far: "), _numTimepointsLogged, F("\n"));
     MS_DBG(F("Mod of 120: "), checkTime % 120, F("\n"));
-    if ((checkTime % _interruptRate == 0 ) or
+    if ((checkTime % _loggingIntervalSeconds == 0 ) or
         (_numTimepointsLogged < 10 and checkTime % 120 == 0))
     {
         // Update the time variables with the current time
@@ -283,11 +284,12 @@ bool Logger::checkMarkedInterval(void)
 {
     bool retval;
     MS_DBG(F("Marked Time: "), markedEpochTime, F("\n"));
-    MS_DBG(F("Mod of Logging Interval: "), markedEpochTime % _interruptRate, F("\n"));
+    MS_DBG(F("Logging interval in seconds: "), _loggingIntervalSeconds, F("\n"));
+    MS_DBG(F("Mod of Logging Interval: "), markedEpochTime % _loggingIntervalSeconds, F("\n"));
     MS_DBG(F("Number of Readings so far: "), _numTimepointsLogged, F("\n"));
     MS_DBG(F("Mod of 120: "), markedEpochTime % 120, F("\n"));
     if (markedEpochTime != 0 &&
-        ((markedEpochTime % _interruptRate == 0 ) or
+        ((markedEpochTime % _loggingIntervalSeconds == 0 ) or
         (_numTimepointsLogged < 10 and markedEpochTime % 120 == 0)))
     {
         // Update the number of readings taken

diff --git a/src/LoggerBase.h b/src/LoggerBase.h
@@ -221,7 +221,7 @@ class Logger : public VariableArray
     int8_t _SDCardPin;
     int8_t _mcuWakePin;
     float _loggingIntervalMinutes;
-    uint8_t _interruptRate;
+    uint16_t _loggingIntervalSeconds;
     const char *_loggerID;
     bool _autoFileName;
     bool _isFileNameSet;