Skip to content

Commit 7a4dcb8

Browse files
committed
cleanup
1 parent 1a986ba commit 7a4dcb8

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

adafruit_ms8607.py

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ def _set_calibration_consts(self):
183183
self._calibration_constants = constants
184184

185185
@property
186-
def pressure_temperature(self):
186+
def pressure_and_temperature(self):
187187
"""Pressure and Temperature, measured at the same time"""
188188
raw_temperature, raw_pressure = self._read_temp_pressure()
189189

@@ -305,22 +305,21 @@ def _dt(self, raw_temperature):
305305
@property
306306
def temperature(self):
307307
"""The current temperature in degrees Celcius"""
308-
return self.pressure_temperature[0]
308+
return self.pressure_and_temperature[0]
309309

310310
@property
311311
def pressure(self):
312312
"""The current barometric pressure in hPa"""
313-
return self.pressure_temperature[1]
313+
return self.pressure_and_temperature[1]
314314

315315
@property
316316
def relative_humidity(self):
317317
"""The current relative humidity in % rH"""
318318

319-
# self._buffer.clear()
320319
self._buffer[0] = _MS8607_HUM_CMD_READ_NO_HOLD
321320
with self.humidity_i2c_device as i2c:
322321
i2c.write(self._buffer, end=1)
323-
sleep(0.016) # _i2cPort->requestFrom((uint8_t)MS8607_HSENSOR_ADDR, 3U)
322+
sleep(0.016)
324323

325324
with self.humidity_i2c_device as i2c:
326325
i2c.readinto(self._buffer, end=3)
@@ -420,12 +419,3 @@ def _check_press_calibration_crc(calibration_int16s, crc):
420419
n_rem >>= 12
421420
calibration_int16s[0] = crc_read
422421
return n_rem == crc
423-
424-
425-
# psensor_reset(void)
426-
# hsensor_reset(void)
427-
# void set_humidity_i2c_master_mode(enum MS8607_humidity_i2c_master_mode mode)
428-
# disable_heater(void)
429-
# enable_heater(void)
430-
# get_heater_status(enum MS8607_heater_status *heater)
431-
# get_dew_point(float temperature, float relative_humidity,

0 commit comments

Comments
 (0)