Rearranged setup for better performance

For reasons unbeknownst to me, it was crashing if the NIST sync was before the "begin" function.  I didn't figure out why, but rearranging fixed it.  The most frustrating thing is that if I turned on the extra print statements for debugging... it magically worked every time, but as soon as they were off again.. it crashed.

Author: SRGDamia1

README.md

@@ -237,6 +237,8 @@ After defining your modem, set it up using one of these two commands, depending
 - The DTRSleepType controls _how_ the modem is put to sleep between readings.  Use "held" if the DTR pin is held HIGH to keep the modem awake, as with a Sodaq GPRSBee rev6.  Use "pulsed" if the DTR pin is pulsed high and then low to wake the modem up, as with an Adafruit Fona or Sodaq GPRSBee rev4.  Use "reverse" if the DTR pin is held LOW to keep the modem awake, as with all XBees.  Use "always_on" if you do not want the library to control the modem power and sleep.
 
 Once the modem has been set up, these functions are available:
+- **on()** - Turns the modem on.  Returns true if connection is successful.
+- **off()** - Turns the modem off and empties the send and receive buffer.  Returns true if connection is successful.
 - **connectNetwork()** - Connects to the internet via WiFi or cellular network.  Returns true if connection is successful.
 - **disconnectNetwork()** - Disconnects from the network, if applicable.
 - **connect(const char host, uint16_t port)** - Makes a TCP connection to a host url and port.  (If you don't know the port, use "80".)  Returns 1 if successful.

examples/DRWI_CitSci/DRWI_CitSci.ino

@@ -197,22 +197,10 @@ void setup()
 
     EnviroDIYLogger.modem.setupModem(&ModemSerial, modemVCCPin, modemCTSPin, modemDTRPin, ModemSleepMode, APN);
 
-    // Turn on the modem
-    EnviroDIYLogger.modem.modemOnOff->on();
-    // Connect to the network
-    if (EnviroDIYLogger.modem.connectNetwork())
-    {
-        // Synchronize the RTC
-        EnviroDIYLogger.modem.syncDS3231();
-        // Disconnect from the network
-        EnviroDIYLogger.modem.disconnectNetwork();
-    }
-    // Turn off the modem
-    EnviroDIYLogger.modem.modemOnOff->off();
-
     #ifdef DreamHostPortalRX
         EnviroDIYLogger.setDreamHostPortalRX(DreamHostPortalRX);
     #endif
+    
     // Begin the logger;
     EnviroDIYLogger.begin();
 }

examples/double_logger/double_logger.ino

@@ -144,6 +144,10 @@ void setup()
     // Blink the LEDs to show the board is on and starting up
     greenred4flash();
 
+    // Start the Real Time Clock
+    rtc.begin();
+    delay(100);
+
     // Print a start-up note to the first serial port
     Serial.print(F("Now running "));
     Serial.print(SKETCH_NAME);
@@ -164,27 +168,6 @@ void setup()
 
     modem.setupModem(&ModemSerial, modemVCCPin, modemCTSPin, modemDTRPin, ModemSleepMode, SSID, PWD);
 
-    // Turn on the modem
-    modem.modemOnOff->on();
-    // Connect to the network
-    if (modem.connectNetwork())
-    {
-        // Synchronize the RTC
-        modem.syncDS3231();
-        // Disconnect from the network
-        modem.disconnectNetwork();
-    }
-    // Turn off the modem
-    modem.modemOnOff->off();
-
-    // Start the Real Time Clock
-    rtc.begin();
-    delay(100);
-
-    // Print a start-up note to the first serial port
-    Serial.print(F("Current RTC time is: "));
-    Serial.println(Logger::formatDateTime_ISO8601(Logger::getNow()));
-
     // Set up the sensors on both loggers
     logger1min.setupSensors();
     logger5min.setupSensors();
@@ -203,6 +186,23 @@ void setup()
     // Create a header for the second logger and write it to the SD card
     logger5min.logToSD(logger5min.generateFileHeader());
 
+    // Print out the current time
+    Serial.print(F("Current RTC time is: "));
+    Serial.println(Logger::formatDateTime_ISO8601(Logger::getNow()));
+
+    // Turn on the modem
+    modem.on();
+    // Connect to the network
+    if (modem.connectNetwork())
+    {
+        // Synchronize the RTC
+        modem.syncDS3231();
+        // Disconnect from the network
+        modem.disconnectNetwork();
+    }
+    // Turn off the modem
+    modem.off();
+
     // Set up the processor sleep mode
     // Because there's only one processor, we only need to do this once
     logger1min.setupSleep();
@@ -274,7 +274,7 @@ void loop()
     if (Logger::markedEpochTime % 86400 == 0)
     {
         // Turn on the modem
-        modem.modemOnOff->on();
+        modem.on();
         // Connect to the network
         if (modem.connectNetwork())
         {
@@ -284,7 +284,7 @@ void loop()
             modem.disconnectNetwork();
         }
         // Turn off the modem
-        modem.modemOnOff->off();
+        modem.off();
     }
 
     // Call the processor sleep

examples/logging_to_EnviroDIY/logging_to_EnviroDIY.ino

@@ -335,22 +335,10 @@ void setup()
         EnviroDIYLogger.modem.setupModem(&ModemSerial, modemVCCPin, modemCTSPin, modemDTRPin, ModemSleepMode, APN);
     #endif
 
-    // Turn on the modem
-    EnviroDIYLogger.modem.modemOnOff->on();
-    // Connect to the network
-    if (EnviroDIYLogger.modem.connectNetwork())
-    {
-        // Synchronize the RTC
-        EnviroDIYLogger.modem.syncDS3231();
-        // Disconnect from the network
-        EnviroDIYLogger.modem.disconnectNetwork();
-    }
-    // Turn off the modem
-    EnviroDIYLogger.modem.modemOnOff->off();
-
     #ifdef DreamHostPortalRX
         EnviroDIYLogger.setDreamHostPortalRX(DreamHostPortalRX);
     #endif
+
     // Begin the logger;
     EnviroDIYLogger.begin();
 }

src/LoggerBase.h

@@ -502,23 +502,26 @@ class Logger : public VariableArray
     // This calls all of the setup functions - must be run AFTER init
     virtual void begin(void)
     {
+        // Print a start-up note to the first serial port
+        PRINTOUT(F("Beginning logger "), _loggerID, F("\n"));
+
         // Start the Real Time Clock
         rtc.begin();
         delay(100);
 
         // Set up pins for the LED's
         pinMode(_ledPin, OUTPUT);
 
-        // Print a start-up note to the first serial port
-        PRINTOUT(F("Current RTC time is: "));
-        PRINTOUT(formatDateTime_ISO8601(getNow()), F("\n"));
-
         // Set up the sensors
         setupSensors();
 
         // Set up the log file
         setupLogFile();
 
+        // Print the current time
+        PRINTOUT(F("Current RTC time is: "));
+        PRINTOUT(formatDateTime_ISO8601(getNow()), F("\n"));
+
         // Setup sleep mode
         if(_sleep){setupSleep();}
 

src/LoggerDreamHost.h

@@ -109,7 +109,7 @@ class LoggerDreamHost : public LoggerEnviroDIY
             digitalWrite(_ledPin, HIGH);
 
             // Turn on the modem to let it start searching for the network
-            LoggerEnviroDIY::modem.modemOnOff->on();
+            LoggerEnviroDIY::modem.on();
 
             // Wake up all of the sensors
             // I'm not doing as part of sleep b/c it may take up to a second or
@@ -143,7 +143,7 @@ class LoggerDreamHost : public LoggerEnviroDIY
             }
 
             // Turn on the modem off
-            modem.modemOnOff->off();
+            modem.off();
 
             // Turn off the LED
             digitalWrite(_ledPin, LOW);

src/LoggerEnviroDIY.h

@@ -139,6 +139,48 @@ class LoggerEnviroDIY : public Logger
     }
 
     // Convience functions to do it all
+    // This calls all of the setup functions - must be run AFTER init
+    virtual void begin(void) override
+    {
+        // Print a start-up note to the first serial port
+        PRINTOUT(F("Beginning logger "), _loggerID, F("\n"));
+
+        // Start the Real Time Clock
+        rtc.begin();
+        delay(100);
+
+        // Set up pins for the LED's
+        pinMode(_ledPin, OUTPUT);
+
+        // Set up the sensors
+        setupSensors();
+
+        // Set up the log file
+        setupLogFile();
+
+        // Sync the clock with NIST
+        PRINTOUT(F("Current RTC time is: "));
+        PRINTOUT(formatDateTime_ISO8601(getNow()), F("\n"));
+        // Turn on the modem
+        modem.on();
+        // Connect to the network
+        if (modem.connectNetwork())
+        {
+            // Synchronize the RTC
+            modem.syncDS3231();
+            // Disconnect from the network
+            modem.disconnectNetwork();
+        }
+        // Turn off the modem
+        modem.off();
+
+        // Setup sleep mode
+        if(_sleep){setupSleep();}
+
+        PRINTOUT(F("Logger setup finished!\n"));
+        PRINTOUT(F("------------------------------------------\n\n"));
+    }
+
     virtual void log(void) override
     {
         // Check of the current time is an even interval of the logging interval
@@ -150,7 +192,7 @@ class LoggerEnviroDIY : public Logger
             digitalWrite(_ledPin, HIGH);
 
             // Turn on the modem to let it start searching for the network
-            LoggerEnviroDIY::modem.modemOnOff->on();
+            LoggerEnviroDIY::modem.on();
 
             // Wake up all of the sensors
             // I'm not doing as part of sleep b/c it may take up to a second or
@@ -181,7 +223,7 @@ class LoggerEnviroDIY : public Logger
             }
 
             // Turn on the modem off
-            modem.modemOnOff->off();
+            modem.off();
 
             // Turn off the LED
             digitalWrite(_ledPin, LOW);

src/ModemSupport.h

@@ -153,7 +153,12 @@ class pulsedOnOff : public ModemOnOff
 
     bool off(void) override
     {
-        if (isOn()) {pulse();}
+        if (isOn())
+        {
+            DBG(F("Pulsing modem off with pin "));
+            DBG(_onoff_DTR_pin, F("\n"));
+            pulse();
+        }
         else DBG(F("Modem was not ever on.\n"));
         // Wait until is off
         for (unsigned long start = millis(); millis() - start < 5000; )
@@ -349,6 +354,26 @@ class loggerModem
     init(modemStream, vcc33Pin, status_CTS_pin, onoff_DTR_pin, sleepType);
     }
 
+    bool on(void)
+    {
+        // Check if the modem is on; turn it on if not
+        if(!modemOnOff->isOn()) return modemOnOff->on();
+        else return true;
+    }
+
+    bool off(void)
+    {
+        bool retVal = true;
+         // Wait for any sending to complete
+        stream->flush();
+        // Check if the modem is on; turn it off if so
+        if(modemOnOff->isOn()) retVal = modemOnOff->off();
+        else retVal =  true;
+        // Empty anything out of the receive buffer
+        dumpBuffer(stream);
+        return retVal;
+    }
+
     bool connectNetwork(void)
     {
         bool retVal = false;
@@ -358,6 +383,8 @@ class loggerModem
         // Check again if the modem is on.  If it still isn't on, give up
         if(!modemOnOff->isOn()) return false;
 
+        // WiFi modules don't naturally "disconnect" from the network, so first
+        // check the connection before resending credentials
         #if defined(TINY_GSM_MODEM_XBEE) || defined(TINY_GSM_MODEM_ESP8266)
         if (_ssid)
         {

src/VariableArray.h

@@ -95,6 +95,7 @@ class VariableArray
         {
             // Wake everyone up for set up
             success &= _variableList[i]->parentSensor->wake();
+            delay(10);
 
             // Make 5 attempts to contact the sensor before giving up
             while(setupTries < 5)
@@ -106,6 +107,7 @@ class VariableArray
                 // the variable list until after the sensors have all been
                 // setup and then all of the variables attached.
                 sensorSuccess = _variableList[i]->parentSensor->setup();
+                delay(10);
 
                 if(sensorSuccess) break;
                 else
@@ -120,6 +122,7 @@ class VariableArray
 
             // Put everyone back to sleep
             success &= _variableList[i]->parentSensor->sleep();
+            delay(10);
         }
 
         // Now attach all of the variables to their parents