FIX : mode debug ;-(

backend/app/__init__.py

@@ -1,39 +1,36 @@
 # -*- coding: utf-8 -*-
 import os
 from flask import Flask, request
+from flask import jsonify
 from flask.ext import restful
 from config import config
 from yapsy.PluginManager import PluginManagerSingleton
 
 class ListDevices(restful.Resource):
     def get(self):
-        list = [
-            {
-                'id' : 'sonde1',
+        list = {
+	    'sonde1' : {
                 'famille' : 'sonde',
                 'type' : 'temperature',
                 'unite' : '°C'
             },
-            {
-                'id' : 'sonde2',
+            'sonde2' : {
                 'famille' : 'sonde',
                 'type' : 'lumiere',
                 'unite' : 'LUX'
             },
-            {
-                'id' : 'prise1',
+            'prise1' : {
                 'famille' : 'prise',
                 'type' : 'on/off',
                 'unite' : 'boolean'
             }
-        ]
+        }
         return list
 
 def create_app(config_name):
     app = Flask(__name__, static_url_path='/static')
 
-    from .zwave import zwave as zwave_blueprint
-    app.register_blueprint(zwave_blueprint)
+
     api = restful.Api(app)
     plugins = PluginManagerSingleton.get()
     plugins.setPluginPlaces(
@@ -46,6 +43,19 @@ def create_app(config_name):
     api.add_resource(ListDevices,'/rest/list')
     app.config.from_object(config[config_name])
     config[config_name].init_app(app)
-    return app
 
 
+    @app.route('/rest/prise/<int:id>/<int:value>', methods=['PUT'])
+    def set_prise(id, value):
+        node = zwave.network.nodes[id]
+        prise = node.get_switches()[72057594109837312L]
+        if value == 1:
+            prise.data = True
+        else:
+            prise.data = False
+        return jsonify({'code':200})
+
+    from .zwave.zwavenetwork import ZWave
+    zwave = ZWave(app)
+
+    return app

backend/app/zwave/zwavenetwork.py

@@ -1,7 +1,6 @@
 import logging
 import sys,os
 import resource
-from flask.ext import restful
 zwave = True
 try:
     import openzwave
@@ -11,45 +10,58 @@
     from openzwave.controller import ZWaveController
     from openzwave.network import ZWaveNetwork
     from openzwave.option import ZWaveOption
+    from louie import dispatcher, All
 except:
     zwave = False
 import time
 
 
-class ZWave(restful.Resource):
+class ZWave(object):
 
-    network=''
-
-    def __init__(self):
-        if zwave:
-            logging.basicConfig(level=logging.INFO)
-
-            logger = logging.getLogger('openzwave')
-            device="/dev/ttyACM0"
-            log="Debug"
-
-            options = ZWaveOption(device, \
-               config_path="%s/config" % os.path.abspath(os.path.dirname(__file__)), \
-               user_path=".", cmd_line="")
-            options.set_log_file("zwave_test.log")
-            options.set_append_log_file(False)
-            options.set_console_output(False)
-            options.set_save_log_level(log)
-            options.set_logging(False)
-            options.lock()
-
-            netwrk = ZWaveNetwork(options, log=None)
-
-            for i in range(0,2200):
-               if netwrk.state>=netwrk.STATE_AWAKED:
-                  print(" done")
-                  break
-               else:
-                  sys.stdout.write(".")
-                  sys.stdout.flush()
-
-    	    self.network = netwrk
+    network=None
+    zwave = True
 
+    def __init__(self, app):
+        if self.network is None:
+            self.zwave = zwave
+            self.app = None
+            self.blueprint = None
+            if app is not None:
+                self.app = app
+            if zwave:
+                logging.basicConfig(level=logging.INFO)
+
+                logger = logging.getLogger('openzwave')
+                device="/dev/ttyACM0"
+                log="Debug"
+
+                options = ZWaveOption(device, \
+                   config_path="%s/config" % os.path.abspath(os.path.dirname(__file__)), \
+                   user_path=".", cmd_line="")
+                options.set_log_file("zwave_test.log")
+                options.set_append_log_file(False)
+                options.set_console_output(False)
+                options.set_save_log_level(log)
+                options.set_logging(False)
+                options.lock()
+                self.network = ZWaveNetwork(options, log=None)
+
+
+                print "------------------------------------------------------------"
+                print "Init Network : "
+                print "------------------------------------------------------------"
+                for i in range(0,2200):
+                    if self.network.state>=self.network.STATE_AWAKED:
+                        print(" done")
+                        break
+                    else:
+                        sys.stdout.write(".")
+                        sys.stdout.flush()
+
+
+                for node in self.network.nodes:
+                    print node
+
     def get(self, nodeId, value):
         node = self.network.nodes[int(nodeId)]
         prise = node.get_switches()[72057594109837312L]

backend/config.py

@@ -10,7 +10,7 @@ def init_app(app):
         pass
 
 class DevConfig(Config):
-    DEBUG = True
+    DEBUG = False
 
 config = {
     'devel' : DevConfig,

backend/manage.py

@@ -7,10 +7,5 @@
 app = create_app(os.getenv('FLASK_CONFIG') or 'default')
 manager = Manager(app)
 
-def make_shell_context():
-    return dict(app = app)
-
-manager.add_command('shell', Shell(make_context = make_shell_context))
-
 if __name__ == '__main__':
     manager.run()