Adaption to new logging
This commit is contained in:
parent
8ca6a2723a
commit
f8cb99aa08
@ -4,8 +4,12 @@ import time
|
||||
|
||||
DEBUG = False
|
||||
|
||||
logger_name = 'RPI_ENVSENS'
|
||||
logger = logging.getLogger(logger_name)
|
||||
try:
|
||||
from config import APP_NAME as ROOT_LOGGER_NAME
|
||||
except ImportError:
|
||||
ROOT_LOGGER_NAME = 'root'
|
||||
|
||||
logger = logging.getLogger(ROOT_LOGGER_NAME).getChild(__name__)
|
||||
|
||||
|
||||
class background_task(object):
|
||||
|
11
bmp.py
11
bmp.py
@ -1,6 +1,15 @@
|
||||
import logging
|
||||
import time
|
||||
|
||||
from . import logger, background_task
|
||||
try:
|
||||
from config import APP_NAME as ROOT_LOGGER_NAME
|
||||
except ImportError:
|
||||
ROOT_LOGGER_NAME = 'root'
|
||||
|
||||
logger = logging.getLogger(ROOT_LOGGER_NAME).getChild(__name__)
|
||||
|
||||
from . import background_task
|
||||
|
||||
try:
|
||||
import smbus
|
||||
except ImportError:
|
||||
|
63
dht.py
63
dht.py
@ -1,6 +1,15 @@
|
||||
import logging
|
||||
import time
|
||||
|
||||
from . import logger, background_task
|
||||
try:
|
||||
from config import APP_NAME as ROOT_LOGGER_NAME
|
||||
except ImportError:
|
||||
ROOT_LOGGER_NAME = 'root'
|
||||
|
||||
logger = logging.getLogger(ROOT_LOGGER_NAME).getChild(__name__)
|
||||
|
||||
from . import background_task
|
||||
|
||||
try:
|
||||
import adafruit_dht
|
||||
except ImportError:
|
||||
@ -18,9 +27,10 @@ class dht_22(background_task):
|
||||
|
||||
def __init__(self, gpio, data_callback=None):
|
||||
self.__data_callback__ = data_callback
|
||||
self.__monitor__ = dht_22_monitor(300)
|
||||
# Initial the dht device, with data pin connected to:
|
||||
if not DEBUG:
|
||||
self.__dht_device__ = adafruit_dht.DHT22(gpio)
|
||||
self.__dht_device__ = adafruit_dht.DHT22(gpio, use_pulseio=False)
|
||||
# Initialise background_task
|
||||
background_task.__init__(self)
|
||||
|
||||
@ -28,8 +38,13 @@ class dht_22(background_task):
|
||||
data = self.__dht_data_transmission__()
|
||||
if data is not None:
|
||||
logger.debug('DHT-Communication: Successfully: %s', repr(data))
|
||||
self.__monitor__.process(data)
|
||||
if self.__data_callback__ is not None:
|
||||
self.__data_callback__(**data)
|
||||
if self.__monitor__.status():
|
||||
logger.warning("DHT measurement stopped caused by too many identical values!")
|
||||
self.close()
|
||||
|
||||
|
||||
def __dht_data_transmission__(self):
|
||||
if not DEBUG:
|
||||
@ -42,11 +57,11 @@ class dht_22(background_task):
|
||||
data[self.KEY_TIME] = int(time.time())
|
||||
if data[self.KEY_TEMPERATURE] is not None and data[self.KEY_HUMIDITY] is not None:
|
||||
return data
|
||||
time.sleep(2.0)
|
||||
time.sleep(self.RUN_SLEEP_TIME)
|
||||
except RuntimeError as error:
|
||||
# Errors happen fairly often, DHT's are hard to read, just keep going
|
||||
logger.info('DHT-Communication: ' + error.args[0])
|
||||
time.sleep(0.1)
|
||||
time.sleep(2.0)
|
||||
except Exception as error:
|
||||
self.__dht_device__.exit()
|
||||
raise error
|
||||
@ -56,3 +71,43 @@ class dht_22(background_task):
|
||||
self.KEY_HUMIDITY: 1.7,
|
||||
self.KEY_TIME: int(time.time()),
|
||||
}
|
||||
|
||||
|
||||
class dht_22_monitor(object):
|
||||
def __init__(self, max_const_treshold=250):
|
||||
self.__max_const_treshold__ = max_const_treshold
|
||||
self.__fail__ = False
|
||||
self.__max_const_measurements__ = 0
|
||||
self.__init_statevars__()
|
||||
|
||||
def __init_statevars__(self):
|
||||
self.__current_const_measurements__ = 0
|
||||
self.__last_measurements__ = None
|
||||
|
||||
def process(self, data):
|
||||
if self.__last_measurements__ is None:
|
||||
self.__last_measurements__ = data
|
||||
else:
|
||||
data_is_equal = True
|
||||
for key in [dht_22.KEY_HUMIDITY, dht_22.KEY_TEMPERATURE]:
|
||||
if data[key] != self.__last_measurements__[key]:
|
||||
data_is_equal = False
|
||||
if data_is_equal:
|
||||
self.__current_const_measurements__ += 1
|
||||
if self.__current_const_measurements__ > self.__max_const_measurements__:
|
||||
self.__max_const_measurements__ = self.__current_const_measurements__
|
||||
else:
|
||||
if self.__current_const_measurements__ >= self.__max_const_measurements__:
|
||||
logger.warning('%d identical data measurements identified!', self.__max_const_measurements__)
|
||||
self.__init_statevars__()
|
||||
if self.__max_const_measurements__ > self.__max_const_treshold__:
|
||||
if not self.__fail__:
|
||||
logger.warning("DHT measurement values are suspicious constant!")
|
||||
self.__fail__ = True
|
||||
|
||||
def status(self):
|
||||
if self.__fail__:
|
||||
self.__fail__ = False
|
||||
self.__max_const_measurements__ = 0
|
||||
return True
|
||||
return False
|
||||
|
Loading…
x
Reference in New Issue
Block a user