uhk/agent
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into auto-write-config

Browse Source
This commit is contained in:
Róbert Kiss
2017-12-14 22:01:12 +01:00
parent d57ba81d10 9c46c6a348
commit d09c46af42
14 changed files with 68 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/uhk-web/src/app/components/keymap/edit/keymap-edit.component.ts
View File

@@ -82,9 +82,9 @@ export class KeymapEditComponent {
site: 'https://ultimatehackingkeyboard.com',
description: 'Ultimate Hacking Keyboard keymap',
keyboardModel: 'UHK60',
dataModelMajorVersion: userConfiguration.dataModelMajorVersion,
dataModelMinorVersion: userConfiguration.dataModelMinorVersion,
dataModelPatchVersion: userConfiguration.dataModelPatchVersion,
userConfigMajorVersion: userConfiguration.userConfigMajorVersion,
userConfigMinorVersion: userConfiguration.userConfigMinorVersion,
userConfigPatchVersion: userConfiguration.userConfigPatchVersion,
objectType: 'keymap',
objectValue: keymap.toJsonObject()
};

2
packages/uhk-web/src/app/services/hardware-config.json
View File

@@ -1,6 +1,6 @@
{
"signature": "UHK",
"dataModelVersion": 0,
"hardwareConfigVersion": 0,
"hardwareId": 0,
"brandId": 0,
"isIso": false,

6
packages/uhk-web/src/app/services/user-config.json
View File

@@ -1,7 +1,7 @@
{
"dataModelMajorVersion": 3,
"dataModelMinorVersion": 0,
"dataModelPatchVersion": 0,
"userConfigMajorVersion": 4,
"userConfigMinorVersion": 0,
"userConfigPatchVersion": 0,
"deviceName": "My UHK",
"doubleTapSwitchLayerTimeout": 250,
"iconsAndLayerTextsBrightness": 255,

6
packages/uhk-web/src/app/store/effects/user-config.ts
View File

@@ -44,7 +44,7 @@ export class UserConfigEffects {
const userConfig = new UserConfiguration();
userConfig.fromBinary(UhkBuffer.fromArray(data));
if (userConfig.dataModelMajorVersion > 0) {
if (userConfig.userConfigMajorVersion > 0) {
return userConfig;
}
@@ -211,8 +211,8 @@ export class UserConfigEffects {
let config: UserConfiguration;
if (configJsonObject) {
if (configJsonObject.dataModelMajorVersion ===
this.defaultUserConfigurationService.getDefault().dataModelMajorVersion) {
if (configJsonObject.userConfigMajorVersion ===
this.defaultUserConfigurationService.getDefault().userConfigMajorVersion) {
config = new UserConfiguration().fromJsonObject(configJsonObject);
}
}

4
packages/uhk-web/src/app/store/reducers/user-configuration.spec.ts
View File

@@ -56,7 +56,7 @@ describe('user-configuration reducer', () => {
const result = reducer(state, saveKeyAction);
expect(result).not.toBe(defaultUserConfig);
expect(result.toJsonObject()).toEqual({
dataModelVersion: 4,
userConfigVersion: 4,
moduleConfigurations: [
{
id: 1,
@@ -233,7 +233,7 @@ describe('user-configuration reducer', () => {
const result = reducer(state, saveKeyAction);
expect(result).not.toBe(defaultUserConfig);
expect(result.toJsonObject()).toEqual({
dataModelVersion: 4,
userConfigVersion: 4,
moduleConfigurations: [
{
id: 1,

6
packages/uhk-web/test/user-config-helper.ts
View File

@@ -1,9 +1,9 @@
import { cloneDeep } from 'lodash';
const defaultUserConfig = {
dataModelMajorVersion: 3,
dataModelMinorVersion: 0,
dataModelPatchVersion: 0,
userConfigMajorVersion: 3,
userConfigMinorVersion: 0,
userConfigPatchVersion: 0,
deviceName: 'My UHK',
doubleTapSwitchLayerTimeout: 250,
iconsAndLayerTextsBrightness: 255,