Rename xively to logger

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

diff --git a/vis/main.py b/vis/main.py
index 605bc30cc06f15995eb792e7fe093bb4b00cbee4..00149ad274d28212d2042232429bb4dd449512a4 100755 (executable)
--- a/vis/main.py
+++ b/vis/main.py
@@ -1,16 +1,16 @@
 #!/usr/bin/env python
 
 from config import Config
-from xively import Xively
-from serial import Serial
+from logger import Logger
+from device import Device
 from visual import Visual
 
 class Main:
        def __init__(self):
                self.config = Config();
-               self.xively = Xively();
-               self.serial = Serial();
-               self.visual = Visual();
+               self.device = Device(self.config);
+               self.logger = Logger(self.config);
+               self.visual = Visual(self.config, self.device, self.logger);
 
        def main(self):
                self.visual.run()