Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Maj domo force ep (needed for Lumi decoupled mode) #1710

Merged
merged 7 commits into from
Feb 6, 2024
Merged

Maj domo force ep (needed for Lumi decoupled mode) #1710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
28298dd
Set lumi.switch.acn047 in decoupled mode
pipiche38 Feb 4, 2024
de99cf6
Enable possibility to force MajDomoDevice on a specific Ep
pipiche38 Feb 4, 2024
c961720
update to for the value to 2 digits number for Switch
pipiche38 Feb 4, 2024
9740464
Update conf file
pipiche38 Feb 4, 2024
d78a4c8
change Switch into Button
pipiche38 Feb 5, 2024
dbf7575
change the log message when sending raw command
pipiche38 Feb 5, 2024
7b68481
config file move to Certified Db https://github.com/zigbeefordomoticz…
pipiche38 Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Classes/WebServer/WebServer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1295,7 +1295,7 @@ def rest_raw_zigbee(self, verb, data, parameters):
'timestamp': time.time()
}

self.logging( "Log","Sending request to coordinator %s" % ( data))
self.logging( "Log","Sending request to coordinator %s for target %s" % ( data, target_address))
self.ControllerLink.sendData( "RAW-COMMAND", data, NwkId=int(target_address,16), sqn=int(sqn,16), ackIsDisabled=ack_Is_Disabled )

return _response
Expand Down
11 changes: 7 additions & 4 deletions Modules/readZclClusters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ def action_majdomodevice( self, Devices, MsgSrcAddr, MsgSrcEp, MsgClusterId, Msg

self.log.logging( "ZclClusters", "Debug", "action_majdomodevice - %s/%s %s %s %s %s" %(
MsgSrcAddr, MsgSrcEp, MsgClusterId, MsgAttrID, device_model, value ))

_majdomo_formater = cluster_attribute_retrieval( self, MsgSrcEp, MsgClusterId, MsgAttrID, "DomoDeviceFormat", model=device_model)
self.log.logging( "ZclClusters", "Debug", " _majdomo_formater: %s" %_majdomo_formater)

Expand All @@ -387,15 +387,18 @@ def action_majdomodevice( self, Devices, MsgSrcAddr, MsgSrcEp, MsgClusterId, Msg
self.log.logging( "ZclClusters", "Debug", " _majdomo_formater: %s %s -> %s" %(_majdomo_formater, value, majValue))

_majdomo_cluster = cluster_attribute_retrieval( self, MsgSrcEp, MsgClusterId, MsgAttrID, "UpdDomoDeviceWithCluster", model=device_model)
self.log.logging( "ZclClusters", "Debug", " _majdomo_cluster: %s" %_majdomo_cluster)

majCluster = _majdomo_cluster if _majdomo_cluster is not None else MsgClusterId
self.log.logging( "ZclClusters", "Debug", " _majdomo_cluster: %s" %_majdomo_cluster)

_majdomo_attribute = cluster_attribute_retrieval( self, MsgSrcEp, MsgClusterId, MsgAttrID, "UpdDomoDeviceWithAttribute", model=device_model)
majAttribute = _majdomo_attribute if _majdomo_attribute is not None else ""
self.log.logging( "ZclClusters", "Debug", " _majdomo_attribute: %s -> %s" %(_majdomo_attribute, majAttribute))

MajDomoDevice(self, Devices, MsgSrcAddr, MsgSrcEp, majCluster, majValue, Attribute_=majAttribute)
_majdomo_endpoint = cluster_attribute_retrieval( self, MsgSrcEp, MsgClusterId, MsgAttrID, "UpdDomoDeviceWithEp", model=device_model)
target_ep = _majdomo_endpoint if _majdomo_endpoint is not None else MsgSrcEp
self.log.logging( "ZclClusters", "Debug", " _majdomo_ep: %s -> %s" %(_majdomo_endpoint, target_ep))

MajDomoDevice(self, Devices, MsgSrcAddr, target_ep, majCluster, majValue, Attribute_=majAttribute)


def majdomodevice_possiblevalues( self, MsgSrcEp, MsgClusterId, MsgAttrID, model, value):
Expand Down
Loading