Skip to content

Commit f05664b

Browse files
author
jg
committed
A few KBMRobot changes. Tested simple shift + w on both and it seems to work.
1 parent 7a3e1ec commit f05664b

File tree

3 files changed

+25
-26
lines changed

3 files changed

+25
-26
lines changed

lib/interactive/game-controls/emulator.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ var multiKeyToggle = function(key, state, modifiers){
6666
// This can only be alt, command (mac), control, and shift. So 3 max.
6767
var modLength = modifiers.length;
6868

69-
if(modLength > 0 && modlength <= 3){
69+
if(modLength > 0 && modLength <= 3){
7070
// We're good to go!
7171

7272
// Press for RobotJS
@@ -90,14 +90,14 @@ var multiKeyToggle = function(key, state, modifiers){
9090
if(state == "down"){
9191
console.log('Kbm Multikey: ', key, state, modifiers);
9292
try{
93-
kbmRobot.press(modifiers[1]).press(key).go();
93+
kbmRobot.press(modifiers[0]).press(key).go();
9494
}catch(err){
9595
errorLog.log('Kbm Multikey: Invalid key code specified or invalid modifiers. ('+key+')');
9696
}
9797
} else {
9898
console.log('Kbm Multikey: ', key, state, modifiers);
9999
try{
100-
kbmRobot.release(key).release(modifiers[1]).go();
100+
kbmRobot.release(key).release(modifiers[0]).go();
101101
} catch(err){
102102
errorLog.log('Kbm Multikey: Invalid key code specified or invalid modifiers. ('+key+')');
103103
}
@@ -112,14 +112,14 @@ var multiKeyToggle = function(key, state, modifiers){
112112
if(state == "down"){
113113
console.log('Kbm Multikey: ', key, state, modifiers);
114114
try{
115-
kbmRobot.press(modifiers[1]).press(modifiers[2]).press(key).go();
115+
kbmRobot.press(modifiers[0]).press(modifiers[1]).press(key).go();
116116
}catch(err){
117117
errorLog.log('Kbm Multikey: Invalid key code specified or invalid modifiers. ('+key+')');
118118
}
119119
} else {
120120
console.log('Kbm Multikey: ', key, state, modifiers);
121121
try{
122-
kbmRobot.release(key).release(modifiers[1]).release(modifiers[2]).go();
122+
kbmRobot.release(key).release(modifiers[0]).release(modifiers[1]).go();
123123
} catch(err){
124124
errorLog.log('Kbm Multikey: Invalid key code specified or invalid modifiers. ('+key+')');
125125
}
@@ -134,14 +134,14 @@ var multiKeyToggle = function(key, state, modifiers){
134134
if(state == "down"){
135135
console.log('Kbm Multikey: ', key, state, modifiers);
136136
try{
137-
kbmRobot.press(modifiers[1]).press(modifiers[2]).press(modifiers[3]).press(key).go();
137+
kbmRobot.press(modifiers[0]).press(modifiers[1]).press(modifiers[2]).press(key).go();
138138
}catch(err){
139139
errorLog.log('Kbm Multikey: Invalid key code specified or invalid modifiers. ('+key+')');
140140
}
141141
} else {
142142
console.log('Kbm Multikey: ', key, state, modifiers);
143143
try{
144-
kbmRobot.release(key).release(modifiers[1]).release(modifiers[2]).release(modifiers[3]).go();
144+
kbmRobot.release(key).release(modifiers[0]).release(modifiers[1]).release(modifiers[2]).go();
145145
} catch(err){
146146
errorLog.log('Kbm Multikey: Invalid key code specified or invalid modifiers. ('+key+')');
147147
}

lib/interactive/game-controls/tactile/tactileProcessor.js

+18-17
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function tactile(report) {
3434
// Route button to correct handler for it's purpose.
3535
if(modifiers !== undefined && modifiers instanceof Array){
3636
// Multikey button
37-
multiKey(key, modifiers, buttonID);
37+
multiKey(key, modifiers, press);
3838
} else if (oppositeKey !== "") {
3939
// Key comparison
4040
movement(key, oppositeKey, buttonID);
@@ -43,7 +43,7 @@ function tactile(report) {
4343
tactileHold(key, holding, buttonID);
4444
} else {
4545
// Tap it
46-
tactileTap(key, press, buttonID);
46+
tactileTap(key, press);
4747
}
4848
} else {
4949
// This button doesnt have press frequency or holding checked in dev lab.
@@ -95,21 +95,23 @@ function buttonSave(report) {
9595
}
9696

9797
// Tactile Key Tap.
98-
function multiKey(key, modifiers, buttonID) {
99-
var key = keyTranslator.translate(key);
98+
function multiKey(key, modifiers, press) {
99+
if (press > 0) {
100+
var key = keyTranslator.translate(key);
100101

101-
// Scrub the modifiers list and make a clean array.
102-
var cleanModifiers = [];
103-
for (var i in modifiers){
104-
var cleanButton = keyTranslator.translate(modifiers[i]);
105-
cleanModifiers.push(cleanButton);
106-
}
102+
// Scrub the modifiers list and make a clean array.
103+
var cleanModifiers = [];
104+
for (var i in modifiers){
105+
var cleanButton = keyTranslator.translate(modifiers[i]);
106+
cleanModifiers.push(cleanButton);
107+
}
107108

108-
emulate.keyToggle(key, "down", cleanModifiers);
109+
emulate.multiKeyToggle(key, "down", cleanModifiers);
109110

110-
setTimeout(function() {
111-
emulate.keyToggle(key, "up", cleanModifiers);
112-
}, 30);
111+
setTimeout(function() {
112+
emulate.multiKeyToggle(key, "up", cleanModifiers);
113+
}, 30);
114+
}
113115
}
114116

115117
// Movement Keys
@@ -165,10 +167,9 @@ function tactileHold(key, holding, buttonID) {
165167
}
166168

167169
// Tactile Key Tap.
168-
function tactileTap(key, press, buttonID) {
169-
var key = keyTranslator.translate(key);
170-
170+
function tactileTap(key, press) {
171171
if (press > 0) {
172+
var key = keyTranslator.translate(key);
172173
emulate.keyToggle(key, "down");
173174

174175
setTimeout(function() {

lib/interactive/progress-reports/tactileReport.js

-2
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,6 @@ function tactileProgress(tactile) {
124124
}
125125
}
126126

127-
console.log(tempReport);
128-
129127
// Return tactile report;
130128
return compileReport(tempReport);
131129
}

0 commit comments

Comments
 (0)