X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=vis%2Fmain.py;h=00149ad274d28212d2042232429bb4dd449512a4;hb=5277ee21e352354a19478bad29496fc05d2f747b;hp=605bc30cc06f15995eb792e7fe093bb4b00cbee4;hpb=2cd0c0e6b9c2f65254909c807199d61ba63a1667;p=~andy%2Fcsm213a-hw

diff --git a/vis/main.py b/vis/main.py
index 605bc30..00149ad 100755
--- 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()