From 42e39375d10e82004255ece8b8d614cc80e438ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= <laci@monda.hu>
Date: Thu, 9 Nov 2017 01:05:42 +0100
Subject: [PATCH] Rename HardwareConfiguration.hardwareId to deviceId and set
 it to 1 by default.

---
 .../config-items/hardware-configuration.ts             | 10 +++++-----
 packages/usb/write-hca.js                              |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/uhk-common/src/config-serializer/config-items/hardware-configuration.ts b/packages/uhk-common/src/config-serializer/config-items/hardware-configuration.ts
index dfebf262..b1358acd 100644
--- a/packages/uhk-common/src/config-serializer/config-items/hardware-configuration.ts
+++ b/packages/uhk-common/src/config-serializer/config-items/hardware-configuration.ts
@@ -9,7 +9,7 @@ export class HardwareConfiguration {
     dataModelVersion: number;
 
     @assertUInt8
-    hardwareId: number;
+    deviceId: number;
 
     @assertUInt8
     brandId: number;
@@ -24,7 +24,7 @@ export class HardwareConfiguration {
     fromJsonObject(jsonObject: any): HardwareConfiguration {
         this.signature = jsonObject.signature;
         this.dataModelVersion = jsonObject.dataModelVersion;
-        this.hardwareId = jsonObject.hardwareId;
+        this.deviceId = jsonObject.deviceId;
         this.brandId = jsonObject.brandId;
         this.uuid = jsonObject.uuid;
         this.isIso = jsonObject.isIso;
@@ -35,7 +35,7 @@ export class HardwareConfiguration {
     fromBinary(buffer: UhkBuffer): HardwareConfiguration {
         this.signature = buffer.readString();
         this.dataModelVersion = buffer.readUInt16();
-        this.hardwareId = buffer.readUInt8();
+        this.deviceId = buffer.readUInt8();
         this.uuid = buffer.readUInt32();
         this.brandId = buffer.readUInt8();
         this.isIso = buffer.readBoolean();
@@ -47,7 +47,7 @@ export class HardwareConfiguration {
         return {
             signature: this.signature,
             dataModelVersion: this.dataModelVersion,
-            hardwareId: this.hardwareId,
+            deviceId: this.deviceId,
             brandId: this.brandId,
             uuid: this.uuid,
             isIso: this.isIso,
@@ -58,7 +58,7 @@ export class HardwareConfiguration {
     toBinary(buffer: UhkBuffer): void {
         buffer.writeString(this.signature);
         buffer.writeUInt16(this.dataModelVersion);
-        buffer.writeUInt8(this.hardwareId);
+        buffer.writeUInt8(this.deviceId);
         buffer.writeUInt8(this.brandId);
         buffer.writeUInt32(this.uuid);
         buffer.writeBoolean(this.isIso);
diff --git a/packages/usb/write-hca.js b/packages/usb/write-hca.js
index 57e184f5..df3450c5 100755
--- a/packages/usb/write-hca.js
+++ b/packages/usb/write-hca.js
@@ -28,7 +28,7 @@ const hardwareConfig = new HardwareConfiguration();
 
 hardwareConfig.signature = 'UHK';
 hardwareConfig.dataModelVersion = 0;
-hardwareConfig.hardwareId = 0;
+hardwareConfig.deviceId = 1;
 hardwareConfig.uuid = uuid;
 hardwareConfig.brandId = 0;
 hardwareConfig.isIso = layout === 'iso';