Merge pull request #294 from EnviroDIY/develop

SRGDamia1 · web-flow · commit c0333534241d · 2019-09-11T15:40:56.000-04:00
Develop
diff --git a/examples/DRWI_CitSci/DRWI_CitSci.ino b/examples/DRWI_CitSci/DRWI_CitSci.ino
@@ -7,7 +7,7 @@ Software License: BSD-3.
   Copyright (c) 2017, Stroud Water Research Center (SWRC)
   and the EnviroDIY Development Team
 
-This example sketch is written for ModularSensors library version 0.23.10
+This example sketch is written for ModularSensors library version 0.23.11
 
 This sketch is an example of logging data to an SD card and sending the data to
 both the EnviroDIY data portal as should be used by groups involved with
@@ -21,9 +21,6 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
 //    Defines for the Arduino IDE
 //    In PlatformIO, set these build flags in your platformio.ini
 // ==========================================================================
-#ifndef SDI12_EXTERNAL_PCINT
-#define SDI12_EXTERNAL_PCINT
-#endif
 #ifndef TINY_GSM_RX_BUFFER
 #define TINY_GSM_RX_BUFFER 512
 #endif
@@ -43,7 +40,7 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
 //    Data Logger Settings
 // ==========================================================================
 // The library version this example was written for
-const char *libraryVersion = "0.23.10";
+const char *libraryVersion = "0.23.11";
 // The name of this file
 const char *sketchName = "DWRI_CitSci.ino";
 // Logger ID, also becomes the prefix for the name of the data file on SD card
diff --git a/examples/DRWI_LTE/DRWI_LTE.ino b/examples/DRWI_LTE/DRWI_LTE.ino
@@ -7,7 +7,7 @@ Software License: BSD-3.
   Copyright (c) 2017, Stroud Water Research Center (SWRC)
   and the EnviroDIY Development Team
 
-This example sketch is written for ModularSensors library version 0.23.10
+This example sketch is written for ModularSensors library version 0.23.11
 
 This sketch is an example of logging data to an SD card and sending the data to
 both the EnviroDIY data portal as should be used by groups involved with
@@ -21,9 +21,6 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
 //    Defines for the Arduino IDE
 //    In PlatformIO, set these build flags in your platformio.ini
 // ==========================================================================
-#ifndef SDI12_EXTERNAL_PCINT
-#define SDI12_EXTERNAL_PCINT
-#endif
 #ifndef TINY_GSM_RX_BUFFER
 #define TINY_GSM_RX_BUFFER 512
 #endif
@@ -43,7 +40,7 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
 //    Data Logger Settings
 // ==========================================================================
 // The library version this example was written for
-const char *libraryVersion = "0.23.10";
+const char *libraryVersion = "0.23.11";
 // The name of this file
 const char *sketchName = "DRWI_LTE.ino";
 // Logger ID, also becomes the prefix for the name of the data file on SD card
diff --git a/examples/DRWI_NoCellular/DRWI_NoCellular.ino b/examples/DRWI_NoCellular/DRWI_NoCellular.ino
@@ -7,7 +7,7 @@ Software License: BSD-3.
   Copyright (c) 2017, Stroud Water Research Center (SWRC)
   and the EnviroDIY Development Team
 
-This example sketch is written for ModularSensors library version 0.23.10
+This example sketch is written for ModularSensors library version 0.23.11
 
 This sketch is an example of logging data to an SD card as should be used by
 groups involved with The William Penn Foundation's Delaware River Watershed
@@ -21,9 +21,6 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
 //    Defines for the Arduino IDE
 //    In PlatformIO, set these build flags in your platformio.ini
 // ==========================================================================
-#ifndef SDI12_EXTERNAL_PCINT
-#define SDI12_EXTERNAL_PCINT
-#endif
 
 // ==========================================================================
 //    Include the base required libraries
@@ -37,7 +34,7 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
 //    Data Logger Settings
 // ==========================================================================
 // The library version this example was written for
-const char *libraryVersion = "0.23.10";
+const char *libraryVersion = "0.23.11";
 // The name of this file
 const char *sketchName = "DRWI_NoCellular.ino";
 // Logger ID, also becomes the prefix for the name of the data file on SD card
diff --git a/examples/baro_rho_correction/baro_rho_correction.ino b/examples/baro_rho_correction/baro_rho_correction.ino
@@ -7,7 +7,7 @@ Software License: BSD-3.
   Copyright (c) 2017, Stroud Water Research Center (SWRC)
   and the EnviroDIY Development Team
 
-This example sketch is written for ModularSensors library version 0.23.10
+This example sketch is written for ModularSensors library version 0.23.11
 
 This sketch is an example of logging data to an SD card and sending the data to
 the EnviroDIY data portal.
@@ -20,12 +20,6 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
 //    Defines for the Arduino IDE
 //    In PlatformIO, set these build flags in your platformio.ini
 // ==========================================================================
-#ifndef SDI12_EXTERNAL_PCINT
-#define SDI12_EXTERNAL_PCINT
-#endif
-#ifndef NEOSWSERIAL_EXTERNAL_PCINT
-#define NEOSWSERIAL_EXTERNAL_PCINT
-#endif
 #ifndef TINY_GSM_RX_BUFFER
 #define TINY_GSM_RX_BUFFER 512
 #endif
@@ -49,7 +43,7 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
 //    Data Logger Settings
 // ==========================================================================
 // The library version this example was written for
-const char *libraryVersion = "0.23.10";
+const char *libraryVersion = "0.23.11";
 // The name of this file
 const char *sketchName = "baro_rho_correction.ino";
 // Logger ID, also becomes the prefix for the name of the data file on SD card
diff --git a/examples/cuahsi_workshop/cuahsi_workshop.ino b/examples/cuahsi_workshop/cuahsi_workshop.ino
@@ -7,7 +7,7 @@ Software License: BSD-3.
   Copyright (c) 2017, Stroud Water Research Center (SWRC)
   and the EnviroDIY Development Team
 
-This example sketch is written for ModularSensors library version 0.23.10
+This example sketch is written for ModularSensors library version 0.23.11
 
 This shows most of the standard functions of the library at once.
 
@@ -42,7 +42,7 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
 //    Data Logger Settings
 // ==========================================================================
 // The library version this example was written for
-const char *libraryVersion = "0.23.10";
+const char *libraryVersion = "0.23.11";
 // The name of this file
 const char *sketchName = "cuahsi_workshop.ino";
 // Logger ID, also becomes the prefix for the name of the data file on SD card
diff --git a/examples/data_saving/data_saving.ino b/examples/data_saving/data_saving.ino
@@ -7,7 +7,7 @@ Software License: BSD-3.
   Copyright (c) 2017, Stroud Water Research Center (SWRC)
   and the EnviroDIY Development Team
 
-This example sketch is written for ModularSensors library version 0.23.10
+This example sketch is written for ModularSensors library version 0.23.11
 
 This sketch is an example of logging data to an SD card and sending only a
 portion of that data to the EnviroDIY data portal.
@@ -20,12 +20,6 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
 //    Defines for the Arduino IDE
 //    In PlatformIO, set these build flags in your platformio.ini
 // ==========================================================================
-#ifndef SDI12_EXTERNAL_PCINT
-#define SDI12_EXTERNAL_PCINT
-#endif
-#ifndef NEOSWSERIAL_EXTERNAL_PCINT
-#define NEOSWSERIAL_EXTERNAL_PCINT
-#endif
 #ifndef TINY_GSM_RX_BUFFER
 #define TINY_GSM_RX_BUFFER 512
 #endif
@@ -48,7 +42,7 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
 //    Data Logger Settings
 // ==========================================================================
 // The library version this example was written for
-const char *libraryVersion = "0.23.10";
+const char *libraryVersion = "0.23.11";
 // The name of this file
 const char *sketchName = "data_saving.ino";
 // Logger ID, also becomes the prefix for the name of the data file on SD card
diff --git a/examples/double_logger/double_logger.ino b/examples/double_logger/double_logger.ino
@@ -7,7 +7,7 @@ Software License: BSD-3.
   Copyright (c) 2017, Stroud Water Research Center (SWRC)
   and the EnviroDIY Development Team
 
-This example sketch is written for ModularSensors library version 0.23.10
+This example sketch is written for ModularSensors library version 0.23.11
 
 This sketch is an example of logging data from different variables at two
 different logging intervals.  This example uses more of the manual functions
@@ -29,7 +29,7 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
 //    Data Logger Settings
 // ==========================================================================
 // The library version this example was written for
-const char *libraryVersion = "0.23.10";
+const char *libraryVersion = "0.23.11";
 // The name of this file
 const char *sketchName = "double_logger.ino";
 // Logger ID - we're only using one logger ID for both "loggers"
diff --git a/examples/logging_to_MMW/logging_to_MMW.ino b/examples/logging_to_MMW/logging_to_MMW.ino
@@ -7,7 +7,7 @@ Software License: BSD-3.
   Copyright (c) 2017, Stroud Water Research Center (SWRC)
   and the EnviroDIY Development Team
 
-This example sketch is written for ModularSensors library version 0.23.10
+This example sketch is written for ModularSensors library version 0.23.11
 
 This shows most of the standard functions of the library at once.
 
@@ -19,12 +19,6 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
 //    Defines for the Arduino IDE
 //    In PlatformIO, set these build flags in your platformio.ini
 // ==========================================================================
-#ifndef SDI12_EXTERNAL_PCINT
-#define SDI12_EXTERNAL_PCINT
-#endif
-#ifndef NEOSWSERIAL_EXTERNAL_PCINT
-#define NEOSWSERIAL_EXTERNAL_PCINT
-#endif
 #ifndef TINY_GSM_RX_BUFFER
 #define TINY_GSM_RX_BUFFER 512
 #endif
@@ -47,7 +41,7 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
 //    Data Logger Settings
 // ==========================================================================
 // The library version this example was written for
-const char *libraryVersion = "0.23.10";
+const char *libraryVersion = "0.23.11";
 // The name of this file
 const char *sketchName = "logging_to MMW.ino";
 // Logger ID, also becomes the prefix for the name of the data file on SD card
diff --git a/examples/logging_to_ThingSpeak/logging_to_ThingSpeak.ino b/examples/logging_to_ThingSpeak/logging_to_ThingSpeak.ino
@@ -7,7 +7,7 @@ Software License: BSD-3.
   Copyright (c) 2017, Stroud Water Research Center (SWRC)
   and the EnviroDIY Development Team
 
-This example sketch is written for ModularSensors library version 0.23.10
+This example sketch is written for ModularSensors library version 0.23.11
 
 This sketch is an example of logging data to an SD card and sending the data to
 ThingSpeak.
@@ -20,12 +20,6 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
 //    Defines for the Arduino IDE
 //    In PlatformIO, set these build flags in your platformio.ini
 // ==========================================================================
-#ifndef SDI12_EXTERNAL_PCINT
-#define SDI12_EXTERNAL_PCINT
-#endif
-#ifndef NEOSWSERIAL_EXTERNAL_PCINT
-#define NEOSWSERIAL_EXTERNAL_PCINT
-#endif
 #ifndef TINY_GSM_RX_BUFFER
 #define TINY_GSM_RX_BUFFER 512
 #endif
@@ -48,7 +42,7 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
 //    Data Logger Settings
 // ==========================================================================
 // The library version this example was written for
-const char *libraryVersion = "0.23.10";
+const char *libraryVersion = "0.23.11";
 // The name of this file
 const char *sketchName = "logging_to_ThingSpeak.ino";
 // Logger ID, also becomes the prefix for the name of the data file on SD card
diff --git a/examples/menu_a_la_carte/menu_a_la_carte.ino b/examples/menu_a_la_carte/menu_a_la_carte.ino
@@ -7,7 +7,7 @@ Software License: BSD-3.
   Copyright (c) 2017, Stroud Water Research Center (SWRC)
   and the EnviroDIY Development Team
 
-This example sketch is written for ModularSensors library version 0.23.10
+This example sketch is written for ModularSensors library version 0.23.11
 
 This shows most of the standard functions of the library at once.
 
@@ -19,12 +19,6 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
 //    Defines for the Arduino IDE
 //    In PlatformIO, set these build flags in your platformio.ini
 // ==========================================================================
-#ifndef SDI12_EXTERNAL_PCINT
-#define SDI12_EXTERNAL_PCINT
-#endif
-#ifndef NEOSWSERIAL_EXTERNAL_PCINT
-#define NEOSWSERIAL_EXTERNAL_PCINT
-#endif
 #ifndef TINY_GSM_RX_BUFFER
 #define TINY_GSM_RX_BUFFER 512
 #endif
@@ -48,7 +42,7 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
 //    Data Logger Settings
 // ==========================================================================
 // The library version this example was written for
-const char *libraryVersion = "0.23.10";
+const char *libraryVersion = "0.23.11";
 // The name of this file
 const char *sketchName = "menu_a_la_carte.ino";
 // Logger ID, also becomes the prefix for the name of the data file on SD card
diff --git a/examples/simple_logging/simple_logging.ino b/examples/simple_logging/simple_logging.ino
@@ -7,7 +7,7 @@ Software License: BSD-3.
   Copyright (c) 2017, Stroud Water Research Center (SWRC)
   and the EnviroDIY Development Team
 
-This example sketch is written for ModularSensors library version 0.23.10
+This example sketch is written for ModularSensors library version 0.23.11
 
 This sketch is an example of logging data to an SD card
 
@@ -19,9 +19,6 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
 //    Defines for the Arduino IDE
 //    In PlatformIO, set these build flags in your platformio.ini
 // ==========================================================================
-#ifndef SDI12_EXTERNAL_PCINT
-#define SDI12_EXTERNAL_PCINT
-#endif
 
 // ==========================================================================
 //    Include the base required libraries
@@ -35,7 +32,7 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
 //    Data Logger Settings
 // ==========================================================================
 // The library version this example was written for
-const char *libraryVersion = "0.23.10";
+const char *libraryVersion = "0.23.11";
 // The name of this file
 const char *sketchName = "simple_logging.ino";
 // Logger ID, also becomes the prefix for the name of the data file on SD card
diff --git a/examples/simple_logging_LearnEnviroDIY/simple_logging_LearnEnviroDIY.ino b/examples/simple_logging_LearnEnviroDIY/simple_logging_LearnEnviroDIY.ino
@@ -7,7 +7,7 @@ Software License: BSD-3.
   Copyright (c) 2017, Stroud Water Research Center (SWRC)
   and the EnviroDIY Development Team
 
-This example sketch is written for ModularSensors library version 0.23.10
+This example sketch is written for ModularSensors library version 0.23.11
 
 This sketch is an example of logging data to an SD card
 
@@ -27,7 +27,7 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
 //    Data Logger Settings
 // ==========================================================================
 // The library version this example was written for
-const char *libraryVersion = "0.23.10";
+const char *libraryVersion = "0.23.11";
 // The name of this file
 const char *sketchName = "simple_logging.ino";
 // Logger ID, also becomes the prefix for the name of the data file on SD card
diff --git a/examples/single_sensor/single_sensor.ino b/examples/single_sensor/single_sensor.ino
@@ -7,7 +7,7 @@ Software License: BSD-3.
   Copyright (c) 2017, Stroud Water Research Center (SWRC)
   and the EnviroDIY Development Team
 
-This example sketch is written for ModularSensors library version 0.23.10
+This example sketch is written for ModularSensors library version 0.23.11
 
 This sketch is an example of getting data from a single sensor, in this case, a
 MaxBotix Ultrasonic Range Finder
@@ -19,9 +19,6 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
 //    Defines for the Arduino IDE
 //    In PlatformIO, set these build flags in your platformio.ini
 // ==========================================================================
-#ifndef SDI12_EXTERNAL_PCINT
-#define SDI12_EXTERNAL_PCINT
-#endif
 
 // ==========================================================================
 // Include the base required libraries
@@ -32,7 +29,7 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
 #include <VariableBase.h>
 
 // The library version this example was written for
-const char *libraryVersion = "0.23.10";
+const char *libraryVersion = "0.23.11";
 // The name of this file
 const char *sketchName = "single_sensor.ino";
 
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
     "name": "EnviroDIY_ModularSensors",
-    "version": "0.23.10",
+    "version": "0.23.11",
     "description":  "A library that allows access to multiple sensors through a unified interface.  This allows the user to simply access many sensors to log the data or send the data to data repositories like the EnviroDIY data portal.",
     "keywords": "modular, sensor, sensors, datalogger, logger, low power, sleeping, EnviroDIY, ModularSensors, Mayfly, WikiWatershed, ThingSpeak",
     "platforms": "atmelavr, atmelsam",
@@ -302,7 +302,7 @@
         {
             "name": "TinyGSM",
             "version": "https://github.com/EnviroDIY/TinyGSM.git",
-            "version_note": "=0.9.16",
+            "version_note": "=0.9.17",
             "note": "A small Arduino library for GPRS modules.",
             "authors": [
                 "Volodymyr Shymanskyy",
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=EnviroDIY_ModularSensors
-version=0.23.10
+version=0.23.11
 author=Sara Damiano <sdamiano@stroudcenter.org>, Shannon Hicks <shicks@stroudcenter.org>
 maintainer=Sara Damiano <sdamiano@stroudcenter.org>
 sentence=A library that allows access to multiple sensors through a unified interface.
diff --git a/src/ModSensorDebugger.h b/src/ModSensorDebugger.h
@@ -15,7 +15,7 @@
 #include <Arduino.h>
 
 // The current library version number
-#define MODULAR_SENSORS_VERSION "0.23.10"
+#define MODULAR_SENSORS_VERSION "0.23.11"
 
 #ifndef STANDARD_SERIAL_OUTPUT
     // #if defined(ARDUINO_SAMD_ZERO) && defined(SERIAL_PORT_USBVIRTUAL)
diff --git a/src/dataPublisherBase.cpp b/src/dataPublisherBase.cpp
diff --git a/src/dataPublisherBase.h b/src/dataPublisherBase.h
diff --git a/src/modems/DigiXBeeWifi.cpp b/src/modems/DigiXBeeWifi.cpp
diff --git a/src/modems/DigiXBeeWifi.h b/src/modems/DigiXBeeWifi.h
diff --git a/src/modems/EspressifESP8266.cpp b/src/modems/EspressifESP8266.cpp
diff --git a/src/modems/EspressifESP8266.h b/src/modems/EspressifESP8266.h
diff --git a/src/publishers/ThingSpeakPublisher.cpp b/src/publishers/ThingSpeakPublisher.cpp
