diff --git a/.tools/update_changelog.sh b/.tools/update_changelog.sh index cb0ce2b429..d89e3bce3f 100644 --- a/.tools/update_changelog.sh +++ b/.tools/update_changelog.sh @@ -38,15 +38,17 @@ do fi # Version line + # Note: '## VERSION1' or '## VERSION2, VERSION1' if [[ "${L}" == "## "* ]]; then - if [[ "${L}" == "## ${VERSION}"* ]]; then + if [[ "${L}" == *"${VERSION}"* ]]; then echo "- Version is already correct in changelog. Doing nothing" echo rm ${TMP} break fi echo "- Updating version to ${VERSION}" - echo "## ${VERSION}" >> ${TMP} + VERSIONOLD=${VERSION### } + echo "## ${VERSION}, ${VERSIONOLD}" >> ${TMP} STEP=2 # Copy rest of the file continue fi diff --git a/core/config/devices/TS0601__TZE200_e3oitdyu/TS0601__TZE200_e3oitdyu.json b/core/config/devices/TS0601__TZE200_e3oitdyu/TS0601__TZE200_e3oitdyu.json index d5fdf614ee..0519390730 100644 --- a/core/config/devices/TS0601__TZE200_e3oitdyu/TS0601__TZE200_e3oitdyu.json +++ b/core/config/devices/TS0601__TZE200_e3oitdyu/TS0601__TZE200_e3oitdyu.json @@ -3,6 +3,7 @@ "manufacturer": "Moes", "model": "MS-105BZ", "type": "Moes dual dimmer module", + "genericType": "Outlet", "alternateIds": { "TS0601__TZE200_fjjbhx9d": [], "TS0601__TZE200_gwkapsoq": [], @@ -22,21 +23,11 @@ "params": "dpId=01&data=01", "isVisible": 1 }, - "On (OLD)": { - "use": "cmdG-TuyaEF00-Set-OnOff", - "params": "onOff=01&dpId=01", - "isVisible": 1 - }, "Off 1": { "use": "act_tuyaEF00-SetBool", "params": "dpId=01&data=00", "isVisible": 1 }, - "Off (OLD)": { - "use": "cmdG-TuyaEF00-Set-OnOff", - "params": "onOff=00&dpId=01", - "isVisible": 1 - }, "Status 1": { "use": "inf_zbAttr-0006-OnOff", "logicalId": "status1", @@ -65,11 +56,6 @@ "comment": "x per 100 to x per 1000 conversion", "isVisible": 1 }, - "Set Level 1 (OLD)": { - "use": "cmdG-TuyaEF00-Set-Level", - "params": "dpId=02", - "isVisible": 1 - }, "Level 1": { "use": "inf_levelPercent", "logicalId": "level1", diff --git a/docs/fr_FR/Changelog.md b/docs/fr_FR/Changelog.md index 226053c214..5bff4504cb 100644 --- a/docs/fr_FR/Changelog.md +++ b/docs/fr_FR/Changelog.md @@ -1,6 +1,7 @@ # ChangeLog -- Correction: Fichiers dit corrompus à l'installation. +- Correction: Fichiers corrompus à l'installation. +- Amélioration: Moes MS105B: Amélioration modèle (2473). ## 241106-BETA-1