Get things running

[~andy/csm213a-hw] / vis / config.py

diff --git a/vis/config.py b/vis/config.py
index be79e485c0a8a64ce752730c0f9cb608360fdcb8..5e5ce4ae731fc44c196983d885a668212d4b8e78 100644 (file)
--- a/vis/config.py
+++ b/vis/config.py
@@ -25,15 +25,15 @@ class Config:
                'enable': {
                        'acc':      True,
                        'mag':      True,
-                       'touch':    True,
-                       'light':    True,
+                       'lgt':      True,
+                       'tch':      True,
                        'a2d':      True,
                },
                'rate': {
                        'acc':      1,
                        'mag':      1,
-                       'touch':    1,
-                       'light':    1,
+                       'lgh':      1,
+                       'tch':      1,
                        'a2d':      1,
                },
        }
@@ -72,8 +72,8 @@ class Config:
                self.maxrate  = int(get('xively', 'maxrate'))
 
                for key in list(self.defaults['enable'].keys()):
-                       self.enable[key] = bin(get('enable', key))
-                       self.rate[key]   = int(get('rate',   key))
+                       self.enable[key] =   bin(get('enable', key))
+                       self.rate[key]   = float(get('rate',   key))
 
        def save(self):
                self.parser.set('serial', 'device',           self.device)
@@ -87,8 +87,8 @@ class Config:
                self.parser.set('xively', 'maxrate',  str(int(self.maxrate)))
 
                for key in self.defaults['enable'].keys():
-                       self.parser.set('enable', key, str(bool(self.enable[key])))
-                       self.parser.set('rate',   key, str( int(self.rate[key])))
+                       self.parser.set('enable', key, str( bool(self.enable[key])))
+                       self.parser.set('rate',   key, str(float(self.rate[key])))
 
                with open(self.filename, 'w') as fd:
                        self.parser.write(fd)