From 4f7beb52381b82c1aa9b25f62a192223e5f66989 Mon Sep 17 00:00:00 2001 From: chrono Date: Tue, 10 Dec 2013 09:34:32 +0000 Subject: [PATCH] Moved python libs to ./lib --- max31855.py => lib/max31855.py | 0 oven.py => lib/oven.py | 0 ovenWatcher.py => lib/ovenWatcher.py | 0 picoreflowd.py | 10 +++++++--- storage/profiles/lead.json | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) rename max31855.py => lib/max31855.py (100%) rename oven.py => lib/oven.py (100%) rename ovenWatcher.py => lib/ovenWatcher.py (100%) mode change 100644 => 100755 picoreflowd.py diff --git a/max31855.py b/lib/max31855.py similarity index 100% rename from max31855.py rename to lib/max31855.py diff --git a/oven.py b/lib/oven.py similarity index 100% rename from oven.py rename to lib/oven.py diff --git a/ovenWatcher.py b/lib/ovenWatcher.py similarity index 100% rename from ovenWatcher.py rename to lib/ovenWatcher.py diff --git a/picoreflowd.py b/picoreflowd.py old mode 100644 new mode 100755 index ffe2318..0eb8198 --- a/picoreflowd.py +++ b/picoreflowd.py @@ -1,4 +1,7 @@ +#!/usr/bin/env python + import os +import sys import logging import json @@ -17,6 +20,10 @@ logging.basicConfig(level=config.log_level, format=config.log_format) log = logging.getLogger("picoreflowd") log.info("Starting picoreflowd") +script_dir = os.path.dirname(os.path.realpath(__file__)) +sys.path.insert(0, script_dir + '/lib') +profile_path = os.path.join(script_dir, "storage", "profiles") + from oven import Oven, Profile from ovenWatcher import OvenWatcher @@ -24,9 +31,6 @@ app = bottle.Bottle() oven = Oven() ovenWatcher = OvenWatcher(oven) -script_dir = os.path.dirname(os.path.realpath(__file__)) -profile_path = os.path.join(script_dir, "storage", "profiles") - @app.route('/') def index(): diff --git a/storage/profiles/lead.json b/storage/profiles/lead.json index 3e68a72..978e1e9 100644 --- a/storage/profiles/lead.json +++ b/storage/profiles/lead.json @@ -1 +1 @@ -{"type": "profile", "data": [[0, 20], [60, 100], [180.7938551407944, 82.5], [225.7138263665595, 176.25]], "name": "lead"} \ No newline at end of file +{"type": "profile", "data": [[0, 20], [60, 100], [180, 82], [225, 176]], "name": "lead"}