Resolve merge conflicts for adding BME680 #441

Merged
d-buchmann merged 10 commits from master into master 2021-12-07 14:56:22 +00:00

10 Commits

Author SHA1 Message Date
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
buchmann
3bdbd12d7d Resolve merge conflicts for adding BME680 2021-10-19 09:44:06 +02:00