@@ -167,8 +167,12 @@ def SensorsInfo(self):
167
167
extension_types = {'ADC' : {'function' : 'analogReadAllFloat' },
168
168
'DAC' : {'function' : 'analogReadAllFloat' },
169
169
'PWM' : {'function' : 'pwmWildcard' },
170
- 'DAC ' : {'function' : 'wildcard' }}
170
+ 'GPIOPort ' : {'function' : 'wildcard' }}
171
171
for device_type in device ['type' ]:
172
+ try :
173
+ display_name = device ['description' ]
174
+ except :
175
+ display_name = None
172
176
if device_type in sensor_types :
173
177
try :
174
178
sensor_type = sensor_types [device_type ]
@@ -177,7 +181,7 @@ def SensorsInfo(self):
177
181
channel = '{}:{}' .format (device ['name' ], device_type .lower ())
178
182
else :
179
183
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 )
181
185
except :
182
186
exception ('Failed to get sensor data: {} {}' .format (device_type , device ['name' ]))
183
187
else :
@@ -186,7 +190,7 @@ def SensorsInfo(self):
186
190
func = getattr (sensor , extension_type ['function' ])
187
191
values = self .CallDeviceFunction (func )
188
192
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 )
190
194
except :
191
195
exception ('Failed to get extension data: {} {}' .format (device_type , device ['name' ]))
192
196
logJson ('Sensors info: {}' .format (sensors_info ))
0 commit comments