Skip to content

Commit ca7653f

Browse files
authored
Merge pull request #463 from EnviroDIY/develop
v0.35 release candidate: GroPoint Modbus; Xbee & Digi WiFi fixes; Prep for batch transmission
2 parents db7bfb0 + 1c2c275 commit ca7653f

File tree

185 files changed

+3465
-1554
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

185 files changed

+3465
-1554
lines changed

.github/workflows/build_documentation.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ jobs:
3939
- uses: actions/checkout@v4
4040

4141
- name: Set up Python
42-
uses: actions/setup-python@v4
42+
uses: actions/setup-python@v5
4343
with:
4444
python-version: '3.x'
4545

46-
# Using anwer from here to get the exit code and pass the output: https://stackoverflow.com/questions/59191913/how-do-i-get-the-output-of-a-specific-step-in-github-actions
46+
# Using answer from here to get the exit code and pass the output: https://stackoverflow.com/questions/59191913/how-do-i-get-the-output-of-a-specific-step-in-github-actions
4747
- name: check for classes in the menu example
4848
id: check_component
4949
continue-on-error: true
@@ -89,12 +89,12 @@ jobs:
8989
path: code_docs/ModularSensors
9090

9191
- name: Set up Python
92-
uses: actions/setup-python@v4
92+
uses: actions/setup-python@v5
9393
with:
9494
python-version: '3.x'
9595

9696
- name: Restore Python Dependencies
97-
uses: actions/cache@v3
97+
uses: actions/cache@v4
9898
id: cache_python
9999
with:
100100
path: ~/.cache/pip
@@ -107,7 +107,7 @@ jobs:
107107
108108
- name: Restore Doxygen, Graphviz, and TeX Live
109109
id: cache_doxygen
110-
uses: actions/cache@v3
110+
uses: actions/cache@v4
111111
with:
112112
path: |
113113
/usr/lib/x86_64-linux-gnu/texlive

.github/workflows/build_examples.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: actions/checkout@v4
2121

2222
- name: Set up Python
23-
uses: actions/setup-python@v4
23+
uses: actions/setup-python@v5
2424
with:
2525
python-version: '3.x'
2626
cache: 'pip'
@@ -34,7 +34,7 @@ jobs:
3434
python continuous_integration/generate_job_matrix.py
3535
3636
- name: Store generated examples
37-
uses: actions/upload-artifact@v3
37+
uses: actions/upload-artifact@v4
3838
with:
3939
name: generated_examples
4040
path: |
@@ -83,7 +83,7 @@ jobs:
8383
run: |
8484
echo "Pull Request from the fork ${{ github.event.pull_request.head.repo.full_name }} at ${{ github.event.pull_request.head.ref }}"
8585
echo "LIBRARY_INSTALL_ZIP=https://github.com/${{ github.event.pull_request.head.repo.full_name }}/archive/${{ github.event.pull_request.head.ref }}.zip" >> $GITHUB_ENV
86-
echo "LIBRARY_INSTALL_GIT=https://github.com${{ github.event.pull_request.head.repo.full_name }}.git#${{ github.event.pull_request.head.ref }}" >> $GITHUB_ENV
86+
echo "LIBRARY_INSTALL_GIT=https://github.com/${{ github.event.pull_request.head.repo.full_name }}.git#${{ github.event.pull_request.head.ref }}" >> $GITHUB_ENV
8787
8888
- name: store enviroment variables as output
8989
id: store_vars
@@ -126,7 +126,7 @@ jobs:
126126
uses: arduino/setup-arduino-cli@v1.1.2
127127

128128
- name: Restore Arduino platforms and libraries
129-
uses: actions/cache@v3
129+
uses: actions/cache@v4
130130
id: cache_libraries
131131
with:
132132
path: |
@@ -150,7 +150,7 @@ jobs:
150150
sh continuous_integration/install-test-version-arduino-cli.sh
151151
152152
- name: Download the prepared examples
153-
uses: actions/download-artifact@v3
153+
uses: actions/download-artifact@v4
154154
with:
155155
name: generated_examples
156156
path: |
@@ -179,7 +179,7 @@ jobs:
179179
runs-on: ubuntu-latest
180180
needs: [generate_matrix, determine_library_source]
181181
env:
182-
LIBRARY_INSTALL_GIT: ${{ needs.determine_library_source.outputs.library_install_zip }}
182+
LIBRARY_INSTALL_GIT: ${{ needs.determine_library_source.outputs.library_install_git }}
183183
strategy:
184184
matrix:
185185
job_info: ${{ fromJSON(needs.generate_matrix.outputs.pio_job_matrix) }}
@@ -188,16 +188,16 @@ jobs:
188188
- uses: actions/checkout@v4
189189

190190
- name: Set up Python
191-
uses: actions/setup-python@v4
191+
uses: actions/setup-python@v5
192192
with:
193193
python-version: '3.x'
194194
cache: 'pip'
195195

196196
- name: Install python dependencies, including PlatformIO
197197
run: pip install -r continuous_integration/requirements.txt
198198

199-
- name: Restore PlatformIO and Arduino platforms and libraries
200-
uses: actions/cache@v3
199+
- name: Restore PlatformIO platforms and libraries
200+
uses: actions/cache@v4
201201
id: cache_libraries
202202
with:
203203
path: |
@@ -222,7 +222,7 @@ jobs:
222222
pio pkg install -g --library ${{ env.LIBRARY_INSTALL_GIT }}
223223
224224
- name: Download the prepared examples
225-
uses: actions/download-artifact@v3
225+
uses: actions/download-artifact@v4
226226
with:
227227
name: generated_examples
228228
path: |

.github/workflows/changelog_reminder.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ jobs:
1515
changelog_regex: '/CHANGELOG\/.*\/*.md'
1616
customPrMessage: 'Please add your changes to the change log!'
1717
env:
18-
GITHUB_TOKEN: ${{ secrets.SARA_PUSH_TOKEN }}
18+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/prepare_release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
echo "ZIP_NAME=$ZIP_FILE" >> $GITHUB_ENV
3131
3232
- name: Set up python
33-
uses: actions/setup-python@v4
33+
uses: actions/setup-python@v5
3434
with:
3535
python-version: '3.x'
3636

.github/workflows/verify_library_structure.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- uses: actions/checkout@v4
1818

1919
- name: Set up Python
20-
uses: actions/setup-python@v4
20+
uses: actions/setup-python@v5
2121
with:
2222
python-version: '3.x'
2323

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,3 +109,6 @@ continuous_integration_artifacts/*
109109
arduino_cli.log
110110
**/sensor_tests/*
111111
docs/Doxyfile.bak
112+
continuous_integration/output_check_component_inclusion.log
113+
continuous_integration/platformio_ci_local.ini
114+
pioScripts/install_shared_deps.py

ChangeLog.md

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,57 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1717
### Removed
1818

1919
### Fixed
20-
- Fixed GitHub actions for pull requests from forks.
2120

2221
***
2322

2423

24+
## [0.35.0]
25+
26+
### Changed
27+
- **BREAKING** Refactored how the publisher transmit buffer works. This will require adjustment to custom data publishers.
28+
- Update GitHub actions
29+
- Remove date from copyright for easier tracking
30+
- Turn modem off at end of setup, regardless of time
31+
- Clean function to set file timestamp on SD card
32+
- Use equation rather than table for CSQ
33+
- Only polling modem for enabled parameters
34+
- INCREASED THE MAXIMUM NUMBER OF VARIABLES FROM A SINGLE SENSOR and implemented an option to set this by build flag.
35+
- This will increase memory use for the entire library.
36+
If you are not using the GroPoint sensors which require many variables, I recommend you change this value via the build flag `-D MAX_NUMBER_VARS=8`
37+
- Allow all WiFi modems to first attempt to connect using existing on-modem saved credentials rather than immediately sending new credentials.
38+
- Add further debug printouts to the processor stats
39+
40+
### Added
41+
- Support [GroPoint Profile GPLP-8 Eight-Segment Soil Moisture and Temperature Profiling Probe](https://www.gropoint.com/products/soil-sensors/gropoint-profile)
42+
- Support [Vega Puls 21 Radar](https://www.vega.com/en-us/products/product-catalog/level/radar/vegapuls-21)
43+
- Functions to enable and disable modem metadata polling by bitmask
44+
45+
### Removed
46+
- Removed the (unused) sendOffset parameter from dataPublisherBase.
47+
48+
### Fixed
49+
- Minor bug fixes for XBee Wifi
50+
- Handle no SIM card response from SIM7080G (EnviroDIY LTE Bee)
51+
- Fixed Keller debugging output.
52+
- Fixed file reference for SDFat 2.2.3
53+
54+
### Known Issues
55+
- The modem hardware, firmware, and serial number is only implemented for the Digi XBee WiFi.
56+
57+
## [0.34.1]
58+
59+
### Changed
60+
- Incorporated improvements to the XBee Wifi - from [neilh10](https://github.com/EnviroDIY/ModularSensors/commits?author=neilh10)
61+
- #347 -WiFi S6B stability - tears dwon TCP/IP before going to sleep, doesn't automatically poll for meta data
62+
63+
### Added
64+
- Added the ability to enable or disable polling of modem attached variables.
65+
By default, all polling is off, but polling is enabled for a modem sensor when a sensor is created and attached to a modem.
66+
This functionailty is inspired from [neilh10](https://github.com/EnviroDIY/ModularSensors/commits?author=neilh10).
67+
68+
### Fixed
69+
- Fixed GitHub actions for pull requests from forks.
70+
2571
## [0.34.0]
2672

2773
### Changed

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Software License Agreement (BSD-3 License)
22

3-
**Copyright (c) 2010-2017, Stroud Water Research Center (SWRC) and the EnviroDIY Development Team.**
3+
**Copyright (c) 2010-2024, Stroud Water Research Center (SWRC) and the EnviroDIY Development Team.**
44
All rights reserved.
55

66
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,9 @@ For some generalized information about attaching sensors to an Arduino style boa
6262
- [Decagon Devices ES-2: conductivity ](https://envirodiy.github.io/ModularSensors/group__sensor__es2.html)
6363
- [Decagon Devices CTD-10: conductivity, temperature & depth ](https://envirodiy.github.io/ModularSensors/group__sensor__decagon__ctd.html)
6464
- [Everlight ALS-PT19 Analog Light Sensor (via processor ADC)](https://envirodiy.github.io/ModularSensors/group__sensor__alspt19.html)
65-
- [Freescale Semiconductor MPL115A2: barometric pressure and temperature](https://envirodiy.github.io/ModularSensors/group__sensor__mpl115a2.html)
6665
- [External Arduino I2C Rain Tipping Bucket Counter: rainfall totals](https://envirodiy.github.io/ModularSensors/group__sensor__i2c__rain.html)
66+
- [Freescale Semiconductor MPL115A2: barometric pressure and temperature](https://envirodiy.github.io/ModularSensors/group__sensor__mpl115a2.html)
67+
- [GroPoint Profile GPLP-8 Eight-Segment Soil Moisture and Temperature Profiling Probe](https://envirodiy.github.io/ModularSensors/group__sensor__gplp8.html)
6768
- [In-Situ RDO PRO-X: dissolved oxygen](https://envirodiy.github.io/ModularSensors/group__sensor__insitu__rdo.html)
6869
- [In-Situ SDI-12 TROLLs: pressure, temperature, and depth](https://envirodiy.github.io/ModularSensors/group__sensor__insitu__troll.html)
6970
- [Keller Submersible Level Transmitters: pressure and temperature](https://envirodiy.github.io/ModularSensors/group__keller__group.html)
@@ -82,6 +83,7 @@ For some generalized information about attaching sensors to an Arduino style boa
8283
- [TI ADS1115: external voltage with support for divided current](https://envirodiy.github.io/ModularSensors/group__sensor__ads1x15.html)
8384
- [TI INA219: current, voltage, and power draw](https://envirodiy.github.io/ModularSensors/group__sensor__ina219.html)
8485
- [Turner Cyclops-7F: various parameters](https://envirodiy.github.io/ModularSensors/group__sensor__cyclops.html)
86+
- [Vega Puls 21: radar distance](https://envirodiy.github.io/ModularSensors/group__sensor__vega__puls21.html)
8587
- [Yosemitech: water quality sensors](https://envirodiy.github.io/ModularSensors/group__yosemitech__group.html)
8688
- [Y502-A or Y504-A: Optical DO and Temperature](https://envirodiy.github.io/ModularSensors/group__sensor__y504.html)
8789
- [Y510-B: Optical Turbidity and Temperature](https://envirodiy.github.io/ModularSensors/group__sensor__y510.html)

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.34.0
1+
0.35.0

0 commit comments

Comments
 (0)