Rename serial to device and clean up

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

diff --git a/vis/main.py b/vis/main.py
index 897a4f7e340838c885a71789a31016f48693e765..4f4fcd295c8be991e4cd460d2e5521ad94e17603 100755 (executable)
--- a/vis/main.py
+++ b/vis/main.py
@@ -2,15 +2,15 @@
 
 from config import Config
 from xively import Xively
-from serial import Serial
+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.config);
+               self.device = Device(self.config);
+               self.xively = Xively(self.config);
+               self.visual = Visual(self.config, self.device, self.xively);
 
        def main(self):
                self.visual.run()