X-Git-Url: http://pileus.org/git/?p=~andy%2Fcsm213a-hw;a=blobdiff_plain;f=vis%2Fconfig.py;h=a41cf643c3e261747a4e0dc63040eb2902346f7c;hp=07151fe383b06a41d5581fefead5c6821a1d3ee0;hb=fc3721b2f7f7acd9dae5340615b434f68b811b28;hpb=2f86fd9689f36563206cc14f0d270d189e2d2f49 diff --git a/vis/config.py b/vis/config.py index 07151fe..a41cf64 100644 --- a/vis/config.py +++ b/vis/config.py @@ -61,15 +61,15 @@ class Config: self.parser.read(self.filename) - self.device = get('serial', 'device') - self.baudrate = int(get('serial', 'baudrate')) - self.parity = get('serial', 'parity') - self.databits = int(get('serial', 'databits')) - self.stopbits = int(get('serial', 'stopbits')) - - self.feedid = get('xively', 'feedid') - self.apikey = get('xively', 'apikey') - self.maxrate = int(get('xively', 'maxrate')) + self.device = get('serial', 'device') + self.baudrate = int(get('serial', 'baudrate')) + self.parity = get('serial', 'parity') + self.databits = int(get('serial', 'databits')) + self.stopbits = int(get('serial', 'stopbits')) + + self.feedid = get('xively', 'feedid') + self.apikey = get('xively', 'apikey') + self.maxrate = float(get('xively', 'maxrate')) for key in list(self.defaults['enable'].keys()): self.enable[key] = bin(get('enable', key)) @@ -82,9 +82,9 @@ class Config: self.parser.set('serial', 'databits', str(int(self.databits))) self.parser.set('serial', 'stopbits', str(int(self.stopbits))) - self.parser.set('xively', 'feedid', self.feedid) - self.parser.set('xively', 'apikey', self.apikey) - self.parser.set('xively', 'maxrate', str(int(self.maxrate))) + self.parser.set('xively', 'feedid', self.feedid) + self.parser.set('xively', 'apikey', self.apikey) + self.parser.set('xively', 'maxrate', str(float(self.maxrate))) for key in self.defaults['enable'].keys(): self.parser.set('enable', key, str( bool(self.enable[key])))