Merge branch 'master' into master

itavero · Jan 11, 2025 · 49fc72a · 49fc72a
2 parents 9a37044 + a677151
commit 49fc72a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,8 @@ Since version 1.0.0, we try to follow the [Semantic Versioning](https://semver.o
 
 - Expose `moving` as Motion Sensor. (see [#956](https://github.com/itavero/homebridge-z2m/pull/956))
 
+## [1.11.0-beta.9] - 2025-01-05
+
 ### Changed
 
 - Lights: `color_mode` is now always used (no longer an experimental flag; also see [#208](https://github.com/itavero/homebridge-z2m/issues/208))
@@ -490,7 +492,8 @@ For `cover` devices the following changes/fixes are in this release:
 - Restore BatteryService and WindowCovering properly on start up.
 - Improve state determination for WindowCovering.
 
-[unreleased]: https://github.com/itavero/homebridge-z2m/compare/v1.11.0-beta.8...HEAD
+[unreleased]: https://github.com/itavero/homebridge-z2m/compare/v1.11.0-beta.9...HEAD
+[1.11.0-beta.9]: https://github.com/itavero/homebridge-z2m/compare/v1.11.0-beta.8...v1.11.0-beta.9
 [1.11.0-beta.8]: https://github.com/itavero/homebridge-z2m/compare/v1.11.0-beta.7...v1.11.0-beta.8
 [1.11.0-beta.7]: https://github.com/itavero/homebridge-z2m/compare/v1.11.0-beta.6...v1.11.0-beta.7
 [1.11.0-beta.6]: https://github.com/itavero/homebridge-z2m/compare/v1.11.0-beta.5...v1.11.0-beta.6

diff --git a/generate-docs.sh b/generate-docs.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# Determine vesrion of zigbee-herdsman-converters based on latest Zigbee2MQTT release
+# Determine version of zigbee-herdsman-converters based on latest Zigbee2MQTT release
 Z2M_VERSION=$(npm view zigbee2mqtt@latest version)
 HERDSMAN_VERSION=$(npm view "zigbee2mqtt@$Z2M_VERSION" dependencies.zigbee-herdsman-converters)
 
@@ -17,4 +17,4 @@ DOC_VERSIONS_FILE=src/docgen/versions.ts
 npm i --no-save zigbee-herdsman-converters@${HERDSMAN_VERSION}
 
 # Run documentation script
-ts-node src/docgen/docgen.ts
+npx ts-node src/docgen/docgen.ts
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "displayName": "Homebridge Zigbee2MQTT",
   "name": "homebridge-z2m",
-  "version": "1.11.0-beta.8",
+  "version": "1.11.0-beta.9",
   "description": "Expose your Zigbee devices to HomeKit with ease, by integrating Zigbee2MQTT with Homebridge.",
   "license": "Apache-2.0",
   "homepage": "https://z2m.dev",

diff --git a/src/docgen/docgen.ts b/src/docgen/docgen.ts
@@ -117,7 +117,7 @@ const serviceNameMapping = new Map<string, ServiceInfo>([
   addServiceMapping(hapNodeJs.Service.Lightbulb, 'light.md'),
   addServiceMapping(hapNodeJs.Service.StatelessProgrammableSwitch, 'action.md'),
   addServiceMapping(hapNodeJs.Service.WindowCovering, 'cover.md'),
-  addServiceMapping(hapNodeJs.Service.BatteryService, 'battery.md'),
+  addServiceMapping(hapNodeJs.Service.Battery, 'battery.md'),
   addServiceMapping(hapNodeJs.Service.LockMechanism, 'lock.md'),
   addServiceMapping(hapNodeJs.Service.Switch, 'switch.md'),
   addServiceMapping(hapNodeJs.Service.Thermostat, 'climate.md'),
@@ -146,7 +146,7 @@ const controllerMapping = new Map<string, ControllerMapping>([
   ['AdaptiveLightingController', new ControllerMapping('Adaptive Lighting', 'light.md')],
 ]);
 
-const servicesIgnoredForDeterminingSupport = new Set<string>([hapNodeJs.Service.BatteryService.UUID]);
+const servicesIgnoredForDeterminingSupport = new Set<string>([hapNodeJs.Service.Battery.UUID]);
 
 const ignoredExposesNames = new Set<string>(['linkquality', 'battery', 'battery_low']);
 

diff --git a/src/docgen/docs_accessory.ts b/src/docgen/docs_accessory.ts
@@ -1,6 +1,7 @@
 import { Controller, Service } from 'homebridge';
 import { BasicAccessory, ServiceHandler } from '../converters/interfaces';
 import { BasicLogger } from '../logger';
+import { sanitizeAccessoryName } from '../helpers';
 
 export class DocsAccessory implements BasicAccessory {
   readonly log: BasicLogger = {
@@ -44,7 +45,7 @@ export class DocsAccessory implements BasicAccessory {
     if (subType !== undefined) {
       name += ` ${subType}`;
     }
-    return name;
+    return sanitizeAccessoryName(name);
   }
 
   getServicesAndCharacteristics(): Map<string, string[]> {