From 7160487ccdd1ea6d07816290a95c42e49cc350ef Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue, 6 Sep 2022 10:36:37 -0700 Subject: Fungo rev1: fix QMK Configurator key sequence (#18293) * info.json: correct JSON syntax; friendly formatting * info.json: fix key sequence --- keyboards/fungo/rev1/info.json | 168 +++++++++++++++++++---------------------- 1 file changed, 77 insertions(+), 91 deletions(-) (limited to 'keyboards') diff --git a/keyboards/fungo/rev1/info.json b/keyboards/fungo/rev1/info.json index d34e95d578..6941d70d81 100644 --- a/keyboards/fungo/rev1/info.json +++ b/keyboards/fungo/rev1/info.json @@ -11,101 +11,87 @@ "layouts": { "LAYOUT_fungo_split_num": { "layout": [ - {"x": 0, "y": 0.375}, - {"x": 1, "y": 0.375}, - {"x": 2, "y": 0.125}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0.125}, - {"x": 5, "y": 0.25}, - {"x": 6, "y": 0.5}, + {"x":0, "y":0.375}, + {"x":1, "y":0.375}, + {"x":2, "y":0.125}, + {"x":3, "y":0}, + {"x":4, "y":0.125}, + {"x":5, "y":0.25}, + {"x":6, "y":0.5}, + {"x":12, "y":0.5}, + {"x":13, "y":0.25}, + {"x":14, "y":0.125}, + {"x":15, "y":0}, + {"x":16, "y":0.125}, + {"x":17, "y":0.375}, + {"x":18, "y":0.375}, - {"x": 12, "y": 0.5}, - {"x": 13, "y": 0.25}, - {"x": 14, "y": 0.125}, - {"x": 15, "y": 0}, - {"x": 16, "y": 0.125}, - {"x": 17, "y": 0.375}, - {"x": 18, "y": 0.375}, - + {"x":0, "y":1.375}, + {"x":1, "y":1.375}, + {"x":2, "y":1.125}, + {"x":3, "y":1}, + {"x":4, "y":1.125}, + {"x":5, "y":1.25}, + {"x":6, "y":1.5}, + {"x":12, "y":1.5}, + {"x":13, "y":1.25}, + {"x":14, "y":1.125}, + {"x":15, "y":1}, + {"x":16, "y":1.125}, + {"x":17, "y":1.375}, + {"x":18, "y":1.375}, - {"x": 0, "y": 1.375}, - {"x": 1, "y": 1.375}, - {"x": 2, "y": 1.125}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1.125}, - {"x": 5, "y": 1.25}, - {"x": 6, "y": 1.5}, + {"x":0, "y":2.375}, + {"x":1, "y":2.375}, + {"x":2, "y":2.125}, + {"x":3, "y":2}, + {"x":4, "y":2.125}, + {"x":5, "y":2.25}, + {"x":6, "y":2.5}, + {"x":12, "y":2.5}, + {"x":13, "y":2.25}, + {"x":14, "y":2.125}, + {"x":15, "y":2}, + {"x":16, "y":2.125}, + {"x":17, "y":2.375}, + {"x":18, "y":2.375}, - {"x": 12, "y": 1.5}, - {"x": 13, "y": 1.25}, - {"x": 14, "y": 1.125}, - {"x": 15, "y": 1}, - {"x": 16, "y": 1.125}, - {"x": 17, "y": 1.375}, - {"x": 18, "y": 1.375}, - - {"x": 0, "y": 2.375}, - {"x": 1, "y": 2.375}, - {"x": 2, "y": 2.125}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2.125}, - {"x": 5, "y": 2.25}, - {"x": 6, "y": 2.5}, + {"x":0, "y":3.375}, + {"x":1, "y":3.375}, + {"x":2, "y":3.125}, + {"x":3, "y":3}, + {"x":4, "y":3.125}, + {"x":5, "y":3.25}, + {"x":6, "y":3.5}, + {"x":7, "y":4}, + {"x":8.25, "y":3.75}, + {"x":9.75, "y":3.75}, + {"x":11, "y":4}, + {"x":12, "y":3.5}, + {"x":13, "y":3.25}, + {"x":14, "y":3.125}, + {"x":15, "y":3}, + {"x":16, "y":3.125}, + {"x":17, "y":3.375}, + {"x":18, "y":3.375}, - {"x": 12, "y": 2.5}, - {"x": 13, "y": 2.25}, - {"x": 14, "y": 2.125}, - {"x": 15, "y": 2}, - {"x": 16, "y": 2.125}, - {"x": 17, "y": 2.375}, - {"x": 18, "y": 2.375}, - - {"x": 0, "y": 3.375}, - {"x": 1, "y": 3.375}, - {"x": 2, "y": 3.125}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3.125}, - {"x": 5, "y": 3.25}, - {"x": 6, "y": 3.5}, - - {"x": 12, "y": 3.5}, - {"x": 13, "y": 3.25}, - {"x": 14, "y": 3.125}, - {"x": 15, "y": 3}, - {"x": 16, "y": 3.125}, - {"x": 17, "y": 3.375}, - {"x": 18, "y": 3.375}, - - {"x": 0, "y": 4.375}, - {"x": 1, "y": 4.375}, - {"x": 2, "y": 4.25}, - {"x": 3, "y": 4.25}, - {"x": 5.25, "y": 3}, - {"x": 5.75, "y": 5}, - {"x": 7, "y": 4}, - - {"x": 11, "y": 4}, - {"x": 13.25, "y": 5}, - {"x": 13.75, "y": 3}, - {"x": 15, "y": 4.25}, - {"x": 16, "y": 4.25}, - {"x": 17, "y": 4.375}, - {"x": 18, "y": 4.375}, - - - {"x": 7, "y": 5}, - {"x": 8.25, "y": 3.75}, - {"x": 8.25, "y": 4.75}, - - {"x": 9.75, "y": 4.75}, - {"x": 9.75, "y": 3.75}, - {"x": 11, "y": 5}, - - - - - - ] + {"x":0, "y":4.375}, + {"x":1, "y":4.375}, + {"x":2, "y":4.25}, + {"x":3, "y":4.25}, + {"x":4.333, "y":4.25}, + {"x":5.667, "y":4.625}, + {"x":7, "y":5}, + {"x":8.25, "y":4.75}, + {"x":9.75, "y":4.75}, + {"x":11, "y":5}, + {"x":12.333, "y":4.625}, + {"x":13.667, "y":4.25}, + {"x":15, "y":4.25}, + {"x":16, "y":4.25}, + {"x":17, "y":4.375}, + {"x":18, "y":4.375} + ] } } } -- cgit v1.2.3 From f73330755153912f18619cfeaefe0270394e0daf Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Wed, 7 Sep 2022 00:13:12 +0200 Subject: keymaps/stapelberg: keypad layer for multimedia keys, wake on escape (#18295) This makes more keys function as printed on the actual keyboard :) --- keyboards/kinesis/keymaps/stapelberg/keymap.c | 30 +++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) (limited to 'keyboards') diff --git a/keyboards/kinesis/keymaps/stapelberg/keymap.c b/keyboards/kinesis/keymaps/stapelberg/keymap.c index 431c9f234f..9518c017bc 100644 --- a/keyboards/kinesis/keymaps/stapelberg/keymap.c +++ b/keyboards/kinesis/keymaps/stapelberg/keymap.c @@ -17,6 +17,7 @@ #include QMK_KEYBOARD_H #define QWERTY 0 // Base qwerty +#define LAYER1 1 /**************************************************************************************************** @@ -56,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL,KC_LALT, KC_LGUI, KC_BSPC,KC_ESC ,KC_END , - KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SLCK ,KC_PAUS, KC_NO, QK_BOOT, + KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SLCK ,KC_PAUS, MO(1), QK_BOOT, KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_MINS, KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,KC_BSLS, KC_H ,KC_J ,KC_K ,KC_L ,KC_SCLN,KC_QUOT, @@ -65,5 +66,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_RALT,KC_RCTL, KC_PGUP, KC_PGDN,KC_ENTER ,KC_SPC - ) + ), + +// LAYER1 is activated by the keypad key. It has WAKE on Escape (left-most key), +// and volume keys on PSCR (mute), SLCK (volume down) and PAUS (volume up), +// as printed on the Kinesis Advantage 2. +[LAYER1] = LAYOUT( + + KC_WAKE, KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO, + KC_NO , KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO , + KC_NO , KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO , + KC_NO , KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO , + KC_NO , KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO , + KC_NO ,KC_NO ,KC_NO ,KC_NO , + KC_NO ,KC_NO , + KC_NO , + KC_NO ,KC_NO ,KC_NO , + KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_MUTE ,KC_VOLD ,KC_VOLU, KC_TRNS, KC_NO , + KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO , + KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO , + KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO , + KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO , + KC_NO ,KC_NO ,KC_NO ,KC_NO , + KC_NO ,KC_NO , + KC_NO , + KC_NO ,KC_NO ,KC_NO + ), }; -- cgit v1.2.3