Skip to content

Commit 06c76fe

Browse files
argument and return types for functions in the base class
1 parent 72bc584 commit 06c76fe

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

adafruit_bme680.py

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ class Adafruit_BME680:
120120
:param int refresh_rate: Maximum number of readings per second. Faster property reads
121121
will be from the previous reading."""
122122

123-
def __init__(self, *, refresh_rate=10):
123+
def __init__(self, *, refresh_rate: int = 10) -> None:
124124
"""Check the BME680 was found, read the coefficients and enable the sensor for continuous
125125
reads."""
126126
self._write(_BME680_REG_SOFTRESET, [0xB6])
@@ -160,62 +160,62 @@ def __init__(self, *, refresh_rate=10):
160160
self._min_refresh_time = 1 / refresh_rate
161161

162162
@property
163-
def pressure_oversample(self):
163+
def pressure_oversample(self) -> int:
164164
"""The oversampling for pressure sensor"""
165165
return _BME680_SAMPLERATES[self._pressure_oversample]
166166

167167
@pressure_oversample.setter
168-
def pressure_oversample(self, sample_rate):
168+
def pressure_oversample(self, sample_rate: int) -> None:
169169
if sample_rate in _BME680_SAMPLERATES:
170170
self._pressure_oversample = _BME680_SAMPLERATES.index(sample_rate)
171171
else:
172172
raise RuntimeError("Invalid oversample")
173173

174174
@property
175-
def humidity_oversample(self):
175+
def humidity_oversample(self) -> int:
176176
"""The oversampling for humidity sensor"""
177177
return _BME680_SAMPLERATES[self._humidity_oversample]
178178

179179
@humidity_oversample.setter
180-
def humidity_oversample(self, sample_rate):
180+
def humidity_oversample(self, sample_rate: int) -> None:
181181
if sample_rate in _BME680_SAMPLERATES:
182182
self._humidity_oversample = _BME680_SAMPLERATES.index(sample_rate)
183183
else:
184184
raise RuntimeError("Invalid oversample")
185185

186186
@property
187-
def temperature_oversample(self):
187+
def temperature_oversample(self) -> int:
188188
"""The oversampling for temperature sensor"""
189189
return _BME680_SAMPLERATES[self._temp_oversample]
190190

191191
@temperature_oversample.setter
192-
def temperature_oversample(self, sample_rate):
192+
def temperature_oversample(self, sample_rate: int) -> None:
193193
if sample_rate in _BME680_SAMPLERATES:
194194
self._temp_oversample = _BME680_SAMPLERATES.index(sample_rate)
195195
else:
196196
raise RuntimeError("Invalid oversample")
197197

198198
@property
199-
def filter_size(self):
199+
def filter_size(self) -> int:
200200
"""The filter size for the built in IIR filter"""
201201
return _BME680_FILTERSIZES[self._filter]
202202

203203
@filter_size.setter
204-
def filter_size(self, size):
204+
def filter_size(self, size: int) -> None:
205205
if size in _BME680_FILTERSIZES:
206206
self._filter = _BME680_FILTERSIZES.index(size)
207207
else:
208208
raise RuntimeError("Invalid size")
209209

210210
@property
211-
def temperature(self):
211+
def temperature(self) -> float:
212212
"""The compensated temperature in degrees Celsius."""
213213
self._perform_reading()
214214
calc_temp = ((self._t_fine * 5) + 128) / 256
215215
return calc_temp / 100
216216

217217
@property
218-
def pressure(self):
218+
def pressure(self) -> float:
219219
"""The barometric pressure in hectoPascals"""
220220
self._perform_reading()
221221
var1 = (self._t_fine / 2) - 64000
@@ -242,12 +242,12 @@ def pressure(self):
242242
return calc_pres / 100
243243

244244
@property
245-
def relative_humidity(self):
245+
def relative_humidity(self) -> float:
246246
"""The relative humidity in RH %"""
247247
return self.humidity
248248

249249
@property
250-
def humidity(self):
250+
def humidity(self) -> float:
251251
"""The relative humidity in RH %"""
252252
self._perform_reading()
253253
temp_scaled = ((self._t_fine * 5) + 128) / 256
@@ -284,14 +284,14 @@ def humidity(self):
284284
return calc_hum
285285

286286
@property
287-
def altitude(self):
287+
def altitude(self) -> float:
288288
"""The altitude based on current :attr:`pressure` vs the sea level pressure
289289
(:attr:`sea_level_pressure`) - which you must enter ahead of time)"""
290290
pressure = self.pressure # in Si units for hPascal
291291
return 44330 * (1.0 - math.pow(pressure / self.sea_level_pressure, 0.1903))
292292

293293
@property
294-
def gas(self):
294+
def gas(self) -> int:
295295
"""The gas resistance in ohms"""
296296
self._perform_reading()
297297
if self._chip_variant == 0x01:
@@ -311,7 +311,7 @@ def gas(self):
311311
calc_gas_res = (var3 + (var2 / 2)) / var2
312312
return int(calc_gas_res)
313313

314-
def _perform_reading(self):
314+
def _perform_reading(self) -> None:
315315
"""Perform a single-shot reading from the sensor and fill internal data structure for
316316
calculations"""
317317
if time.monotonic() - self._last_reading < self._min_refresh_time:
@@ -357,7 +357,7 @@ def _perform_reading(self):
357357
var3 = (var3 * self._temp_calibration[2] * 16) / 16384
358358
self._t_fine = int(var2 + var3)
359359

360-
def _read_calibration(self):
360+
def _read_calibration(self) -> None:
361361
"""Read & save the calibration coefficients"""
362362
coeff = self._read(_BME680_BME680_COEFF_ADDR1, 25)
363363
coeff += self._read(_BME680_BME680_COEFF_ADDR2, 16)
@@ -381,14 +381,14 @@ def _read_calibration(self):
381381
self._heat_val = self._read_byte(0x00)
382382
self._sw_err = (self._read_byte(0x04) & 0xF0) / 16
383383

384-
def _read_byte(self, register):
384+
def _read_byte(self, register: int) -> int:
385385
"""Read a byte register value and return it"""
386386
return self._read(register, 1)[0]
387387

388-
def _read(self, register, length):
388+
def _read(self, register: int, length: int) -> None:
389389
raise NotImplementedError()
390390

391-
def _write(self, register, values):
391+
def _write(self, register: int, values) -> None:
392392
raise NotImplementedError()
393393

394394

0 commit comments

Comments
 (0)