From 98b84bc49c3d11a36514dda7498c24391f2cbc5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= <laci@monda.hu>
Date: Wed, 8 Nov 2017 22:57:43 +0100
Subject: [PATCH] Change nomenclature in the release script and package.json
 from master and slave to device and module.

---
 scripts/make-release.js | 34 +++++++++++++++++-----------------
 scripts/package.json    |  4 ++--
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/scripts/make-release.js b/scripts/make-release.js
index 5374661..417dacb 100755
--- a/scripts/make-release.js
+++ b/scripts/make-release.js
@@ -9,14 +9,14 @@ const package = JSON.parse(fs.readFileSync(`${__dirname}/package.json`));
 const version = package.version;
 const releaseName = `uhk-firmware-${version}`;
 const releaseDir = `${__dirname}/${releaseName}`;
-const slavesDir = `${releaseDir}/slaves`;
+const modulesDir = `${releaseDir}/modules`;
 const releaseFile = `${__dirname}/${releaseName}.tar.bz2`;
 const leftFirmwareFile = `${__dirname}/../left/build/uhk60-left_release/uhk-left.bin`;
 const usbDir = `${__dirname}/../lib/agent/packages/usb`;
 
-const masterSourceFirmwares = package.masters.map(master => `${__dirname}/../${master.source}`);
-const slaveSourceFirmwares = package.slaves.map(slave => `${__dirname}/../${slave.source}`);
-rm('-rf', releaseDir, releaseFile, masterSourceFirmwares, slaveSourceFirmwares);
+const deviceSourceFirmwares = package.devices.map(device => `${__dirname}/../${device.source}`);
+const moduleSourceFirmwares = package.modules.map(module => `${__dirname}/../${module.source}`);
+rm('-rf', releaseDir, releaseFile, deviceSourceFirmwares, moduleSourceFirmwares);
 
 exec(`/opt/Freescale/KDS_v3/eclipse/kinetis-design-studio \
 --launcher.suppressErrors \
@@ -28,21 +28,21 @@ exec(`/opt/Freescale/KDS_v3/eclipse/kinetis-design-studio \
 -cleanBuild uhk-right`
 );
 
-for (let master of package.masters) {
-    const masterDir = `${releaseDir}/masters/${master.name}`;
-    const masterSource = `${__dirname}/../${master.source}`;
-    mkdir('-p', masterDir);
-    chmod(644, masterSource);
-    cp(masterSource, `${masterDir}/firmware.hex`);
-    exec(`${usbDir}/user-config-json-to-bin.ts ${masterDir}/config.bin`);
+for (let device of package.devices) {
+    const deviceDir = `${releaseDir}/devices/${device.name}`;
+    const deviceSource = `${__dirname}/../${device.source}`;
+    mkdir('-p', deviceDir);
+    chmod(644, deviceSource);
+    cp(deviceSource, `${deviceDir}/firmware.hex`);
+    exec(`${usbDir}/user-config-json-to-bin.ts ${deviceDir}/config.bin`);
 }
 
-for (let slave of package.slaves) {
-    const slaveDir = `${releaseDir}/slaves`;
-    const slaveSource = `${__dirname}/../${slave.source}`;
-    mkdir('-p', slaveDir);
-    chmod(644, slaveSource);
-    cp(slaveSource, `${slaveDir}/${slave.name}.bin`);
+for (let module of package.modules) {
+    const moduleDir = `${releaseDir}/modules`;
+    const moduleSource = `${__dirname}/../${module.source}`;
+    mkdir('-p', moduleDir);
+    chmod(644, moduleSource);
+    cp(moduleSource, `${moduleDir}/${module.name}.bin`);
 }
 
 cp(`${__dirname}/package.json`, releaseDir);
diff --git a/scripts/package.json b/scripts/package.json
index ba04f65..8a7b212 100644
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -19,14 +19,14 @@
   "dataModelVersion": "1.0.0",
   "usbProtocolVersion": "1.2.0",
   "slaveProtocolVersion": "2.1.0",
-  "masters": [
+  "devices": [
     {
       "deviceId": 0,
       "name": "uhk60-right",
       "source": "right/build/uhk60-right_release/uhk-right.hex"
     }
   ],
-  "slaves": [
+  "modules": [
     {
       "moduleId": 1,
       "name": "uhk60-left",