fix: only serialize Firmware Update hardware version if defined (#7452)

zwave-js · Dec 2, 2024 · 18c5e0a · 18c5e0a
1 parent f2d7b3e
commit 18c5e0a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/packages/cc/src/cc/FirmwareUpdateMetaDataCC.ts b/packages/cc/src/cc/FirmwareUpdateMetaDataCC.ts
@@ -667,7 +667,7 @@ export class FirmwareUpdateMetaDataCCRequestGet
 	public nonSecureTransfer?: boolean;
 
 	public serialize(ctx: CCEncodingContext): Bytes {
-		this.payload = Bytes.alloc(11, 0);
+		this.payload = Bytes.alloc(10, 0);
 		this.payload.writeUInt16BE(this.manufacturerId, 0);
 		this.payload.writeUInt16BE(this.firmwareId, 2);
 		this.payload.writeUInt16BE(this.checksum, 4);
@@ -678,7 +678,13 @@ export class FirmwareUpdateMetaDataCCRequestGet
 		this.payload[9] = (this.activation ? 0b1 : 0)
 			| (this.nonSecureTransfer ? 0b10 : 0)
 			| (this.resume ? 0b100 : 0);
-		this.payload[10] = this.hardwareVersion ?? 0x00;
+		// Hardware version is not always set, but devices check it
+		if (this.hardwareVersion != undefined) {
+			this.payload = Bytes.concat([
+				this.payload,
+				[this.hardwareVersion],
+			]);
+		}
 
 		// eslint-disable-next-line @typescript-eslint/no-deprecated
 		return super.serialize(ctx);
@@ -1030,12 +1036,17 @@ export class FirmwareUpdateMetaDataCCActivationSet
 	public hardwareVersion?: number;
 
 	public serialize(ctx: CCEncodingContext): Bytes {
-		this.payload = new Bytes(8);
+		this.payload = new Bytes(7);
 		this.payload.writeUInt16BE(this.manufacturerId, 0);
 		this.payload.writeUInt16BE(this.firmwareId, 2);
 		this.payload.writeUInt16BE(this.checksum, 4);
 		this.payload[6] = this.firmwareTarget;
-		this.payload[7] = this.hardwareVersion ?? 0x00;
+		if (this.hardwareVersion != undefined) {
+			this.payload = Bytes.concat([
+				this.payload,
+				[this.hardwareVersion],
+			]);
+		}
 		// eslint-disable-next-line @typescript-eslint/no-deprecated
 		return super.serialize(ctx);
 	}

diff --git a/packages/zwave-js/src/lib/node/mixins/70_FirmwareUpdate.ts b/packages/zwave-js/src/lib/node/mixins/70_FirmwareUpdate.ts
@@ -222,6 +222,7 @@ export abstract class FirmwareUpdateMixin extends SchedulePollMixin
 				// Prepare the firmware update
 				let fragmentSizeSecure: number;
 				let fragmentSizeNonSecure: number;
+				let hardwareVersion: number | undefined;
 				let meta: FirmwareUpdateMetaData;
 				try {
 					const prepareResult = await self
@@ -250,6 +251,7 @@ export abstract class FirmwareUpdateMixin extends SchedulePollMixin
 					({
 						fragmentSizeSecure,
 						fragmentSizeNonSecure,
+						hardwareVersion,
 						...meta
 					} = prepareResult!);
 				} catch {
@@ -353,6 +355,7 @@ export abstract class FirmwareUpdateMixin extends SchedulePollMixin
 							meta,
 							fragmentSize,
 							checksum,
+							hardwareVersion,
 							shouldResume,
 							options.nonSecureTransfer,
 						);
@@ -646,8 +649,9 @@ export abstract class FirmwareUpdateMixin extends SchedulePollMixin
 		meta: FirmwareUpdateMetaData,
 		fragmentSize: number,
 		checksum: number,
-		resume: boolean | undefined,
-		nonSecureTransfer: boolean | undefined,
+		hardwareVersion?: number,
+		resume?: boolean,
+		nonSecureTransfer?: boolean,
 	) {
 		const api = this.commandClasses["Firmware Update Meta Data"];
 
@@ -669,6 +673,7 @@ export abstract class FirmwareUpdateMixin extends SchedulePollMixin
 			firmwareTarget: target,
 			fragmentSize,
 			checksum,
+			hardwareVersion,
 			resume,
 			nonSecureTransfer,
 		});