Commit Graph

508 Commits

Author SHA1 Message Date
Vitor de Miranda Henrique
2ebcc4fcda Merge pull request #441 from d-buchmann/master
Resolve merge conflicts for adding BME680
2021-12-07 08:56:21 -06:00
d-buchmann
cbc9048799 remove unneeded parens 2021-12-02 10:49:52 +01:00
d-buchmann
190b11b41d copy&paste from read_bme280_temp() 2021-11-18 17:02:50 +01:00
d-buchmann
e8dd4184e2 tabs to spaces 2021-11-18 15:09:30 +01:00
d-buchmann
40248545bb change tab indent size to 4 2021-11-18 15:07:20 +01:00
d-buchmann
33338d5ec8 fix indentation in __init__.py 2021-11-17 20:27:22 +01:00
d-buchmann
b4cb5a82a4 fix indentation in bme680.py 2021-11-17 20:20:05 +01:00
d-buchmann
5068f0e4b8 Merge branch 'master' into master 2021-11-17 15:33:19 +01:00
d-buchmann
7170ef2ecb Add bme680 lib as requirement 2021-11-17 15:30:35 +01:00
d-buchmann
a630111ff1 Remove dead code 2021-11-17 15:27:11 +01:00
Vitor de Miranda Henrique
770e550159 Merge pull request #444 from thijstriemstra/patch-1 2021-11-10 06:04:05 -03:00
Vitor de Miranda Henrique
4980899bfd Merge pull request #450 from DragRedSim/master
Changed README.md to new Adafruit_DHT library
2021-11-04 11:19:02 -03:00
David Ross Smith
4ca82c1036 Changed README.md to new Adafruit_DHT library
The library used has changed, but the instructions were never updated to explain how to install the new library. This corrects that oversight.
2021-11-01 18:36:05 +11:00
Thijs Triemstra
20312381d5 restore __main__ 2021-10-27 02:15:32 +02:00
Thijs Triemstra
c32b20832c doc update 2021-10-27 02:12:18 +02:00
Thijs Triemstra
8d1e339086 move bus declaration 2021-10-27 02:03:53 +02:00
Thijs Triemstra
5798c8e313 use sys.executable 2021-10-26 21:43:17 +02:00
Thijs Triemstra
f06e1e6d57 use RPi.bme280 2021-10-26 21:40:51 +02:00
Thijs Triemstra
ea393e7ee1 use RPi.bme280 2021-10-26 21:37:55 +02:00
buchmann
3bdbd12d7d Resolve merge conflicts for adding BME680 2021-10-19 09:44:06 +02:00
Vitor de Miranda Henrique
c9f16bf33f Update setup.py 4.13.2 2021-10-18 09:00:50 -05:00
Vitor de Miranda Henrique
c970fff801 gpiozero missing 2021-10-18 08:58:05 -05:00
Vitor de Miranda Henrique
42448f8102 gitignore update 2021-10-17 20:44:03 -05:00
Vitor de Miranda Henrique
ae2091c198 Merge branch 'master' of github.com:vitormhenrique/OctoPrint-Enclosure 4.13.1 2021-10-17 16:44:33 -05:00
Vitor de Miranda Henrique
d30a3d4afd fixing shutdown_on_error 2021-10-17 16:43:12 -05:00
Vitor de Miranda Henrique
84d03b6ffa Merge pull request #369 from ShagoY/master
Update __init__.py for BME280 for Octoprint (Python3.7)
2021-10-17 16:16:17 -05:00
Vitor de Miranda Henrique
072a1e5f83 Merge pull request #380 from coliss86/patch-1
Enhanced formatting with markdown of the readme
2021-10-17 16:16:07 -05:00
Vitor de Miranda Henrique
5f8bb6abe0 Merge branch 'master' into patch-1 2021-10-17 16:16:02 -05:00
Vitor de Miranda Henrique
8af8f27131 Merge pull request #404 from sschueller/master
Added Raspberry Pi CPU Temp
2021-10-17 16:13:07 -05:00
Vitor de Miranda Henrique
ab69ff7ae9 Merge pull request #439 from Dak0r/feature/shutdown_on_error 2021-10-13 21:56:25 -05:00
Stefan Schueller
b53344c057 Merge branch 'vitormhenrique-master' 2021-10-13 21:25:39 +02:00
Stefan Schueller
670d96be55 Merge branch 'master' of https://github.com/vitormhenrique/OctoPrint-Enclosure into vitormhenrique-master 2021-10-13 21:24:03 +02:00
Daniel Korgel
fc66d3a92b Fixed Line Ending in __init__.py 2021-10-13 20:39:45 +02:00
Daniel Korgel
7d40dec319 Removed debug logs 2021-10-13 20:37:37 +02:00
Daniel Korgel
262baca587 Fixed typos in settings description 2021-10-13 20:34:02 +02:00
Daniel Korgel
a6672b2907 Merge remote-tracking branch 'upstream/master' into feature/shutdown_on_error 2021-10-13 19:50:52 +02:00
Vitor de Miranda Henrique
e2817cc1b8 Merge pull request #392 from Dak0r/graph-pr-branch
Implemented temperature and humidity display in graph
2021-10-13 12:44:14 -05:00
Vitor de Miranda Henrique
9120c06587 Merge pull request #428 from unsplorer/DHT_Fix
adapt getDHTTemp.py to python3
2021-10-13 12:41:10 -05:00
Vitor de Miranda Henrique
c2b1819e22 Merge pull request #431 from pciavald/patch-1
add description to the output id argument
2021-10-13 12:38:49 -05:00
Vitor de Miranda Henrique
ac8929842c Update README.md 2021-10-13 12:38:11 -05:00
Vitor de Miranda Henrique
a4d17ae339 Merge pull request #419 from qtemp/master
Change read_raw_i2c_temp to return temp and humidity
2021-10-13 12:37:01 -05:00
Vitor de Miranda Henrique
bcde876786 Merge pull request #433 from hucker/patch-1
Update enclosure_settings.jinja2
2021-10-13 12:36:32 -05:00
Vitor de Miranda Henrique
a15863ba7f Merge pull request #436 from ademuri/master
Add option for pullup for DS18B20
2021-10-13 12:35:57 -05:00
Vitor de Miranda Henrique
37d7b77994 Merge pull request #438 from jneilliii/patch-1
fix deprecated payload in PrintDone event
2021-10-13 12:35:44 -05:00
Daniel Korgel
0d743fda49 Updated settings description text 2021-10-13 14:55:17 +02:00
Daniel Korgel
af58d60009 Merge branch 'graph-pr-branch' into feature/shutdown_on_error 2021-10-13 14:52:35 +02:00
Daniel Korgel
21281c9711 incremented settings version number 2021-10-13 14:40:11 +02:00
Daniel Korgel
28fbe7bec3 Merge remote-tracking branch 'upstream/master' into graph-pr-branch 2021-10-13 14:34:35 +02:00
jneilliii
528e3e8a2c fix deprecated payload in PrintDone event
This should resolve the error associated with #432
2021-10-13 00:48:40 -04:00
Adam Demuri
d615faef8d Add option for pullup for DS18B20
These sensors need a pullup resistor on the data pin. Instead of using
an external pullup, this adds an option to use an internal pullup.
2021-10-08 21:51:37 -06:00