Skip to content

Commit 6d12b0d

Browse files
committed
Set display name so auto-detected 1-wire devices show a default name.
1 parent 78df1be commit 6d12b0d

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

myDevices/sensors/sensors.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,12 @@ def SensorsInfo(self):
167167
extension_types = {'ADC': {'function': 'analogReadAllFloat'},
168168
'DAC': {'function': 'analogReadAllFloat'},
169169
'PWM': {'function': 'pwmWildcard'},
170-
'DAC': {'function': 'wildcard'}}
170+
'GPIOPort': {'function': 'wildcard'}}
171171
for device_type in device['type']:
172+
try:
173+
display_name = device['description']
174+
except:
175+
display_name = None
172176
if device_type in sensor_types:
173177
try:
174178
sensor_type = sensor_types[device_type]
@@ -177,7 +181,7 @@ def SensorsInfo(self):
177181
channel = '{}:{}'.format(device['name'], device_type.lower())
178182
else:
179183
channel = device['name']
180-
cayennemqtt.DataChannel.add(sensors_info, cayennemqtt.DEV_SENSOR, channel, value=self.CallDeviceFunction(func), **sensor_type['data_args'])
184+
cayennemqtt.DataChannel.add(sensors_info, cayennemqtt.DEV_SENSOR, channel, value=self.CallDeviceFunction(func), **sensor_type['data_args'], name=display_name)
181185
except:
182186
exception('Failed to get sensor data: {} {}'.format(device_type, device['name']))
183187
else:
@@ -186,7 +190,7 @@ def SensorsInfo(self):
186190
func = getattr(sensor, extension_type['function'])
187191
values = self.CallDeviceFunction(func)
188192
for pin, value in values.items():
189-
cayennemqtt.DataChannel.add(sensors_info, cayennemqtt.DEV_SENSOR, device['name'] + ':' + str(pin), cayennemqtt.VALUE, value)
193+
cayennemqtt.DataChannel.add(sensors_info, cayennemqtt.DEV_SENSOR, device['name'] + ':' + str(pin), cayennemqtt.VALUE, value, name=display_name)
190194
except:
191195
exception('Failed to get extension data: {} {}'.format(device_type, device['name']))
192196
logJson('Sensors info: {}'.format(sensors_info))

0 commit comments

Comments
 (0)