Fix issue with correct result codes

kiibohd · Dec 28, 2018 · 5038cc1 · 5038cc1
1 parent 3185c40
commit 5038cc1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/src/common/config/mangle.js b/src/common/config/mangle.js
@@ -9,7 +9,7 @@ import _ from 'lodash';
 function mangleLayer(layer) {
   const key = getKey(layer);
   return {
-    key: key.aliases[key.triggerDef],
+    key: key.aliases[key.resultDef],
     label: key.label
   };
 }

diff --git a/src/common/keys/predefined.js b/src/common/keys/predefined.js
@@ -165,22 +165,22 @@ function buildKeys() {
     ['fw/none', 'NONE', ['#:None'], c.spec],
     ['fw/nxfn', 'NEXT-ƒ', ['NEXT LAYER', '#:layerRotate(0)', 'NLayer'], c.spec],
     ['fw/pvfn', 'PREV-ƒ', ['PREV LAYER', '#:layerRotate(1)', 'PLayer'], c.spec],
-    ['fw/fn1', 'ƒ1', ['#:Layer[1]', '#:LayerShift[1]', 'Layer[1]', 'FUNCTION1', '#:layerShift(1)', 'FUN1', 'FUN'], c.spec, null, 2],
-    ['fw/fn2', 'ƒ2', ['#:Layer[2]', '#:LayerShift[2]', 'Layer[2]', 'FUNCTION2', '#:layerShift(2)', 'FUN2'], c.spec, null, 2],
-    ['fw/fn3', 'ƒ3', ['#:Layer[3]', '#:LayerShift[3]', 'Layer[3]', 'FUNCTION3', '#:layerShift(3)', 'FUN3'], c.spec, null, 2],
-    ['fw/fn4', 'ƒ4', ['#:Layer[4]', '#:LayerShift[4]', 'Layer[4]', 'FUNCTION4', '#:layerShift(4)', 'FUN4'], c.spec, null, 2],
-    ['fw/fn5', 'ƒ5', ['#:Layer[5]', '#:LayerShift[5]', 'Layer[5]', 'FUNCTION5', '#:layerShift(5)', 'FUN5'], c.spec, null, 2],
-    ['fw/fn6', 'ƒ6', ['#:Layer[6]', '#:LayerShift[6]', 'Layer[6]', 'FUNCTION6', '#:layerShift(6)', 'FUN6'], c.spec, null, 2],
-    ['fw/fn7', 'ƒ7', ['#:Layer[7]', '#:LayerShift[7]', 'Layer[7]', 'FUNCTION7', '#:layerShift(7)', 'FUN7'], c.spec, null, 2],
-    ['fw/fn8', 'ƒ8', ['#:Layer[8]', '#:LayerShift[8]', 'Layer[8]', 'FUNCTION8', '#:layerShift(8)', 'FUN8'], null, null, 2],
-    ['fw/fn9', 'ƒ9', ['#:Layer[9]', '#:LayerShift[9]', 'Layer[9]', 'FUNCTION9', '#:layerShift(9)', 'FUN9'], null, null, 2],
-    ['fw/fn10', 'ƒ10', ['#:Layer[10]', '#:LayerShift[10]', 'Layer[10]', 'FUNCTION10', '#:layerShift(10)', 'FUN10'], null, null, 2],
-    ['fw/fn11', 'ƒ11', ['#:Layer[11]', '#:LayerShift[11]', 'Layer[11]', 'FUNCTION11', '#:layerShift(11)', 'FUN11'], null, null, 2],
-    ['fw/fn12', 'ƒ12', ['#:Layer[12]', '#:LayerShift[12]', 'Layer[12]', 'FUNCTION12', '#:layerShift(12)', 'FUN12'], null, null, 2],
-    ['fw/fn13', 'ƒ13', ['#:Layer[13]', '#:LayerShift[13]', 'Layer[13]', 'FUNCTION13', '#:layerShift(13)', 'FUN13'], null, null, 2],
-    ['fw/fn14', 'ƒ14', ['#:Layer[14]', '#:LayerShift[14]', 'Layer[14]', 'FUNCTION14', '#:layerShift(14)', 'FUN14'], null, null, 2],
-    ['fw/fn15', 'ƒ15', ['#:Layer[15]', '#:LayerShift[15]', 'Layer[15]', 'FUNCTION15', '#:layerShift(15)', 'FUN15'], null, null, 2],
-    ['fw/fn16', 'ƒ16', ['#:Layer[16]', '#:LayerShift[16]', 'Layer[16]', 'FUNCTION16', '#:layerShift(16)', 'FUN16'], null, null, 2],
+    ['fw/fn1', 'ƒ1', ['#:Layer[1]', '#:LayerShift[1]', 'Layer[1]', 'FUNCTION1', '#:layerShift(1)', 'FUN1', 'FUN'], c.spec, null, 3],
+    ['fw/fn2', 'ƒ2', ['#:Layer[2]', '#:LayerShift[2]', 'Layer[2]', 'FUNCTION2', '#:layerShift(2)', 'FUN2'], c.spec, null, 3],
+    ['fw/fn3', 'ƒ3', ['#:Layer[3]', '#:LayerShift[3]', 'Layer[3]', 'FUNCTION3', '#:layerShift(3)', 'FUN3'], c.spec, null, 3],
+    ['fw/fn4', 'ƒ4', ['#:Layer[4]', '#:LayerShift[4]', 'Layer[4]', 'FUNCTION4', '#:layerShift(4)', 'FUN4'], c.spec, null, 3],
+    ['fw/fn5', 'ƒ5', ['#:Layer[5]', '#:LayerShift[5]', 'Layer[5]', 'FUNCTION5', '#:layerShift(5)', 'FUN5'], c.spec, null, 3],
+    ['fw/fn6', 'ƒ6', ['#:Layer[6]', '#:LayerShift[6]', 'Layer[6]', 'FUNCTION6', '#:layerShift(6)', 'FUN6'], c.spec, null, 3],
+    ['fw/fn7', 'ƒ7', ['#:Layer[7]', '#:LayerShift[7]', 'Layer[7]', 'FUNCTION7', '#:layerShift(7)', 'FUN7'], c.spec, null, 3],
+    ['fw/fn8', 'ƒ8', ['#:Layer[8]', '#:LayerShift[8]', 'Layer[8]', 'FUNCTION8', '#:layerShift(8)', 'FUN8'], null, null, 3],
+    ['fw/fn9', 'ƒ9', ['#:Layer[9]', '#:LayerShift[9]', 'Layer[9]', 'FUNCTION9', '#:layerShift(9)', 'FUN9'], null, null, 3],
+    ['fw/fn10', 'ƒ10', ['#:Layer[10]', '#:LayerShift[10]', 'Layer[10]', 'FUNCTION10', '#:layerShift(10)', 'FUN10'], null, null, 3],
+    ['fw/fn11', 'ƒ11', ['#:Layer[11]', '#:LayerShift[11]', 'Layer[11]', 'FUNCTION11', '#:layerShift(11)', 'FUN11'], null, null, 3],
+    ['fw/fn12', 'ƒ12', ['#:Layer[12]', '#:LayerShift[12]', 'Layer[12]', 'FUNCTION12', '#:layerShift(12)', 'FUN12'], null, null, 3],
+    ['fw/fn13', 'ƒ13', ['#:Layer[13]', '#:LayerShift[13]', 'Layer[13]', 'FUNCTION13', '#:layerShift(13)', 'FUN13'], null, null, 3],
+    ['fw/fn14', 'ƒ14', ['#:Layer[14]', '#:LayerShift[14]', 'Layer[14]', 'FUNCTION14', '#:layerShift(14)', 'FUN14'], null, null, 3],
+    ['fw/fn15', 'ƒ15', ['#:Layer[15]', '#:LayerShift[15]', 'Layer[15]', 'FUNCTION15', '#:layerShift(15)', 'FUN15'], null, null, 3],
+    ['fw/fn16', 'ƒ16', ['#:Layer[16]', '#:LayerShift[16]', 'Layer[16]', 'FUNCTION16', '#:layerShift(16)', 'FUN16'], null, null, 3],
 
     ['fw/lck1', 'LOCK-1', ['#:LayerLock[1]', 'LOCK1', '#:layerLock(1)', 'LCK1', 'LCK'], c.spec, null, 2],
     ['fw/lck2', 'LOCK-2', ['#:LayerLock[2]', 'LOCK2', '#:layerLock(2)', 'LCK2'], c.spec, null, 2],