Skip to content

Commit ff900f9

Browse files
authored
Merge pull request #240 from EnviroDIY/develop
Develop
2 parents cbf64a6 + eea2a85 commit ff900f9

File tree

103 files changed

+5184
-1893
lines changed

Some content is hidden

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

103 files changed

+5184
-1893
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,8 @@ include/readme.txt
6565
.vscode
6666

6767
# Other
68-
sensor_tests/
6968
compile_tests/
70-
logger_test/
69+
logger_test*/
7170
YosemitechDO/
7271
LongTermLogger/
7372
barometric_correction/

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@ Although this library was written primarily for the [EnviroDIY Mayfly data logge
2323
- [Apogee SQ-212: quantum light sensor, via TI ADS1115](https://github.com/EnviroDIY/ModularSensors/wiki/Apogee-SQ212)
2424
- [AOSong AM2315: humidity & temperature](https://github.com/EnviroDIY/ModularSensors/wiki/AOSong-AM2315)
2525
- [AOSong DHT: humidity & temperature](https://github.com/EnviroDIY/ModularSensors/wiki/AOSong-DHT)
26+
- [Atlas Scientific EZO Sensors](https://github.com/EnviroDIY/ModularSensors/wiki/Atlas-Sensors)
27+
- EZO-CO2: Carbon Dioxide and Temperature
28+
- EZO-DO: Dissolved Oxygen
29+
- EZO-EC: Conductivity, Total Dissolved Solids, Salinity, and Specific Gravity
30+
- EZO-ORP: Oxidation/Reduction Potential
31+
- EZO-pH: pH
32+
- EZO-RTD: Temperature
2633
- [Bosch BME280: barometric pressure, humidity & temperature](https://github.com/EnviroDIY/ModularSensors/wiki/Bosch-BME280)
2734
- [Campbell Scientific OBS-3+: turbidity, via TI ADS1115](https://github.com/EnviroDIY/ModularSensors/wiki/Campbell-OBS3)
2835
- [Meter Environmental ECH2O 5TM (formerly Decagon Devices 5TM): soil moisture](https://github.com/EnviroDIY/ModularSensors/wiki/Meter-ECH2O-5TM)
7.91 MB
Binary file not shown.

doc/AtlasScientific_DO_probe.pdf

760 KB
Binary file not shown.
9.49 MB
Binary file not shown.
780 KB
Binary file not shown.
782 KB
Binary file not shown.
782 KB
Binary file not shown.
3.23 MB
Binary file not shown.
7.72 MB
Binary file not shown.

0 commit comments

Comments
 (0)