From 6b6119d3d1c9340b339903f83365b176a82f225f Mon Sep 17 00:00:00 2001 From: Peter Dahlberg Date: Sat, 21 May 2016 22:21:42 +0200 Subject: [PATCH] get rid of separate constants file --- bme280.py | 14 ++++++++- bme280_const.py | 81 ------------------------------------------------- 2 files changed, 13 insertions(+), 82 deletions(-) delete mode 100644 bme280_const.py diff --git a/bme280.py b/bme280.py index db0e002..fd28ef3 100644 --- a/bme280.py +++ b/bme280.py @@ -34,9 +34,21 @@ # THE SOFTWARE. import time -from bme280_const import * from ustruct import unpack, unpack_from +# 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): diff --git a/bme280_const.py b/bme280_const.py deleted file mode 100644 index 01311d9..0000000 --- a/bme280_const.py +++ /dev/null @@ -1,81 +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. - - -# 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 Registers - -BME280_REGISTER_DIG_T1 = 0x88 # Trimming parameter registers -BME280_REGISTER_DIG_T2 = 0x8A -BME280_REGISTER_DIG_T3 = 0x8C - -BME280_REGISTER_DIG_P1 = 0x8E -BME280_REGISTER_DIG_P2 = 0x90 -BME280_REGISTER_DIG_P3 = 0x92 -BME280_REGISTER_DIG_P4 = 0x94 -BME280_REGISTER_DIG_P5 = 0x96 -BME280_REGISTER_DIG_P6 = 0x98 -BME280_REGISTER_DIG_P7 = 0x9A -BME280_REGISTER_DIG_P8 = 0x9C -BME280_REGISTER_DIG_P9 = 0x9E - -BME280_REGISTER_DIG_H1 = 0xA1 -BME280_REGISTER_DIG_H2 = 0xE1 -BME280_REGISTER_DIG_H3 = 0xE3 -BME280_REGISTER_DIG_H4 = 0xE4 -BME280_REGISTER_DIG_H5 = 0xE5 -BME280_REGISTER_DIG_H6 = 0xE6 -BME280_REGISTER_DIG_H7 = 0xE7 - -BME280_REGISTER_CHIPID = 0xD0 -BME280_REGISTER_VERSION = 0xD1 -BME280_REGISTER_SOFTRESET = 0xE0 - -BME280_REGISTER_CONTROL_HUM = 0xF2 -BME280_REGISTER_CONTROL = 0xF4 -BME280_REGISTER_CONFIG = 0xF5 -BME280_REGISTER_PRESSURE_DATA = 0xF7 -BME280_REGISTER_TEMP_DATA = 0xFA -BME280_REGISTER_HUMIDITY_DATA = 0xFD