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

Pipiche38/cfgrpt/resetatdevicelevel #1265

Merged
merged 3 commits into from
Sep 5, 2022
Merged

Pipiche38/cfgrpt/resetatdevicelevel #1265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b926f90
prevent to have an unknown zcl_decoder message for IAS ACE as it is h…
pipiche38 Sep 5, 2022
4890b86
when doing Reset in ConfigureReporting tool, all ReportingConfigurati…
pipiche38 Sep 5, 2022
c73d347
comply with codefactor
pipiche38 Sep 5, 2022
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
11 changes: 9 additions & 2 deletions Classes/WebServer/rest_CfgReporting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
import Domoticz
from Classes.WebServer.headerResponse import (prepResponseMessage,
setupHeadersResponse)
from Modules.pluginDbAttributes import STORE_CUSTOM_CONFIGURE_REPORTING
from Modules.pluginDbAttributes import STORE_READ_CONFIGURE_REPORTING, STORE_CONFIGURE_REPORTING, STORE_CUSTOM_CONFIGURE_REPORTING

from Modules.zigateConsts import SIZE_DATA_TYPE


Expand Down Expand Up @@ -79,8 +80,14 @@ def rest_cfgrpt_ondemand_with_config_delete(self, verb, data, parameters , _resp

if STORE_CUSTOM_CONFIGURE_REPORTING in self.ListOfDevices[ deviceId ]:
del self.ListOfDevices[ deviceId ][ STORE_CUSTOM_CONFIGURE_REPORTING ]

if STORE_READ_CONFIGURE_REPORTING in self.ListOfDevices[ deviceId ]:
del self.ListOfDevices[ deviceId ][ STORE_READ_CONFIGURE_REPORTING ]

if STORE_CONFIGURE_REPORTING in self.ListOfDevices[ deviceId ]:
del self.ListOfDevices[ deviceId ][ STORE_CONFIGURE_REPORTING ]

action = {"Name": "Configure reporting record removed", "TimeStamp": int(time.time())}
action = {"Name": "Reset Configure reporting records removed", "TimeStamp": int(time.time())}
_response["Data"] = json.dumps(action, sort_keys=True)
return _response

Expand Down
4 changes: 4 additions & 0 deletions Zigbee/zclDecoders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ def zcl_decoders(self, SrcNwkId, SrcEndPoint, TargetEp, ClusterId, Payload, fram

if ClusterId == "0500" and is_direction_to_client(fcf) and Command == "01":
return buildframe_8400_cmd(self, "8400", frame, Sqn, SrcNwkId, SrcEndPoint, TargetEp, ClusterId, ManufacturerCode, Command, Data)

if ClusterId == "0501":
# Handle in inRawAPS
return frame

if ClusterId in ( "ef00", "ff00"):
# Do not log a message as this will be handled by the inRawAPS and delegated.
Expand Down