pylib/rpi_envsens
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Timing and Formatadaptions

Browse Source
This commit is contained in:
Dirk Alders 2021-10-13 08:53:50 +02:00
parent afedf43bdf
commit 6ab2629fb1
2 changed files with 155 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

220
bmp.py
View File

@ -20,129 +20,131 @@ else:
class bmp_180(background_task): class bmp_180(background_task):
RUN_SLEEP_TIME = 0.5 RUN_SLEEP_TIME = 2.0
SMBUS_DELAY = 0.5 SMBUS_DELAY = 0.5
MIN_REFRESH_RATE = RUN_SLEEP_TIME + 3 * SMBUS_DELAY MIN_REFRESH_RATE = RUN_SLEEP_TIME + 3 * SMBUS_DELAY
KEY_TEMPERATURE = 'temperature' KEY_TEMPERATURE = 'temperature'
KEY_PRESSURE = 'pressure' KEY_PRESSURE = 'pressure'
KEY_TIME = 'time' KEY_TIME = 'time'
def __init__(self, data_callback=None): def __init__(self, data_callback=None):
self.__data_callback__ = data_callback self.__data_callback__ = data_callback
# Initialise background_task # Initialise background_task
background_task.__init__(self) background_task.__init__(self)
def __run__(self): def __run__(self):
data = self.__bmp_data_transmission__() data = self.__bmp_data_transmission__()
if data is not None: if data is not None:
logger.debug('BMP-Communication: Successfully: %s', repr(data)) logger.info('BMP-Communication successful: %s', repr(data))
if self.__data_callback__ is not None: if self.__data_callback__ is not None:
self.__data_callback__(**data) self.__data_callback__(**data)
else:
logger.debug('BMP-Communication failed: No data received')
def __bmp_data_transmission__(self): def __bmp_data_transmission__(self):
if not DEBUG: if not DEBUG:
rv = {} rv = {}
# Get I2C bus # Get I2C bus
bus = smbus.SMBus(1) bus = smbus.SMBus(1)
# BMP180 address, 0x77(119) # BMP180 address, 0x77(119)
# Read data back from 0xAA(170), 22 bytes # Read data back from 0xAA(170), 22 bytes
data = bus.read_i2c_block_data(0x77, 0xAA, 22) data = bus.read_i2c_block_data(0x77, 0xAA, 22)
# Convert the data # Convert the data
AC1 = data[0] * 256 + data[1] AC1 = data[0] * 256 + data[1]
if AC1 > 32767 : if AC1 > 32767 :
AC1 -= 65535 AC1 -= 65535
AC2 = data[2] * 256 + data[3] AC2 = data[2] * 256 + data[3]
if AC2 > 32767 : if AC2 > 32767 :
AC2 -= 65535 AC2 -= 65535
AC3 = data[4] * 256 + data[5] AC3 = data[4] * 256 + data[5]
if AC3 > 32767 : if AC3 > 32767 :
AC3 -= 65535 AC3 -= 65535
AC4 = data[6] * 256 + data[7] AC4 = data[6] * 256 + data[7]
AC5 = data[8] * 256 + data[9] AC5 = data[8] * 256 + data[9]
AC6 = data[10] * 256 + data[11] AC6 = data[10] * 256 + data[11]
B1 = data[12] * 256 + data[13] B1 = data[12] * 256 + data[13]
if B1 > 32767 : if B1 > 32767 :
B1 -= 65535 B1 -= 65535
B2 = data[14] * 256 + data[15] B2 = data[14] * 256 + data[15]
if B2 > 32767 : if B2 > 32767 :
B2 -= 65535 B2 -= 65535
MB = data[16] * 256 + data[17] MB = data[16] * 256 + data[17]
if MB > 32767 : if MB > 32767 :
MB -= 65535 MB -= 65535
MC = data[18] * 256 + data[19] MC = data[18] * 256 + data[19]
if MC > 32767 : if MC > 32767 :
MC -= 65535 MC -= 65535
MD = data[20] * 256 + data[21] MD = data[20] * 256 + data[21]
if MD > 32767 : if MD > 32767 :
MD -= 65535 MD -= 65535
time.sleep(self.SMBUS_DELAY) time.sleep(self.SMBUS_DELAY)
# BMP180 address, 0x77(119) # BMP180 address, 0x77(119)
# Select measurement control register, 0xF4(244) # Select measurement control register, 0xF4(244)
# 0x2E(46) Enable temperature measurement # 0x2E(46) Enable temperature measurement
bus.write_byte_data(0x77, 0xF4, 0x2E) bus.write_byte_data(0x77, 0xF4, 0x2E)
time.sleep(self.SMBUS_DELAY) time.sleep(self.SMBUS_DELAY)
# BMP180 address, 0x77(119) # BMP180 address, 0x77(119)
# Read data back from 0xF6(246), 2 bytes # Read data back from 0xF6(246), 2 bytes
# temp MSB, temp LSB # temp MSB, temp LSB
data = bus.read_i2c_block_data(0x77, 0xF6, 2) data = bus.read_i2c_block_data(0x77, 0xF6, 2)
# Convert the data # Convert the data
temp = data[0] * 256 + data[1] temp = data[0] * 256 + data[1]
# BMP180 address, 0x77(119) # BMP180 address, 0x77(119)
# Select measurement control register, 0xF4(244) # Select measurement control register, 0xF4(244)
# 0x74(116) Enable pressure measurement, OSS = 1 # 0x74(116) Enable pressure measurement, OSS = 1
bus.write_byte_data(0x77, 0xF4, 0x74) bus.write_byte_data(0x77, 0xF4, 0x74)
time.sleep(self.SMBUS_DELAY) time.sleep(self.SMBUS_DELAY)
# BMP180 address, 0x77(119) # BMP180 address, 0x77(119)
# Read data back from 0xF6(246), 3 bytes # Read data back from 0xF6(246), 3 bytes
# pres MSB1, pres MSB, pres LSB # pres MSB1, pres MSB, pres LSB
data = bus.read_i2c_block_data(0x77, 0xF6, 3) data = bus.read_i2c_block_data(0x77, 0xF6, 3)
rv[self.KEY_TIME] = int(time.time()) rv[self.KEY_TIME] = int(time.time())
# Convert the data # Convert the data
pres = ((data[0] * 65536) + (data[1] * 256) + data[2]) / 128 pres = ((data[0] * 65536) + (data[1] * 256) + data[2]) / 128
# Callibration for Temperature # Callibration for Temperature
X1 = (temp - AC6) * AC5 / 32768.0 X1 = (temp - AC6) * AC5 / 32768.0
X2 = (MC * 2048.0) / (X1 + MD) X2 = (MC * 2048.0) / (X1 + MD)
B5 = X1 + X2 B5 = X1 + X2
rv[self.KEY_TEMPERATURE] = ((B5 + 8.0) / 16.0) / 10.0 rv[self.KEY_TEMPERATURE] = ((B5 + 8.0) / 16.0) / 10.0
# Calibration for Pressure # Calibration for Pressure
B6 = B5 - 4000 B6 = B5 - 4000
X1 = (B2 * (B6 * B6 / 4096.0)) / 2048.0 X1 = (B2 * (B6 * B6 / 4096.0)) / 2048.0
X2 = AC2 * B6 / 2048.0 X2 = AC2 * B6 / 2048.0
X3 = X1 + X2 X3 = X1 + X2
B3 = (((AC1 * 4 + X3) * 2) + 2) / 4.0 B3 = (((AC1 * 4 + X3) * 2) + 2) / 4.0
X1 = AC3 * B6 / 8192.0 X1 = AC3 * B6 / 8192.0
X2 = (B1 * (B6 * B6 / 2048.0)) / 65536.0 X2 = (B1 * (B6 * B6 / 2048.0)) / 65536.0
X3 = ((X1 + X2) + 2) / 4.0 X3 = ((X1 + X2) + 2) / 4.0
B4 = AC4 * (X3 + 32768) / 32768.0 B4 = AC4 * (X3 + 32768) / 32768.0
B7 = ((pres - B3) * (25000.0)) B7 = ((pres - B3) * (25000.0))
pressure = 0.0 pressure = 0.0
if B7 < 2147483648: if B7 < 2147483648:
pressure = (B7 * 2) / B4 pressure = (B7 * 2) / B4
else : else :
pressure = (B7 / B4) * 2 pressure = (B7 / B4) * 2
X1 = (pressure / 256.0) * (pressure / 256.0) X1 = (pressure / 256.0) * (pressure / 256.0)
X1 = (X1 * 3038.0) / 65536.0 X1 = (X1 * 3038.0) / 65536.0
X2 = ((-7357) * pressure) / 65536.0 X2 = ((-7357) * pressure) / 65536.0
rv[self.KEY_PRESSURE] = (pressure + (X1 + X2 + 3791) / 16.0) / 100 rv[self.KEY_PRESSURE] = (pressure + (X1 + X2 + 3791) / 16.0) / 100
return rv return rv
else: else:
time.sleep(3 * self.SMBUS_DELAY) time.sleep(3 * self.SMBUS_DELAY)
return { return {
self.KEY_PRESSURE: 1717., self.KEY_PRESSURE: 1717.,
self.KEY_TEMPERATURE: 17.17, self.KEY_TEMPERATURE: 17.17,
self.KEY_TIME: int(time.time()) self.KEY_TIME: int(time.time())
} }

12
dht.py
View File

@ -19,7 +19,7 @@ else:
from . import DEBUG from . import DEBUG
class dht_22(background_task): class dht_22(background_task):
RUN_SLEEP_TIME = 2.0 RUN_SLEEP_TIME = 4.0
MIN_REFRESH_RATE = RUN_SLEEP_TIME MIN_REFRESH_RATE = RUN_SLEEP_TIME
KEY_TEMPERATURE = 'temperature' KEY_TEMPERATURE = 'temperature'
KEY_HUMIDITY = 'humidity' KEY_HUMIDITY = 'humidity'
@ -43,15 +43,15 @@ class dht_22(background_task):
# check data # check data
if self.__temp_monitor__.process(data[self.KEY_TEMPERATURE], data[self.KEY_TIME]) and self.__hum_monitor__.process(data[self.KEY_HUMIDITY], data[self.KEY_TIME]): if self.__temp_monitor__.process(data[self.KEY_TEMPERATURE], data[self.KEY_TIME]) and self.__hum_monitor__.process(data[self.KEY_HUMIDITY], data[self.KEY_TIME]):
# #
logger.debug('DHT-Communication: Successfully: %s', repr(data)) logger.info('DHT-Communication successful: %s', repr(data))
self.__monitor__.process(data) self.__monitor__.process(data)
if self.__data_callback__ is not None: if self.__data_callback__ is not None:
self.__data_callback__(**data) self.__data_callback__(**data)
if self.__monitor__.status(): if self.__monitor__.status():
logger.warning("DHT measurement stopped caused by too many identical values!") logger.warning("DHT-Communication failed: Measurement stopped caused by suspicious constant values!")
self.close() self.close()
else: else:
logger.warning("DHT-Gradient to high: Ignoring data %s!", repr(data)) logger.debug("DHT-Communication failed: Gradient to high. Ignoring data %s!", repr(data))
@ -69,7 +69,7 @@ class dht_22(background_task):
time.sleep(self.RUN_SLEEP_TIME) time.sleep(self.RUN_SLEEP_TIME)
except RuntimeError as error: except RuntimeError as error:
# Errors happen fairly often, DHT's are hard to read, just keep going # Errors happen fairly often, DHT's are hard to read, just keep going
logger.debug('DHT-Communication: ' + error.args[0]) logger.debug('DHT-Communication failed: ' + error.args[0])
time.sleep(2.0) time.sleep(2.0)
except Exception as error: except Exception as error:
self.__dht_device__.exit() self.__dht_device__.exit()
@ -127,8 +127,6 @@ class dht_22_monitor(object):
else: else:
self.__init_statevars__() self.__init_statevars__()
if self.__max_const_measurements__ > self.__max_const_treshold__: if self.__max_const_measurements__ > self.__max_const_treshold__:
if not self.__fail__:
logger.warning("DHT measurement values are suspicious constant!")
self.__fail__ = True self.__fail__ = True
def status(self): def status(self):