bugfix

src/ems.py

@@ -59,7 +59,7 @@ class ems(Thread):
         if conf['config_debug']:
             print '\tEMS-BUFFER:\t', buf
 
-        self.sql_query.put('/device')
+        self.mysql.query.put('/device')
         get = self.buffer.update_buffer(self.mysql.queue.get())
         #print 'GET:\t', get
 

src/pac.py

@@ -41,16 +41,16 @@ for item in conf['pac_messages']:
 tab = DataFrame(columns = col)
 
 ### Modbus ###
-sw = Switch(MODBUS)
-queue, query = sw.initialisiere()
-print '\tTEST-QUERY:\t', query
-print '\tTEST-QUEUE:\t', queue
-sw.start()
+modbus = Switch(MODBUS)
+modbus.initialisiere()
+print '\tTEST-QUERY:\t', modbus.query
+print '\tTEST-QUEUE:\t', modbus.queue
+modbus.start()
 while True:
     res = {}
     for mes in conf['pac_messages']:
-        query.put([1, int(mes)])
-        res.update(queue.get())
+        modbus.query.put([1, int(mes)])
+        res.update(modbus.queue.get())
 
     res_data = tab.append(res, ignore_index=True)
     res_data[col[1::]] =  res_data[col[1::]].astype(numpy.float) #till now only float support

src/run.py

@@ -11,6 +11,7 @@ from CAN.Filter import CAN_start
 c = config()
 conf = c.readConf()
 
+# TODO : Informationen, verweise
 
-CAN_start(conf)
+#CAN_start(conf)
 REST_start()