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

feat(device): Read only filled user configuration and fix app close on mac (#486)

Browse Source 
* feat(device): Save user configuration length

* feat(device): Read only filled user configuration from EEPROM

* fix(agent): Close device connections and quit from app on Mac
This commit is contained in:
Róbert Kiss
2017-11-02 23:06:53 +01:00
committed by László Monda
parent fe6cd68c55
commit 0c30eccaca
5 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,9 @@ export class UserConfiguration {
@assertUInt16
dataModelVersion: number;
@assertUInt16
userConfigurationLength: number;
deviceName: string;
moduleConfigurations: ModuleConfiguration[] = [];
@@ -24,6 +27,7 @@ export class UserConfiguration {
fromJsonObject(jsonObject: any): UserConfiguration {
this.dataModelVersion = jsonObject.dataModelVersion;
this.userConfigurationLength = jsonObject.userConfigurationLength;
this.deviceName = jsonObject.deviceName;
this.setDefaultDeviceName();
this.moduleConfigurations = jsonObject.moduleConfigurations.map((moduleConfiguration: any) => {
@@ -35,11 +39,13 @@ export class UserConfiguration {
return macro;
});
this.keymaps = jsonObject.keymaps.map((keymap: any) => new Keymap().fromJsonObject(keymap, this.macros));
this.recalculateConfigurationLength();
return this;
}
fromBinary(buffer: UhkBuffer): UserConfiguration {
this.dataModelVersion = buffer.readUInt16();
this.userConfigurationLength = buffer.readUInt16();
this.deviceName = buffer.readString();
this.setDefaultDeviceName();
this.moduleConfigurations = buffer.readArray<ModuleConfiguration>(uhkBuffer => {
@@ -52,12 +58,18 @@ export class UserConfiguration {
});
this.keymaps = buffer.readArray<Keymap>(uhkBuffer => new Keymap().fromBinary(uhkBuffer, this.macros));
ConfigSerializer.resolveSwitchKeymapActions(this.keymaps);
if (this.userConfigurationLength === 0) {
this.recalculateConfigurationLength();
}
return this;
}
toJsonObject(): any {
return {
dataModelVersion: this.dataModelVersion,
userConfigurationLength: this.userConfigurationLength,
deviceName: this.deviceName,
moduleConfigurations: this.moduleConfigurations.map(moduleConfiguration => moduleConfiguration.toJsonObject()),
keymaps: this.keymaps.map(keymap => keymap.toJsonObject(this.macros)),
@@ -67,6 +79,7 @@ export class UserConfiguration {
toBinary(buffer: UhkBuffer): void {
buffer.writeUInt16(this.dataModelVersion);
buffer.writeUInt16(this.userConfigurationLength);
buffer.writeString(this.deviceName);
buffer.writeArray(this.moduleConfigurations);
buffer.writeArray(this.macros);
@@ -87,6 +100,12 @@ export class UserConfiguration {
return this.macros.find(macro => macroId === macro.id);
}
recalculateConfigurationLength(){
const buffer = new UhkBuffer();
this.toBinary(buffer);
this.userConfigurationLength = buffer.offset;
}
private setDefaultDeviceName(): void {
if (!this.deviceName || this.deviceName.trim().length === 0) {
this.deviceName = 'My UHK';