From 7b2eec29c60436a6139cf30df5832e08de0bea43 Mon Sep 17 00:00:00 2001 From: Tony Atkins Date: Mon, 23 Mar 2020 12:13:49 +0100 Subject: [PATCH 1/3] GPII-4125: Updated gpii-universal to test work-in-progress on LSR. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 10998950b..9ff1b52ea 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "dependencies": { "edge-js": "10.3.1", "ffi-napi": "2.4.3", - "gpii-universal": "0.3.0-dev.20200317T172537Z.a0bd3d657", + "gpii-universal": "https://github.com/the-t-in-rtf/universal.git#GPII-4125", "@pokusew/pcsclite": "0.4.18", "ref": "1.3.4", "ref-struct": "1.1.0", From 24deb11fbd22df50c1bcf9c678133c069bf0f02c Mon Sep 17 00:00:00 2001 From: Tony Atkins Date: Tue, 9 Jun 2020 12:02:26 +0200 Subject: [PATCH 2/3] GPII-4125: Added additional logging for SPI errors. --- .../node_modules/spiSettingsHandler/src/SpiSettingsHandler.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gpii/node_modules/spiSettingsHandler/src/SpiSettingsHandler.js b/gpii/node_modules/spiSettingsHandler/src/SpiSettingsHandler.js index 7628ca14f..dd08c2fb2 100644 --- a/gpii/node_modules/spiSettingsHandler/src/SpiSettingsHandler.js +++ b/gpii/node_modules/spiSettingsHandler/src/SpiSettingsHandler.js @@ -191,6 +191,10 @@ gpii.windows.spi.callProblematicSpi = function (pvParamType, action, uiParam, pv if (code === null) { // The child process was killed. fluid.log("SPI call has failed"); + + // Log information about the previous call. + fluid.log("Timed out waiting for SPI call:\n" + JSON.stringify(options, null, 2)); + promise.reject({ isError: true, message: "Timed out waiting for the SPI call to complete (see GPII-2001)" From af69eba3870d829dd75a47e6a5b92604d2c00f81 Mon Sep 17 00:00:00 2001 From: Tony Atkins Date: Tue, 9 Jun 2020 13:08:53 +0200 Subject: [PATCH 3/3] GPII-4125: Fixed borked package.json following merge with upstream master. --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 9ff1b52ea..a7726d651 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,8 @@ "ref-struct": "1.1.0", "ref-array": "1.1.2", "string-argv": "0.0.2", - "rimraf": "2.6.2" + "rimraf": "2.6.2", + "win-ca": "3.1.1" }, "devDependencies": { "eslint-config-fluid": "1.3.0",