Mercurial > code > home > repos > homeauto

comparison service/piNode/devices.py @ 1037:8d1a8a96e895

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more round() workarounds for mismatching literals not patching themselves out Ignore-this: 9e173ff490ca2b4cea54ffad40beed49 darcs-hash:7af87eaa585900fdbf1a004c3764798171caa28d
author drewp <drewp@bigasterisk.com>
date Thu, 28 Jan 2016 02:48:54 -0800
parents 8e075449ba0a
children 4ebb5cc30002
comparison
equal deleted inserted replaced
1036:5f56a8c96458 1037:8d1a8a96e895
204 self.sensor.trigger() 204 self.sensor.trigger()
205 humid, tempC = self.sensor.humidity(), self.sensor.temperature() 205 humid, tempC = self.sensor.humidity(), self.sensor.temperature()
206 206
207 stmts = set() 207 stmts = set()
208 if humid is not None: 208 if humid is not None:
209 stmts.add((self.uri, ROOM['humidity'], Literal(humid))) 209 stmts.add((self.uri, ROOM['humidity'], Literal(round(humid, 2))))
210 else: 210 else:
211 stmts.add((self.uri, RDFS['comment'], 211 stmts.add((self.uri, RDFS['comment'],
212 Literal('DHT read returned None'))) 212 Literal('DHT read returned None')))
213 if tempC is not None: 213 if tempC is not None:
214 stmts.add((self.uri, ROOM['temperatureF'], 214 stmts.add((self.uri, ROOM['temperatureF'],
215 Literal(tempC * 9 / 5 + 32))) 215 # see round() note in arduinoNode/devices.py
216 Literal(round(tempC * 9 / 5 + 32, 2))))
216 else: 217 else:
217 stmts.add((self.uri, RDFS['comment'], 218 stmts.add((self.uri, RDFS['comment'],
218 Literal('DHT read returned None'))) 219 Literal('DHT read returned None')))
219 return stmts 220 return stmts
220 221
251 for sensor in self._sensors: 252 for sensor in self._sensors:
252 stmts.append((self.uri, ROOM['connectedTo'], sensor.uri)) 253 stmts.append((self.uri, ROOM['connectedTo'], sensor.uri))
253 try: 254 try:
254 tempF = sensor.get_temperature(sensor.DEGREES_F) 255 tempF = sensor.get_temperature(sensor.DEGREES_F)
255 stmts.append((sensor.uri, ROOM['temperatureF'], 256 stmts.append((sensor.uri, ROOM['temperatureF'],
256 Literal(tempF))) 257 # see round() note in arduinoNode/devices.py
258 Literal(round(tempF, 2))))
257 except w1thermsensor.core.SensorNotReadyError as e: 259 except w1thermsensor.core.SensorNotReadyError as e:
258 log.warning(e) 260 log.warning(e)
259 261
260 return stmts 262 return stmts
261 except Exception as e: 263 except Exception as e: