cn/python-bme680
1
0
Fork 0
mirror of https://github.com/cmur2/python-bme680.git synced 2024-12-22 22:54:29 +01:00
Code Releases Activity

Fix Python 3 TypeError crashes by using floor division explicitly

Browse Source 
The / operator in Python 3 returns a float, which was causing TypeErrors
when being passed to the << or >> operators.
This commit is contained in:
Dave Arter 2017-11-19 17:10:27 +00:00
parent d9970151cd
commit 3e4bf56802
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/bme680/__init__.py
View File

@ -314,9 +314,9 @@ class BME680(BME680Data):
calc_pressure = ((calc_pressure - (var2 >> 12)) * (3125)) calc_pressure = ((calc_pressure - (var2 >> 12)) * (3125))
if calc_pressure >= (1 << 31): if calc_pressure >= (1 << 31):
calc_pressure = ((calc_pressure / var1) << 1) calc_pressure = ((calc_pressure // var1) << 1)
else: else:
calc_pressure = ((calc_pressure << 1) / var1) calc_pressure = ((calc_pressure << 1) // var1)
var1 = (self.calibration_data.par_p9 * (((calc_pressure >> 3) * var1 = (self.calibration_data.par_p9 * (((calc_pressure >> 3) *
(calc_pressure >> 3)) >> 13)) >> 12 (calc_pressure >> 3)) >> 13)) >> 12
@ -334,14 +334,14 @@ class BME680(BME680Data):
def _calc_humidity(self, humidity_adc): def _calc_humidity(self, humidity_adc):
temp_scaled = ((self.calibration_data.t_fine * 5) + 128) >> 8 temp_scaled = ((self.calibration_data.t_fine * 5) + 128) >> 8
var1 = (humidity_adc - ((self.calibration_data.par_h1 * 16))) \ var1 = (humidity_adc - ((self.calibration_data.par_h1 * 16))) \
- (((temp_scaled * self.calibration_data.par_h3) / (100)) >> 1) - (((temp_scaled * self.calibration_data.par_h3) // (100)) >> 1)
var2 = (self.calibration_data.par_h2 var2 = (self.calibration_data.par_h2
* (((temp_scaled * self.calibration_data.par_h4) / (100)) * (((temp_scaled * self.calibration_data.par_h4) // (100))
+ (((temp_scaled * ((temp_scaled * self.calibration_data.par_h5) / (100))) >> 6) + (((temp_scaled * ((temp_scaled * self.calibration_data.par_h5) // (100))) >> 6)
/ (100)) + (1 * 16384))) >> 10 // (100)) + (1 * 16384))) >> 10
var3 = var1 * var2 var3 = var1 * var2
var4 = self.calibration_data.par_h6 << 7 var4 = self.calibration_data.par_h6 << 7
var4 = ((var4) + ((temp_scaled * self.calibration_data.par_h7) / (100))) >> 4 var4 = ((var4) + ((temp_scaled * self.calibration_data.par_h7) // (100))) >> 4
var5 = ((var3 >> 14) * (var3 >> 14)) >> 10 var5 = ((var3 >> 14) * (var3 >> 14)) >> 10
var6 = (var4 * var5) >> 1 var6 = (var4 * var5) >> 1
calc_hum = (((var3 + var6) >> 10) * (1000)) >> 12 calc_hum = (((var3 + var6) >> 10) * (1000)) >> 12

4
library/bme680/constants.py
View File

@ -323,9 +323,9 @@ class CalibrationData:
self.par_gh3 = twos_comp(calibration[GH3_REG], bits=8) self.par_gh3 = twos_comp(calibration[GH3_REG], bits=8)
def set_other(self, heat_range, heat_value, sw_error): def set_other(self, heat_range, heat_value, sw_error):
self.res_heat_range = (heat_range & RHRANGE_MSK) / 16 self.res_heat_range = (heat_range & RHRANGE_MSK) // 16
self.res_heat_val = heat_value self.res_heat_val = heat_value
self.range_sw_err = (sw_error * RSERROR_MSK) / 16 self.range_sw_err = (sw_error * RSERROR_MSK) // 16
# BME680 sensor settings structure which comprises of ODR, # BME680 sensor settings structure which comprises of ODR,
# over-sampling and filter settings. # over-sampling and filter settings.