Skip to content

Commit 2a9457c

Browse files
committed
Merge branch 'develop' into hmac_auth
2 parents 03a9279 + eede35f commit 2a9457c

File tree

11 files changed

+304
-231
lines changed

11 files changed

+304
-231
lines changed

.github/workflows/build_documentation.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149
150150
- name: Deploy to github pages
151151
if: "(github.event_name == 'release' && github.event.action == 'published') || (github.event_name == 'workflow_dispatch' && github.event.inputs.publish == 'true')"
152-
uses: peaceiris/[email protected].0
152+
uses: peaceiris/[email protected].2
153153
with:
154154
github_token: ${{ secrets.GITHUB_TOKEN }}
155155
publish_dir: ${{ github.workspace }}/code_docs/ModularSensorsDoxygen/m.css

.github/workflows/prepare_release.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,57 +47,57 @@ jobs:
4747
4848
- name: Install ModularSensors from the master branch
4949
run: |
50-
pio pkg install -g --library https://github.com/EnviroDIY/ModularSensors
50+
pio pkg install -g -l https://github.com/EnviroDIY/ModularSensors
5151
5252
# Uninstall graphics libraries from Adafruit
5353
- name: Uninstall Adafruit GFX Library library
5454
continue-on-error: true
5555
run: |
5656
echo "::debug::Removing Adafruit GFX Library"
57-
pio pkg uninstall --library -g adafruit/Adafruit GFX Library
57+
pio pkg uninstall -g -l "adafruit/Adafruit GFX Library"
5858
5959
- name: Uninstall Adafruit NeoPixel library
6060
continue-on-error: true
6161
run: |
6262
echo "::debug::Removing Adafruit NeoPixel"
63-
pio pkg uninstall --library -g adafruit/Adafruit NeoPixel
63+
pio pkg uninstall -g -l "adafruit/Adafruit NeoPixel"
6464
6565
- name: Uninstall Adafruit SSD1306 library
6666
continue-on-error: true
6767
run: |
6868
echo "::debug::Removing Adafruit SSD1306"
69-
pio pkg uninstall --library -g adafruit/Adafruit SSD1306
69+
pio pkg uninstall -g -l "adafruit/Adafruit SSD1306"
7070
7171
- name: Uninstall Adafruit ADXL343 library
7272
continue-on-error: true
7373
run: |
7474
echo "::debug::Removing Adafruit ADXL343"
75-
pio pkg uninstall --library -g adafruit/Adafruit ADXL343
75+
pio pkg uninstall -g -l "adafruit/Adafruit ADXL343"
7676
7777
- name: Uninstall Adafruit STMPE610 library
7878
continue-on-error: true
7979
run: |
8080
echo "::debug::Removing Adafruit STMPE610"
81-
pio pkg uninstall --library -g adafruit/Adafruit STMPE610
81+
pio pkg uninstall -g -l "adafruit/Adafruit STMPE610"
8282
8383
- name: Uninstall Adafruit TouchScreen library
8484
continue-on-error: true
8585
run: |
8686
echo "::debug::Removing Adafruit TouchScreen"
87-
pio pkg uninstall --library -g adafruit/Adafruit TouchScreen
87+
pio pkg uninstall -g -l "adafruit/Adafruit TouchScreen"
8888
8989
- name: Uninstall Adafruit ILI9341 library
9090
continue-on-error: true
9191
run: |
9292
echo "::debug::Removing Adafruit ILI9341"
93-
pio pkg uninstall --library -g adafruit/Adafruit ILI9341
93+
pio pkg uninstall -g -l "adafruit/Adafruit ILI9341"
9494
9595
# zip up all the installed libraries
9696
# need to cd into the pio directory so we don't get extra junk directories
9797
- name: Zip libraries
9898
run: |
9999
echo "::debug::Listing global libraries"
100-
pio pkg list --library -g -v
100+
pio pkg list -g -v --only-libraries
101101
echo "::debug::Zipping global libraries"
102102
cd /home/runner/.platformio/
103103
zip ${{ env.ZIP_NAME }}.zip -r lib
@@ -151,7 +151,7 @@ jobs:
151151
# Create a new release
152152
- name: Create release
153153
id: create_release
154-
uses: softprops/[email protected].14
154+
uses: softprops/[email protected].15
155155
env:
156156
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
157157
with:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,3 +108,4 @@ compile_results.log
108108
continuous_integration_artifacts/*
109109
arduino_cli.log
110110
**/sensor_tests/*
111+
docs/Doxyfile.bak

ChangeLog.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3434
- Specify python version 3.x for actions (used by PlatformIO)
3535

3636
### Added
37-
- Support Campbell RainVUE10 SDI-12 Precipitation Sensor (#416)
37+
- Support Campbell RainVUE10 SDI-12 Precipitation Sensor [#416](https://github.com/EnviroDIY/ModularSensors/issues/416)
3838
- Support YosemiTech Y700 Pressor Sensor ([#421](https://github.com/EnviroDIY/ModularSensors/issues/421))
3939

4040
### Removed
@@ -44,6 +44,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
4444
- Fixed non-concurrent data fetch for SDI-12 when *NOT* using debugging.
4545
- Fixed internet connection when in "testing mode"
4646
- Allow a non-zero wait time for SDI-12 sensors
47+
- Fixed outdated GitHub actions
4748

4849
***
4950

README.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ There is extensive documentation available in the [ModularSensors github pages](
2626
[//]: # ( @m_footernavigation )
2727

2828
[//]: # ( Start GitHub Only )
29-
- [ModularSensors](#modularsensors)
30-
- [The EnviroDIY ModularSensors Library](#the-envirodiy-modularsensors-library)
31-
- [Supported Sensors](#supported-sensors)
32-
- [Data Endpoints](#data-endpoints)
33-
- [Supported Cellular/Wifi Modules:](#supported-cellularwifi-modules)
34-
- [Contributing](#contributing)
35-
- [License](#license)
36-
- [Acknowledgments](#acknowledgments)
29+
- [ModularSensors ](#modularsensors-)
30+
- [The EnviroDIY ModularSensors Library ](#the-envirodiy-modularsensors-library-)
31+
- [Supported Sensors ](#supported-sensors-)
32+
- [Data Endpoints ](#data-endpoints-)
33+
- [Supported Cellular/Wifi Modules: ](#supported-cellularwifi-modules-)
34+
- [Contributing ](#contributing-)
35+
- [License ](#license-)
36+
- [Acknowledgments ](#acknowledgments-)
3737

3838
[//]: # ( End GitHub Only )
3939

@@ -58,6 +58,7 @@ For some generalized information about attaching sensors to an Arduino style boa
5858
- [Bosch BMP388 and BMP390: barometric pressure & temperature](https://envirodiy.github.io/ModularSensors/group__sensor__bmp3xx.html)
5959
- [Campbell Scientific OBS-3+: turbidity, via TI ADS1115](https://envirodiy.github.io/ModularSensors/group__sensor__obs3.html)
6060
- [Campbell Scientific ClariVUE10: turbidity](https://envirodiy.github.io/ModularSensors/group__sensor__clarivue.html)
61+
- [Campbell Scientific RainVUE10: precipitation](https://envirodiy.github.io/ModularSensors/group__sensor__rainvue.html)
6162
- [Decagon Devices ES-2: conductivity ](https://envirodiy.github.io/ModularSensors/group__sensor__es2.html)
6263
- [Decagon Devices CTD-10: conductivity, temperature & depth ](https://envirodiy.github.io/ModularSensors/group__sensor__decagon__ctd.html)
6364
- [Everlight ALS-PT19 Analog Light Sensor (via processor ADC)](https://envirodiy.github.io/ModularSensors/group__sensor__alspt19.html)
@@ -91,6 +92,7 @@ For some generalized information about attaching sensors to an Arduino style boa
9192
- [Y533: ORP, and Temperature](https://envirodiy.github.io/ModularSensors/group__sensor__y533.html)
9293
- [Y551: UV254/COD, Turbidity, and Temperature](https://envirodiy.github.io/ModularSensors/group__sensor__y551.html)
9394
- [Y560: Ammonium, Temperature, and pH](https://envirodiy.github.io/ModularSensors/group__sensor__y560.html)
95+
- [Y700: Pressure and Temperature](https://envirodiy.github.io/ModularSensors/group__sensor__y700.html)
9496
- [Y4000 Multiparameter Sonde](https://envirodiy.github.io/ModularSensors/group__sensor__y4000.html)
9597
- [Zebra-Tech D-Opto: dissolved oxygen](https://envirodiy.github.io/ModularSensors/group__sensor__dopto.html)
9698

continuous_integration/generate-documentation.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ python fixSectionsInXml.py
3737
# echo "\n\e[32mFixing copied function documentation in group documentation\e[0m"
3838
# python fixFunctionsInGroups.py
3939

40-
python $GITHUB_WORKSPACE/code_docs/m.css/documentation/doxygen.py "mcss-conf.py" --no-doxygen --output "$GITHUB_WORKSPACE/code_docs/ModularSensors/docs/output_mcss.log" --templates "$GITHUB_WORKSPACE/code_docs/m.css/documentation/templates/EnviroDIY" --debug
40+
python $GITHUB_WORKSPACE/code_docs/m.css/documentation/doxygen.py "mcss-conf.py" --no-doxygen --output "$GITHUB_WORKSPACE/code_docs/ModularSensors/docs/output_mcss.log" --templates "$GITHUB_WORKSPACE/code_docs/m.css/documentation/templates/EnviroDIY"
4141

4242
echo "\n\e[32mCopying function documentation\e[0m"
4343
python copyFunctions.py

0 commit comments

Comments
 (0)