Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactoring of onewire sensor component (#9691)

pull/9697/head
bestlibre 2017-10-04 16:35:58 +02:00 committed by Pascal Vizeli
parent e753c51e34
commit 84271a2dac
1 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
homeassistant/components/sensor/onewire.py
View File

@ -61,8 +61,9 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
'[.-]*')): '[.-]*')):
sensor_id = os.path.split(device_folder)[1] sensor_id = os.path.split(device_folder)[1]
device_file = os.path.join(device_folder, 'w1_slave') device_file = os.path.join(device_folder, 'w1_slave')
devs.append(OneWire(device_names.get(sensor_id, sensor_id), devs.append(OneWireDirect(device_names.get(sensor_id,
device_file, 'temperature')) sensor_id),
device_file, 'temperature'))
else: else:
for family_file_path in glob(os.path.join(base_dir, '*', 'family')): for family_file_path in glob(os.path.join(base_dir, '*', 'family')):
family_file = open(family_file_path, "r") family_file = open(family_file_path, "r")
@ -73,8 +74,9 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
os.path.split(family_file_path)[0])[1] os.path.split(family_file_path)[0])[1]
device_file = os.path.join( device_file = os.path.join(
os.path.split(family_file_path)[0], sensor_value) os.path.split(family_file_path)[0], sensor_value)
devs.append(OneWire(device_names.get(sensor_id, sensor_id), devs.append(OneWireOWFS(device_names.get(sensor_id,
device_file, sensor_key)) sensor_id),
device_file, sensor_key))
if devs == []: if devs == []:
_LOGGER.error("No onewire sensor found. Check if dtoverlay=w1-gpio " _LOGGER.error("No onewire sensor found. Check if dtoverlay=w1-gpio "
@ -97,9 +99,8 @@ class OneWire(Entity):
def _read_value_raw(self): def _read_value_raw(self):
"""Read the value as it is returned by the sensor.""" """Read the value as it is returned by the sensor."""
ds_device_file = open(self._device_file, 'r') with open(self._device_file, 'r') as ds_device_file:
lines = ds_device_file.readlines() lines = ds_device_file.readlines()
ds_device_file.close()
return lines return lines
@property @property
@ -117,30 +118,37 @@ class OneWire(Entity):
"""Return the unit the value is expressed in.""" """Return the unit the value is expressed in."""
return self._unit_of_measurement return self._unit_of_measurement
class OneWireDirect(OneWire):
"""Implementation of an One wire Sensor directly connected to RPI GPIO."""
def update(self): def update(self):
"""Get the latest data from the device.""" """Get the latest data from the device."""
value = None value = None
if self._device_file.startswith(DEFAULT_MOUNT_DIR): lines = self._read_value_raw()
while lines[0].strip()[-3:] != 'YES':
time.sleep(0.2)
lines = self._read_value_raw() lines = self._read_value_raw()
while lines[0].strip()[-3:] != 'YES': equals_pos = lines[1].find('t=')
time.sleep(0.2) if equals_pos != -1:
lines = self._read_value_raw() value_string = lines[1][equals_pos + 2:]
equals_pos = lines[1].find('t=') value = round(float(value_string) / 1000.0, 1)
if equals_pos != -1: self._state = value
value_string = lines[1][equals_pos+2:]
value = round(float(value_string) / 1000.0, 1)
else: class OneWireOWFS(OneWire):
try: """Implementation of an One wire Sensor through owfs."""
ds_device_file = open(self._device_file, 'r')
value_read = ds_device_file.readlines() def update(self):
ds_device_file.close() """Get the latest data from the device."""
if len(value_read) == 1: value = None
value = round(float(value_read[0]), 1) try:
except ValueError: value_read = self._read_value_raw()
_LOGGER.warning("Invalid value read from %s", if len(value_read) == 1:
self._device_file) value = round(float(value_read[0]), 1)
except FileNotFoundError: except ValueError:
_LOGGER.warning( _LOGGER.warning("Invalid value read from %s", self._device_file)
"Cannot read from sensor: %s", self._device_file) except FileNotFoundError:
_LOGGER.warning("Cannot read from sensor: %s", self._device_file)
self._state = value self._state = value