Merge branch 'master' into auto-write-config

This commit is contained in:
Róbert Kiss
2017-12-14 22:01:12 +01:00
14 changed files with 68 additions and 66 deletions

View File

@@ -16,8 +16,9 @@
"dependencies": {
"node-hid": "0.5.7"
},
"firmwareVersion": "6.0.0",
"dataModelVersion": "4.0.0",
"usbProtocolVersion": "3.0.0",
"slaveProtocolVersion": "3.0.0"
"firmwareVersion": "7.0.0",
"deviceProtocolVersion": "4.0.0",
"moduleProtocolVersion": "3.0.0",
"userConfigVersion": "4.0.0",
"hardwareConfigVersion": "1.0.0"
}

View File

@@ -34,10 +34,11 @@ export class AppService extends MainServiceBase {
hasPermission: this.uhkHidDeviceService.hasPermission(),
agentVersionInfo: {
version: packageJson.version,
dataModelVersion: packageJson.dataModelVersion,
usbProtocolVersion: packageJson.usbProtocolVersion,
slaveProtocolVersion: packageJson.slaveProtocolVersion,
firmwareVersion: packageJson.firmwareVersion
firmwareVersion: packageJson.firmwareVersion,
deviceProtocolVersion: packageJson.deviceProtocolVersion,
moduleProtocolVersion: packageJson.moduleProtocolVersion,
userConfigVersion: packageJson.userConfigVersion,
hardwareConfigVersion: packageJson.hardwareConfigVersion
}
};
this.logService.info('[AppService] getAppStartInfo response:', response);