From 03ae4768e799f3ea2d583b397695324c07468375 Mon Sep 17 00:00:00 2001 From: Maff Date: Tue, 19 Jun 2018 20:11:14 +0100 Subject: [PATCH] Finished renaming uPyhttpd, swapped bme280 for a submodule --- .gitmodules | 3 + bme280.py | 171 ------------------------------------------------- support/bme280 | 1 + uPyhttpd.py | 3 +- 4 files changed, 6 insertions(+), 172 deletions(-) delete mode 100644 bme280.py create mode 160000 support/bme280 diff --git a/.gitmodules b/.gitmodules index 9e94fd1..33a7a0f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "support/micropyGPS"] path = support/micropyGPS url = https://github.com/inmcm/micropyGPS +[submodule "support/bme280"] + path = support/bme280 + url = https://github.com/catdog2/mpy_bme280_esp8266 diff --git a/bme280.py b/bme280.py deleted file mode 100644 index 4eb6d2a..0000000 --- a/bme280.py +++ /dev/null @@ -1,171 +0,0 @@ -import time -from ustruct import unpack, unpack_from -from array import array - -# BME280 default address. -BME280_I2CADDR = 0x76 - -# Operating Modes -BME280_OSAMPLE_1 = 1 -BME280_OSAMPLE_2 = 2 -BME280_OSAMPLE_4 = 3 -BME280_OSAMPLE_8 = 4 -BME280_OSAMPLE_16 = 5 - -BME280_REGISTER_CONTROL_HUM = 0xF2 -BME280_REGISTER_CONTROL = 0xF4 - - -class BME280: - def __init__(self, - mode=BME280_OSAMPLE_1, - address=BME280_I2CADDR, - i2c=None, - **kwargs): - # Check that mode is valid. - if mode not in [BME280_OSAMPLE_1, BME280_OSAMPLE_2, BME280_OSAMPLE_4, - BME280_OSAMPLE_8, BME280_OSAMPLE_16]: - raise ValueError( - 'Unexpected mode value {0}. Set mode to one of ' - 'BME280_ULTRALOWPOWER, BME280_STANDARD, BME280_HIGHRES, or ' - 'BME280_ULTRAHIGHRES'.format(mode)) - self._mode = mode - self.address = address - if i2c is None: - raise ValueError('An I2C object is required.') - self.i2c = i2c - - # load calibration data - dig_88_a1 = self.i2c.readfrom_mem(self.address, 0x88, 26) - dig_e1_e7 = self.i2c.readfrom_mem(self.address, 0xE1, 7) - self.dig_T1, self.dig_T2, self.dig_T3, self.dig_P1, \ - self.dig_P2, self.dig_P3, self.dig_P4, self.dig_P5, \ - self.dig_P6, self.dig_P7, self.dig_P8, self.dig_P9, \ - _, self.dig_H1 = unpack("> 4) - - self.dig_H6 = unpack_from("> 4 - raw_press = ((readout[0] << 16) | (readout[1] << 8) | readout[2]) >> 4 - # temperature(0xFA): ((msb << 16) | (lsb << 8) | xlsb) >> 4 - raw_temp = ((readout[3] << 16) | (readout[4] << 8) | readout[5]) >> 4 - # humidity(0xFD): (msb << 8) | lsb - raw_hum = (readout[6] << 8) | readout[7] - - result[0] = raw_temp - result[1] = raw_press - result[2] = raw_hum - - def read_compensated_data(self, result=None): - """ Reads the data from the sensor and returns the compensated data. - - Args: - result: array of length 3 or alike where the result will be - stored, in temperature, pressure, humidity order. You may use - this to read out the sensor without allocating heap memory - - Returns: - array with temperature, pressure, humidity. Will be the one from - the result parameter if not None - """ - self.read_raw_data(self._l3_resultarray) - raw_temp, raw_press, raw_hum = self._l3_resultarray - # temperature - var1 = ((raw_temp >> 3) - (self.dig_T1 << 1)) * (self.dig_T2 >> 11) - var2 = (((((raw_temp >> 4) - self.dig_T1) * - ((raw_temp >> 4) - self.dig_T1)) >> 12) * self.dig_T3) >> 14 - self.t_fine = var1 + var2 - temp = (self.t_fine * 5 + 128) >> 8 - - # pressure - var1 = self.t_fine - 128000 - var2 = var1 * var1 * self.dig_P6 - var2 = var2 + ((var1 * self.dig_P5) << 17) - var2 = var2 + (self.dig_P4 << 35) - var1 = (((var1 * var1 * self.dig_P3) >> 8) + - ((var1 * self.dig_P2) << 12)) - var1 = (((1 << 47) + var1) * self.dig_P1) >> 33 - if var1 == 0: - pressure = 0 - else: - p = 1048576 - raw_press - p = (((p << 31) - var2) * 3125) // var1 - var1 = (self.dig_P9 * (p >> 13) * (p >> 13)) >> 25 - var2 = (self.dig_P8 * p) >> 19 - pressure = ((p + var1 + var2) >> 8) + (self.dig_P7 << 4) - - # humidity - h = self.t_fine - 76800 - h = (((((raw_hum << 14) - (self.dig_H4 << 20) - - (self.dig_H5 * h)) + 16384) - >> 15) * (((((((h * self.dig_H6) >> 10) * - (((h * self.dig_H3) >> 11) + 32768)) >> 10) + - 2097152) * self.dig_H2 + 8192) >> 14)) - h = h - (((((h >> 15) * (h >> 15)) >> 7) * self.dig_H1) >> 4) - h = 0 if h < 0 else h - h = 419430400 if h > 419430400 else h - humidity = h >> 12 - - if result: - result[0] = temp - result[1] = pressure - result[2] = humidity - return result - - return array("i", (temp, pressure, humidity)) - - @property - def values(self): - """ human readable values """ - - t, p, h = self.read_compensated_data() - - p = p // 256 - pi = p // 100 - pd = p - pi * 100 - - hi = h // 1024 - hd = h * 100 // 1024 - hi * 100 - return ("{}C".format(t / 100), "{}.{:02d}hPa".format(pi, pd), - "{}.{:02d}%".format(hi, hd)) diff --git a/support/bme280 b/support/bme280 new file mode 160000 index 0000000..d7e052b --- /dev/null +++ b/support/bme280 @@ -0,0 +1 @@ +Subproject commit d7e052b28281942996a8f0e1bbdbef87f87bbb8e diff --git a/uPyhttpd.py b/uPyhttpd.py index c74bacd..9f16ff1 100644 --- a/uPyhttpd.py +++ b/uPyhttpd.py @@ -1,4 +1,4 @@ -#tinyWebServer, because microWebSrv wasn't small enough. +#uPyhttpd, because microWebSrv wasn't small enough. import socket _routes={} _HTTPStatusCodes={ @@ -13,6 +13,7 @@ _HTTPStatusCodes={ 404: 'Not Found', 500: 'Not Implemented', } + def __init__(self, bind_ip='0.0.0.0', bind_port=80, verbose=False): self.verbose=verbose self.bind_ip=bind_ip