Skip to content

Commit

Permalink
Merge branch 'master' into sun2000-modbus-to-latest
Browse files Browse the repository at this point in the history
  • Loading branch information
mcm1957 authored Dec 6, 2023
2 parents 2ce2f74 + 486fdec commit 1668242
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 38 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/newPrComment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

steps:
- run: echo user ${{github.event.comment.user.login}}
- uses: actions/github-script@v6
- uses: actions/github-script@v7
with:
script: |
github.rest.issues.addLabels({
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
],
"devDependencies": {
"@iobroker/repochecker": "^2.1.12",
"axios": "^1.6.0",
"axios": "^1.6.2",
"chai": "^4.3.10",
"eslint": "^8.52.0",
"eslint": "^8.54.0",
"gulp": "^4.0.2",
"image-size": "^1.0.2",
"minimist": "^1.2.8",
Expand Down
56 changes: 31 additions & 25 deletions sources-dist-stable.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,6 @@
"type": "general",
"version": "0.0.7"
},
"apple-find-me": {
"meta": "https://raw.githubusercontent.com/PfisterDaniel/ioBroker.apple-find-me/master/io-package.json",
"icon": "https://raw.githubusercontent.com/PfisterDaniel/ioBroker.apple-find-me/master/admin/find-me.png",
"type": "geoposition",
"version": "0.0.14"
},
"artnet": {
"meta": "https://raw.githubusercontent.com/ioBroker/ioBroker.artnet/master/io-package.json",
"icon": "https://raw.githubusercontent.com/ioBroker/ioBroker.artnet/master/admin/artnet.png",
Expand Down Expand Up @@ -186,7 +180,7 @@
"meta": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.beckhoff/master/io-package.json",
"icon": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.beckhoff/master/admin/beckhoff.png",
"type": "hardware",
"version": "1.5.2"
"version": "1.5.3"
},
"benchmark": {
"meta": "https://raw.githubusercontent.com/foxriver76/ioBroker.benchmark/main/io-package.json",
Expand Down Expand Up @@ -480,7 +474,7 @@
"meta": "https://raw.githubusercontent.com/crycode-de/ioBroker.ds18b20/master/io-package.json",
"icon": "https://raw.githubusercontent.com/crycode-de/ioBroker.ds18b20/master/admin/ds18b20.png",
"type": "hardware",
"version": "2.0.4"
"version": "2.0.5"
},
"dwd": {
"meta": "https://raw.githubusercontent.com/ioBroker/ioBroker.dwd/master/io-package.json",
Expand Down Expand Up @@ -552,13 +546,13 @@
"meta": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.emby/master/io-package.json",
"icon": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.emby/master/admin/emby.png",
"type": "multimedia",
"version": "1.0.2"
"version": "1.1.1"
},
"ems-esp": {
"meta": "https://raw.githubusercontent.com/tp1de/ioBroker.ems-esp/main/io-package.json",
"icon": "https://raw.githubusercontent.com/tp1de/ioBroker.ems-esp/main/admin/ems-esp.png",
"type": "climate-control",
"version": "2.6.1"
"version": "2.6.2"
},
"energymanager": {
"meta": "https://raw.githubusercontent.com/unltdnetworx/ioBroker.energymanager/master/io-package.json",
Expand All @@ -582,7 +576,7 @@
"meta": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.envertech-pv/master/io-package.json",
"icon": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.envertech-pv/master/admin/envertech-pv.png",
"type": "energy",
"version": "1.0.2"
"version": "1.1.0"
},
"epson_ecotank_et_2750": {
"meta": "https://raw.githubusercontent.com/o0shojo0o/ioBroker.epson_ecotank_et_2750/master/io-package.json",
Expand Down Expand Up @@ -788,11 +782,17 @@
"type": "alarm",
"version": "0.3.0"
},
"gira-iot": {
"meta": "https://raw.githubusercontent.com/klein0r/ioBroker.gira-iot/master/io-package.json",
"icon": "https://raw.githubusercontent.com/klein0r/ioBroker.gira-iot/master/admin/gira-iot.png",
"type": "iot-systems",
"version": "0.4.0"
},
"go-e": {
"meta": "https://raw.githubusercontent.com/MK-2001/ioBroker.go-e/main/io-package.json",
"icon": "https://raw.githubusercontent.com/MK-2001/ioBroker.go-e/main/admin/go-echarger.png",
"type": "vehicle",
"version": "1.0.27"
"version": "1.0.29"
},
"govee-local": {
"meta": "https://raw.githubusercontent.com/boergegrunicke/ioBroker.govee-local/main/io-package.json",
Expand Down Expand Up @@ -1319,7 +1319,7 @@
"meta": "https://raw.githubusercontent.com/foxthefox/ioBroker.lifx/master/io-package.json",
"icon": "https://raw.githubusercontent.com/foxthefox/ioBroker.lifx/master/admin/lifx_logo.png",
"type": "lighting",
"version": "1.0.3"
"version": "1.0.4"
},
"lightcontrol": {
"meta": "https://raw.githubusercontent.com/Schmakus/ioBroker.lightcontrol/main/io-package.json",
Expand Down Expand Up @@ -1625,7 +1625,7 @@
"meta": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.mqtt-client/master/io-package.json",
"icon": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.mqtt-client/master/admin/mqtt-client.png",
"type": "protocols",
"version": "1.6.5"
"version": "1.7.0"
},
"musiccast": {
"meta": "https://raw.githubusercontent.com/foxthefox/ioBroker.musiccast/master/io-package.json",
Expand Down Expand Up @@ -1730,8 +1730,8 @@
"version": "0.1.2"
},
"nsclient": {
"meta": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.nsclient/master/io-package.json",
"icon": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.nsclient/master/admin/nsclient.png",
"meta": "https://raw.githubusercontent.com/mcm4iob/ioBroker.nsclient/master/io-package.json",
"icon": "https://raw.githubusercontent.com/mcm4iob/ioBroker.nsclient/master/admin/nsclient.png",
"type": "infrastructure",
"version": "0.2.0"
},
Expand Down Expand Up @@ -1997,7 +1997,7 @@
"meta": "https://raw.githubusercontent.com/ylabonte/ioBroker.procon-ip/master/io-package.json",
"icon": "https://raw.githubusercontent.com/ylabonte/ioBroker.procon-ip/master/admin/procon-ip.png",
"type": "iot-systems",
"version": "1.4.0"
"version": "1.5.1"
},
"proxmox": {
"meta": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.proxmox/master/io-package.json",
Expand Down Expand Up @@ -2057,13 +2057,13 @@
"meta": "https://raw.githubusercontent.com/PLCHome/ioBroker.pylontech/master/io-package.json",
"icon": "https://raw.githubusercontent.com/PLCHome/ioBroker.pylontech/master/admin/pylontech.png",
"type": "energy",
"version": "0.0.6"
"version": "0.0.7"
},
"radar2": {
"meta": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.radar2/master/io-package.json",
"icon": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.radar2/master/admin/radar2.png",
"type": "network",
"version": "2.0.8"
"version": "2.1.0"
},
"radiohead": {
"meta": "https://raw.githubusercontent.com/crycode-de/ioBroker.radiohead/master/io-package.json",
Expand Down Expand Up @@ -2531,7 +2531,7 @@
"meta": "https://raw.githubusercontent.com/hombach/ioBroker.tibberlink/master/io-package.json",
"icon": "https://raw.githubusercontent.com/hombach/ioBroker.tibberlink/master/admin/tibberlink.png",
"type": "energy",
"version": "1.5.0"
"version": "1.6.1"
},
"tinker": {
"meta": "https://raw.githubusercontent.com/simatec/ioBroker.tinker/master/io-package.json",
Expand Down Expand Up @@ -2561,7 +2561,13 @@
"meta": "https://raw.githubusercontent.com/o0shojo0o/ioBroker.traccar/master/io-package.json",
"icon": "https://raw.githubusercontent.com/o0shojo0o/ioBroker.traccar/master/admin/traccar.png",
"type": "geoposition",
"version": "1.1.3"
"version": "1.1.4"
},
"tractive-gps": {
"meta": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.tractive-gps/main/io-package.json",
"icon": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.tractive-gps/main/admin/tractive-gps.png",
"type": "geoposition",
"version": "1.1.0"
},
"tradfri": {
"meta": "https://raw.githubusercontent.com/AlCalzone/ioBroker.tradfri/master/io-package.json",
Expand Down Expand Up @@ -2747,7 +2753,7 @@
"meta": "https://raw.githubusercontent.com/inventwo/ioBroker.vis-icontwo/master/io-package.json",
"icon": "https://raw.githubusercontent.com/inventwo/ioBroker.vis-icontwo/master/admin/icontwo.png",
"type": "visualization-icons",
"version": "0.97.1"
"version": "0.98.0"
},
"vis-inventwo": {
"meta": "https://raw.githubusercontent.com/inventwo/ioBroker.vis-inventwo/master/io-package.json",
Expand Down Expand Up @@ -2918,8 +2924,8 @@
"version": "0.0.15"
},
"welcome": {
"meta": "https://raw.githubusercontent.com/ioBroker/ioBroker.welcome/master/io-package.json",
"icon": "https://raw.githubusercontent.com/ioBroker/ioBroker.welcome/master/admin/welcome.png",
"meta": "https://raw.githubusercontent.com/ioBroker/ioBroker.welcome/main/io-package.json",
"icon": "https://raw.githubusercontent.com/ioBroker/ioBroker.welcome/main/admin/welcome.png",
"type": "general",
"version": "0.1.0"
},
Expand Down Expand Up @@ -3103,4 +3109,4 @@
"type": "hardware",
"version": "3.1.0"
}
}
}
35 changes: 25 additions & 10 deletions sources-dist.json
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@
"meta": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.boschindego/main/io-package.json",
"icon": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.boschindego/main/admin/boschindego.png",
"type": "garden"
},
},
"bosesoundtouch": {
"meta": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.bosesoundtouch/master/io-package.json",
"icon": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.bosesoundtouch/master/admin/bosesoundtouch.png",
Expand Down Expand Up @@ -1638,8 +1638,8 @@
"type": "utility"
},
"nsclient": {
"meta": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.nsclient/master/io-package.json",
"icon": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.nsclient/master/admin/nsclient.png",
"meta": "https://raw.githubusercontent.com/mcm4iob/ioBroker.nsclient/master/io-package.json",
"icon": "https://raw.githubusercontent.com/mcm4iob/ioBroker.nsclient/master/admin/nsclient.png",
"type": "infrastructure"
},
"nuki": {
Expand Down Expand Up @@ -1727,6 +1727,11 @@
"icon": "https://raw.githubusercontent.com/oweitman/ioBroker.openligadb/master/admin/openligadb_b.png",
"type": "misc-data"
},
"opensmartcity": {
"meta": "https://raw.githubusercontent.com/ioBroker/ioBroker.opensmartcity/main/io-package.json",
"icon": "https://raw.githubusercontent.com/ioBroker/ioBroker.opensmartcity/main/admin/opensmartcity.png",
"type": "weather"
},
"opentherm": {
"meta": "https://raw.githubusercontent.com/DrozmotiX/ioBroker.opentherm/main/io-package.json",
"icon": "https://raw.githubusercontent.com/DrozmotiX/ioBroker.opentherm/main/admin/opentherm.png",
Expand Down Expand Up @@ -1823,8 +1828,8 @@
"type": "network"
},
"pid": {
"meta": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.pid/master/io-package.json",
"icon": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.pid/master/admin/pid.png",
"meta": "https://raw.githubusercontent.com/mcm4iob/ioBroker.pid/master/io-package.json",
"icon": "https://raw.githubusercontent.com/mcm4iob/ioBroker.pid/master/admin/pid.png",
"type": "general"
},
"piface": {
Expand Down Expand Up @@ -1977,6 +1982,11 @@
"icon": "https://raw.githubusercontent.com/TA2k/ioBroker.renault/master/admin/renault.png",
"type": "vehicle"
},
"reolink": {
"meta": "https://raw.githubusercontent.com/aendue/ioBroker.reolink/main/io-package.json",
"icon": "https://raw.githubusercontent.com/aendue/ioBroker.reolink/main/admin/reolink_logo.png",
"type": "alarm"
},
"residents": {
"meta": "https://raw.githubusercontent.com/jpawlowski/ioBroker.residents/main/io-package.json",
"icon": "https://raw.githubusercontent.com/jpawlowski/ioBroker.residents/main/admin/residents.svg",
Expand Down Expand Up @@ -2218,8 +2228,8 @@
"type": "communication"
},
"solaredge": {
"meta": "https://raw.githubusercontent.com/92lleo/ioBroker.solaredge/master/io-package.json",
"icon": "https://raw.githubusercontent.com/92lleo/ioBroker.solaredge/master/admin/solaredge.png",
"meta": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.solaredge/master/io-package.json",
"icon": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.solaredge/master/admin/solaredge.png",
"type": "energy"
},
"solarlog": {
Expand Down Expand Up @@ -2631,6 +2641,11 @@
"icon": "https://raw.githubusercontent.com/ioBroker/ioBroker.vis-2-widgets-material/main/admin/vis-2-widgets-material.png",
"type": "visualization-widgets"
},
"vis-2-widgets-sweethome3d": {
"meta": "https://raw.githubusercontent.com/ioBroker/ioBroker.vis-2-widgets-sweethome3d/main/io-package.json",
"icon": "https://raw.githubusercontent.com/ioBroker/ioBroker.vis-2-widgets-sweethome3d/main/admin/vis-2-widgets-sweethome3d.png",
"type": "visualization-widgets"
},
"vis-3dmodel": {
"meta": "https://raw.githubusercontent.com/Excodibur/ioBroker.vis-3dmodel/master/io-package.json",
"icon": "https://raw.githubusercontent.com/Excodibur/ioBroker.vis-3dmodel/master/admin/vis-3dmodel.png",
Expand Down Expand Up @@ -2857,8 +2872,8 @@
"type": "climate-control"
},
"welcome": {
"meta": "https://raw.githubusercontent.com/ioBroker/ioBroker.welcome/master/io-package.json",
"icon": "https://raw.githubusercontent.com/ioBroker/ioBroker.welcome/master/admin/welcome.png",
"meta": "https://raw.githubusercontent.com/ioBroker/ioBroker.welcome/main/io-package.json",
"icon": "https://raw.githubusercontent.com/ioBroker/ioBroker.welcome/main/admin/welcome.png",
"type": "general"
},
"whatsapp-cmb": {
Expand Down Expand Up @@ -3031,4 +3046,4 @@
"icon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.zwave2/master/admin/zwave2.svg?sanitize=true",
"type": "hardware"
}
}
}

0 comments on commit 1668242

Please sign in to comment.