Merge branch 'develop' into hmac_auth

EnviroDIY · Mar 15, 2023 · 03a9279 · 03a9279 · github-actions · Mar 15, 2023
2 parents bf3afe2 + b602ee8
commit 03a9279
Show file tree

Hide file tree

Showing 16 changed files with 74 additions and 520 deletions.
diff --git a/.github/workflows/build_documentation.yaml b/.github/workflows/build_documentation.yaml
@@ -24,7 +24,7 @@ concurrency:
 env:
   REBUILD_CACHE_NUMBER: 2
   PYTHON_DEPS_ARCHIVE_NUM: 2
-  DOXYGEN_VERSION: Release_1_9_4
+  DOXYGEN_VERSION: Release_1_9_6
   TEX_VERSION: 2019
   # ^^ 2019 is the latest TeX live available on apt-get and that's good enough
   GRAPHVIZ_VERSION: 2.43.0

diff --git a/.github/workflows/build_examples.yaml b/.github/workflows/build_examples.yaml
@@ -40,6 +40,19 @@ jobs:
           path: |
             continuous_integration_artifacts/
 
+  print_job_matrix:
+    name: print_job_matrix
+    runs-on: ubuntu-latest
+    needs: generate_matrix
+    steps:
+      - name: Check the generated matrix output
+        run: |
+          echo "Arduino job matrix:"
+          echo "${{ needs.generate_matrix.outputs.arduino_job_matrix }}"
+          echo
+          echo "PlatformIO job matrix"
+          echo "${{ needs.generate_matrix.outputs.pio_job_matrix }}"
+
   build_ex_arduino:
     name: ${{ matrix.job_info.job_name }}
     runs-on: ubuntu-latest

diff --git a/.gitignore b/.gitignore
@@ -107,3 +107,4 @@ continuous_integration/arduino_cli_local.yaml
 compile_results.log
 continuous_integration_artifacts/*
 arduino_cli.log
+**/sensor_tests/*
diff --git a/continuous_integration/dependencies.json b/continuous_integration/dependencies.json
@@ -1,5 +1,5 @@
 {
-  "action_cache_version": 14,
+  "action_cache_version": 15,
   "dependencies": [
     {
       "name": "EnviroDIY_DS3231",
@@ -79,7 +79,7 @@
       "owner": "adafruit",
       "library id": "31",
       "url": "https://github.com/adafruit/Adafruit_Sensor",
-      "version": "~1.1.5",
+      "version": "~1.1.9",
       "note": "Adafruit's unified sensor library is used by their other libraries",
       "authors": ["Adafruit"],
       "frameworks": "arduino",
@@ -143,7 +143,7 @@
       "owner": "adafruit",
       "library id": "160",
       "url": "https://github.com/adafruit/Adafruit_INA219",
-      "version": "~1.2.0",
+      "version": "~1.2.1",
       "note": "This is a library for the Adafruit INA219 high side DC current sensor boards",
       "authors": ["Adafruit"],
       "frameworks": "arduino",
@@ -164,7 +164,7 @@
       "owner": "adafruit",
       "library id": "11710",
       "url": "https://github.com/adafruit/Adafruit_SHT4X",
-      "version": "~1.0.0",
+      "version": "~1.0.2",
       "note": "Sensirion SHT4x Library by Adafruit",
       "authors": ["Adafruit"],
       "frameworks": "arduino"
@@ -263,7 +263,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",

diff --git a/continuous_integration/generate_job_matrix.py b/continuous_integration/generate_job_matrix.py
@@ -72,7 +72,6 @@
     "megaatmega2560": {"fqbn": "arduino:avr:mega"},
     "zeroUSB": {"fqbn": "arduino:samd:mzero_bl"},
     "adafruit_feather_m0": {"fqbn": "adafruit:samd:adafruit_feather_m0"},
-    "sodaq_autonomo": {"fqbn": "SODAQ:samd:sodaq_autonomo"},
 }
 
 
@@ -695,6 +694,13 @@ def extend_pio_config(added_envs):
 json_out.close()
 
 
+#%%
+# different attempt to save output
+with open(os.environ["GITHUB_OUTPUT"], "a") as fh:
+    print("arduino_job_matrix={}".format(json.dumps(arduino_job_matrix)), file=fh)
+    print("pio_job_matrix={}".format(json.dumps(pio_job_matrix)), file=fh)
+
+
 #%%
 if "GITHUB_WORKSPACE" not in os.environ.keys():
     try:

diff --git a/continuous_integration/install-deps-arduino-cli.sh b/continuous_integration/install-deps-arduino-cli.sh
@@ -25,9 +25,6 @@ arduino-cli --config-file continuous_integration/arduino_cli.yaml core install a
 echo "\n\e[32mInstalling the Adafruit SAMD Core\e[0m"
 arduino-cli --config-file continuous_integration/arduino_cli.yaml core install adafruit:samd
 
-echo "\n\e[32mInstalling the Sodaq SAMD Core\e[0m"
-arduino-cli --config-file continuous_integration/arduino_cli.yaml core install SODAQ:samd
-
 echo "\n\e[32mUpdating the core index\e[0m"
 arduino-cli --config-file continuous_integration/arduino_cli.yaml core update-index
 

diff --git a/examples/menu_a_la_carte/ReadMe.md b/examples/menu_a_la_carte/ReadMe.md
@@ -69,15 +69,16 @@ ___
       - [Atlas Scientific EZO-EC Conductivity Sensor](#atlas-scientific-ezo-ec-conductivity-sensor)
     - [Bosch BME280 Environmental Sensor](#bosch-bme280-environmental-sensor)
     - [Bosch BMP388 and BMP398 Pressure Sensors](#bosch-bmp388-and-bmp398-pressure-sensors)
-      - [Campbell ClariVUE SDI-12 Turbidity Sensor](#campbell-clarivue-sdi-12-turbidity-sensor)
+    - [Campbell ClariVUE SDI-12 Turbidity Sensor](#campbell-clarivue-sdi-12-turbidity-sensor)
     - [Campbell OBS3+ Analog Turbidity Sensor](#campbell-obs3-analog-turbidity-sensor)
-      - [Decagon CTD-10 Conductivity, Temperature, and Depth Sensor](#decagon-ctd-10-conductivity-temperature-and-depth-sensor)
+    - [Campbell RainVUE SDI-12 Precipitation Sensor](#campbell-rainvue-sdi-12-precipitation-sensor)
+    - [Decagon CTD-10 Conductivity, Temperature, and Depth Sensor](#decagon-ctd-10-conductivity-temperature-and-depth-sensor)
     - [Decagon ES2 Conductivity and Temperature Sensor](#decagon-es2-conductivity-and-temperature-sensor)
-      - [Everlight ALS-PT19 Ambient Light Sensor](#everlight-als-pt19-ambient-light-sensor)
+    - [Everlight ALS-PT19 Ambient Light Sensor](#everlight-als-pt19-ambient-light-sensor)
     - [External Voltage via TI ADS1x15](#external-voltage-via-ti-ads1x15)
     - [Freescale Semiconductor MPL115A2 Miniature I2C Digital Barometer](#freescale-semiconductor-mpl115a2-miniature-i2c-digital-barometer)
-      - [In-Situ Aqua/Level TROLL Pressure, Temperature, and Depth Sensor](#in-situ-aqualevel-troll-pressure-temperature-and-depth-sensor)
-      - [In-Situ RDO PRO-X Rugged Dissolved Oxygen Probe](#in-situ-rdo-pro-x-rugged-dissolved-oxygen-probe)
+    - [In-Situ Aqua/Level TROLL Pressure, Temperature, and Depth Sensor](#in-situ-aqualevel-troll-pressure-temperature-and-depth-sensor)
+    - [In-Situ RDO PRO-X Rugged Dissolved Oxygen Probe](#in-situ-rdo-pro-x-rugged-dissolved-oxygen-probe)
     - [Keller RS485/Modbus Water Level Sensors](#keller-rs485modbus-water-level-sensors)
       - [Keller Acculevel High Accuracy Submersible Level Transmitter](#keller-acculevel-high-accuracy-submersible-level-transmitter)
       - [Keller Nanolevel Level Transmitter](#keller-nanolevel-level-transmitter)
@@ -90,7 +91,7 @@ ___
       - [Meter Teros 11 Soil Moisture Sensor](#meter-teros-11-soil-moisture-sensor)
     - [PaleoTerra Redox Sensors](#paleoterra-redox-sensors)
     - [Trinket-Based Tipping Bucket Rain Gauge](#trinket-based-tipping-bucket-rain-gauge)
-      - [Sensirion SHT4X Digital Humidity and Temperature Sensor](#sensirion-sht4x-digital-humidity-and-temperature-sensor)
+    - [Sensirion SHT4X Digital Humidity and Temperature Sensor](#sensirion-sht4x-digital-humidity-and-temperature-sensor)
     - [Northern Widget Tally Event Counter](#northern-widget-tally-event-counter)
     - [TI INA219 High Side Current Sensor](#ti-ina219-high-side-current-sensor)
     - [Turner Cyclops-7F Submersible Fluorometer](#turner-cyclops-7f-submersible-fluorometer)
@@ -105,6 +106,7 @@ ___
       - [Yosemitech Y533 Oxidation Reduction Potential (ORP) Sensor](#yosemitech-y533-oxidation-reduction-potential-orp-sensor)
       - [Yosemitech Y551 Carbon Oxygen Demand (COD) Sensor with Wiper](#yosemitech-y551-carbon-oxygen-demand-cod-sensor-with-wiper)
       - [Yosemitech Y560 Ammonium Sensor](#yosemitech-y560-ammonium-sensor)
+      - [Yosemitech Y700 Pressure Sensor](#yosemitech-y700-pressure-sensor)
       - [Yosemitech Y4000 Multi-Parameter Sonde](#yosemitech-y4000-multi-parameter-sonde)
     - [Zebra Tech D-Opto Dissolved Oxygen Sensor](#zebra-tech-d-opto-dissolved-oxygen-sensor)
   - [Calculated Variables](#calculated-variables)
@@ -763,6 +765,15 @@ Note that to access both the high and low range returns, two instances must be c
 ___
 
 
+#### Campbell RainVUE SDI-12 Precipitation Sensor <!-- {#menu_walk_campbell_rain_vue10} -->
+
+@see @ref sensor_rainvue
+
+[//]: # ( @menusnip{campbell_rain_vue10} )
+
+___
+
+
 #### Decagon CTD-10 Conductivity, Temperature, and Depth Sensor <!-- {#menu_walk_decagon_ctd} -->
 
 @see @ref sensor_decagon_ctd
@@ -1164,6 +1175,15 @@ ___
 ___
 
 
+#### Yosemitech Y700 Pressure Sensor <!-- {#menu_walk_yosemitech_y700} -->
+
+@see @ref sensor_y700
+
+[//]: # ( @menusnip{yosemitech_y700} )
+
+___
+
+
 #### Yosemitech Y4000 Multi-Parameter Sonde <!-- {#menu_walk_yosemitech_y4000} -->
 
 @see @ref sensor_y4000

diff --git a/examples/menu_a_la_carte/menu_a_la_carte.ino b/examples/menu_a_la_carte/menu_a_la_carte.ino
@@ -1202,11 +1202,11 @@ Variable* obs3VoltHigh = new CampbellOBS3_Voltage(
 /** End [campbell_obs3] */
 #endif
 
-#if defined BUILD_SENSOR_CAMPBELL_RAINVUE10
+#if defined BUILD_SENSOR_CAMPBELL_RAIN_VUE10
 // ==========================================================================
 //  Campbell RainVUE Precipitation Sensor
 // ==========================================================================
-/** Start [campbell_rainvue10] */
+/** Start [campbell_rain_vue10] */
 #include <sensors/CampbellRainVUE10.h>
 
 // NOTE: Use -1 for any pins that don't apply or aren't being used.
@@ -1228,7 +1228,7 @@ Variable* rainvueRainRateAve = new CampbellRainVUE10_RainRateAve(
     &rainvue, "12345678-abcd-1234-ef00-1234567890ab");
 Variable* rainvueRainRateMax = new CampbellRainVUE10_RainRateMax(
     &rainvue, "12345678-abcd-1234-ef00-1234567890ab");
-/** End [campbell_rainvue10] */
+/** End [campbell_rain_vue10] */
 #endif
 
 
@@ -2512,6 +2512,12 @@ Variable* variableList[] = {
     obs3TurbHigh,
     obs3VoltHigh,
 #endif
+#if defined BUILD_SENSOR_CAMPBELL_RAIN_VUE10
+    rainvuePrecipitation,
+    rainvueTips,
+    rainvueRainRateAve,
+    rainvueRainRateMax,
+#endif
 #if defined BUILD_SENSOR_DECAGON_CTD
     ctdCond,
     ctdTemp,
@@ -2659,6 +2665,10 @@ Variable* variableList[] = {
     y560pH,
     y560Temp,
 #endif
+#if defined BUILD_SENSOR_YOSEMITECH_Y700
+    y700Pres,
+    y700Temp,
+#endif
 #if defined BUILD_SENSOR_YOSEMITECH_Y4000
     y4000DO,
     y4000Turb,

diff --git a/library.json b/library.json
@@ -140,7 +140,7 @@
       "owner": "adafruit",
       "library id": "31",
       "url": "https://github.com/adafruit/Adafruit_Sensor",
-      "version": "~1.1.5",
+      "version": "~1.1.9",
       "note": "Adafruit's unified sensor library is used by their other libraries",
       "authors": ["Adafruit"],
       "frameworks": "arduino",
@@ -204,7 +204,7 @@
       "owner": "adafruit",
       "library id": "160",
       "url": "https://github.com/adafruit/Adafruit_INA219",
-      "version": "~1.2.0",
+      "version": "~1.2.1",
       "note": "This is a library for the Adafruit INA219 high side DC current sensor boards",
       "authors": ["Adafruit"],
       "frameworks": "arduino",
@@ -225,7 +225,7 @@
       "owner": "adafruit",
       "library id": "11710",
       "url": "https://github.com/adafruit/Adafruit_SHT4X",
-      "version": "~1.0.0",
+      "version": "~1.0.2",
       "note": "Sensirion SHT4x Library by Adafruit",
       "authors": ["Adafruit"],
       "frameworks": "arduino"

diff --git a/library.properties b/library.properties
@@ -8,4 +8,4 @@ category=Sensors
 url=https://github.com/EnviroDIY/ModularSensors
 architectures=avr,samd
 includes=LoggerBase.h
-depends=EnviroDIY_DS3231, RTCZero, EnableInterrupt, SdFat, TinyGSM, PubSubClient, Adafruit BusIO, Adafruit Unified Sensor, Adafruit ADS1X15, Adafruit AM2315, Adafruit BME280 Library, DHT sensor library, Adafruit INA219, Adafruit MPL115A2, Adafruit SHT4x Library, OneWire, DallasTemperature, SDI-12, MS5803, SensorModbusMaster, KellerModbus, YosemitechModbus
+depends=EnviroDIY_DS3231, RTCZero, EnableInterrupt, SdFat, TinyGSM, PubSubClient, Adafruit BusIO, Adafruit Unified Sensor, Adafruit ADS1X15, Adafruit AM2315, Adafruit BME280 Library, DHT sensor library, Adafruit INA219, Adafruit MPL115A2, Adafruit SHT4x Library, OneWire, DallasTemperature, SDI-12, SensorModbusMaster, KellerModbus, YosemitechModbus