Merge branch 'master' into hmac_auth

Author: aufdenkampe

ChangeLog.md

@@ -21,6 +21,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ***
 
 
+## [0.33.4]
+
+### Fixed
+- Increased warm-up and measurement time for Campbell ClariVUE-10 to work with the latest version of the sensor.
+***
+
+
 ## [0.33.3]
 
 ### Fixed
@@ -747,7 +754,8 @@ Our first release of the modular sensors library to support easily logging data
 
 ***
 
-[Unreleased]: https://github.com/EnviroDIY/ModularSensors/compare/v0.33.3...HEAD
+[Unreleased]: https://github.com/EnviroDIY/ModularSensors/compare/v0.33.4...HEAD
+[0.33.4]: https://github.com/EnviroDIY/ModularSensors/releases/tag/v0.33.4
 [0.33.3]: https://github.com/EnviroDIY/ModularSensors/releases/tag/v0.33.3
 [0.33.2]: https://github.com/EnviroDIY/ModularSensors/releases/tag/v0.33.2
 [0.33.1]: https://github.com/EnviroDIY/ModularSensors/releases/tag/v0.33.1

VERSION

@@ -1 +1 @@
-0.33.3
+0.33.4

continuous_integration/dependencies.json

@@ -68,7 +68,7 @@
       "owner": "adafruit",
       "library id": "6214",
       "url": "https://github.com/adafruit/Adafruit_BusIO",
-      "version": "~1.11.3",
+      "version": "~1.11.6",
       "note": "Adafruit BusIO, a dependency of other Adafruit libraries",
       "authors": ["Adafruit"],
       "frameworks": "arduino",
@@ -174,7 +174,7 @@
       "owner": "paulstoffregen",
       "library id": "1",
       "url": "https://github.com/PaulStoffregen/OneWire",
-      "version": "~2.3.6",
+      "version": "~2.3.7",
       "note": "OneWire - Control 1-Wire protocol (DS18S20, DS18B20, DS2408 and etc)",
       "authors": [
         "Paul Stoffregen",

docs/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = ModularSensors
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 0.33.3
+PROJECT_NUMBER         = 0.33.4
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

library.json

@@ -1,6 +1,6 @@
 {
   "name": "EnviroDIY_ModularSensors",
-  "version": "0.33.3",
+  "version": "0.33.4",
   "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, Monitor My Watershed, ThingSpeak",
   "platforms": "atmelavr, atmelsam",
@@ -129,7 +129,7 @@
       "owner": "adafruit",
       "library id": "6214",
       "url": "https://github.com/adafruit/Adafruit_BusIO",
-      "version": "~1.11.3",
+      "version": "~1.11.6",
       "note": "Adafruit BusIO, a dependency of other Adafruit libraries",
       "authors": ["Adafruit"],
       "frameworks": "arduino",
@@ -235,7 +235,7 @@
       "owner": "paulstoffregen",
       "library id": "1",
       "url": "https://github.com/PaulStoffregen/OneWire",
-      "version": "~2.3.6",
+      "version": "~2.3.7",
       "note": "OneWire - Control 1-Wire protocol (DS18S20, DS18B20, DS2408 and etc)",
       "authors": [
         "Paul Stoffregen",

library.properties

@@ -1,5 +1,5 @@
 name=ModularSensors
-version=0.33.3
+version=0.33.4
 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.

src/ModularSensors.h

@@ -14,7 +14,7 @@
 /**
  * @brief The current library version number
  */
-#define MODULAR_SENSORS_VERSION "0.33.3"
+#define MODULAR_SENSORS_VERSION "0.33.4"
 
 // To get all of the base classes for ModularSensors, include LoggerBase.
 // NOTE:  Individual sensor definitions must be included separately.

src/sensors/CampbellClariVUE10.h

@@ -35,11 +35,9 @@
  * The sensor is implemented as a sub-classes of the SDI12Sensors class.
  * It requires a 9.6 to 18 Vdc power supply, which can be turned off between measurements.
  * It draws < 300 µA when inactive and < 35 mA while measuring.
- * You will need a voltage booster or a separate power supply to give the ClariVUE10 sufficient voltage to run.
- * At the Stroud Center, we use [Pololu 12V Step-Up Voltage Regulators](https://www.pololu.com/product/2116).
  *
  * @note While it is supported, you should not average measurements for this sensor.
- * The sensor already takes 8 readings by default and returns the median of those.
+ * The sensor takes a burst of 30 readings and returns the median of those.
  *
  * @section sensor_clarivue_datasheet Sensor Datasheet
  * The specifications and datasheet are available at https://www.campbellsci.com/clarivue10
@@ -87,21 +85,18 @@
  * This is longer than the expected 250ms for a SDI-12 sensor, but I couldn't
  * get a response from the sensor faster than that.
  */
-#define CLARIVUE10_WARM_UP_TIME_MS 275
+#define CLARIVUE10_WARM_UP_TIME_MS 5500
 /// @brief Sensor::_stabilizationTime_ms; the ClariVUE10 is stable as soon as it
 /// warms up (0ms stabilization).
 #define CLARIVUE10_STABILIZATION_TIME_MS 0
 /**
- * @brief Sensor::_measurementTime_ms; the ClariVUE10 takes ~7200ms to
+ * @brief Sensor::_measurementTime_ms; the ClariVUE10 takes ~9500ms to
  * complete a measurement.
  *
- * Spec sheet says the measurement time is 8s.  When taking concurrent
- * measurements I was consistently getting a result before about 6800ms.
- * When taking a standard measurement I was getting a result after about 7185ms.
- * It seems safest to use round up from the time I was getting for a
- * non-concurrent measurment.  Waiting the full 8s seems excessive.
+ * Spec sheet says the measurement time is 9s.  When taking a standard
+ * measurement I was not getting a result until after about 9335ms.
  */
-#define CLARIVUE10_MEASUREMENT_TIME_MS 7200
+#define CLARIVUE10_MEASUREMENT_TIME_MS 9500
 /// @brief Extra wake time required for an SDI-12 sensor between the "break"
 /// and the time the command is sent.  The ClariVUE requires no extra time.
 #define CLARIVUE10_EXTRA_WAKE_TIME_MS 0

src/sensors/Decagon5TM.cpp

@@ -115,7 +115,7 @@ bool Decagon5TM::getResults(void) {
         VWC = (4.3e-6 * (ea * ea * ea)) - (5.5e-4 * (ea * ea)) +
             (2.92e-2 * ea) - 5.3e-2;
         VWC *= 100;  // Convert to actual percent
-        MS_DBG(F("Calculated VWC:"), ea)
+        MS_DBG(F("Calculated VWC:"), ea);
         if (VWC < 0) {
             VWC = 0;
             MS_DBG(F("Setting negative VWC to 0"));