smokephil/ems
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

code aufgeräumt

Browse source
This commit is contained in:
Philipp Rauch 2014-01-30 16:06:14 +01:00
parent bd216d5222
commit 25e406ed8c
6 changed files with 62 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/CANFilter.py
View file

@ -12,25 +12,26 @@ from datetime import datetime
from time import sleep
from threading import Thread
from Queue import Queue
from config import Config
from pandas import DataFrame
from profile.database import Database
debug = True
class CANFilter(Thread):
def CAN_start(conf):
print 'starte CAN mit Baud von', conf['can_baudrate']
can = CANFilter(conf)
can.start()
### LOAD CONFIG ###
c = Config()
conf = c.readConf()
class CANFilter(Thread):
### Lookup f<>r CAN --> DB ###
lookup = {
'dc_battery' : 'battery'
}
def __init__(self):
def __init__(self, conf):
Thread.__init__(self)
self.conf = conf
self.queue = Queue()
### init DB ###
@ -48,14 +49,14 @@ class CANFilter(Thread):
self.pcan = PcanAdapter(PcanAdapter.Baudrate[self.conf['can_baudrate']],
debug = self.conf['config_debug'])
self.pcan.initialize()
if isinstance(self.conf["symfile"], str):
sym = "%s/%s" % (self.conf["config_dictionary"],
self.conf["symfile"])
if isinstance(self.conf['can_symfile'], str):
sym = '%s/%s' % (self.conf['config_dictionary'],
self.conf['can_symfile'])
self.symList.append(get_DataFrameDict(sym))
Add2Adapter(self.pcan, sym)
elif isinstance(self.conf["symfile"], list):
for element in self.conf["symfile"]:
sym = "%s/%s" % (self.conf["config_dictionary"], element)
elif isinstance(self.conf['can_symfile'], list):
for element in self.conf['can_symfile']:
sym = '%s/%s' % (self.conf['config_dictionary'], element)
self.symList.append(get_DataFrameDict(sym))
Add2Adapter(self.pcan, sym)