From 313e209059a1c4feb258919ac8cdd94b75d748bf Mon Sep 17 00:00:00 2001 From: Sara Damiano Date: Wed, 8 Jun 2022 13:31:43 -0400 Subject: [PATCH] Increase time for ClariVUE Signed-off-by: Sara Damiano --- ChangeLog.md | 10 +++++++++- VERSION | 2 +- continuous_integration/dependencies.json | 4 ++-- docs/Doxyfile | 2 +- library.json | 6 +++--- library.properties | 2 +- src/ModularSensors.h | 2 +- src/sensors/CampbellClariVUE10.h | 17 ++++++----------- 8 files changed, 24 insertions(+), 21 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 01d580280..f2f21c45f 100644 --- a/ChangeLog.md +++ b/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 diff --git a/VERSION b/VERSION index 90d7d2b46..dddc2e9ca 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.33.3 +0.33.4 diff --git a/continuous_integration/dependencies.json b/continuous_integration/dependencies.json index 513970db3..46112fcd0 100644 --- a/continuous_integration/dependencies.json +++ b/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", diff --git a/docs/Doxyfile b/docs/Doxyfile index bab301e2b..a0e3c4758 100644 --- a/docs/Doxyfile +++ b/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 diff --git a/library.json b/library.json index 91ef23ce8..09553b1cc 100644 --- a/library.json +++ b/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", diff --git a/library.properties b/library.properties index f29b864b7..89ca9b4cc 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=ModularSensors -version=0.33.3 +version=0.33.4 author=Sara Damiano , Shannon Hicks maintainer=Sara Damiano sentence=A library that allows access to multiple sensors through a unified interface. diff --git a/src/ModularSensors.h b/src/ModularSensors.h index 229c8f174..26de80518 100644 --- a/src/ModularSensors.h +++ b/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. diff --git a/src/sensors/CampbellClariVUE10.h b/src/sensors/CampbellClariVUE10.h index 1754d241e..102392d8d 100644 --- a/src/sensors/CampbellClariVUE10.h +++ b/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