Skip to content
Snippets Groups Projects
Commit 02bfaf79 authored by jkerdreu's avatar jkerdreu
Browse files

Fix module import

git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/trunk@1941 b32b6428-25c9-4566-ad07-03861ab6144f
parent 6c7773f7
No related branches found
No related tags found
No related merge requests found
from __future__ import print_function
import platform
import sys,time
# Zwave imports
from openzwave.option import ZWaveOption
from openzwave.network import ZWaveNetwork
from openzwave.object import ZWaveException
from pydispatch import dispatcher
from xaal.lib import tools,Engine,Device
from .cmdclass import COMMAND_CLASS
from . import cmdclass
from . import products
from prettytable import PrettyTable
......@@ -118,7 +118,7 @@ class GW(object):
val = node.values[k]
# some devices have broken command_class
if val.command_class == None: continue
if ((cmd_class == COMMAND_CLASS(val.command_class)) and (val.index==idx) and (val.instance == instance)):
if ((cmd_class == cmdclass.COMMAND_CLASS(val.command_class)) and (val.index==idx) and (val.instance == instance)):
return val
return None
......@@ -139,7 +139,7 @@ class GW(object):
for k in zdev.values:
val = zdev.values[k]
if val.command_class:
klass = COMMAND_CLASS(val.command_class)
klass = cmdclass.COMMAND_CLASS(val.command_class)
else:
klass = 'Error'
table.add_row([k,val.instance,val.index,val.label,val.data,val.units,klass])
......@@ -148,8 +148,12 @@ class GW(object):
def run():
eng = Engine()
try:
gw=GW(eng)
eng.run()
except ZWaveException as err:
logger.warn('Error w/ Zwave network: %s' % err.value)
def main():
try:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment