renamed settings module to config to avoid irritations
parent
a237de8940
commit
bb840d46cf
|
|
@ -8,8 +8,8 @@ import xml.etree.ElementTree as ET
|
|||
import os
|
||||
|
||||
from timeFunctions import *
|
||||
from settings import SensorType, setup_data_echo, setup_data_log
|
||||
from settings import settings
|
||||
from config import SensorType, setup_data_echo, setup_data_log
|
||||
from config import settings
|
||||
|
||||
class Logger(object):
|
||||
def __init__(self, log):
|
||||
|
|
|
|||
4
Setup.py
4
Setup.py
|
|
@ -15,8 +15,8 @@ except ImportError:
|
|||
print("package 'tinkerforge' not installed, canceling")
|
||||
raise Exception("package 'tinkerforge' not installed, canceling")
|
||||
|
||||
from settings import SensorType
|
||||
from settings import settings
|
||||
from config import SensorType
|
||||
from config import settings
|
||||
|
||||
class ConnectionSetup(object):
|
||||
def __init__(self, log):
|
||||
|
|
|
|||
2
main.py
2
main.py
|
|
@ -6,7 +6,7 @@ import time
|
|||
|
||||
from Logger import Logger
|
||||
from Setup import ConnectionSetup
|
||||
from settings import settings, setupLogger
|
||||
from config import settings, setupLogger
|
||||
|
||||
log = setupLogger()
|
||||
lockpath=os.path.join(settings.locks,settings.lockname)
|
||||
|
|
|
|||
Loading…
Reference in New Issue