Re: Plugin Z4D avec new matériel "passerelle Zigbee SLZB 06"
Publié : 27 janv. 2025, 12:59
en cherchant, j'ai trouvé ça à executer.
mais pour la commande suivante , j'ai toujours une erreurgit stash
Saved working directory and index state WIP on stable7: 8694b202 Release 7.1.016 - Hotfix for EZSP chipset
patrick@raspberrypi:~/domoticz/plugins/Domoticz-Zigbee $ git pull
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
Updating 8694b202..af1d9e18
Fast-forward
.hidden/VERSION | 2 +-
Classes/PluginConf.py | 8 +-
Classes/WebServer/WebServer.py | 56 ++--
Classes/WebServer/com.py | 2 +
Classes/WebServer/dispatcher.py | 222 ++++++++--------
Classes/WebServer/rest_PluginUpgrade.py | 7 +-
Classes/WebServer/rest_device_params.py | 94 +++++++
Classes/ZigpyTransport/AppGeneric.py | 2 +-
DevicesModules/custom_zlinky.py | 478 ++++++++++++++++++++--------------
Modules/actuators.py | 32 ++-
Modules/checkingUpdate.py | 8 +-
Modules/database.py | 4 +-
Modules/heartbeat.py | 11 +-
Modules/readAttributes.py | 50 +++-
Modules/tools.py | 4 +
Modules/zlinky.py | 255 ++++++++++++------
ReleaseNotes.md | 22 ++
Tools/big-clean-git.sh | 19 --
Tools/clean-git.sh | 6 -
Tools/cleaning-repository.sh | 50 ++++
Tools/plugin-auto-upgrade.sh | 250 ++++++++++++------
Tools/printLOD.py | 90 ++++---
Zigbee/zclDecoders.py | 1 -
plugin.py | 11 +
sonar-project.properties | 3 +
www/z4d/{12.445878b6b97c587c.js => 12.9b43b1ddebc052a8.js} | 2 +-
www/z4d/{317.59bbe14d2339e649.js => 317.8348e1df39faeac7.js} | 2 +-
www/z4d/3rdpartylicenses.txt | 3 -
www/z4d/521.3fdfd13040e64239.js | 1 +
www/z4d/521.4a2e700ea1ed6d2d.js | 1 -
www/z4d/{577.d8ab166ec1c4b8d8.js => 577.fa69d399ab88eb5c.js} | 2 +-
www/z4d/{644.e5bbcc7e1d18b79d.js => 644.06ec887a183e3377.js} | 2 +-
www/z4d/{837.e9d5b18d020927e4.js => 837.bb9840a9999b6259.js} | 2 +-
www/z4d/{846.273fca847945652d.js => 846.79a43d02dda5caf6.js} | 2 +-
www/z4d/{908.08c26a5f1272a6a5.js => 908.bcd45ae997039883.js} | 2 +-
www/z4d/index.html | 2 +-
www/z4d/main.c415fca447920f26.js | 1 +
www/z4d/main.dc6bb7d4a99f0738.js | 1 -
www/z4d/{runtime.d2f1aeee7ac9ef47.js => runtime.d5745d958be89c98.js} | 2 +-
39 files changed, 1120 insertions(+), 592 deletions(-)
create mode 100644 Classes/WebServer/rest_device_params.py
delete mode 100644 Tools/big-clean-git.sh
delete mode 100644 Tools/clean-git.sh
create mode 100644 Tools/cleaning-repository.sh
create mode 100644 sonar-project.properties
rename www/z4d/{12.445878b6b97c587c.js => 12.9b43b1ddebc052a8.js} (99%)
rename www/z4d/{317.59bbe14d2339e649.js => 317.8348e1df39faeac7.js} (99%)
create mode 100644 www/z4d/521.3fdfd13040e64239.js
delete mode 100644 www/z4d/521.4a2e700ea1ed6d2d.js
rename www/z4d/{577.d8ab166ec1c4b8d8.js => 577.fa69d399ab88eb5c.js} (99%)
rename www/z4d/{644.e5bbcc7e1d18b79d.js => 644.06ec887a183e3377.js} (99%)
rename www/z4d/{837.e9d5b18d020927e4.js => 837.bb9840a9999b6259.js} (99%)
rename www/z4d/{846.273fca847945652d.js => 846.79a43d02dda5caf6.js} (99%)
rename www/z4d/{908.08c26a5f1272a6a5.js => 908.bcd45ae997039883.js} (99%)
create mode 100644 www/z4d/main.c415fca447920f26.js
delete mode 100644 www/z4d/main.dc6bb7d4a99f0738.js
rename www/z4d/{runtime.d2f1aeee7ac9ef47.js => runtime.d5745d958be89c98.js} (57%)
salinois/domoticz/plugins/Domoticz-Zigbee $ git checkout rc-stable7-7.1.021
error: Your local changes to the following files would be overwritten by checkout:
plugin.py
Please commit your changes or stash them before you switch branches.
Aborting