Skip to content

Commit ba967c3

Browse files
committed
Skip loading 1-wire devices that do not exist.
1 parent aa2c38b commit ba967c3

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

myDevices/devices/manager.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from myDevices.utils.config import Config
99
from myDevices.devices import serial, digital, analog, sensor, shield
1010
from myDevices.devices.instance import DEVICES
11-
from myDevices.devices.onewire import detectOneWireDevices
11+
from myDevices.devices.onewire import detectOneWireDevices, deviceExists, FAMILIES
1212

1313
PACKAGES = [serial, digital, analog, sensor, shield]
1414
DYNAMIC_DEVICES = {}
@@ -135,6 +135,9 @@ def addDevice(name, device, description, args, origin):
135135
logger.error("Device <%s> already exists" % name)
136136
return -1
137137
logger.debug('addDevice: ' + str(name) + ' ' + str(device))
138+
if device in FAMILIES.values() and ('slave' not in args or not deviceExists(args['slave'])):
139+
logger.info('1-wire device does not exist: {}, {}'.format(device, args['slave']))
140+
return -1
138141
# if '/' in device:
139142
# deviceClass = device.split('/')[0]
140143
# else:

myDevices/devices/onewire.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,3 +105,5 @@ def detectOneWireDevices():
105105
debug('Error detecting 1-wire devices: {}'.format(err))
106106
return devices
107107

108+
def deviceExists(slave):
109+
return os.path.exists("/sys/bus/w1/devices/%s" % slave)

0 commit comments

Comments
 (0)