Mercurial > templog
comparison py/uploader.py @ 192:e13146001852
merge
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Tue, 11 Feb 2014 22:11:03 +0800 |
parents | f4aabbf0da67 |
children | 4d82099d1fe0 |
comparison
equal
deleted
inserted
replaced
191:8318d50d766d | 192:e13146001852 |
---|---|
31 tosend['readings'] = readings | 31 tosend['readings'] = readings |
32 | 32 |
33 tosend['wort_name'] = self.server.wort_name | 33 tosend['wort_name'] = self.server.wort_name |
34 tosend['fridge_name'] = self.server.wort_name | 34 tosend['fridge_name'] = self.server.wort_name |
35 | 35 |
36 tosend.update(dict(self.server.params)) | 36 tosend['current_params'] = dict(self.server.params) |
37 | 37 |
38 tosend['start_time'] = self.server.start_time | 38 tosend['start_time'] = self.server.start_time |
39 tosend['uptime'] = utils.uptime() | 39 tosend['uptime'] = utils.uptime() |
40 | 40 |
41 return tosend | 41 return tosend |