Skip to content

Commit

Permalink
Merge branch 'develop' into hmac_auth
Browse files Browse the repository at this point in the history
  • Loading branch information
aufdenkampe committed Mar 16, 2023
2 parents 03a9279 + eede35f commit 2a9457c
Show file tree
Hide file tree
Showing 11 changed files with 304 additions and 231 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_documentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ jobs:
- name: Deploy to github pages
if: "(github.event_name == 'release' && github.event.action == 'published') || (github.event_name == 'workflow_dispatch' && github.event.inputs.publish == 'true')"
uses: peaceiris/[email protected].0
uses: peaceiris/[email protected].2
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ${{ github.workspace }}/code_docs/ModularSensorsDoxygen/m.css
20 changes: 10 additions & 10 deletions .github/workflows/prepare_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,57 +47,57 @@ jobs:
- name: Install ModularSensors from the master branch
run: |
pio pkg install -g --library https://github.com/EnviroDIY/ModularSensors
pio pkg install -g -l https://github.com/EnviroDIY/ModularSensors
# Uninstall graphics libraries from Adafruit
- name: Uninstall Adafruit GFX Library library
continue-on-error: true
run: |
echo "::debug::Removing Adafruit GFX Library"
pio pkg uninstall --library -g adafruit/Adafruit GFX Library
pio pkg uninstall -g -l "adafruit/Adafruit GFX Library"
- name: Uninstall Adafruit NeoPixel library
continue-on-error: true
run: |
echo "::debug::Removing Adafruit NeoPixel"
pio pkg uninstall --library -g adafruit/Adafruit NeoPixel
pio pkg uninstall -g -l "adafruit/Adafruit NeoPixel"
- name: Uninstall Adafruit SSD1306 library
continue-on-error: true
run: |
echo "::debug::Removing Adafruit SSD1306"
pio pkg uninstall --library -g adafruit/Adafruit SSD1306
pio pkg uninstall -g -l "adafruit/Adafruit SSD1306"
- name: Uninstall Adafruit ADXL343 library
continue-on-error: true
run: |
echo "::debug::Removing Adafruit ADXL343"
pio pkg uninstall --library -g adafruit/Adafruit ADXL343
pio pkg uninstall -g -l "adafruit/Adafruit ADXL343"
- name: Uninstall Adafruit STMPE610 library
continue-on-error: true
run: |
echo "::debug::Removing Adafruit STMPE610"
pio pkg uninstall --library -g adafruit/Adafruit STMPE610
pio pkg uninstall -g -l "adafruit/Adafruit STMPE610"
- name: Uninstall Adafruit TouchScreen library
continue-on-error: true
run: |
echo "::debug::Removing Adafruit TouchScreen"
pio pkg uninstall --library -g adafruit/Adafruit TouchScreen
pio pkg uninstall -g -l "adafruit/Adafruit TouchScreen"
- name: Uninstall Adafruit ILI9341 library
continue-on-error: true
run: |
echo "::debug::Removing Adafruit ILI9341"
pio pkg uninstall --library -g adafruit/Adafruit ILI9341
pio pkg uninstall -g -l "adafruit/Adafruit ILI9341"
# zip up all the installed libraries
# need to cd into the pio directory so we don't get extra junk directories
- name: Zip libraries
run: |
echo "::debug::Listing global libraries"
pio pkg list --library -g -v
pio pkg list -g -v --only-libraries
echo "::debug::Zipping global libraries"
cd /home/runner/.platformio/
zip ${{ env.ZIP_NAME }}.zip -r lib
Expand Down Expand Up @@ -151,7 +151,7 @@ jobs:
# Create a new release
- name: Create release
id: create_release
uses: softprops/[email protected].14
uses: softprops/[email protected].15
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,4 @@ compile_results.log
continuous_integration_artifacts/*
arduino_cli.log
**/sensor_tests/*
docs/Doxyfile.bak
3 changes: 2 additions & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Specify python version 3.x for actions (used by PlatformIO)

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

### Removed
Expand All @@ -44,6 +44,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- 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
- Fixed outdated GitHub actions

***

Expand Down
18 changes: 10 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ There is extensive documentation available in the [ModularSensors github pages](
[//]: # ( @m_footernavigation )

[//]: # ( Start GitHub Only )
- [ModularSensors](#modularsensors)
- [The EnviroDIY ModularSensors Library](#the-envirodiy-modularsensors-library)
- [Supported Sensors](#supported-sensors)
- [Data Endpoints](#data-endpoints)
- [Supported Cellular/Wifi Modules:](#supported-cellularwifi-modules)
- [Contributing](#contributing)
- [License](#license)
- [Acknowledgments](#acknowledgments)
- [ModularSensors ](#modularsensors-)
- [The EnviroDIY ModularSensors Library ](#the-envirodiy-modularsensors-library-)
- [Supported Sensors ](#supported-sensors-)
- [Data Endpoints ](#data-endpoints-)
- [Supported Cellular/Wifi Modules: ](#supported-cellularwifi-modules-)
- [Contributing ](#contributing-)
- [License ](#license-)
- [Acknowledgments ](#acknowledgments-)

[//]: # ( End GitHub Only )

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

Expand Down
2 changes: 1 addition & 1 deletion continuous_integration/generate-documentation.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ python fixSectionsInXml.py
# echo "\n\e[32mFixing copied function documentation in group documentation\e[0m"
# python fixFunctionsInGroups.py

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
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"

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

4 comments on commit 2a9457c

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lint_errors

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All sensor and variable subclasses must be included in the Menu a la Carte example
missing_menu_docs

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All sensor and variable subclasses must be included in the Menu a la Carte example
missing_menu_docs

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lint_errors

Please sign in to comment.