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

24
packages/uhk-common/src/config-serializer/config-items/macro-action/keymap.spec.ts
View File

@@ -3,9 +3,9 @@ import { UserConfiguration } from '../user-configuration';
describe('keymap', () => {
it('should normalize SwitchLayerAction if non base layer action is not SwitchLayerAction', () => {
const inputJsonConfig = {
dataModelMajorVersion: 3,
dataModelMinorVersion: 0,
dataModelPatchVersion: 0,
userConfigMajorVersion: 3,
userConfigMinorVersion: 0,
userConfigPatchVersion: 0,
deviceName: 'My UHK',
doubleTapSwitchLayerTimeout: 250,
iconsAndLayerTextsBrightness: 255,
@@ -75,9 +75,9 @@ describe('keymap', () => {
]
};
const expectedJsonConfig = {
dataModelMajorVersion: 3,
dataModelMinorVersion: 0,
dataModelPatchVersion: 0,
userConfigMajorVersion: 3,
userConfigMinorVersion: 0,
userConfigPatchVersion: 0,
deviceName: 'My UHK',
doubleTapSwitchLayerTimeout: 250,
iconsAndLayerTextsBrightness: 255,
@@ -156,9 +156,9 @@ describe('keymap', () => {
it('should normalize SwitchLayerAction if non base layer action is other SwitchLayerAction', () => {
const inputJsonConfig = {
dataModelMajorVersion: 3,
dataModelMinorVersion: 0,
dataModelPatchVersion: 0,
userConfigMajorVersion: 3,
userConfigMinorVersion: 0,
userConfigPatchVersion: 0,
deviceName: 'My UHK',
doubleTapSwitchLayerTimeout: 250,
iconsAndLayerTextsBrightness: 255,
@@ -228,9 +228,9 @@ describe('keymap', () => {
]
};
const expectedJsonConfig = {
dataModelMajorVersion: 3,
dataModelMinorVersion: 0,
dataModelPatchVersion: 0,
userConfigMajorVersion: 3,
userConfigMinorVersion: 0,
userConfigPatchVersion: 0,
deviceName: 'My UHK',
doubleTapSwitchLayerTimeout: 250,
iconsAndLayerTextsBrightness: 255,

14
packages/uhk-common/src/config-serializer/config-items/user-configuration.spec.ts
View File

@@ -8,9 +8,9 @@ describe('user-configuration', () => {
it('should transform an empty config', () => {
jsonTester({
dataModelMajorVersion: 3,
dataModelMinorVersion: 0,
dataModelPatchVersion: 0,
userConfigMajorVersion: 3,
userConfigMinorVersion: 0,
userConfigPatchVersion: 0,
deviceName: 'My UHK',
doubleTapSwitchLayerTimeout: 250,
iconsAndLayerTextsBrightness: 255,
@@ -34,9 +34,9 @@ describe('user-configuration', () => {
it('should transform a null keyActionType ', () => {
jsonTester({
dataModelMajorVersion: 3,
dataModelMinorVersion: 0,
dataModelPatchVersion: 0,
userConfigMajorVersion: 3,
userConfigMinorVersion: 0,
userConfigPatchVersion: 0,
deviceName: 'My UHK',
doubleTapSwitchLayerTimeout: 250,
iconsAndLayerTextsBrightness: 255,
@@ -75,7 +75,7 @@ describe('user-configuration', () => {
it('Should set the device name to "My UHK" if not exists in the config', () => {
const original = {
dataModelVersion: 1,
userConfigVersion: 1,
moduleConfigurations: [],
macros: [],
keymaps: []

34
packages/uhk-common/src/config-serializer/config-items/user-configuration.ts
View File

@@ -8,13 +8,13 @@ import { ConfigSerializer } from '../config-serializer';
export class UserConfiguration {
@assertUInt16
dataModelMajorVersion: number;
userConfigMajorVersion: number;
@assertUInt16
dataModelMinorVersion: number;
userConfigMinorVersion: number;
@assertUInt16
dataModelPatchVersion: number;
userConfigPatchVersion: number;
@assertUInt16
userConfigurationLength: number;
@@ -74,9 +74,9 @@ export class UserConfiguration {
}
fromJsonObject(jsonObject: any): UserConfiguration {
this.dataModelMajorVersion = jsonObject.dataModelMajorVersion;
this.dataModelMinorVersion = jsonObject.dataModelMinorVersion;
this.dataModelPatchVersion = jsonObject.dataModelPatchVersion;
this.userConfigMajorVersion = jsonObject.userConfigMajorVersion;
this.userConfigMinorVersion = jsonObject.userConfigMinorVersion;
this.userConfigPatchVersion = jsonObject.userConfigPatchVersion;
this.deviceName = jsonObject.deviceName;
this.setDefaultDeviceName();
this.doubleTapSwitchLayerTimeout = jsonObject.doubleTapSwitchLayerTimeout;
@@ -107,9 +107,9 @@ export class UserConfiguration {
}
fromBinary(buffer: UhkBuffer): UserConfiguration {
this.dataModelMajorVersion = buffer.readUInt16();
this.dataModelMinorVersion = buffer.readUInt16();
this.dataModelPatchVersion = buffer.readUInt16();
this.userConfigMajorVersion = buffer.readUInt16();
this.userConfigMinorVersion = buffer.readUInt16();
this.userConfigPatchVersion = buffer.readUInt16();
this.userConfigurationLength = buffer.readUInt16();
this.deviceName = buffer.readString();
this.setDefaultDeviceName();
@@ -147,9 +147,9 @@ export class UserConfiguration {
toJsonObject(): any {
return {
dataModelMajorVersion: this.dataModelMajorVersion,
dataModelMinorVersion: this.dataModelMinorVersion,
dataModelPatchVersion: this.dataModelPatchVersion,
userConfigMajorVersion: this.userConfigMajorVersion,
userConfigMinorVersion: this.userConfigMinorVersion,
userConfigPatchVersion: this.userConfigPatchVersion,
deviceName: this.deviceName,
doubleTapSwitchLayerTimeout: this.doubleTapSwitchLayerTimeout,
iconsAndLayerTextsBrightness: this.iconsAndLayerTextsBrightness,
@@ -172,9 +172,9 @@ export class UserConfiguration {
}
toBinary(buffer: UhkBuffer): void {
buffer.writeUInt16(this.dataModelMajorVersion);
buffer.writeUInt16(this.dataModelMinorVersion);
buffer.writeUInt16(this.dataModelPatchVersion);
buffer.writeUInt16(this.userConfigMajorVersion);
buffer.writeUInt16(this.userConfigMinorVersion);
buffer.writeUInt16(this.userConfigPatchVersion);
buffer.writeUInt16(this.userConfigurationLength);
buffer.writeString(this.deviceName);
buffer.writeUInt16(this.doubleTapSwitchLayerTimeout);
@@ -199,8 +199,8 @@ export class UserConfiguration {
}
toString(): string {
return `<UserConfiguration dataModelVersion="${this.dataModelMajorVersion}.\
${this.dataModelMinorVersion}.${this.dataModelPatchVersion}">`;
return `<UserConfiguration userConfigVersion="${this.userConfigMajorVersion}.\
${this.userConfigMinorVersion}.${this.userConfigPatchVersion}">`;
}
getKeymap(keymapAbbreviation: string): Keymap {

7
packages/uhk-common/src/models/version-information.ts
View File

@@ -1,7 +1,8 @@
export interface VersionInformation {
version: string;
dataModelVersion: string;
usbProtocolVersion: string;
slaveProtocolVersion: string;
firmwareVersion: string;
deviceProtocolVersion: string;
moduleProtocolVersion: string;
userConfigVersion: string;
hardwareConfigVersion: string;
}