kopia lustrzana https://github.com/peterhinch/mpy_bme280_esp8266
get rid of i2c_device.py
Peter Dahlberg
rodzic
8bb69b4a01
commit
d3c9732c7d
42
bme280.py
42
bme280.py
|
|
@ -35,7 +35,7 @@
|
|||
|
||||
import time
|
||||
from bme280_const import *
|
||||
from i2c_device import Device
|
||||
from ustruct import unpack, unpack_from
|
||||
|
||||
class BME280:
|
||||
def __init__(self, mode=BME280_OSAMPLE_1, address=BME280_I2CADDR, i2c=None,
|
||||
|
|
@ -52,37 +52,23 @@ class BME280:
|
|||
if i2c is None:
|
||||
raise ValueError('An I2C object is required.')
|
||||
self.i2c = i2c
|
||||
# Create I2C device.
|
||||
self._device = Device(address, i2c)
|
||||
|
||||
# Load calibration values.
|
||||
self.dig_T1 = self._device.readU16LE(BME280_REGISTER_DIG_T1)
|
||||
self.dig_T2 = self._device.readS16LE(BME280_REGISTER_DIG_T2)
|
||||
self.dig_T3 = self._device.readS16LE(BME280_REGISTER_DIG_T3)
|
||||
# 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("<HhhHhhhhhhhhB", dig_88_a1)
|
||||
|
||||
self.dig_P1 = self._device.readU16LE(BME280_REGISTER_DIG_P1)
|
||||
self.dig_P2 = self._device.readS16LE(BME280_REGISTER_DIG_P2)
|
||||
self.dig_P3 = self._device.readS16LE(BME280_REGISTER_DIG_P3)
|
||||
self.dig_P4 = self._device.readS16LE(BME280_REGISTER_DIG_P4)
|
||||
self.dig_P5 = self._device.readS16LE(BME280_REGISTER_DIG_P5)
|
||||
self.dig_P6 = self._device.readS16LE(BME280_REGISTER_DIG_P6)
|
||||
self.dig_P7 = self._device.readS16LE(BME280_REGISTER_DIG_P7)
|
||||
self.dig_P8 = self._device.readS16LE(BME280_REGISTER_DIG_P8)
|
||||
self.dig_P9 = self._device.readS16LE(BME280_REGISTER_DIG_P9)
|
||||
self.dig_H2, self.dig_H3 = unpack("<hB", dig_e1_e7)
|
||||
e4_sign, = unpack_from("<b", dig_e1_e7, 3)
|
||||
self.dig_H4 = (e4_sign << 4) | (dig_e1_e7[4] & 0xF)
|
||||
|
||||
self.dig_H1 = self._device.readU8(BME280_REGISTER_DIG_H1)
|
||||
self.dig_H2 = self._device.readS16LE(BME280_REGISTER_DIG_H2)
|
||||
self.dig_H3 = self._device.readU8(BME280_REGISTER_DIG_H3)
|
||||
self.dig_H6 = self._device.readS8(BME280_REGISTER_DIG_H7)
|
||||
e6_sign, = unpack_from("<b", dig_e1_e7, 5)
|
||||
self.dig_H5 = (e6_sign << 4) | (dig_e1_e7[4] >> 4)
|
||||
|
||||
h4 = self._device.readS8(BME280_REGISTER_DIG_H4)
|
||||
h4 = (h4 << 24) >> 20
|
||||
self.dig_H4 = h4 | (self._device.readU8(BME280_REGISTER_DIG_H5) & 0x0F)
|
||||
|
||||
h5 = self._device.readS8(BME280_REGISTER_DIG_H6)
|
||||
h5 = (h5 << 24) >> 20
|
||||
self.dig_H5 = h5 | (
|
||||
self._device.readU8(BME280_REGISTER_DIG_H5) >> 4 & 0x0F)
|
||||
self.dig_H6 = unpack_from("<b", dig_e1_e7, 6)
|
||||
|
||||
|
||||
self.i2c.writeto_mem(self.address, BME280_REGISTER_CONTROL,
|
||||
|
|
|
|||
101
i2c_device.py
101
i2c_device.py
|
|
@ -1,101 +0,0 @@
|
|||
# Author: Paul Cunnane 2016
|
||||
#
|
||||
# This module borrows heavily from the Adafruit BME280 Python library
|
||||
# and the Adafruit GPIO/I2C library. Original copyright notices are reproduced
|
||||
# below.
|
||||
#
|
||||
# Those libraries were written for the Raspberry Pi. This modification is
|
||||
# intended for the MicroPython and esp8266 boards.
|
||||
#
|
||||
# Copyright (c) 2014 Adafruit Industries
|
||||
# Author: Tony DiCola
|
||||
#
|
||||
# Based on the BMP280 driver with BME280 changes provided by
|
||||
# David J Taylor, Edinburgh (www.satsignal.eu)
|
||||
#
|
||||
# Based on Adafruit_I2C.py created by Kevin Townsend.
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
# of this software and associated documentation files (the "Software"), to deal
|
||||
# in the Software without restriction, including without limitation the rights
|
||||
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
# copies of the Software, and to permit persons to whom the Software is
|
||||
# furnished to do so, subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be included in
|
||||
# all copies or substantial portions of the Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
# THE SOFTWARE.
|
||||
|
||||
class Device:
|
||||
"""Class for communicating with an I2C device.
|
||||
|
||||
Allows reading and writing 8-bit, 16-bit, and byte array values to
|
||||
registers on the device."""
|
||||
|
||||
def __init__(self, address, i2c):
|
||||
"""Create an instance of the I2C device at the specified address using
|
||||
the specified I2C interface object."""
|
||||
self._address = address
|
||||
self._i2c = i2c
|
||||
|
||||
def readRaw8(self):
|
||||
"""Read an 8-bit value on the bus (without register)."""
|
||||
return int.from_bytes(self._i2c.readfrom(self._address, 1)) & 0xFF
|
||||
|
||||
def readU8(self, register):
|
||||
"""Read an unsigned byte from the specified register."""
|
||||
return int.from_bytes(
|
||||
self._i2c.readfrom_mem(self._address, register, 1)) & 0xFF
|
||||
|
||||
def readS8(self, register):
|
||||
"""Read a signed byte from the specified register."""
|
||||
result = self.readU8(register)
|
||||
if result > 127:
|
||||
result -= 256
|
||||
return result
|
||||
|
||||
def readU16(self, register, little_endian=True):
|
||||
"""Read an unsigned 16-bit value from the specified register, with the
|
||||
specified endianness (default little endian, or least significant byte
|
||||
first)."""
|
||||
result = int.from_bytes(
|
||||
self._i2c.readfrom_mem(self._address, register, 2)) & 0xFFFF
|
||||
if not little_endian:
|
||||
result = ((result << 8) & 0xFF00) + (result >> 8)
|
||||
return result
|
||||
|
||||
def readS16(self, register, little_endian=True):
|
||||
"""Read a signed 16-bit value from the specified register, with the
|
||||
specified endianness (default little endian, or least significant byte
|
||||
first)."""
|
||||
result = self.readU16(register, little_endian)
|
||||
if result > 32767:
|
||||
result -= 65536
|
||||
return result
|
||||
|
||||
def readU16LE(self, register):
|
||||
"""Read an unsigned 16-bit value from the specified register, in little
|
||||
endian byte order."""
|
||||
return self.readU16(register, little_endian=True)
|
||||
|
||||
def readU16BE(self, register):
|
||||
"""Read an unsigned 16-bit value from the specified register, in big
|
||||
endian byte order."""
|
||||
return self.readU16(register, little_endian=False)
|
||||
|
||||
def readS16LE(self, register):
|
||||
"""Read a signed 16-bit value from the specified register, in little
|
||||
endian byte order."""
|
||||
return self.readS16(register, little_endian=True)
|
||||
|
||||
def readS16BE(self, register):
|
||||
"""Read a signed 16-bit value from the specified register, in big
|
||||
endian byte order."""
|
||||
return self.readS16(register, little_endian=False)
|
||||
Ładowanie…
Reference in New Issue