Merge pull request #423 from EnviroDIY/y700_y4000

Y700 y4000

Author: aufdenkampe

ChangeLog.md

@@ -35,10 +35,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - Support Campbell RainVUE10 SDI-12 Precipitation Sensor (#416)
+- Support YosemiTech Y700 Pressor Sensor ([#421](https://github.com/EnviroDIY/ModularSensors/issues/421))
 
 ### Removed
 
 ### Fixed
+- Fixed bug in YosemiTech Y4000 Sonde ([#420](https://github.com/EnviroDIY/ModularSensors/issues/420))
 - Fixed non-concurrent data fetch for SDI-12 when *NOT* using debugging.
 - Fixed internet connection when in "testing mode"
 - Allow a non-zero wait time for SDI-12 sensors

VERSION

@@ -1 +1 @@
-0.33.4
+0.34.0

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.4
+PROJECT_NUMBER         = 0.34.0
 
 # 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

examples/menu_a_la_carte/menu_a_la_carte.ino

@@ -2230,6 +2230,38 @@ Variable* y560Temp =
 #endif
 
 
+#if defined BUILD_SENSOR_YOSEMITECH_Y700
+// ==========================================================================
+//  Yosemitech Y700 Pressure Sensor
+// ==========================================================================
+/** Start [yosemitech_y700] */
+#include <sensors/YosemitechY700.h>
+
+// NOTE: Extra hardware and software serial ports are created in the "Settings
+// for Additional Serial Ports" section
+
+// NOTE: Use -1 for any pins that don't apply or aren't being used.
+byte          y700ModbusAddress  = 0x70;  // The modbus address of the Y700
+const int8_t  y700AdapterPower   = sensorPowerPin;  // RS485 adapter power pin
+const int8_t  y700SensorPower    = A3;              // Sensor power pin
+const int8_t  y700EnablePin      = -1;              // Adapter RE/DE pin
+const uint8_t y700NumberReadings = 5;
+// The manufacturer recommends averaging 10 readings, but we take 5 to minimize
+// power consumption
+
+// Create a Y700 pressure sensor object
+YosemitechY700 y700(y700ModbusAddress, modbusSerial, y700AdapterPower,
+                    y700SensorPower, y700EnablePin, y700NumberReadings);
+
+// Create pressure and temperature variable pointers for the Y700
+Variable* y700Pres =
+    new YosemitechY700_Pressure(&y700, "12345678-abcd-1234-ef00-1234567890ab");
+Variable* y700Temp =
+    new YosemitechY700_Temp(&y700, "12345678-abcd-1234-ef00-1234567890ab");
+/** End [yosemitech_y700] */
+#endif
+
+
 #if defined BUILD_SENSOR_YOSEMITECH_Y4000
 // ==========================================================================
 //  Yosemitech Y4000 Multiparameter Sonde (DOmgL, Turbidity, Cond, pH, Temp,

library.json

@@ -324,7 +324,7 @@
       "owner": "envirodiy",
       "library id": "2078",
       "url": "https://github.com/EnviroDIY/YosemitechModbus",
-      "version": "~0.3.2",
+      "version": "~0.4.0",
       "note": "Arduino library for communication with Yosemitech sensors via Modbus.",
       "authors": ["Sara Damiano", "Anthony Aufdenkampe"],
       "frameworks": "arduino",