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

Serialize switch layer action the final way. Add toggle flag.

Browse Source
This commit is contained in:
László Monda
2016-03-20 23:40:24 +01:00
parent 7a529fb4de
commit 1107619b1a
2 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
model/serializeConfig.js
+25 -22
View File
@@ -14,25 +14,28 @@ var ARRAY_LAST_ELEMENT_ID = 0;
var KEY_ACTION_ID_KEYSTROKE_SCANCODE_FIRST = 1; var KEY_ACTION_ID_KEYSTROKE_SCANCODE_FIRST = 1;
var KEY_ACTION_ID_KEYSTROKE_SCANCODE_LAST = 231; var KEY_ACTION_ID_KEYSTROKE_SCANCODE_LAST = 231;
var KEY_ACTION_ID_SWITCH_LAYER_MOD = 232; var KEY_ACTION_ID_SWITCH_LAYER = 232;
var KEY_ACTION_ID_SWITCH_LAYER_FN = 233; var KEY_ACTION_ID_DUAL_ROLE_KEYSTROKE_MOD = 233;
var KEY_ACTION_ID_SWITCH_LAYER_MOUSE = 234; var KEY_ACTION_ID_DUAL_ROLE_KEYSTROKE_FN = 234;
var KEY_ACTION_ID_DUAL_ROLE_KEYSTROKE_MOD = 235; var KEY_ACTION_ID_DUAL_ROLE_KEYSTROKE_MOUSE = 235;
var KEY_ACTION_ID_DUAL_ROLE_KEYSTROKE_FN = 236; var KEY_ACTION_ID_DUAL_ROLE_KEYSTROKE_LEFT_CTRL = 236;
var KEY_ACTION_ID_DUAL_ROLE_KEYSTROKE_MOUSE = 237; var KEY_ACTION_ID_DUAL_ROLE_KEYSTROKE_LEFT_SHIFT = 237;
var KEY_ACTION_ID_DUAL_ROLE_KEYSTROKE_LEFT_CTRL = 238; var KEY_ACTION_ID_DUAL_ROLE_KEYSTROKE_LEFT_ALT = 238;
var KEY_ACTION_ID_DUAL_ROLE_KEYSTROKE_LEFT_SHIFT = 239; var KEY_ACTION_ID_DUAL_ROLE_KEYSTROKE_LEFT_SUPER = 239;
var KEY_ACTION_ID_DUAL_ROLE_KEYSTROKE_LEFT_ALT = 240; var KEY_ACTION_ID_DUAL_ROLE_KEYSTROKE_RIGHT_CTRL = 240;
var KEY_ACTION_ID_DUAL_ROLE_KEYSTROKE_LEFT_SUPER = 241; var KEY_ACTION_ID_DUAL_ROLE_KEYSTROKE_RIGHT_SHIFT = 241;
var KEY_ACTION_ID_DUAL_ROLE_KEYSTROKE_RIGHT_CTRL = 242; var KEY_ACTION_ID_DUAL_ROLE_KEYSTROKE_RIGHT_ALT = 242;
var KEY_ACTION_ID_DUAL_ROLE_KEYSTROKE_RIGHT_SHIFT = 243; var KEY_ACTION_ID_DUAL_ROLE_KEYSTROKE_RIGHT_SUPER = 243;
var KEY_ACTION_ID_DUAL_ROLE_KEYSTROKE_RIGHT_ALT = 244; var KEY_ACTION_ID_MOUSE = 244;
var KEY_ACTION_ID_DUAL_ROLE_KEYSTROKE_RIGHT_SUPER = 245; var KEY_ACTION_ID_PLAY_MACRO = 245;
var KEY_ACTION_ID_MOUSE = 246; var KEY_ACTION_ID_SWITCH_KEYMAP = 246;
var KEY_ACTION_ID_PLAY_MACRO = 247;
var KEY_ACTION_ID_SWITCH_KEYMAP = 248;
var KEY_ACTION_ID_NONE = 255; var KEY_ACTION_ID_NONE = 255;
var SWITCH_LAYER_MOD = 0;
var SWITCH_LAYER_FN = 1;
var SWITCH_LAYER_MOUSE = 2;
var SWITCH_LAYER_TOGGLE = 0x80;
var NONE_ACTION_PADDING = 0; var NONE_ACTION_PADDING = 0;
var MOUSE_ACTION_ID_LEFT_CLICK = 0; var MOUSE_ACTION_ID_LEFT_CLICK = 0;
@@ -141,12 +144,12 @@ function serializeSwitchKeymapAction(switchKeymapAction) {
} }
function serializeSwitchLayerAction(switchLayerAction) { function serializeSwitchLayerAction(switchLayerAction) {
writer.uint8(KEY_ACTION_ID_SWITCH_LAYER);
writer.uint8({ writer.uint8({
mod : KEY_ACTION_ID_SWITCH_LAYER_MOD, mod : SWITCH_LAYER_MOD,
fn : KEY_ACTION_ID_SWITCH_LAYER_FN, fn : SWITCH_LAYER_FN,
mouse: KEY_ACTION_ID_SWITCH_LAYER_MOUSE mouse: SWITCH_LAYER_MOD
}[switchLayerAction]); }[switchLayerAction] | switchLayerAction.toggle ? SWITCH_LAYER_TOGGLE : 0);
writer.uint8(0);
} }
serializeKeyActions(keyActions); serializeKeyActions(keyActions);
model/uhk-config.json
+2 -1
View File
@@ -38,7 +38,8 @@
}, },
{ {
"actionType": "switchLayer", "actionType": "switchLayer",
"layer": "fn" "layer": "fn",
"toggle": false
}, },
{ {
"actionType": "dualRoleKeystroke", "actionType": "dualRoleKeystroke",