Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
Python
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
xAAL
Code
Python
Commits
f3bf6bbc
Commit
f3bf6bbc
authored
1 month ago
by
KERDREUX Jerome
Browse files
Options
Downloads
Patches
Plain Diff
Test the light API.
parent
6533ffdb
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
devices/protocols/ZwaveJS/xaal/zwavejs/devices.py
+24
-3
24 additions, 3 deletions
devices/protocols/ZwaveJS/xaal/zwavejs/devices.py
devices/protocols/ZwaveJS/xaal/zwavejs/gw.py
+2
-2
2 additions, 2 deletions
devices/protocols/ZwaveJS/xaal/zwavejs/gw.py
with
26 additions
and
5 deletions
devices/protocols/ZwaveJS/xaal/zwavejs/devices.py
+
24
−
3
View file @
f3bf6bbc
...
...
@@ -32,7 +32,8 @@ def value_is_command_class(value: Value, command_class: COMMAND_CLASS):
def
value_is_value
(
value
:
Value
):
return
value
.
property_
in
[
"
value
"
,
"
currentValue
"
]
# return value.property_ in ["value", "currentValue", "targetValue"]
return
value
.
property_
in
[
"
targetValue
"
]
def
build_devices
(
node
:
Node
,
eng
:
AsyncEngine
):
...
...
@@ -41,7 +42,7 @@ def build_devices(node: Node, eng: AsyncEngine):
# node.on("value updated", self.value_updated)
# pdb.set_trace()
#
assert
BASE_ADDR
base_addr
=
BASE_ADDR
+
node
.
node_id
*
128
for
k
in
node
.
values
:
value
=
node
.
values
.
get
(
k
)
...
...
@@ -54,6 +55,9 @@ def build_devices(node: Node, eng: AsyncEngine):
if
value_is_command_class
(
value
,
COMMAND_CLASS
.
SWITCH_BINARY
):
obj
=
PowerRelay
(
node
,
value
,
base_addr
)
if
value_is_command_class
(
value
,
COMMAND_CLASS
.
SWITCH_MULTILEVEL
):
obj
=
Lamp
(
node
,
value
,
base_addr
)
if
value_is_command_class
(
value
,
COMMAND_CLASS
.
METER
):
obj
=
PowerMeter
(
node
,
value
,
base_addr
)
pass
...
...
@@ -61,6 +65,7 @@ def build_devices(node: Node, eng: AsyncEngine):
if
obj
is
not
None
and
obj
.
dev
:
obj
.
setup
()
eng
.
add_device
(
obj
.
dev
)
logger
.
warning
(
obj
.
dev
)
# if node.node_id == 5:
# pdb.set_trace()
...
...
@@ -100,7 +105,6 @@ class PowerRelay(ZwaveDevice):
self
.
dev
.
attributes
[
"
power
"
]
=
value
.
value
async
def
turn_on
(
self
):
pdb
.
set_trace
()
await
self
.
node
.
async_set_value
(
self
.
state
,
True
)
async
def
turn_off
(
self
):
...
...
@@ -122,3 +126,20 @@ class PowerMeter(ZwaveDevice):
value
=
event
[
'
value
'
]
if
self
.
power
==
value
:
self
.
dev
.
attributes
[
"
power
"
]
=
value
.
value
class
Lamp
(
ZwaveDevice
):
def
__init__
(
self
,
node
:
Node
,
value
:
Value
,
base_addr
:
bindings
.
UUID
):
super
().
__init__
(
node
)
dev
=
devices
.
lamp
(
base_addr
)
dev
.
methods
[
"
turn_on
"
]
=
self
.
turn_on
dev
.
methods
[
"
turn_off
"
]
=
self
.
turn_off
dev
.
attributes
[
"
light
"
]
=
value
.
value
self
.
dev
=
dev
self
.
state
=
value
async
def
turn_on
(
self
):
await
self
.
node
.
async_set_value
(
self
.
state
,
99
)
async
def
turn_off
(
self
):
await
self
.
node
.
async_set_value
(
self
.
state
,
0
)
This diff is collapsed.
Click to expand it.
devices/protocols/ZwaveJS/xaal/zwavejs/gw.py
+
2
−
2
View file @
f3bf6bbc
...
...
@@ -26,8 +26,8 @@ logger = logging.getLogger(__name__)
logging
.
getLogger
(
"
zwave_js_server
"
).
setLevel
(
logging
.
WARNING
)
URL
=
"
ws://10.77.3.143:3000
"
#
URL = "ws://localhost:3000"
#
URL = "ws://10.77.3.143:3000"
URL
=
"
ws://localhost:3000
"
DEBUG
=
True
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment