From d1c35b12555cafcb0ca6107cfca9b0ef13c0276c Mon Sep 17 00:00:00 2001 From: xyverz Date: Fri, 16 Sep 2016 22:02:33 -0700 Subject: [PATCH 001/117] removed a couple of mod_tap keys since they had some unintended conseqeunces across various platforms. --- keyboards/planck/keymaps/xyverz/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/planck/keymaps/xyverz/keymap.c b/keyboards/planck/keymaps/xyverz/keymap.c index 192933b1..9998f2a3 100644 --- a/keyboards/planck/keymaps/xyverz/keymap.c +++ b/keyboards/planck/keymaps/xyverz/keymap.c @@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_DVORAK] = { {KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH}, {KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS}, - {KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, SFT_T(KC_ENT)}, + {KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT}, {KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_BSPC, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT } }, From 26d6b90dde303099405e5d61d8304af2e31f845b Mon Sep 17 00:00:00 2001 From: Xyverz Date: Sat, 17 Sep 2016 14:43:25 -0700 Subject: [PATCH 002/117] Update readme.md --- keyboards/ergodox/keymaps/xyverz/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ergodox/keymaps/xyverz/readme.md b/keyboards/ergodox/keymaps/xyverz/readme.md index 6ecdabc9..2d72fa6c 100644 --- a/keyboards/ergodox/keymaps/xyverz/readme.md +++ b/keyboards/ergodox/keymaps/xyverz/readme.md @@ -19,7 +19,7 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t ,--------------------------------------------------.,--------------------------------------------------. | ] | 1 | 2 | 3 | 4 | 5 | ESC || ESC | 6 | 7 | 8 | 9 | 0 | [ | |--------+------+------+------+------+-------------||------+------+------+------+------+------+--------| - | Tab | ' | , | . | Y | Y | || | F | G | C | R | L | \ | + | Tab | ' | , | . | P | Y | || | F | G | C | R | L | \ | |--------+------+------+------+------+------| || |------+------+------+------+------+--------| | CapsLk | A | O | E | U | I |------||------| D | H | T | N | S | - | |--------+------+------+------+------+------| _MD || _KP |------+------+------+------+------+--------| From a03d72f597f8595fa76b64825f1b7934646f422c Mon Sep 17 00:00:00 2001 From: Xyverz Date: Fri, 30 Sep 2016 13:05:21 -0700 Subject: [PATCH 003/117] Updates to my Planck keymap - standardizing the bottom row. --- keyboards/planck/keymaps/xyverz/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/planck/keymaps/xyverz/keymap.c b/keyboards/planck/keymaps/xyverz/keymap.c index 9998f2a3..bbb83faf 100644 --- a/keyboards/planck/keymaps/xyverz/keymap.c +++ b/keyboards/planck/keymaps/xyverz/keymap.c @@ -50,8 +50,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = { {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, {KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, - {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT }, - {BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} + {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT}, + {KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_BSPC, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT } }, /* Colemak @@ -68,8 +68,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_COLEMAK] = { {KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC}, {KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT}, - {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT }, - {BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} + {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT}, + {KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_BSPC, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT } }, /* Dvorak From 8cd3a8402571bb9d0c28579060f59a4ac26c37e5 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Fri, 30 Sep 2016 22:43:15 -0700 Subject: [PATCH 004/117] revisions to my keymap again. --- keyboards/tv44/keymaps/xyverz/keymap.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/keyboards/tv44/keymaps/xyverz/keymap.c b/keyboards/tv44/keymaps/xyverz/keymap.c index 8cbcf8d3..6026c1ca 100644 --- a/keyboards/tv44/keymaps/xyverz/keymap.c +++ b/keyboards/tv44/keymaps/xyverz/keymap.c @@ -22,10 +22,10 @@ extern keymap_config_t keymap_config; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_DV] = { /* 0: Dvorak */ - {KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC }, - {MO(_L1), KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_ENT }, + {KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH }, + {MO(_L1), KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, LT(_L2, KC_MINS)}, {KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT }, - {KC_LCTL, KC_LALT, KC_LGUI, KC_BSPC, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC, KC_SLSH, KC_MINS, XXXXXXX, MO(_L2) } + {KC_LCTL, KC_LALT, KC_LGUI, KC_BSPC, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC, KC_BSLS, KC_EQL, XXXXXXX, KC_ENT } }, [_QW] = { /* 1: Qwerty */ @@ -46,14 +46,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL }, {_______, KC_BSLS, KC_QUOT, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_DOWN, KC_UP, KC_LEFT, KC_RGHT, _______ }, {_______, _______, _______, KC_PSCR, _______, _______, _______, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, KC_RSFT }, - {KC_ESC, KC_LGUI, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, KC_SLSH, _______, _______ } + {KC_ESC, KC_LGUI, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, KC_EQL, _______, _______ } }, [_L2] = { /* 2: FN 2 */ - {KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_ESC }, - {_______, KC_F11, KC_F12, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_VOLU, KC_ENT }, - {_______, _______, _______, _______, _______, _______, _______, _______, KC_END, KC_PGDN, KC_VOLD, _______ }, - {QWERTY, DVORAK, COLEMAK, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______ } + {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_ESC }, + {_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, KC_HOME, KC_PGUP, KC_VOLU, _______ }, + {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_END, KC_PGDN, KC_VOLD, _______ }, + {QWERTY, DVORAK, COLEMAK, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, KC_PLUS, _______, _______ } } }; From e3c3170610561042df3d67f358c15553878a2012 Mon Sep 17 00:00:00 2001 From: xyverz Date: Fri, 30 Sep 2016 23:10:34 -0700 Subject: [PATCH 005/117] More standardization between the three layouts Swapped Number Row with Symbols between _L1 and _L2. --- keyboards/tv44/keymaps/xyverz/keymap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/tv44/keymaps/xyverz/keymap.c b/keyboards/tv44/keymaps/xyverz/keymap.c index 6026c1ca..00347b01 100644 --- a/keyboards/tv44/keymaps/xyverz/keymap.c +++ b/keyboards/tv44/keymaps/xyverz/keymap.c @@ -30,27 +30,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QW] = { /* 1: Qwerty */ {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC }, - {MO(_L1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT }, + {MO(_L1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, LT(_L2, KC_QUOT)}, {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT }, - {KC_LCTL, KC_LALT, KC_LGUI, KC_BSPC, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC, KC_SLSH, KC_MINS, XXXXXXX, MO(_L2) } + {KC_LCTL, KC_LALT, KC_LGUI, KC_BSPC, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC, KC_SLSH, KC_MINS, XXXXXXX, KC_ENT } }, [_CM] = { /* 2: Colemak */ {KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC }, - {MO(_L1), KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_ENT }, + {MO(_L1), KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, LT(_L2, KC_QUOT)}, {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT }, - {KC_LCTL, KC_LALT, KC_LGUI, KC_BSPC, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC, KC_SLSH, KC_MINS, XXXXXXX, MO(_L2) } + {KC_LCTL, KC_LALT, KC_LGUI, KC_BSPC, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC, KC_SLSH, KC_MINS, XXXXXXX, KC_ENT } }, [_L1] = {/* 1: FN 1 */ - {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL }, + {KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL }, {_______, KC_BSLS, KC_QUOT, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_DOWN, KC_UP, KC_LEFT, KC_RGHT, _______ }, {_______, _______, _______, KC_PSCR, _______, _______, _______, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, KC_RSFT }, {KC_ESC, KC_LGUI, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, KC_EQL, _______, _______ } }, [_L2] = { /* 2: FN 2 */ - {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_ESC }, + {KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_ESC }, {_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, KC_HOME, KC_PGUP, KC_VOLU, _______ }, {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_END, KC_PGDN, KC_VOLD, _______ }, {QWERTY, DVORAK, COLEMAK, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, KC_PLUS, _______, _______ } From f41d540e81d21ad5697cf6e48ad1c09edd9a1cb9 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Tue, 18 Oct 2016 16:28:44 -0700 Subject: [PATCH 006/117] Add files via upload Minor changes to my Dvorak keymap. Updated the readme.md to reflect these changes. --- keyboards/ergodox/keymaps/xyverz/keymap.c | 14 +++++++------- keyboards/ergodox/keymaps/xyverz/readme.md | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/keyboards/ergodox/keymaps/xyverz/keymap.c b/keyboards/ergodox/keymaps/xyverz/keymap.c index 08ee5aed..ec909ec5 100644 --- a/keyboards/ergodox/keymaps/xyverz/keymap.c +++ b/keyboards/ergodox/keymaps/xyverz/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Layer 0 : Dvorak * ,--------------------------------------------------. ,--------------------------------------------------. - * | ] | 1 | 2 | 3 | 4 | 5 | ESC | | ESC | 6 | 7 | 8 | 9 | 0 | [ | + * | = | 1 | 2 | 3 | 4 | 5 | ESC | | ESC | 6 | 7 | 8 | 9 | 0 | / | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * | Tab | ' | , | . | P | Y | | | | F | G | C | R | L | \ | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| @@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+------+------+------+------+------| _MD | | _KP |------+------+------+------+------+--------| * | LShift | ; | Q | J | K | X | | | | B | M | W | V | Z | RShift | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | LGUI | ` | INS | Left | Rght | | Up | Dn | / | = | RGUI | + * | LGUI | ` | INS | Left | Rght | | Up | Dn | [ | ] | RGUI | * `----------------------------------' `----------------------------------' * ,-------------. ,-------------. * | LCTL | LALT | | RALT | RCTL | @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_DV] = KEYMAP( // left hand - KC_RBRC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC, + KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC, KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, XXXXXXX, KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, MO(_MD), @@ -70,11 +70,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_HOME, KC_BSPC, KC_DEL, KC_END, // right hand - KC_ESC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, + KC_ESC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_SLSH, XXXXXXX, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSLS, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, MO(_KP), KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, - KC_UP, KC_DOWN, KC_SLSH, KC_EQL, KC_RGUI, + KC_UP, KC_DOWN, KC_LBRC, KC_RBRC, KC_RGUI, KC_RALT, KC_RCTL, KC_PGUP, KC_PGDN, KC_ENT, KC_SPC @@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+------+------+------+------+------| _MD | | _KP |------+------+------+------+------+--------| * | LShift | Z | X | C | V | B | | | | N | M | , | . | / | RShift | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | LGUI | ` | INS | Left | Rght | | Up | Dn | / | = | RGUI | + * | LGUI | ` | INS | Left | Rght | | Up | Dn | [ | ] | RGUI | * `----------------------------------' `----------------------------------' * ,-------------. ,-------------. * | LCTL | LALT | | RALT | RCTL | @@ -133,7 +133,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+------+------+------+------+------| _MD | | _KP |------+------+------+------+------+--------| * | LShift | Z | X | C | V | B | | | | K | M | , | . | / | RShift | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | LGUI | ` | INS | Left | Rght | | Up | Dn | / | = | RGUI | + * | LGUI | ` | INS | Left | Rght | | Up | Dn | [ | ] | RGUI | * `----------------------------------' `----------------------------------' * ,-------------. ,-------------. * | LCTL | LALT | | RALT | RCTL | diff --git a/keyboards/ergodox/keymaps/xyverz/readme.md b/keyboards/ergodox/keymaps/xyverz/readme.md index 2d72fa6c..134fb50a 100644 --- a/keyboards/ergodox/keymaps/xyverz/readme.md +++ b/keyboards/ergodox/keymaps/xyverz/readme.md @@ -2,7 +2,7 @@ ## About this keymap: -The Dvorak layout shown herestems from my early Kinesis years, using the Contour PS/2 with a Dvorak software layout. Because of this, the RBRC and LBRC were on opposite sides of the board in the corner keys. I've decided to continue using this layout with my ErgoDox. +The Dvorak layout shown here stems from my early Kinesis years, using the Contour PS/2 with a Dvorak software layout. ~~Because of this, the RBRC and LBRC were on opposite sides of the board in the corner keys. I've decided to continue using this layout with my ErgoDox.~~ I've decided do give the normal placing of the SLSH, EQL, and xBRC keys a try, after using a different keyboard for a while... The QWERTY layout shown here is based entirely on the Kinesis Advantage layout, with the additional keys as shown in the diagrams. The Colemak layout is merely an adaptation of that. @@ -17,7 +17,7 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t ### Layer 0: Dvorak layer ,--------------------------------------------------.,--------------------------------------------------. - | ] | 1 | 2 | 3 | 4 | 5 | ESC || ESC | 6 | 7 | 8 | 9 | 0 | [ | + | = | 1 | 2 | 3 | 4 | 5 | ESC || ESC | 6 | 7 | 8 | 9 | 0 | / | |--------+------+------+------+------+-------------||------+------+------+------+------+------+--------| | Tab | ' | , | . | P | Y | || | F | G | C | R | L | \ | |--------+------+------+------+------+------| || |------+------+------+------+------+--------| @@ -25,7 +25,7 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t |--------+------+------+------+------+------| _MD || _KP |------+------+------+------+------+--------| | LShift | Z | X | C | V | X | || | B | M | W | V | Z | RShift | `--------+------+------+------+------+-------------'`-------------+------+------+------+------+--------' - | LGUI | ` | INS | Left | Rght | | Up | Dn | / | = | RGUI | + | LGUI | ` | INS | Left | Rght | | Up | Dn | [ | ] | RGUI | `----------------------------------' `----------------------------------' ,-------------.,-------------. | LCtr | LAlt || Ralt | RCtr | From 7920063035f45ce76541083e64ea66c77041a5c3 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Tue, 18 Oct 2016 16:34:00 -0700 Subject: [PATCH 007/117] Add files via upload Minor layout changes. --- keyboards/atreus/keymaps/xyverz/keymap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/atreus/keymaps/xyverz/keymap.c b/keyboards/atreus/keymaps/xyverz/keymap.c index b418cc9b..f976b053 100644 --- a/keyboards/atreus/keymaps/xyverz/keymap.c +++ b/keyboards/atreus/keymaps/xyverz/keymap.c @@ -28,30 +28,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_DV] = { /* Dvorak */ {KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_NO, KC_F, KC_G, KC_C, KC_R, KC_L }, {KC_A, KC_O, KC_E, KC_U, KC_I, KC_NO, KC_D, KC_H, KC_T, KC_N, KC_S }, - {SFT_T(KC_SCLN), KC_Q, KC_J, KC_K, KC_X, CTL_T(KC_DEL), KC_B, KC_M, KC_W, KC_V, SFT_T(KC_Z) }, + {SFT_T(KC_SCLN), KC_Q, KC_J, KC_K, KC_X, CTL_T(KC_BSPC), KC_B, KC_M, KC_W, KC_V, SFT_T(KC_Z) }, {KC_ESC, KC_TAB, KC_LGUI, MO(_L2), KC_BSPC, ALT_T(KC_ENT), KC_SPC, MO(_L1), KC_MINS, KC_SLSH, KC_EQL} }, [_QW] = { /* Qwerty */ {KC_Q, KC_W, KC_E, KC_R, KC_T, KC_NO, KC_Y, KC_U, KC_I, KC_O, KC_P }, {KC_A, KC_S, KC_D, KC_F, KC_G, KC_NO, KC_H, KC_J, KC_K, KC_L, KC_SCLN}, - {SFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, CTL_T(KC_DEL), KC_N, KC_M, KC_COMM, KC_DOT, SFT_T(KC_SLSH) }, + {SFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, CTL_T(KC_BSPC), KC_N, KC_M, KC_COMM, KC_DOT, SFT_T(KC_SLSH) }, {KC_ESC, KC_TAB, KC_LGUI, MO(_L2), KC_BSPC, ALT_T(KC_ENT), KC_SPC, MO(_L1), KC_MINS, KC_QUOT, KC_ENT} }, [_CM] = { /* Colemak */ {KC_Q, KC_W, KC_F, KC_P, KC_G, KC_NO, KC_J, KC_L, KC_U, KC_Y, KC_SCLN}, {KC_A, KC_R, KC_S, KC_T, KC_D, KC_NO, KC_H, KC_N, KC_E, KC_I, KC_O }, - {SFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, CTL_T(KC_DEL), KC_K, KC_M, KC_COMM, KC_DOT, SFT_T(KC_SLSH) }, + {SFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, CTL_T(KC_BSPC), KC_K, KC_M, KC_COMM, KC_DOT, SFT_T(KC_SLSH) }, {KC_ESC, KC_TAB, KC_LGUI, MO(_L2), KC_BSPC, ALT_T(KC_ENT), KC_SPC, MO(_L1), KC_MINS, KC_QUOT, KC_ENT} }, [_L1] = { /* LAYER 1 */ {KC_1, KC_2, KC_3, KC_4, KC_5, KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0 }, - {KC_TAB, KC_INS, KC_UP, KC_DEL, KC_HOME, KC_NO, KC_PGUP, KC_MUTE, KC_VOLD, KC_VOLU, KC_EQL }, - {KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_LCTL, KC_PGDN, KC_MPRV, KC_MPLY, KC_MNXT, KC_BSLS}, + {KC_TAB, KC_INS, KC_UP, KC_DEL, KC_HOME, KC_NO, KC_PGUP, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS}, + {KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_LCTL, KC_PGDN, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS}, {KC_TRNS, KC_GRV, KC_LGUI, KC_TRNS, KC_DEL, KC_LALT, KC_SPC, KC_TRNS, KC_LBRC, KC_RBRC, KC_ENT } }, [_L2] = { /* LAYER 2 */ {KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_NO, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN}, - {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO, KC_TRNS, KC_F6, KC_F7, KC_F8, KC_PLUS}, + {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO, KC_TRNS, KC_F6, KC_F7, KC_F8, KC_PIPE}, {KC_TRNS, KC_TRNS, DVORAK, QWERTY, COLEMAK, KC_LCTL, KC_TRNS, KC_F9, KC_F10, KC_F11, KC_F12 }, {KC_TRNS, KC_TRNS, KC_LGUI, KC_TRNS, KC_BSPC, KC_LALT, KC_SPC, KC_TRNS, LSFT(KC_LBRC), LSFT(KC_RBRC), RESET} } From 91b1aa0994ad2296d03148d9bec8c455ef105fcb Mon Sep 17 00:00:00 2001 From: Xyverz Date: Tue, 18 Oct 2016 16:34:42 -0700 Subject: [PATCH 008/117] Add files via upload Minor layout changes --- keyboards/preonic/keymaps/xyverz/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/preonic/keymaps/xyverz/keymap.c b/keyboards/preonic/keymaps/xyverz/keymap.c index adc7392e..bc4692f3 100644 --- a/keyboards/preonic/keymaps/xyverz/keymap.c +++ b/keyboards/preonic/keymaps/xyverz/keymap.c @@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { {KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH}, {KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS}, {KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT}, - {KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_SPC, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT } + {KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_SPC, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_LGUI, KC_ENT } }, /* Lower @@ -339,4 +339,4 @@ void play_goodbye_tone() _delay_ms(150); } -#endif \ No newline at end of file +#endif From 61eb35191a482aafde7e5eaa66c9b4a6fc455488 Mon Sep 17 00:00:00 2001 From: xyverz Date: Mon, 31 Oct 2016 17:58:22 -0700 Subject: [PATCH 009/117] Adding more keymaps. --- keyboards/clueboard/keymaps/xyverz/keymap.c | 108 ++++++++++++++++++++ keyboards/gh60/keymaps/xyverz/keymap | 61 +++++++++++ keyboards/gh60/keymaps/xyverz/keymap.c | 101 ++++++++++++++++++ keyboards/gh60/keymaps/xyverz/keymap_orig.c | 61 +++++++++++ 4 files changed, 331 insertions(+) create mode 100644 keyboards/clueboard/keymaps/xyverz/keymap.c create mode 100644 keyboards/gh60/keymaps/xyverz/keymap create mode 100644 keyboards/gh60/keymaps/xyverz/keymap.c create mode 100644 keyboards/gh60/keymaps/xyverz/keymap_orig.c diff --git a/keyboards/clueboard/keymaps/xyverz/keymap.c b/keyboards/clueboard/keymaps/xyverz/keymap.c new file mode 100644 index 00000000..01f158bf --- /dev/null +++ b/keyboards/clueboard/keymaps/xyverz/keymap.c @@ -0,0 +1,108 @@ +#include "clueboard.h" + +// Used for SHIFT_ESC +#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. +#define _BL 0 +#define _FL 1 +#define _RS 2 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Keymap _BL: (Base Layer) Default Layer + * ,--------------------------------------------------------------------------. ,----. + * |Esc~| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \| BS| |PGUP| + * |--------------------------------------------------------------------------| |----| + * | Tab| Q| W| E| R| T| Y| U| I| O| P| [| ]| \| |PGDN| + * |--------------------------------------------------------------------------| `----' + * |Capslck| A| S| D| F| G| H| J| K| L| ;| '| # | Ent| + * |-----------------------------------------------------------------------------. + * |Shift| BS| Z| X| C| V| B| N| M| ,| .| /| BS|Shift| UP| + * |------------------------------------------------------------------------|----|----. + * | Ctrl| Gui| Alt| MHen| Space| Space| Hen| Alt| Ctrl| _FL|LEFT|DOWN|RGHT| + * `----------------------------------------------------------------------------------' + */ +[_BL] = KEYMAP( + F(0), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC, KC_PGUP, \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, \ + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, \ + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_RSFT, KC_UP, \ + KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, KC_SPC,KC_SPC, KC_HENK, KC_RALT, KC_RCTL, MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT), + + /* Keymap _FL: Function Layer + * ,--------------------------------------------------------------------------. ,----. + * | `| F1| F2| F3| F4| F5| F6| F7| F8| F9| F10| F11| F12| | Del| |BLIN| + * |--------------------------------------------------------------------------| |----| + * | | | | | | | | |PScr|SLck|Paus| | | | |BLDE| + * |--------------------------------------------------------------------------| `----' + * | | | _RS| | | | | | | | | | | | + * |-----------------------------------------------------------------------------. + * | | | | | | | | | | | | | | |PGUP| + * |------------------------------------------------------------------------|----|----. + * | | | | | | | | | | _FL|HOME|PGDN| END| + * `----------------------------------------------------------------------------------' + */ +[_FL] = KEYMAP( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL, BL_STEP, \ + KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, MO(_RS),KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FL), KC_HOME, KC_PGDN, KC_END), + + /* Keymap _RS: Reset layer + * ,--------------------------------------------------------------------------. ,----. + * | | | | | | | | | | | | | | | | | | + * |--------------------------------------------------------------------------| |----| + * | | | | |RESET| | | | | | | | | | | | + * |--------------------------------------------------------------------------| `----' + * | | | _RS| | | | | | | | | | | | + * |-----------------------------------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |------------------------------------------------------------------------|----|----. + * | | | | | | | | | | _FL| | | | + * `----------------------------------------------------------------------------------' + */ +[_RS] = KEYMAP( + KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAI, \ + KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,RESET, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, \ + KC_TRNS, KC_TRNS, MO(_RS),KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + MO(_FL), KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FL), RGB_SAI, \ + KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, RGB_MOD, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUD, RGB_SAD, RGB_HUI), +}; + +enum function_id { + SHIFT_ESC, +}; + +const uint16_t PROGMEM fn_actions[] = { + [0] = ACTION_FUNCTION(SHIFT_ESC), +}; + +void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { + static uint8_t shift_esc_shift_mask; + switch (id) { + case SHIFT_ESC: + shift_esc_shift_mask = get_mods()&MODS_CTRL_MASK; + if (record->event.pressed) { + if (shift_esc_shift_mask) { + add_key(KC_GRV); + send_keyboard_report(); + } else { + add_key(KC_ESC); + send_keyboard_report(); + } + } else { + if (shift_esc_shift_mask) { + del_key(KC_GRV); + send_keyboard_report(); + } else { + del_key(KC_ESC); + send_keyboard_report(); + } + } + break; + } +} diff --git a/keyboards/gh60/keymaps/xyverz/keymap b/keyboards/gh60/keymaps/xyverz/keymap new file mode 100644 index 00000000..85b998a4 --- /dev/null +++ b/keyboards/gh60/keymaps/xyverz/keymap @@ -0,0 +1,61 @@ +#include "gh60.h" +#include "action_layer.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* 0: qwerty */ + KEYMAP( + ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, LBRC,RBRC,BSPC, \ + TAB, QUOT,COMM,DOT, P, Y, F, G, C, R, L, SLSH,EQL, BSLS, \ + FN0, A, O, E, U, I, D, H, T, N, S, MINS,NO, ENT, \ + LSFT,NO, SCLN,Q, J, K, X, B, M, W, V, Z, NO, RSFT, \ + LCTL,LALT,LGUI, SPC, NO, RGUI,RALT,RCTL,FN0), + /* 1: fn */ + KEYMAP( + ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, DEL, \ + TRNS,TRNS,UP, TRNS,TRNS,TRNS,TRNS,PGUP,UP, PGDN,PSCR,SLCK,PAUS,TRNS, \ + TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,HOME,LEFT,DOWN,RGHT,INS, DEL, TRNS,TRNS, \ + CAPS,TRNS,TRNS,TRNS,TRNS,TRNS,END, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \ + TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,TRNS), +}; + +const uint16_t PROGMEM fn_actions[] = { + [0] = ACTION_LAYER_MOMENTARY(1), // to Fn overlay +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + // MACRODOWN only works in this function + switch(id) { + case 0: + if (record->event.pressed) { + register_code(KC_RSFT); + } else { + unregister_code(KC_RSFT); + } + break; + } + return MACRO_NONE; +}; + +void matrix_scan_user(void) { + +//Layer LED indicators + uint32_t layer = layer_state; + + if (layer & (1<<1)) { + gh60_wasd_leds_on(); + gh60_fn_led_on(); + } else { + gh60_wasd_leds_off(); + gh60_fn_led_off(); + } + + if (layer & (1<<2)) { + gh60_poker_leds_on(); + gh60_esc_led_on(); + } else { + gh60_poker_leds_off(); + gh60_esc_led_off(); + } + +}; diff --git a/keyboards/gh60/keymaps/xyverz/keymap.c b/keyboards/gh60/keymaps/xyverz/keymap.c new file mode 100644 index 00000000..f0211a88 --- /dev/null +++ b/keyboards/gh60/keymaps/xyverz/keymap.c @@ -0,0 +1,101 @@ +#include "gh60.h" +#include "action_layer.h" +#include "eeconfig.h" + + +extern keymap_config_t keymap_config; + + +// Used for SHIFT_ESC +#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. +#define _QW 0 +#define _DV 1 +#define _CM 2 +#define _FL 3 + +// Macro name shortcuts +#define QWERTY M(_QW) +#define DVORAK M(_DV) +#define COLEMAK M(_CM) + +// Fillers to make layering more clear +#define _______ KC_TRNS +#define XXXXXXX KC_NO + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[_QW] = { /* Layer 0: Qwerty */ + {KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC}, + {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS}, + {MO(_FL), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, XXXXXXX, KC_ENT }, + {KC_LSFT, XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, XXXXXXX, KC_RSFT}, + {KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, XXXXXXX, KC_SPC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RGUI, KC_RALT, KC_RCTL, MO(_FL)} + }, + +[_DV] = { /* Layer 1: Dvorak */ + {KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC}, + {KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSLS}, + {MO(_FL), KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, XXXXXXX, KC_ENT }, + {KC_LSFT, XXXXXXX, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, XXXXXXX, KC_RSFT}, + {KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, XXXXXXX, KC_SPC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RGUI, KC_RALT, KC_RCTL, MO(_FL)} + }, + +[_CM] = { /* Layer 2: Colemak */ + {KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC}, + {KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS}, + {MO(_FL), KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, XXXXXXX, KC_ENT }, + {KC_LSFT, XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, XXXXXXX, KC_RSFT}, + {KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, XXXXXXX, KC_SPC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RGUI, KC_RALT, KC_RCTL, MO(_FL)} + }, + +[_FL] = { /* Layer 3: Functions */ + {_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL }, + {_______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, _______}, + {_______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, XXXXXXX, _______}, + {KC_CAPS, XXXXXXX, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_END, _______, _______, _______, _______, _______, XXXXXXX, _______}, + {QWERTY, DVORAK, COLEMAK, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______} + }, + + +}; + +enum function_id { + SHIFT_ESC, +}; + + +const uint16_t PROGMEM fn_actions[] = { + +}; + +void persistant_default_layer_set(uint16_t default_layer) { + eeconfig_update_default_layer(default_layer); + default_layer_set(default_layer); +} + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + switch(id) { + case _DV: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_DV); + } + break; + case _QW: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_QW); + } + break; + case _CM: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_CM); + } + break; + } + return MACRO_NONE; +}; diff --git a/keyboards/gh60/keymaps/xyverz/keymap_orig.c b/keyboards/gh60/keymaps/xyverz/keymap_orig.c new file mode 100644 index 00000000..85b998a4 --- /dev/null +++ b/keyboards/gh60/keymaps/xyverz/keymap_orig.c @@ -0,0 +1,61 @@ +#include "gh60.h" +#include "action_layer.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* 0: qwerty */ + KEYMAP( + ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, LBRC,RBRC,BSPC, \ + TAB, QUOT,COMM,DOT, P, Y, F, G, C, R, L, SLSH,EQL, BSLS, \ + FN0, A, O, E, U, I, D, H, T, N, S, MINS,NO, ENT, \ + LSFT,NO, SCLN,Q, J, K, X, B, M, W, V, Z, NO, RSFT, \ + LCTL,LALT,LGUI, SPC, NO, RGUI,RALT,RCTL,FN0), + /* 1: fn */ + KEYMAP( + ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, DEL, \ + TRNS,TRNS,UP, TRNS,TRNS,TRNS,TRNS,PGUP,UP, PGDN,PSCR,SLCK,PAUS,TRNS, \ + TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,HOME,LEFT,DOWN,RGHT,INS, DEL, TRNS,TRNS, \ + CAPS,TRNS,TRNS,TRNS,TRNS,TRNS,END, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \ + TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,TRNS), +}; + +const uint16_t PROGMEM fn_actions[] = { + [0] = ACTION_LAYER_MOMENTARY(1), // to Fn overlay +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + // MACRODOWN only works in this function + switch(id) { + case 0: + if (record->event.pressed) { + register_code(KC_RSFT); + } else { + unregister_code(KC_RSFT); + } + break; + } + return MACRO_NONE; +}; + +void matrix_scan_user(void) { + +//Layer LED indicators + uint32_t layer = layer_state; + + if (layer & (1<<1)) { + gh60_wasd_leds_on(); + gh60_fn_led_on(); + } else { + gh60_wasd_leds_off(); + gh60_fn_led_off(); + } + + if (layer & (1<<2)) { + gh60_poker_leds_on(); + gh60_esc_led_on(); + } else { + gh60_poker_leds_off(); + gh60_esc_led_off(); + } + +}; From 063328344ada87757595d6b6b11023a6848da2e4 Mon Sep 17 00:00:00 2001 From: xyverz Date: Mon, 31 Oct 2016 18:04:01 -0700 Subject: [PATCH 010/117] Removed files that weren't supposed to be uploaded from gh60 keymap folder --- keyboards/gh60/keymaps/xyverz/keymap | 61 --------------------- keyboards/gh60/keymaps/xyverz/keymap_orig.c | 61 --------------------- 2 files changed, 122 deletions(-) delete mode 100644 keyboards/gh60/keymaps/xyverz/keymap delete mode 100644 keyboards/gh60/keymaps/xyverz/keymap_orig.c diff --git a/keyboards/gh60/keymaps/xyverz/keymap b/keyboards/gh60/keymaps/xyverz/keymap deleted file mode 100644 index 85b998a4..00000000 --- a/keyboards/gh60/keymaps/xyverz/keymap +++ /dev/null @@ -1,61 +0,0 @@ -#include "gh60.h" -#include "action_layer.h" - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* 0: qwerty */ - KEYMAP( - ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, LBRC,RBRC,BSPC, \ - TAB, QUOT,COMM,DOT, P, Y, F, G, C, R, L, SLSH,EQL, BSLS, \ - FN0, A, O, E, U, I, D, H, T, N, S, MINS,NO, ENT, \ - LSFT,NO, SCLN,Q, J, K, X, B, M, W, V, Z, NO, RSFT, \ - LCTL,LALT,LGUI, SPC, NO, RGUI,RALT,RCTL,FN0), - /* 1: fn */ - KEYMAP( - ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, DEL, \ - TRNS,TRNS,UP, TRNS,TRNS,TRNS,TRNS,PGUP,UP, PGDN,PSCR,SLCK,PAUS,TRNS, \ - TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,HOME,LEFT,DOWN,RGHT,INS, DEL, TRNS,TRNS, \ - CAPS,TRNS,TRNS,TRNS,TRNS,TRNS,END, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,TRNS), -}; - -const uint16_t PROGMEM fn_actions[] = { - [0] = ACTION_LAYER_MOMENTARY(1), // to Fn overlay -}; - -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - // MACRODOWN only works in this function - switch(id) { - case 0: - if (record->event.pressed) { - register_code(KC_RSFT); - } else { - unregister_code(KC_RSFT); - } - break; - } - return MACRO_NONE; -}; - -void matrix_scan_user(void) { - -//Layer LED indicators - uint32_t layer = layer_state; - - if (layer & (1<<1)) { - gh60_wasd_leds_on(); - gh60_fn_led_on(); - } else { - gh60_wasd_leds_off(); - gh60_fn_led_off(); - } - - if (layer & (1<<2)) { - gh60_poker_leds_on(); - gh60_esc_led_on(); - } else { - gh60_poker_leds_off(); - gh60_esc_led_off(); - } - -}; diff --git a/keyboards/gh60/keymaps/xyverz/keymap_orig.c b/keyboards/gh60/keymaps/xyverz/keymap_orig.c deleted file mode 100644 index 85b998a4..00000000 --- a/keyboards/gh60/keymaps/xyverz/keymap_orig.c +++ /dev/null @@ -1,61 +0,0 @@ -#include "gh60.h" -#include "action_layer.h" - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* 0: qwerty */ - KEYMAP( - ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, LBRC,RBRC,BSPC, \ - TAB, QUOT,COMM,DOT, P, Y, F, G, C, R, L, SLSH,EQL, BSLS, \ - FN0, A, O, E, U, I, D, H, T, N, S, MINS,NO, ENT, \ - LSFT,NO, SCLN,Q, J, K, X, B, M, W, V, Z, NO, RSFT, \ - LCTL,LALT,LGUI, SPC, NO, RGUI,RALT,RCTL,FN0), - /* 1: fn */ - KEYMAP( - ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, DEL, \ - TRNS,TRNS,UP, TRNS,TRNS,TRNS,TRNS,PGUP,UP, PGDN,PSCR,SLCK,PAUS,TRNS, \ - TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,HOME,LEFT,DOWN,RGHT,INS, DEL, TRNS,TRNS, \ - CAPS,TRNS,TRNS,TRNS,TRNS,TRNS,END, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,TRNS), -}; - -const uint16_t PROGMEM fn_actions[] = { - [0] = ACTION_LAYER_MOMENTARY(1), // to Fn overlay -}; - -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - // MACRODOWN only works in this function - switch(id) { - case 0: - if (record->event.pressed) { - register_code(KC_RSFT); - } else { - unregister_code(KC_RSFT); - } - break; - } - return MACRO_NONE; -}; - -void matrix_scan_user(void) { - -//Layer LED indicators - uint32_t layer = layer_state; - - if (layer & (1<<1)) { - gh60_wasd_leds_on(); - gh60_fn_led_on(); - } else { - gh60_wasd_leds_off(); - gh60_fn_led_off(); - } - - if (layer & (1<<2)) { - gh60_poker_leds_on(); - gh60_esc_led_on(); - } else { - gh60_poker_leds_off(); - gh60_esc_led_off(); - } - -}; From 8dd422ffe1a84416dd4a8d38878979f5b7bbd51b Mon Sep 17 00:00:00 2001 From: xyverz Date: Mon, 31 Oct 2016 18:27:05 -0700 Subject: [PATCH 011/117] Updates to keymap file. --- keyboards/gh60/keymaps/xyverz/keymap.c | 66 ++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 9 deletions(-) diff --git a/keyboards/gh60/keymaps/xyverz/keymap.c b/keyboards/gh60/keymaps/xyverz/keymap.c index f0211a88..e83a7f5a 100644 --- a/keyboards/gh60/keymaps/xyverz/keymap.c +++ b/keyboards/gh60/keymaps/xyverz/keymap.c @@ -6,9 +6,6 @@ extern keymap_config_t keymap_config; -// Used for SHIFT_ESC -#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) - // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. // Layer names don't all need to be of the same length, obviously, and you can also skip them @@ -29,6 +26,20 @@ extern keymap_config_t keymap_config; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * _QW: Qwerty Layer + * ,-----------------------------------------------------------. + * |ESC | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| Backsp| + * |-----------------------------------------------------------| + * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| + * |-----------------------------------------------------------| + * |Fn | A| S| D| F| G| H| J| K| L| ;| '| Return| + * |-----------------------------------------------------------| + * |Shift | Z| X| C| V| B| N| M| ,| .| /| Shift| + * |-----------------------------------------------------------| + * |Ctrl|Alt |Gui | Space |Gui |Alt |Ctrl| Fn| + * `-----------------------------------------------------------' + */ [_QW] = { /* Layer 0: Qwerty */ {KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC}, {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS}, @@ -37,6 +48,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { {KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, XXXXXXX, KC_SPC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RGUI, KC_RALT, KC_RCTL, MO(_FL)} }, + /* + * _DV: Dvorak Layer + * ,-----------------------------------------------------------. + * |ESC | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| [| ]| Backsp| + * |-----------------------------------------------------------| + * |Tab | '| ,| .| P| Y| F| G| C| R| L| /| =| \| + * |-----------------------------------------------------------| + * |Fn | A| O| E| U| I| D| H| T| N| S| -| Return| + * |-----------------------------------------------------------| + * |Shift | ;| Q| J| K| X| B| M| W| V| Z| Shift| + * |-----------------------------------------------------------| + * |Ctrl|Alt |Gui | Space |Gui |Alt |Ctrl| Fn| + * `-----------------------------------------------------------' + */ [_DV] = { /* Layer 1: Dvorak */ {KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC}, {KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSLS}, @@ -45,6 +70,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { {KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, XXXXXXX, KC_SPC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RGUI, KC_RALT, KC_RCTL, MO(_FL)} }, + /* + * _CM: Colemak Layer + * ,-----------------------------------------------------------. + * |ESC | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| Backsp| + * |-----------------------------------------------------------| + * |Tab | Q| W| F| P| G| J| L| U| Y| ;| [| ]| \| + * |-----------------------------------------------------------| + * |Fn | A| R| S| T| D| H| N| E| I| O| '| Return| + * |-----------------------------------------------------------| + * |Shift | Z| X| C| V| B| K| M| ,| .| /| Shift| + * |-----------------------------------------------------------| + * |Ctrl|Alt |Gui | Space |Gui |Alt |Ctrl| Fn| + * `-----------------------------------------------------------' + */ [_CM] = { /* Layer 2: Colemak */ {KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC}, {KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS}, @@ -53,22 +92,31 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { {KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, XXXXXXX, KC_SPC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RGUI, KC_RALT, KC_RCTL, MO(_FL)} }, + /* + * _FL: Function Layer + * ,-----------------------------------------------------------. + * | |F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| Del| + * |-----------------------------------------------------------| + * | | | | | | | |PgU| Up|PgD|PSc|SLk|Pau| | + * |-----------------------------------------------------------| + * | | |MPr|MPl|MNx| |Hom| Lt| Dn| Rt| | | | + * |-----------------------------------------------------------| + * |CAPS | |Mut|VlD|VlU| |End| | | | | | + * |-----------------------------------------------------------| + * |_QW |_DV |_CM | | | | | | + * `-----------------------------------------------------------' + */ [_FL] = { /* Layer 3: Functions */ {_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL }, {_______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, _______}, {_______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, XXXXXXX, _______}, - {KC_CAPS, XXXXXXX, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_END, _______, _______, _______, _______, _______, XXXXXXX, _______}, + {KC_CAPS, XXXXXXX, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_END, _______, _______, _______, _______, XXXXXXX, _______}, {QWERTY, DVORAK, COLEMAK, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______} }, }; -enum function_id { - SHIFT_ESC, -}; - - const uint16_t PROGMEM fn_actions[] = { }; From 592b90dd221d3847d359b9a4dbd258b9ceb2b3ce Mon Sep 17 00:00:00 2001 From: xyverz Date: Tue, 13 Dec 2016 18:05:45 -0800 Subject: [PATCH 012/117] Changes --- keyboards/planck/keymaps/xyverz/keymap.c | 10 +- keyboards/preonic/keymaps/xyverz/keymap.c | 192 +++++++------------ keyboards/preonic/keymaps/xyverz/makefile.mk | 1 - 3 files changed, 70 insertions(+), 133 deletions(-) delete mode 100644 keyboards/preonic/keymaps/xyverz/makefile.mk diff --git a/keyboards/planck/keymaps/xyverz/keymap.c b/keyboards/planck/keymaps/xyverz/keymap.c index bbb83faf..94ace2af 100644 --- a/keyboards/planck/keymaps/xyverz/keymap.c +++ b/keyboards/planck/keymaps/xyverz/keymap.c @@ -44,14 +44,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------|------+------+------+------+------+------| * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | + * | Brite| Ctrl | Alt | GUI |Lower | Bksp |Space |Raise | Left | Down | Up |Right | * `-----------------------------------------------------------------------------------' */ [_QWERTY] = { {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, {KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT}, - {KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_BSPC, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT } + {KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, GUI_T(KC_BSPC), KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT } }, /* Colemak @@ -62,14 +62,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------|------+------+------+------+------+------| * | Shift| Z | X | C | V | B | K | M | , | . | / |Enter | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | + * | Brite| Ctrl | Alt | GUI |Lower | Bksp |Space |Raise | Left | Down | Up |Right | * `-----------------------------------------------------------------------------------' */ [_COLEMAK] = { {KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC}, {KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT}, {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT}, - {KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_BSPC, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT } + {KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, GUI_T(KC_BSPC), KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT } }, /* Dvorak @@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { {KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH}, {KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS}, {KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT}, - {KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_BSPC, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT } + {KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, GUI_T(KC_BSPC), KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT } }, /* Lower diff --git a/keyboards/preonic/keymaps/xyverz/keymap.c b/keyboards/preonic/keymaps/xyverz/keymap.c index bc4692f3..b2240146 100644 --- a/keyboards/preonic/keymaps/xyverz/keymap.c +++ b/keyboards/preonic/keymaps/xyverz/keymap.c @@ -14,22 +14,16 @@ #define _DVORAK 2 #define _LOWER 3 #define _RAISE 4 -#define _MUSIC 5 #define _ADJUST 16 -// Macro name shortcuts -#define QWERTY M(_QWERTY) -#define COLEMAK M(_COLEMAK) -#define DVORAK M(_DVORAK) -#define LOWER M(_LOWER) -#define RAISE M(_RAISE) -#define M_BL 5 -#define AUD_OFF M(6) -#define AUD_ON M(7) -#define MUS_OFF M(8) -#define MUS_ON M(9) -#define VC_IN M(10) -#define VC_DE M(11) +enum preonic_keycodes { + QWERTY = SAFE_RANGE, + COLEMAK, + DVORAK, + LOWER, + RAISE, + BACKLIT +}; // Fillers to make layering more clear #define _______ KC_TRNS @@ -47,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------|------+------+------+------+------+------| * | Shift| Z | X | C | V | B | N | M | , | . | / | Shift| * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Ctrl | Alt | Left |Right |Lower | Space |Raise | Up | Down | GUI |Enter | + * | Ctrl | Alt | Left |Right |Lower | Bksp |Space |Raise | Up | Down | GUI |Enter | * `-----------------------------------------------------------------------------------' */ [_QWERTY] = { @@ -55,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL}, {KC_MINS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT}, - {KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_SPC, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT } + {KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, GUI_T(KC_BSPC), KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT } }, /* Colemak @@ -66,17 +60,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+-------------+------+------+------+------+------| * | Esc | A | R | S | T | D | H | N | E | I | O | " | * |------+------+------+------+------+------|------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | K | M | , | . | / |Enter | + * | Shift| Z | X | C | V | B | K | M | , | . | / | Shift| * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | + * | Ctrl | Alt | Left |Right |Lower | Bksp |Space |Raise | Up | Down | GUI |Enter | * `-----------------------------------------------------------------------------------' */ [_COLEMAK] = { {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, {KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL}, {KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT}, - {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT }, - {M(M_BL), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} + {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT}, + {KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, GUI_T(KC_BSPC), KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT } }, /* Dvorak @@ -89,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------|------+------+------+------+------+------| * | Shift| ; | Q | J | K | X | B | M | W | V | Z | Shift| * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Ctrl | Alt | Left |Right |Lower | Space |Raise | Up | Down | GUI |Enter | + * | Ctrl | Alt | Left |Right |Lower | Bksp |Space |Raise | Up | Down | GUI |Enter | * `-----------------------------------------------------------------------------------' */ [_DVORAK] = { @@ -97,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { {KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH}, {KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS}, {KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT}, - {KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_SPC, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_LGUI, KC_ENT } + {KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, GUI_T(KC_BSPC), KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT } }, /* Lower @@ -110,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------|------+------+------+------+------+------| * | | F7 | F8 | F9 | F10 | F11 | F12 | | Mute | Vol- | Vol+ | | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Brite| | Home | End | | Ins | | PgUp | PgDN | |Enter | + * | Brite| | Home | End | | Del | Ins | | PgUp | PgDN | |Enter | * `-----------------------------------------------------------------------------------' */ [_LOWER] = { @@ -118,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL}, {KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE}, {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______}, - {M(M_BL), _______, KC_HOME, KC_END, _______, KC_INS, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______} + {BACKLIT, _______, KC_HOME, KC_END, _______, KC_DEL, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______} }, /* Raise @@ -131,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------|------+------+------+------+------+------| * | | F7 | F8 | F9 | F10 | F11 | F12 | | Prev | Play | Next | | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Brite| | Home | End | | Ins | | PgUp | PgDN | |Enter | + * | Brite| | Home | End | | Del | Ins | | PgUp | PgDN | |Enter | * `-----------------------------------------------------------------------------------' */ [_RAISE] = { @@ -139,18 +133,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL}, {KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS}, {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______}, - {M(M_BL), _______, KC_HOME, KC_END, _______, KC_INS, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______} -}, - -/* Music (reserved for process_action_user) - * - */ -[_MUSIC] = { - {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, - {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, - {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, - {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, - {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LOWER, XXXXXXX, XXXXXXX, RAISE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX} + {BACKLIT, _______, KC_HOME, KC_END, _______, KC_DEL, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______} }, /* Adjust (Lower + Raise) @@ -169,32 +152,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = { {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12}, {_______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL}, - {_______, _______, _______, AUD_ON, AUD_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______}, - {_______, VC_DE, VC_IN, MUS_ON, MUS_OFF, _______, _______, _______, _______, _______, _______, _______}, + {_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______}, + {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______}, {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} } -}; - -const uint16_t PROGMEM fn_actions[] = { - }; #ifdef AUDIO_ENABLE -float start_up[][2] = { - {440.0*pow(2.0,(14)/12.0), 20}, - {440.0*pow(2.0,(26)/12.0), 8}, - {440.0*pow(2.0,(18)/12.0), 20}, - {440.0*pow(2.0,(26)/12.0), 8} +float tone_startup[][2] = { + {NOTE_B5, 20}, + {NOTE_B6, 8}, + {NOTE_DS6, 20}, + {NOTE_B6, 8} }; float tone_qwerty[][2] = SONG(QWERTY_SOUND); float tone_dvorak[][2] = SONG(DVORAK_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND); -float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); -float goodbye[][2] = SONG(GOODBYE_SOUND); +float tone_goodbye[][2] = SONG(GOODBYE_SOUND); + +float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); #endif void persistant_default_layer_set(uint16_t default_layer) { @@ -202,34 +182,36 @@ void persistant_default_layer_set(uint16_t default_layer) { default_layer_set(default_layer); } -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - switch(id) { - case _QWERTY: +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case QWERTY: if (record->event.pressed) { #ifdef AUDIO_ENABLE PLAY_NOTE_ARRAY(tone_qwerty, false, 0); #endif persistant_default_layer_set(1UL<<_QWERTY); } + return false; break; - case _COLEMAK: + case COLEMAK: if (record->event.pressed) { #ifdef AUDIO_ENABLE PLAY_NOTE_ARRAY(tone_colemak, false, 0); #endif persistant_default_layer_set(1UL<<_COLEMAK); } + return false; break; - case _DVORAK: + case DVORAK: if (record->event.pressed) { #ifdef AUDIO_ENABLE PLAY_NOTE_ARRAY(tone_dvorak, false, 0); #endif persistant_default_layer_set(1UL<<_DVORAK); } + return false; break; - case _LOWER: + case LOWER: if (record->event.pressed) { layer_on(_LOWER); update_tri_layer(_LOWER, _RAISE, _ADJUST); @@ -237,8 +219,9 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) layer_off(_LOWER); update_tri_layer(_LOWER, _RAISE, _ADJUST); } + return false; break; - case _RAISE: + case RAISE: if (record->event.pressed) { layer_on(_RAISE); update_tri_layer(_LOWER, _RAISE, _ADJUST); @@ -246,8 +229,9 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) layer_off(_RAISE); update_tri_layer(_LOWER, _RAISE, _ADJUST); } + return false; break; - case M_BL: + case BACKLIT: if (record->event.pressed) { register_code(KC_RSFT); #ifdef BACKLIGHT_ENABLE @@ -256,87 +240,41 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) } else { unregister_code(KC_RSFT); } - break; - case 6: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - audio_off(); - #endif - } - break; - case 7: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - audio_on(); - PLAY_NOTE_ARRAY(start_up, false, 0); - #endif - } - break; - case 8: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - layer_off(_MUSIC); - stop_all_notes(); - #endif - } - break; - case 9: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_NOTE_ARRAY(music_scale, false, 0); - layer_on(_MUSIC); - #endif - } - break; - case 10: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - voice_iterate(); - PLAY_NOTE_ARRAY(music_scale, false, 0); - #endif - } - break; - case 11: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - voice_deiterate(); - PLAY_NOTE_ARRAY(music_scale, false, 0); - #endif - } - break; + return false; + break; } - return MACRO_NONE; + return true; }; - void matrix_init_user(void) { - #ifdef AUDIO_ENABLE - _delay_ms(20); // gets rid of tick - PLAY_NOTE_ARRAY(start_up, false, 0); - #endif + #ifdef AUDIO_ENABLE + startup_user(); + #endif } #ifdef AUDIO_ENABLE -uint8_t starting_note = 0x0C; -int offset = 7; - -void process_action_user(keyrecord_t *record) { +void startup_user() +{ + _delay_ms(20); // gets rid of tick + PLAY_NOTE_ARRAY(tone_startup, false, 0); +} - if (IS_LAYER_ON(_MUSIC)) { - if (record->event.pressed) { - play_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)), 0xF); - } else { - stop_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row))); - } - } +void shutdown_user() +{ + PLAY_NOTE_ARRAY(tone_goodbye, false, 0); + _delay_ms(150); + stop_all_notes(); +} +void music_on_user(void) +{ + music_scale_user(); } -void play_goodbye_tone() +void music_scale_user(void) { - PLAY_NOTE_ARRAY(goodbye, false, 0); - _delay_ms(150); + PLAY_NOTE_ARRAY(music_scale, false, 0); } #endif diff --git a/keyboards/preonic/keymaps/xyverz/makefile.mk b/keyboards/preonic/keymaps/xyverz/makefile.mk deleted file mode 100644 index 628167ff..00000000 --- a/keyboards/preonic/keymaps/xyverz/makefile.mk +++ /dev/null @@ -1 +0,0 @@ -AUDIO_ENABLE = yes \ No newline at end of file From 79343f1c6cde28c454eac0a577d0d7dbf3aa2f17 Mon Sep 17 00:00:00 2001 From: xyverz Date: Sun, 8 Jan 2017 21:44:31 -0800 Subject: [PATCH 013/117] Usaility changes to keymap, tidying up a bit. --- keyboards/preonic/keymaps/xyverz/keymap.c | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/keyboards/preonic/keymaps/xyverz/keymap.c b/keyboards/preonic/keymaps/xyverz/keymap.c index b2240146..b4d18f9a 100644 --- a/keyboards/preonic/keymaps/xyverz/keymap.c +++ b/keyboards/preonic/keymaps/xyverz/keymap.c @@ -54,11 +54,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Colemak * ,-----------------------------------------------------------------------------------. - * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | + * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | * |------+------+------+------+------+------+------+------+------+------+------+------| * | Tab | Q | W | F | P | G | J | L | U | Y | ; | Del | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Esc | A | R | S | T | D | H | N | E | I | O | " | + * | Bksp | A | R | S | T | D | H | N | E | I | O | " | * |------+------+------+------+------+------|------+------+------+------+------+------| * | Shift| Z | X | C | V | B | K | M | , | . | / | Shift| * |------+------+------+------+------+------+------+------+------+------+------+------| @@ -66,9 +66,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_COLEMAK] = { - {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, + {KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, {KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL}, - {KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT}, + {KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT}, {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT}, {KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, GUI_T(KC_BSPC), KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT } }, @@ -98,9 +98,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-----------------------------------------------------------------------------------. * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Del | + * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | | | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Caps | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | | + * | Caps | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | * |------+------+------+------+------+------|------+------+------+------+------+------| * | | F7 | F8 | F9 | F10 | F11 | F12 | | Mute | Vol- | Vol+ | | * |------+------+------+------+------+------+------+------+------+------+------+------| @@ -109,8 +109,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_LOWER] = { {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, - {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL}, - {KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE}, + {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE}, + {KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______}, {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______}, {BACKLIT, _______, KC_HOME, KC_END, _______, KC_DEL, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______} }, @@ -119,9 +119,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-----------------------------------------------------------------------------------. * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Del | + * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | \ | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Caps | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | + * | Caps | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | | * |------+------+------+------+------+------|------+------+------+------+------+------| * | | F7 | F8 | F9 | F10 | F11 | F12 | | Prev | Play | Next | | * |------+------+------+------+------+------+------+------+------+------+------+------| @@ -130,8 +130,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_RAISE] = { {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, - {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL}, - {KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS}, + {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSLS}, + {KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______}, {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______}, {BACKLIT, _______, KC_HOME, KC_END, _______, KC_DEL, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______} }, From 7a9a5d0e626aaaff96b99f251d048d24e07289f9 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Mon, 9 Jan 2017 19:08:46 -0800 Subject: [PATCH 014/117] Add files via upload tidying up the keymap --- keyboards/atreus/keymaps/xyverz/keymap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/atreus/keymaps/xyverz/keymap.c b/keyboards/atreus/keymaps/xyverz/keymap.c index f976b053..66fdebb5 100644 --- a/keyboards/atreus/keymaps/xyverz/keymap.c +++ b/keyboards/atreus/keymaps/xyverz/keymap.c @@ -28,25 +28,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_DV] = { /* Dvorak */ {KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_NO, KC_F, KC_G, KC_C, KC_R, KC_L }, {KC_A, KC_O, KC_E, KC_U, KC_I, KC_NO, KC_D, KC_H, KC_T, KC_N, KC_S }, - {SFT_T(KC_SCLN), KC_Q, KC_J, KC_K, KC_X, CTL_T(KC_BSPC), KC_B, KC_M, KC_W, KC_V, SFT_T(KC_Z) }, + {SFT_T(KC_SCLN), KC_Q, KC_J, KC_K, KC_X, CTL_T(KC_DEL), KC_B, KC_M, KC_W, KC_V, SFT_T(KC_Z) }, {KC_ESC, KC_TAB, KC_LGUI, MO(_L2), KC_BSPC, ALT_T(KC_ENT), KC_SPC, MO(_L1), KC_MINS, KC_SLSH, KC_EQL} }, [_QW] = { /* Qwerty */ {KC_Q, KC_W, KC_E, KC_R, KC_T, KC_NO, KC_Y, KC_U, KC_I, KC_O, KC_P }, {KC_A, KC_S, KC_D, KC_F, KC_G, KC_NO, KC_H, KC_J, KC_K, KC_L, KC_SCLN}, - {SFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, CTL_T(KC_BSPC), KC_N, KC_M, KC_COMM, KC_DOT, SFT_T(KC_SLSH) }, - {KC_ESC, KC_TAB, KC_LGUI, MO(_L2), KC_BSPC, ALT_T(KC_ENT), KC_SPC, MO(_L1), KC_MINS, KC_QUOT, KC_ENT} + {SFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, CTL_T(KC_DEL), KC_N, KC_M, KC_COMM, KC_DOT, SFT_T(KC_SLSH) }, + {KC_ESC, KC_TAB, KC_LGUI, MO(_L2), KC_BSPC, ALT_T(KC_ENT), KC_SPC, MO(_L1), KC_MINS, KC_QUOT, KC_EQL} }, [_CM] = { /* Colemak */ {KC_Q, KC_W, KC_F, KC_P, KC_G, KC_NO, KC_J, KC_L, KC_U, KC_Y, KC_SCLN}, {KC_A, KC_R, KC_S, KC_T, KC_D, KC_NO, KC_H, KC_N, KC_E, KC_I, KC_O }, - {SFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, CTL_T(KC_BSPC), KC_K, KC_M, KC_COMM, KC_DOT, SFT_T(KC_SLSH) }, - {KC_ESC, KC_TAB, KC_LGUI, MO(_L2), KC_BSPC, ALT_T(KC_ENT), KC_SPC, MO(_L1), KC_MINS, KC_QUOT, KC_ENT} + {SFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, CTL_T(KC_DEL), KC_K, KC_M, KC_COMM, KC_DOT, SFT_T(KC_SLSH) }, + {KC_ESC, KC_TAB, KC_LGUI, MO(_L2), KC_BSPC, ALT_T(KC_ENT), KC_SPC, MO(_L1), KC_MINS, KC_QUOT, KC_EQL} }, [_L1] = { /* LAYER 1 */ {KC_1, KC_2, KC_3, KC_4, KC_5, KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0 }, {KC_TAB, KC_INS, KC_UP, KC_DEL, KC_HOME, KC_NO, KC_PGUP, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS}, - {KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_LCTL, KC_PGDN, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS}, + {KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_LCTL, KC_PGDN, KC_MPRV, KC_MPLY, KC_MNXT, KC_BSLS}, {KC_TRNS, KC_GRV, KC_LGUI, KC_TRNS, KC_DEL, KC_LALT, KC_SPC, KC_TRNS, KC_LBRC, KC_RBRC, KC_ENT } }, [_L2] = { /* LAYER 2 */ From 1074642c3685816852f0fe58ccdf59a83fca9f47 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Fri, 13 Jan 2017 01:51:52 -0800 Subject: [PATCH 015/117] initial commit of my Atreus62 keymap --- keyboards/atreus62/keymaps/xyverz/keymap.c | 93 ++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 keyboards/atreus62/keymaps/xyverz/keymap.c diff --git a/keyboards/atreus62/keymaps/xyverz/keymap.c b/keyboards/atreus62/keymaps/xyverz/keymap.c new file mode 100644 index 00000000..cf59cd60 --- /dev/null +++ b/keyboards/atreus62/keymaps/xyverz/keymap.c @@ -0,0 +1,93 @@ +// this is the style you want to emulate. +// This is the canonical layout file for the Quantum project. If you want to add another keyboard, + +#include "atreus62.h" +#include "action_layer.h" +#include "eeconfig.h" + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. +#define _DV 0 +#define _QW 1 +#define _CM 2 +#define _L1 3 +#define _L2 4 + +// Macro name shortcuts +#define DVORAK M(_DV) +#define QWERTY M(_QW) +#define COLEMAK M(_CM) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_DV] = { /* dvorak */ + { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL }, + { KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_TRNS, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH }, + { KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, KC_TRNS, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS }, + { KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_LGUI, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT }, + { KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, MO(_L1), KC_BSPC, KC_ENT, KC_SPC, MO(_L2), KC_UP, KC_DOWN, KC_RGUI, KC_RCTL } + }, + + [_QW] = { /* qwerty */ + { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS }, + { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_TRNS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL }, + { KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_TRNS, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT }, + { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LGUI, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT }, + { KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, MO(_L1), KC_BSPC, KC_ENT, KC_SPC, MO(_L2), KC_UP, KC_DOWN, KC_RGUI, KC_RCTL } + }, + + [_CM] = { /* colemak */ + { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS }, + { KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_TRNS, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL }, + { KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_TRNS, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT }, + { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LGUI, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT }, + { KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, MO(_L1), KC_BSPC, KC_ENT, KC_SPC, MO(_L2), KC_UP, KC_DOWN, KC_RGUI, KC_RCTL } + }, + [_L1] = { + { KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_BSPC }, + { KC_TRNS, KC_F11, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F12, KC_BSLS }, + { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LCBR, KC_RCBR, KC_TRNS }, + { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS }, + { KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_TRNS, KC_DEL, KC_TRNS, KC_INS, KC_TRNS, KC_PGUP, KC_PGDN, KC_TRNS, KC_TRNS } + }, + [_L2] = { + { KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_BSPC }, + { KC_TRNS, KC_F11, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F12, KC_PIPE }, + { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS }, + { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS }, + { KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_TRNS, KC_DEL, KC_TRNS, KC_INS, KC_TRNS, KC_PGUP, KC_PGDN, KC_TRNS, KC_TRNS } + }, + +}; + +const uint16_t PROGMEM fn_actions[] = { + +}; + +void persistant_default_layer_set(uint16_t default_layer) { + eeconfig_update_default_layer(default_layer); + default_layer_set(default_layer); +} + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + switch(id) { + case _DV: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_DV); + } + break; + case _QW: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_QW); + } + break; + case _CM: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_CM); + } + break; + } + return MACRO_NONE; +}; From c8a0ab18676ff0f4ca92eaafba84e481406b7912 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Thu, 19 Jan 2017 06:49:59 -0800 Subject: [PATCH 016/117] Changes to Atreus62 keymap, adding Let's Split keymap. --- keyboards/atreus62/keymaps/xyverz/keymap.c | 159 +++++++++++++++------ 1 file changed, 112 insertions(+), 47 deletions(-) diff --git a/keyboards/atreus62/keymaps/xyverz/keymap.c b/keyboards/atreus62/keymaps/xyverz/keymap.c index cf59cd60..e2d8126f 100644 --- a/keyboards/atreus62/keymaps/xyverz/keymap.c +++ b/keyboards/atreus62/keymaps/xyverz/keymap.c @@ -1,6 +1,34 @@ +/* This is the Atreus62 keyboard layout by Xyverz aka u/Zrevyx on r/mk + I've blatantly stolen what works for me from the Planck and Preonic + layouts and modified this file to fit me. Initial credet goes to + u/profet23 for the doing all the work and adding this keyboard to + QMK in the first place. + + I've got Dvorak, Qwerty, and Colemak layouts at this time, with the + possibility of adding more in the future. + + The bottom row is fairly Kinesis-ish since the Contour and Advantage + keyboards have been my daily drivers for the last 17 years. I hope + You can get some enjoyment out of this layout should you chose it! + +CHANGELOG: + + 0.1 - Initial commit. Based off of Profet's default keymap. + 0.2 - Converted to a more Planck/Preonic keymap style file with + persistent layers enabled. Renamed layers to reflect OLKB maps. + Added a TODO list. + +TODO: + + * Make the layout more efficient, even if it means changing the RAISE + and LOWER functionality. + * Add legends in comments for each layer. Maybe. + * Add a gaming layer. + +*/ + // this is the style you want to emulate. // This is the canonical layout file for the Quantum project. If you want to add another keyboard, - #include "atreus62.h" #include "action_layer.h" #include "eeconfig.h" @@ -9,54 +37,69 @@ // The underscores don't mean anything - you can have a layer called STUFF or any other name. // Layer names don't all need to be of the same length, obviously, and you can also skip them // entirely and just use numbers. -#define _DV 0 -#define _QW 1 -#define _CM 2 -#define _L1 3 -#define _L2 4 +#define _DVORAK 0 +#define _QWERTY 1 +#define _COLEMAK 2 +#define _LOWER 3 +#define _RAISE 4 +#define _ADJUST 16 -// Macro name shortcuts -#define DVORAK M(_DV) -#define QWERTY M(_QW) -#define COLEMAK M(_CM) +enum atreus52_keycodes { + DVORAK = SAFE_RANGE, + QWERTY, + COLEMAK, + LOWER, + RAISE +}; + +// Fillers to make layering more clear +#define _______ KC_TRNS +#define XXXXXXX KC_NO const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_DV] = { /* dvorak */ - { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL }, - { KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_TRNS, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH }, - { KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, KC_TRNS, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS }, + [_DVORAK] = { /* dvorak */ + { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, _______, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS }, + { KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, _______, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH }, + { KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, _______, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS }, { KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_LGUI, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT }, - { KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, MO(_L1), KC_BSPC, KC_ENT, KC_SPC, MO(_L2), KC_UP, KC_DOWN, KC_RGUI, KC_RCTL } + { KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_BSPC, KC_ENT, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_RCTL } }, - [_QW] = { /* qwerty */ - { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS }, - { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_TRNS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL }, - { KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_TRNS, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT }, + [_QWERTY] = { /* qwerty */ + { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, _______, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS }, + { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, _______, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL }, + { KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, _______, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT }, { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LGUI, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT }, - { KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, MO(_L1), KC_BSPC, KC_ENT, KC_SPC, MO(_L2), KC_UP, KC_DOWN, KC_RGUI, KC_RCTL } + { KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_BSPC, KC_ENT, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_RCTL } }, - [_CM] = { /* colemak */ - { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS }, - { KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_TRNS, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL }, - { KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_TRNS, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT }, + [_COLEMAK] = { /* colemak */ + { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, _______, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS }, + { KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, _______, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL }, + { KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D, _______, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT }, { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LGUI, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT }, - { KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, MO(_L1), KC_BSPC, KC_ENT, KC_SPC, MO(_L2), KC_UP, KC_DOWN, KC_RGUI, KC_RCTL } + { KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_BSPC, KC_ENT, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_RCTL} + }, + [_LOWER] = { + { KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 }, + { KC_TILD, KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PIPE }, + { _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PLUS, KC_LCBR, KC_RCBR, _______ }, + { _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______ }, + { _______, _______, KC_HOME, KC_END, _______, KC_DEL, _______, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______ } }, - [_L1] = { - { KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_BSPC }, - { KC_TRNS, KC_F11, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F12, KC_BSLS }, - { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LCBR, KC_RCBR, KC_TRNS }, - { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS }, - { KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_TRNS, KC_DEL, KC_TRNS, KC_INS, KC_TRNS, KC_PGUP, KC_PGDN, KC_TRNS, KC_TRNS } + [_RAISE] = { + { KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 }, + { KC_TILD, KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLS }, + { _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_EQL, KC_LBRC, KC_RBRC, _______ }, + { _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______ }, + { _______, _______, KC_HOME, KC_END, _______, KC_DEL, _______, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______ } }, - [_L2] = { - { KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_BSPC }, - { KC_TRNS, KC_F11, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F12, KC_PIPE }, - { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS }, - { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS }, - { KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_TRNS, KC_DEL, KC_TRNS, KC_INS, KC_TRNS, KC_PGUP, KC_PGDN, KC_TRNS, KC_TRNS } + [_ADJUST] = { + { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }, + { _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }, + { _______, _______, _______, _______, _______, _______, _______, _______, QWERTY, COLEMAK, DVORAK, _______, _______ }, + { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }, + { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ } }, }; @@ -70,24 +113,46 @@ void persistant_default_layer_set(uint16_t default_layer) { default_layer_set(default_layer); } -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - switch(id) { - case _DV: +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case QWERTY: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_QWERTY); + } + return false; + break; + case COLEMAK: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_COLEMAK); + } + return false; + break; + case DVORAK: if (record->event.pressed) { - persistant_default_layer_set(1UL<<_DV); + persistant_default_layer_set(1UL<<_DVORAK); } + return false; break; - case _QW: + case LOWER: if (record->event.pressed) { - persistant_default_layer_set(1UL<<_QW); + layer_on(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); } + return false; break; - case _CM: + case RAISE: if (record->event.pressed) { - persistant_default_layer_set(1UL<<_CM); + layer_on(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); } + return false; break; } - return MACRO_NONE; + return true; }; From 80bc59858539383713c9d9f771ae293b1153674f Mon Sep 17 00:00:00 2001 From: Xyverz Date: Thu, 19 Jan 2017 06:51:24 -0800 Subject: [PATCH 017/117] Added Let's Split --- keyboards/lets_split/keymaps/xyverz/keymap.c | 191 +++++++++++++++++++ 1 file changed, 191 insertions(+) create mode 100644 keyboards/lets_split/keymaps/xyverz/keymap.c diff --git a/keyboards/lets_split/keymaps/xyverz/keymap.c b/keyboards/lets_split/keymaps/xyverz/keymap.c new file mode 100644 index 00000000..62ee4b41 --- /dev/null +++ b/keyboards/lets_split/keymaps/xyverz/keymap.c @@ -0,0 +1,191 @@ +#include "lets_split.h" +#include "action_layer.h" +#include "eeconfig.h" + +extern keymap_config_t keymap_config; + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. +#define _QWERTY 0 +#define _COLEMAK 1 +#define _DVORAK 2 +#define _LOWER 3 +#define _RAISE 4 +#define _ADJUST 16 + +enum planck_keycodes { + QWERTY = SAFE_RANGE, + COLEMAK, + DVORAK, + LOWER, + RAISE, + ADJUST +}; + +// Fillers to make layering more clear +#define _______ KC_TRNS +#define XXXXXXX KC_NO + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Qwerty + * ,-----------------------------------------------------------------------------------. + * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Esc | A | S | D | F | G | H | J | K | L | ; | " | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Brite| Ctrl | Alt | GUI |Lower | Bksp |Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ +[_QWERTY] = KEYMAP ( \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ + KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,\ + KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, GUI_T(KC_BSPC), KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT \ +), + +/* Colemak + * ,-----------------------------------------------------------------------------------. + * | Tab | Q | W | F | P | G | J | L | U | Y | ; | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Esc | A | R | S | T | D | H | N | E | I | O | " | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | K | M | , | . | / |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Brite| Ctrl | Alt | GUI |Lower | Bksp |Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ +[_COLEMAK] = KEYMAP ( \ + KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \ + KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ + KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, GUI_T(KC_BSPC), KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT \ +), + +/* Dvorak + * ,-----------------------------------------------------------------------------------. + * | Tab | " | , | . | P | Y | F | G | C | R | L | / | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Esc | A | O | E | U | I | D | H | T | N | S | - | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| ; | Q | J | K | X | B | M | W | V | Z | Shift| + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Ctrl | Alt | Left |Right |Lower | Bksp |Space |Raise | Up | Down | GUI |Enter | + * `-----------------------------------------------------------------------------------' + */ +[_DVORAK] = KEYMAP ( \ + KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \ + KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ + KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, \ + KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, GUI_T(KC_BSPC), KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT \ +), + +/* Lower + * ,-----------------------------------------------------------------------------------. + * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Caps | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | F7 | F8 | F9 | F10 | F11 | F12 | | Mute | Vol- | Vol+ | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Brite| | Home | End | | Del | Ins | | PgUp | PgDN | |Enter | + * `-----------------------------------------------------------------------------------' + */ +[_LOWER] = KEYMAP ( \ + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \ + KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, \ + _______, _______, KC_HOME, KC_END, _______, KC_DEL, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______ \ +), + +/* Raise + * ,-----------------------------------------------------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Caps | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | F7 | F8 | F9 | F10 | F11 | F12 | | Prev | Play | Next | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Brite| | Home | End | | Del | Ins | | PgUp | PgDN | |Enter | + * `-----------------------------------------------------------------------------------' + */ +[_RAISE] = KEYMAP ( \ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ + KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, \ + _______, _______, KC_HOME, KC_END, _______, KC_DEL, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______ \ +), + +/* Adjust (Lower + Raise) + * ,-----------------------------------------------------------------------------------. + * | | Reset| | | | | | | | | | Del | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak| | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof| | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ +[_ADJUST] = KEYMAP ( \ + _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL , \ + _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +) + + +}; + +void persistant_default_layer_set(uint16_t default_layer) { + eeconfig_update_default_layer(default_layer); + default_layer_set(default_layer); +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case QWERTY: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_QWERTY); + } + return false; + break; + case COLEMAK: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_COLEMAK); + } + return false; + break; + case DVORAK: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_DVORAK); + } + return false; + break; + case LOWER: + if (record->event.pressed) { + layer_on(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case RAISE: + if (record->event.pressed) { + layer_on(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + } + return true; +} \ No newline at end of file From 4f163b006e95852e374a71449c121c8aa47ab5a5 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Mon, 30 Jan 2017 00:00:09 -0800 Subject: [PATCH 018/117] First revision of the XK-66 keyboard. --- keyboards/handwired/xk66/Makefile | 3 + keyboards/handwired/xk66/config.h | 162 ++++++++++++++++++ .../handwired/xk66/keymaps/default/Makefile | 21 +++ .../handwired/xk66/keymaps/default/config.h | 8 + .../handwired/xk66/keymaps/default/keymap.c | 90 ++++++++++ .../handwired/xk66/keymaps/default/readme.md | 1 + keyboards/handwired/xk66/readme.md | 28 +++ keyboards/handwired/xk66/rules.mk | 67 ++++++++ keyboards/handwired/xk66/xk66.c | 8 + keyboards/handwired/xk66/xk66.h | 25 +++ 10 files changed, 413 insertions(+) create mode 100644 keyboards/handwired/xk66/Makefile create mode 100644 keyboards/handwired/xk66/config.h create mode 100644 keyboards/handwired/xk66/keymaps/default/Makefile create mode 100644 keyboards/handwired/xk66/keymaps/default/config.h create mode 100644 keyboards/handwired/xk66/keymaps/default/keymap.c create mode 100644 keyboards/handwired/xk66/keymaps/default/readme.md create mode 100644 keyboards/handwired/xk66/readme.md create mode 100644 keyboards/handwired/xk66/rules.mk create mode 100644 keyboards/handwired/xk66/xk66.c create mode 100644 keyboards/handwired/xk66/xk66.h diff --git a/keyboards/handwired/xk66/Makefile b/keyboards/handwired/xk66/Makefile new file mode 100644 index 00000000..bd09e588 --- /dev/null +++ b/keyboards/handwired/xk66/Makefile @@ -0,0 +1,3 @@ +ifndef MAKEFILE_INCLUDED + include ../../../Makefile +endif diff --git a/keyboards/handwired/xk66/config.h b/keyboards/handwired/xk66/config.h new file mode 100644 index 00000000..02ff2a6b --- /dev/null +++ b/keyboards/handwired/xk66/config.h @@ -0,0 +1,162 @@ +/* +Copyright 2012 Jun Wako + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#ifndef CONFIG_H +#define CONFIG_H + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x6060 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Xyverz +#define PRODUCT XK-66 +#define DESCRIPTION A hand-wired 66-key keyboard by Xyverz + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 14 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * +*/ +#define MATRIX_ROW_PINS { B5, B4, D7, D6, D4 } +#define MATRIX_COL_PINS { B6, F7, F6, F5, F4, F1, F0, D1, D0, B7, B3, B2, B1, B0 } +#define UNUSED_PINS + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +// #define BACKLIGHT_PIN B7 +// #define BACKLIGHT_BREATHING +// #define BACKLIGHT_LEVELS 3 + + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCING_DELAY 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* number of backlight levels */ + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* + * Force NKRO + * + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the + * makefile for this to work.) + * + * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) + * until the next keyboard reset. + * + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * fully operational during normal computer usage. + * + * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) + * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by + * bootmagic, NKRO mode will always be enabled until it is toggled again during a + * power-up. + * + */ +//#define FORCE_NKRO + +/* + * Magic Key Options + * + * Magic keys are hotkey commands that allow control over firmware functions of + * the keyboard. They are best used in combination with the HID Listen program, + * found here: https://www.pjrc.com/teensy/hid_listen.html + * + * The options below allow the magic key functionality to be changed. This is + * useful if your keyboard/keypad is missing keys and you want magic key support. + * + */ + +/* key combination for magic key command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) + +/* control how magic key switches layers */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false + +/* override magic key keymap */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM +//#define MAGIC_KEY_HELP1 H +//#define MAGIC_KEY_HELP2 SLASH +//#define MAGIC_KEY_DEBUG D +//#define MAGIC_KEY_DEBUG_MATRIX X +//#define MAGIC_KEY_DEBUG_KBD K +//#define MAGIC_KEY_DEBUG_MOUSE M +//#define MAGIC_KEY_VERSION V +//#define MAGIC_KEY_STATUS S +//#define MAGIC_KEY_CONSOLE C +//#define MAGIC_KEY_LAYER0_ALT1 ESC +//#define MAGIC_KEY_LAYER0_ALT2 GRAVE +//#define MAGIC_KEY_LAYER0 0 +//#define MAGIC_KEY_LAYER1 1 +//#define MAGIC_KEY_LAYER2 2 +//#define MAGIC_KEY_LAYER3 3 +//#define MAGIC_KEY_LAYER4 4 +//#define MAGIC_KEY_LAYER5 5 +//#define MAGIC_KEY_LAYER6 6 +//#define MAGIC_KEY_LAYER7 7 +//#define MAGIC_KEY_LAYER8 8 +//#define MAGIC_KEY_LAYER9 9 +//#define MAGIC_KEY_BOOTLOADER PAUSE +//#define MAGIC_KEY_LOCK CAPS +//#define MAGIC_KEY_EEPROM E +//#define MAGIC_KEY_NKRO N +//#define MAGIC_KEY_SLEEP_LED Z + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT +//#define NO_ACTION_MACRO +//#define NO_ACTION_FUNCTION + +#endif diff --git a/keyboards/handwired/xk66/keymaps/default/Makefile b/keyboards/handwired/xk66/keymaps/default/Makefile new file mode 100644 index 00000000..f4671a9d --- /dev/null +++ b/keyboards/handwired/xk66/keymaps/default/Makefile @@ -0,0 +1,21 @@ +# Build Options +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +MIDI_ENABLE = no # MIDI controls +AUDIO_ENABLE = no # Audio output on port C6 +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend + +ifndef QUANTUM_DIR + include ../../../../Makefile +endif \ No newline at end of file diff --git a/keyboards/handwired/xk66/keymaps/default/config.h b/keyboards/handwired/xk66/keymaps/default/config.h new file mode 100644 index 00000000..df06a262 --- /dev/null +++ b/keyboards/handwired/xk66/keymaps/default/config.h @@ -0,0 +1,8 @@ +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "../../config.h" + +// place overrides here + +#endif \ No newline at end of file diff --git a/keyboards/handwired/xk66/keymaps/default/keymap.c b/keyboards/handwired/xk66/keymaps/default/keymap.c new file mode 100644 index 00000000..61b3bd97 --- /dev/null +++ b/keyboards/handwired/xk66/keymaps/default/keymap.c @@ -0,0 +1,90 @@ +#include "xk66.h" +#include "action_layer.h" +#include "eeconfig.h" + +extern keymap_config_t keymap_config; + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. +#define _DV 0 +#define _QW 1 +#define _CM 2 +#define _FL 3 + +// Macro name shortcuts +#define QWERTY M(_QW) +#define DVORAK M(_DV) +#define COLEMAK M(_CM) + +// Fillers to make layering more clear +#define _______ KC_TRNS +#define XXXXXXX KC_NO + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[_DV] = KEYMAP ( /* Dvorak */ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, \ + KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSLS, \ + MO(_FL), KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_ENT, \ + KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_LEFT, KC_RGHT, KC_BSPC, KC_SPC, KC_UP, KC_DOWN, KC_RGUI, KC_RALT, KC_RCTL, MO(_FL) + ), + +[_QW] = KEYMAP ( /* Qwerty */ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ + MO(_FL), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_LEFT, KC_RGHT, KC_BSPC, KC_SPC, KC_UP, KC_DOWN, KC_RGUI, KC_RALT, KC_RCTL, MO(_FL) + ), + +[_CM] = KEYMAP ( /* Colemak */ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ + KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, \ + MO(_FL), KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_LEFT, KC_RGHT, KC_BSPC, KC_SPC, KC_UP, KC_DOWN, KC_RGUI, KC_RALT, KC_RCTL, MO(_FL) + ), + +[_FL] = KEYMAP ( /* Function Layer 1 */ + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, QWERTY, DVORAK, COLEMAK, _______, _______, _______, \ + KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, \ + RESET, _______, _______, KC_HOME, KC_END, KC_DEL, KC_INS, KC_PGUP, KC_PGDN, _______, _______, _______, _______ + ), + +}; + + +const uint16_t PROGMEM fn_actions[] = { + +}; + +void persistant_default_layer_set(uint16_t default_layer) { + eeconfig_update_default_layer(default_layer); + default_layer_set(default_layer); +} + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + switch(id) { + case _DV: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_DV); + } + break; + case _QW: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_QW); + } + break; + case _CM: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_CM); + } + break; + } + return MACRO_NONE; +}; diff --git a/keyboards/handwired/xk66/keymaps/default/readme.md b/keyboards/handwired/xk66/keymaps/default/readme.md new file mode 100644 index 00000000..6940fdd7 --- /dev/null +++ b/keyboards/handwired/xk66/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for handwired/xk66 \ No newline at end of file diff --git a/keyboards/handwired/xk66/readme.md b/keyboards/handwired/xk66/readme.md new file mode 100644 index 00000000..2aac6bde --- /dev/null +++ b/keyboards/handwired/xk66/readme.md @@ -0,0 +1,28 @@ +handwired/xk66 keyboard firmware +====================== + +## Quantum MK Firmware + +For the full Quantum feature list, see [the parent readme](/). + +## Building + +Download or clone the whole firmware and navigate to the keyboards/handwired/xk66 folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. + +Depending on which keymap you would like to use, you will have to compile slightly differently. + +### Default + +To build with the default keymap, simply run `make default`. + +### Other Keymaps + +Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create a folder with the name of your keymap in the keymaps folder, and see keymap documentation (you can find in top readme.md) and existant keymap files. + +To build the firmware binary hex file with a keymap just do `make` with a keymap like this: + +``` +$ make [default|jack|] +``` + +Keymaps follow the format **__\.c__** and are stored in the `keymaps` folder. diff --git a/keyboards/handwired/xk66/rules.mk b/keyboards/handwired/xk66/rules.mk new file mode 100644 index 00000000..707a5385 --- /dev/null +++ b/keyboards/handwired/xk66/rules.mk @@ -0,0 +1,67 @@ +# MCU name +#MCU = at90usb1287 +MCU = atmega32u4 + +# Processor frequency. +# This will define a symbol, F_CPU, in all source code files equal to the +# processor frequency in Hz. You can then use this symbol in your source code to +# calculate timings. Do NOT tack on a 'UL' at the end, this will be done +# automatically to create a 32-bit value in your source code. +# +# This will be an integer division of F_USB below, as it is sourced by +# F_USB after it has run through any CPU prescalers. Note that this value +# does not *change* the processor frequency - it should merely be updated to +# reflect the processor speed set externally so that the code can use accurate +# software delays. +F_CPU = 16000000 + + +# +# LUFA specific +# +# Target architecture (see library "Board Types" documentation). +ARCH = AVR8 + +# Input clock frequency. +# This will define a symbol, F_USB, in all source code files equal to the +# input clock frequency (before any prescaling is performed) in Hz. This value may +# differ from F_CPU if prescaling is used on the latter, and is required as the +# raw input clock is fed directly to the PLL sections of the AVR for high speed +# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' +# at the end, this will be done automatically to create a 32-bit value in your +# source code. +# +# If no clock division is performed on the input clock inside the AVR (via the +# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. +F_USB = $(F_CPU) + +# Interrupt driven control endpoint task(+60) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + + +# Boot Section Size in *bytes* +# Teensy halfKay 512 +# Teensy++ halfKay 1024 +# Atmel DFU loader 4096 +# LUFA bootloader 4096 +# USBaspLoader 2048 +OPT_DEFS += -DBOOTLOADER_SIZE=512 + + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE ?= yes # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) +EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) +CONSOLE_ENABLE ?= yes # Console for debug(+400) +COMMAND_ENABLE ?= yes # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE ?= no # USB Nkey Rollover +BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default +MIDI_ENABLE ?= no # MIDI controls +UNICODE_ENABLE ?= no # Unicode +BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE ?= no # Audio output on port C6 diff --git a/keyboards/handwired/xk66/xk66.c b/keyboards/handwired/xk66/xk66.c new file mode 100644 index 00000000..3c3e3194 --- /dev/null +++ b/keyboards/handwired/xk66/xk66.c @@ -0,0 +1,8 @@ +#include "xk66.h" + +void matrix_init_kb(void) { + // put your keyboard start-up code here + // runs once when the firmware starts up + + matrix_init_user(); +} diff --git a/keyboards/handwired/xk66/xk66.h b/keyboards/handwired/xk66/xk66.h new file mode 100644 index 00000000..38fe129e --- /dev/null +++ b/keyboards/handwired/xk66/xk66.h @@ -0,0 +1,25 @@ +#ifndef XK66_H +#define XK66_H + +#include "quantum.h" +#include "led.h" + + +// This a shortcut to help you visually see your layout. +// The first section contains all of the arguements +// The second converts the arguments into a two-dimensional array +#define KEYMAP( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2d, \ + K30, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, \ + K40, K41, K42, K43, K44, K45, K46, K48, K49, K4a, K4b, K4c, K4d \ +) { \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, KC_NO, K2d }, \ + { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, KC_NO }, \ + { K40, K41, K42, K43, K44, K45, K46, KC_NO, K48, K49, K4a, K4b, K4c, K4d } \ +} + +#endif \ No newline at end of file From 060f075fd1961b9835eece4bb6882b238fa68610 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Tue, 7 Feb 2017 22:14:56 -0800 Subject: [PATCH 019/117] Added another handwired board, the Atreus50. Added a layer for WOW to my Atreus62. --- keyboards/atreus62/keymaps/xyverz/keymap.c | 23 +++- keyboards/handwired/atreus50/Makefile | 3 + keyboards/handwired/atreus50/atreus50.c | 1 + keyboards/handwired/atreus50/atreus50.h | 18 +++ keyboards/handwired/atreus50/config.h | 58 ++++++++ .../atreus50/keymaps/default/Makefile | 21 +++ .../atreus50/keymaps/default/keymap.c | 128 ++++++++++++++++++ keyboards/handwired/atreus50/rules.mk | 56 ++++++++ 8 files changed, 305 insertions(+), 3 deletions(-) create mode 100644 keyboards/handwired/atreus50/Makefile create mode 100644 keyboards/handwired/atreus50/atreus50.c create mode 100644 keyboards/handwired/atreus50/atreus50.h create mode 100644 keyboards/handwired/atreus50/config.h create mode 100644 keyboards/handwired/atreus50/keymaps/default/Makefile create mode 100644 keyboards/handwired/atreus50/keymaps/default/keymap.c create mode 100644 keyboards/handwired/atreus50/rules.mk diff --git a/keyboards/atreus62/keymaps/xyverz/keymap.c b/keyboards/atreus62/keymaps/xyverz/keymap.c index e2d8126f..7b7c69f5 100644 --- a/keyboards/atreus62/keymaps/xyverz/keymap.c +++ b/keyboards/atreus62/keymaps/xyverz/keymap.c @@ -40,14 +40,16 @@ TODO: #define _DVORAK 0 #define _QWERTY 1 #define _COLEMAK 2 -#define _LOWER 3 -#define _RAISE 4 +#define _WOW 3 +#define _LOWER 4 +#define _RAISE 5 #define _ADJUST 16 enum atreus52_keycodes { DVORAK = SAFE_RANGE, QWERTY, COLEMAK, + WOW, LOWER, RAISE }; @@ -80,6 +82,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LGUI, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT }, { KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_BSPC, KC_ENT, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_RCTL} }, + + [_WOW] = { /* Dvorak with minor modifications for playing World of Warcraft */ + { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, _______, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS }, + { KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, _______, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH }, + { KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, _______, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS }, + { KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_LALT, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT }, + { KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_BSPC, CTL_T(KC_ENT), KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT } + }, + [_LOWER] = { { KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 }, { KC_TILD, KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PIPE }, @@ -97,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = { { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }, { _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }, - { _______, _______, _______, _______, _______, _______, _______, _______, QWERTY, COLEMAK, DVORAK, _______, _______ }, + { _______, _______, _______, _______, _______, _______, _______, _______, QWERTY, COLEMAK, DVORAK, _______, WOW }, { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }, { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ } }, @@ -133,6 +144,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; break; + case WOW: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_WOW); + } + return false; + break; case LOWER: if (record->event.pressed) { layer_on(_LOWER); diff --git a/keyboards/handwired/atreus50/Makefile b/keyboards/handwired/atreus50/Makefile new file mode 100644 index 00000000..bd09e588 --- /dev/null +++ b/keyboards/handwired/atreus50/Makefile @@ -0,0 +1,3 @@ +ifndef MAKEFILE_INCLUDED + include ../../../Makefile +endif diff --git a/keyboards/handwired/atreus50/atreus50.c b/keyboards/handwired/atreus50/atreus50.c new file mode 100644 index 00000000..dd0dbdaa --- /dev/null +++ b/keyboards/handwired/atreus50/atreus50.c @@ -0,0 +1 @@ +#include "atreus50.h" diff --git a/keyboards/handwired/atreus50/atreus50.h b/keyboards/handwired/atreus50/atreus50.h new file mode 100644 index 00000000..5d27109c --- /dev/null +++ b/keyboards/handwired/atreus50/atreus50.h @@ -0,0 +1,18 @@ +#ifndef ATREUS50_H +#define ATREUS50_H + +#include "quantum.h" + +#define KEYMAP( \ + K000, K001, K002, K003, K004, K005, K007, K008, K009, K010, K011, K012, \ + K100, K101, K102, K103, K104, K105, K107, K108, K109, K110, K111, K112, \ + K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \ + K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312 \ +) { \ + { K000, K001, K002, K003, K004, K005, KC_NO, K007, K008, K009, K010, K011, K012 }, \ + { K100, K101, K102, K103, K104, K105, KC_NO, K107, K108, K109, K110, K111, K112 }, \ + { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212 }, \ + { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312 } \ +} + +#endif \ No newline at end of file diff --git a/keyboards/handwired/atreus50/config.h b/keyboards/handwired/atreus50/config.h new file mode 100644 index 00000000..0248032a --- /dev/null +++ b/keyboards/handwired/atreus50/config.h @@ -0,0 +1,58 @@ +#ifndef CONFIG_H +#define CONFIG_H + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x6060 +#define DEVICE_VER 0x0001 +#define MANUFACTURER qmkbuilder +#define PRODUCT Atreus50 +#define DESCRIPTION Keyboard + +/* key matrix size */ +#define MATRIX_ROWS 4 +#define MATRIX_COLS 13 + +/* key matrix pins */ +#define MATRIX_ROW_PINS { F4, F5, F6, F7 } +#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B6, B2, B3 } +#define UNUSED_PINS + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* number of backlight levels */ + +#ifdef BACKLIGHT_PIN +#define BACKLIGHT_LEVELS 3 +#endif + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCING_DELAY 5 + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE + +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* key combination for command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) + +/* prevent stuck modifiers */ +#define PREVENT_STUCK_MODIFIERS + + +#ifdef RGB_DI_PIN +#define RGBLIGHT_ANIMATIONS +#define RGBLED_NUM 0 +#define RGBLIGHT_HUE_STEP 8 +#define RGBLIGHT_SAT_STEP 8 +#define RGBLIGHT_VAL_STEP 8 +#endif + +#endif \ No newline at end of file diff --git a/keyboards/handwired/atreus50/keymaps/default/Makefile b/keyboards/handwired/atreus50/keymaps/default/Makefile new file mode 100644 index 00000000..43fee266 --- /dev/null +++ b/keyboards/handwired/atreus50/keymaps/default/Makefile @@ -0,0 +1,21 @@ +# Build Options +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +MIDI_ENABLE = no # MIDI controls +AUDIO_ENABLE = no # Audio output on port C6 +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend + +ifndef QUANTUM_DIR + include ../../../../Makefile +endif \ No newline at end of file diff --git a/keyboards/handwired/atreus50/keymaps/default/keymap.c b/keyboards/handwired/atreus50/keymaps/default/keymap.c new file mode 100644 index 00000000..b3dc17cb --- /dev/null +++ b/keyboards/handwired/atreus50/keymaps/default/keymap.c @@ -0,0 +1,128 @@ +// This is the canonical layout file for the Quantum project. If you want to add another keyboard, +// this is the style you want to emulate. + +#include "atreus50.h" +#include "action_layer.h" +#include "eeconfig.h" + +extern keymap_config_t keymap_config; + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. +#define _DVORAK 0 +#define _QWERTY 1 +#define _COLEMAK 2 +#define _LOWER 3 +#define _RAISE 4 +#define _ADJUST 16 + +enum planck_keycodes { + DVORAK = SAFE_RANGE, + QWERTY, + COLEMAK, + LOWER, + RAISE, + BACKLIT +}; + +// Fillers to make layering more clear +#define _______ KC_TRNS +#define XXXXXXX KC_NO + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_DVORAK] = { /* dvorak */ + { KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, _______, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH }, + { KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, _______, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS }, + { KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_ENT, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT }, + { KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_BSPC, KC_LGUI, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_RCTL } + }, + + [_QWERTY] = { /* qwerty */ + { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, _______, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL }, + { KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, _______, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT }, + { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT }, + { KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_BSPC, KC_LGUI, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_RCTL } + }, + + [_COLEMAK] = { /* colemak */ + { KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, _______, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL }, + { KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, _______, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT }, + { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ENT, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT }, + { KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_BSPC, KC_LGUI, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_RCTL} + }, + + [_LOWER] = { + { KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______ }, + { KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE }, + { _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, KC_F12, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______ }, + { _______, _______, KC_HOME, KC_END, _______, KC_DEL, _______, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______ } + }, + [_RAISE] = { + { KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, _______, KC_6, KC_7, KC_8, KC_9, KC_0, _______ }, + { KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS }, + { _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, KC_F12, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______ }, + { _______, _______, KC_HOME, KC_END, _______, KC_DEL, _______, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______ } + }, + [_ADJUST] = { + { KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 }, + { _______, RESET, _______, _______, _______, _______, _______, _______, QWERTY, COLEMAK, DVORAK, _______, _______ }, + { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }, + { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ } + }, + +}; + +const uint16_t PROGMEM fn_actions[] = { + +}; + +void persistant_default_layer_set(uint16_t default_layer) { + eeconfig_update_default_layer(default_layer); + default_layer_set(default_layer); +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case QWERTY: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_QWERTY); + } + return false; + break; + case COLEMAK: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_COLEMAK); + } + return false; + break; + case DVORAK: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_DVORAK); + } + return false; + break; + case LOWER: + if (record->event.pressed) { + layer_on(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case RAISE: + if (record->event.pressed) { + layer_on(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + } + return true; +}; \ No newline at end of file diff --git a/keyboards/handwired/atreus50/rules.mk b/keyboards/handwired/atreus50/rules.mk new file mode 100644 index 00000000..1f8e943b --- /dev/null +++ b/keyboards/handwired/atreus50/rules.mk @@ -0,0 +1,56 @@ +# MCU name +MCU = atmega32u4 + +# Processor frequency. +# This will define a symbol, F_CPU, in all source code files equal to the +# processor frequency in Hz. You can then use this symbol in your source code to +# calculate timings. Do NOT tack on a 'UL' at the end, this will be done +# automatically to create a 32-bit value in your source code. +# +# This will be an integer division of F_USB below, as it is sourced by +# F_USB after it has run through any CPU prescalers. Note that this value +# does not *change* the processor frequency - it should merely be updated to +# reflect the processor speed set externally so that the code can use accurate +# software delays. +F_CPU = 16000000 + +# +# LUFA specific +# +# Target architecture (see library "Board Types" documentation). +ARCH = AVR8 + +# Input clock frequency. +# This will define a symbol, F_USB, in all source code files equal to the +# input clock frequency (before any prescaling is performed) in Hz. This value may +# differ from F_CPU if prescaling is used on the latter, and is required as the +# raw input clock is fed directly to the PLL sections of the AVR for high speed +# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' +# at the end, this will be done automatically to create a 32-bit value in your +# source code. +# +# If no clock division is performed on the input clock inside the AVR (via the +# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. +F_USB = $(F_CPU) + +# Interrupt driven control endpoint task(+60) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + + +# Boot Section Size in *bytes* +OPT_DEFS += -DBOOTLOADER_SIZE=4096 + + +# Build Options +# comment out to disable the options. +# +BOOTMAGIC_ENABLE ?= yes # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) +EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) +CONSOLE_ENABLE ?= no # Console for debug(+400) +COMMAND_ENABLE ?= no # Commands for debug and configuration +SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend +NKRO_ENABLE ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality +AUDIO_ENABLE ?= no +RGBLIGHT_ENABLE ?= no \ No newline at end of file From 4d7105c2cf47c7604b54cdf488b4eb9d08c1f1cf Mon Sep 17 00:00:00 2001 From: Xyverz Date: Fri, 10 Feb 2017 23:30:08 -0800 Subject: [PATCH 020/117] Added RGB Underglow to my Preonic --- keyboards/preonic/keymaps/xyverz/Makefile | 23 +++++++++++++++++ keyboards/preonic/keymaps/xyverz/config.h | 21 ++++++++++++++++ keyboards/preonic/keymaps/xyverz/keymap.c | 30 +++++++++++------------ 3 files changed, 59 insertions(+), 15 deletions(-) create mode 100644 keyboards/preonic/keymaps/xyverz/Makefile create mode 100644 keyboards/preonic/keymaps/xyverz/config.h diff --git a/keyboards/preonic/keymaps/xyverz/Makefile b/keyboards/preonic/keymaps/xyverz/Makefile new file mode 100644 index 00000000..ea5f6c16 --- /dev/null +++ b/keyboards/preonic/keymaps/xyverz/Makefile @@ -0,0 +1,23 @@ +# Build Options +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = no # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality +MIDI_ENABLE = no # MIDI controls +AUDIO_ENABLE = no # Audio output on port C6 +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. + +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend + +ifndef QUANTUM_DIR + include ../../../../Makefile +endif \ No newline at end of file diff --git a/keyboards/preonic/keymaps/xyverz/config.h b/keyboards/preonic/keymaps/xyverz/config.h new file mode 100644 index 00000000..4e12921f --- /dev/null +++ b/keyboards/preonic/keymaps/xyverz/config.h @@ -0,0 +1,21 @@ +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "../../config.h" + +// Number of backlight levels +#undef BACKLIGHT_LEVELS +#define BACKLIGHT_LEVELS 3 + +/* ws2812 RGB LED */ +#undef RGB_DI_PIN +#define RGB_DI_PIN B3 +#undef RGBLED_NUM +#define RGBLIGHT_ANIMATIONS +#define RGBLED_NUM 11 // Number of LEDs +#define RGBLIGHT_HUE_STEP 10 +#define RGBLIGHT_SAT_STEP 17 +#define RGBLIGHT_VAL_STEP 17 + + +#endif \ No newline at end of file diff --git a/keyboards/preonic/keymaps/xyverz/keymap.c b/keyboards/preonic/keymaps/xyverz/keymap.c index b4d18f9a..c8457cda 100644 --- a/keyboards/preonic/keymaps/xyverz/keymap.c +++ b/keyboards/preonic/keymaps/xyverz/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_QWERTY] = { {KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, - {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL}, + {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL }, {KC_MINS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT}, {KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, GUI_T(KC_BSPC), KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT } @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_COLEMAK] = { {KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, - {KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL}, + {KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL }, {KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT}, {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT}, {KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, GUI_T(KC_BSPC), KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_ENT } @@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Dvorak * ,-----------------------------------------------------------------------------------. - * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | + * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | \ | * |------+------+------+------+------+------+------+------+------+------+------+------| * | Tab | " | , | . | P | Y | F | G | C | R | L | / | * |------+------+------+------+------+-------------+------+------+------+------+------| @@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_DVORAK] = { - {KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, + {KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS}, {KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH}, {KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS}, {KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT}, @@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Lower * ,-----------------------------------------------------------------------------------. - * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | | * |------+------+------+------+------+-------------+------+------+------+------+------| * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | | | * |------+------+------+------+------+-------------+------+------+------+------+------| @@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_LOWER] = { - {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, + {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______}, {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE}, {KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______}, {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______}, @@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Raise * ,-----------------------------------------------------------------------------------. - * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | | * |------+------+------+------+------+------+------+------+------+------+------+------| * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | \ | * |------+------+------+------+------+-------------+------+------+------+------+------| @@ -129,7 +129,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_RAISE] = { - {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, + {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______}, {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSLS}, {KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______}, {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______}, @@ -140,20 +140,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-----------------------------------------------------------------------------------. * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | Reset| | | | | | | | | | Del | + * | | Reset| | | | | | | | | | | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | |Audoff|Aud on|AGnorm|AGswap|Qwerty|Colemk|Dvorak| | | + * | | | | | |AGnorm|AGswap|Qwerty|Colemk|Dvorak| | | * |------+------+------+------+------+------|------+------+------+------+------+------| - * | |Voice-|Voice+|Musoff|Mus on| | | | | | | | + * | |RGB ON| MODE | HUE+ | HUE- | SAT+ | SAT- | VAL+ | VAL- | | | | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | | | | | * `-----------------------------------------------------------------------------------' */ [_ADJUST] = { - {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12}, - {_______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL}, - {_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______}, - {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______}, + {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 }, + {_______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, + {_______, _______, _______, _______, _______, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______}, + {_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______}, {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} } From 134c354fc502b43798add95b7b154b2bc520e4e6 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Sat, 11 Feb 2017 21:54:05 -0800 Subject: [PATCH 021/117] Adding a config file so that I can get RGB underglow for my Let's Split --- keyboards/lets_split/keymaps/xyverz/config.h | 37 ++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 keyboards/lets_split/keymaps/xyverz/config.h diff --git a/keyboards/lets_split/keymaps/xyverz/config.h b/keyboards/lets_split/keymaps/xyverz/config.h new file mode 100644 index 00000000..87808a97 --- /dev/null +++ b/keyboards/lets_split/keymaps/xyverz/config.h @@ -0,0 +1,37 @@ +/* +Copyright 2012 Jun Wako + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + + +#define USE_SERIAL + +#define MASTER_LEFT +// #define _MASTER_RIGHT +// #define EE_HANDS + +#ifdef SUBPROJECT_rev1 + #include "../../rev1/config.h" +#endif +#ifdef SUBPROJECT_rev2 + #include "../../rev2/config.h" + /* RGB Underglow */ + #undef RGBLED_NUM + #define RGBLIGHT_ANIMATIONS + #define RGBLED_NUM 8 +#endif +#ifdef SUBPROJECT_rev2fliphalf + #include "../../rev2fliphalf/config.h" +#endif From 489415009491847ac1855ef5586e2fdcf303aa19 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Sat, 11 Feb 2017 21:54:58 -0800 Subject: [PATCH 022/117] Changes to the keymap to accommodate the RGB Underglow lighting. --- keyboards/lets_split/keymaps/xyverz/keymap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/lets_split/keymaps/xyverz/keymap.c b/keyboards/lets_split/keymaps/xyverz/keymap.c index 62ee4b41..d52eb40a 100644 --- a/keyboards/lets_split/keymaps/xyverz/keymap.c +++ b/keyboards/lets_split/keymaps/xyverz/keymap.c @@ -126,15 +126,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+-------------+------+------+------+------+------| * | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak| | | * |------+------+------+------+------+------|------+------+------+------+------+------| - * | |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof| | | | | | + * | |RGB ON| MODE | HUE+ | HUE- | SAT+ | SAT- | VAL+ | VAL- | | | | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | | | | | * `-----------------------------------------------------------------------------------' */ [_ADJUST] = KEYMAP ( \ - _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL , \ - _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 , \ + _______, RESET, _______, _______, _______, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, \ + _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ) @@ -188,4 +188,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { break; } return true; -} \ No newline at end of file +} From ea20a064b98b962a723a1ae03ebc27e3f8897321 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Wed, 15 Feb 2017 20:14:32 -0800 Subject: [PATCH 023/117] Added my keymap to the Kinesis project. --- keyboards/kinesis/keymaps/xyverz/Makefile | 21 ++ keyboards/kinesis/keymaps/xyverz/config.h | 8 + keyboards/kinesis/keymaps/xyverz/keymap.c | 226 +++++++++++++++++++++ keyboards/kinesis/keymaps/xyverz/readme.md | 1 + 4 files changed, 256 insertions(+) create mode 100644 keyboards/kinesis/keymaps/xyverz/Makefile create mode 100644 keyboards/kinesis/keymaps/xyverz/config.h create mode 100644 keyboards/kinesis/keymaps/xyverz/keymap.c create mode 100644 keyboards/kinesis/keymaps/xyverz/readme.md diff --git a/keyboards/kinesis/keymaps/xyverz/Makefile b/keyboards/kinesis/keymaps/xyverz/Makefile new file mode 100644 index 00000000..1da780b8 --- /dev/null +++ b/keyboards/kinesis/keymaps/xyverz/Makefile @@ -0,0 +1,21 @@ +# Build Options +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +MIDI_ENABLE = no # MIDI controls +AUDIO_ENABLE = no # Audio output on port C6 +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend + +ifndef QUANTUM_DIR + include ../../../../Makefile +endif diff --git a/keyboards/kinesis/keymaps/xyverz/config.h b/keyboards/kinesis/keymaps/xyverz/config.h new file mode 100644 index 00000000..8893d122 --- /dev/null +++ b/keyboards/kinesis/keymaps/xyverz/config.h @@ -0,0 +1,8 @@ +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "../../config.h" + +// place overrides here + +#endif diff --git a/keyboards/kinesis/keymaps/xyverz/keymap.c b/keyboards/kinesis/keymaps/xyverz/keymap.c new file mode 100644 index 00000000..7c5148ac --- /dev/null +++ b/keyboards/kinesis/keymaps/xyverz/keymap.c @@ -0,0 +1,226 @@ +#include "kinesis.h" +#include "action_layer.h" +#include "eeconfig.h" + +extern keymap_config_t keymap_config; + +#define _DV 0 // Dvorak layer +#define _QW 1 // Qwerty layer +#define _CM 2 // Colemak layer +#define _LO 3 // Media Layer +#define _RA 4 // Keypad Layer + +// Macro name shortcuts +#define DVORAK M(_DV) +#define QWERTY M(_QW) +#define COLEMAK M(_CM) + +// Fillers to make layering more clear +#define _______ KC_TRNS +#define XXXXXXX KC_NO + +// Fillers to make layering more clear +#define _______ KC_TRNS +#define XXXXXXX KC_NO + +/**************************************************************************************************** +* +* Keymap: Default Layer in Qwerty +* +* ,-------------------------------------------------------------------------------------------------------------------. +* | Esc | F1 | F2 | F3 | F4 | F5 | F6 | F8 | F9 | F10 | F12 | PSCR | SLCK | PAUS | FN0 | BOOT | +* |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------| +* | =+ | 1! | 2@ | 3# | 4$ | 5% | | 6^ | 7& | 8* | 9( | 0) | -_ | +* |--------+------+------+------+------+------| +------+------+------+------+------+--------| +* | Tab | Q | W | E | R | T | | Y | U | I | O | P | \| | +* |--------+------+------+------+------+------| |------+------+------+------+------+--------| +* | Caps | A | S | D | F | G | | H | J | K | L | ;: | '" | +* |--------+------+------+------+------+------| |------+------+------+------+------+--------| +* | Shift | Z | X | C | V | B | | N | M | ,. | .> | /? | Shift | +* `--------+------+------+------+------+------- `------+------+------+------+------+--------' +* | `~ | INS | Left | Right| | Up | Down | [{ | ]} | +* `---------------------------' `---------------------------' +* ,-------------. ,-------------. +* | Ctrl | Alt | | Gui | Ctrl | +* ,------|------|------| |------+------+------. +* | | | Home | | PgUp | | | +* | BkSp | Del |------| |------|Return| Space| +* | | | End | | PgDn | | | +* `--------------------' `--------------------' +*/ + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[_DV] = KEYMAP( + // Left Hand + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, + KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, + KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, + KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, + KC_GRV, KC_INS, KC_LEFT, KC_RGHT, + // Left Thumb + KC_LCTL, KC_LALT, + KC_HOME, + KC_BSPC, LT(_LO, KC_DEL), KC_END, + + // Right Hand + KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, MO(_LO), MO(_RA), + KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, + KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, + KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, + KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, + KC_UP, KC_DOWN, KC_LBRC, KC_RBRC, + // Right Thumb + KC_RGUI, KC_RCTL, + KC_PGUP, + KC_PGDN, LT(_RA, KC_ENT), KC_SPC + ), + +[_QW] = KEYMAP( + // Left Hand + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, + KC_GRV, KC_INS, KC_LEFT, KC_RGHT, + // Left Thumb + KC_LCTL, KC_LALT, + KC_HOME, + KC_BSPC, LT(_LO, KC_DEL), KC_END, + + // Right Hand + KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, MO(_LO), MO(_RA), + KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, + KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL , + KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_UP, KC_DOWN, KC_LBRC, KC_RBRC, + // Right Thumb + KC_RGUI, KC_RCTL, + KC_PGUP, + KC_PGDN, LT(_RA, KC_ENT), KC_SPC + ), + +[_CM] = KEYMAP( + // Left Hand + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, + KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, + KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, + KC_GRV, KC_INS, KC_LEFT, KC_RGHT, + // Left Thumb + KC_LCTL, KC_LALT, + KC_HOME, + KC_BSPC, LT(_LO, KC_DEL), KC_END, + + // Right Hand + KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, MO(_LO), MO(_RA), + KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL, + KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, + KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_UP, KC_DOWN, KC_LBRC, KC_RBRC, + // Right Thumb + KC_RGUI, KC_RCTL, + KC_PGUP, + KC_PGDN, LT(_RA, KC_ENT), KC_SPC + ), + +[_LO] = KEYMAP( + // Left Hand + _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, + _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, + _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, + _______, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSEL, + _______, _______, _______, _______, + // Left Thumb + _______, _______, + _______, + _______, _______, _______, + + // Right Hand + _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12, + _______, _______, _______, _______, _______, _______, + _______, _______, KC_PLUS, KC_LCBR, KC_RCBR, _______, + _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, + _______, _______, _______, _______, + // Right Thumb + _______, _______, + _______, + _______, _______, _______ + ), + +[_RA] = KEYMAP( + // Left Hand + _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, + _______, _______, _______, _______, _______, _______, + _______, _______, QWERTY, COLEMAK, DVORAK, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, + // Left Thumb + _______, _______, + _______, + _______, _______, _______, + + // Right Hand */ + _______, _______, _______, RESET, _______, _______, _______, _______, _______, + KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12, + _______, _______, _______, _______, _______, _______, + _______, _______, KC_EQL, KC_LBRC, KC_RBRC, _______, + _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, + _______, _______, _______, _______, + // Right Thumb + _______, _______, + _______, + _______, _______, _______ + ) + +}; + + +const uint16_t PROGMEM fn_actions[] = { + +}; + +void persistant_default_layer_set(uint16_t default_layer) { + eeconfig_update_default_layer(default_layer); + default_layer_set(default_layer); +} + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + switch(id) { + case _DV: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_DV); + } + break; + case _QW: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_QW); + } + break; + case _CM: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_CM); + } + break; + } + return MACRO_NONE; +}; + +// Runs just one time when the keyboard initializes. +void matrix_init_user(void) { + +}; + +// Runs constantly in the background, in a loop. +void matrix_scan_user(void) { + +}; diff --git a/keyboards/kinesis/keymaps/xyverz/readme.md b/keyboards/kinesis/keymaps/xyverz/readme.md new file mode 100644 index 00000000..da033be1 --- /dev/null +++ b/keyboards/kinesis/keymaps/xyverz/readme.md @@ -0,0 +1 @@ +# The default keymap for kinesis-advantage From 1dabceb19782f5856afe66a499020699604b2319 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Wed, 15 Feb 2017 21:56:48 -0800 Subject: [PATCH 024/117] minor adjustments. --- keyboards/kinesis/keymaps/xyverz/keymap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/kinesis/keymaps/xyverz/keymap.c b/keyboards/kinesis/keymaps/xyverz/keymap.c index 7c5148ac..fb2d3bc0 100644 --- a/keyboards/kinesis/keymaps/xyverz/keymap.c +++ b/keyboards/kinesis/keymaps/xyverz/keymap.c @@ -54,25 +54,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_DV] = KEYMAP( // Left Hand KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, + KC_RBRC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_GRV, KC_INS, KC_LEFT, KC_RGHT, // Left Thumb - KC_LCTL, KC_LALT, + CTL_T(KC_ESC), KC_LALT, KC_HOME, KC_BSPC, LT(_LO, KC_DEL), KC_END, // Right Hand KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, MO(_LO), MO(_RA), - KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, - KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, + KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, + KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSLS, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, - KC_UP, KC_DOWN, KC_LBRC, KC_RBRC, + KC_UP, KC_DOWN, KC_SLSH, KC_EQL, // Right Thumb - KC_RGUI, KC_RCTL, + KC_RGUI, CTL_T(KC_ESC), KC_PGUP, KC_PGDN, LT(_RA, KC_ENT), KC_SPC ), From 80d5649f25f7cdd7596eb453576dca9eb680a5cd Mon Sep 17 00:00:00 2001 From: Xyverz Date: Wed, 15 Feb 2017 22:54:52 -0800 Subject: [PATCH 025/117] More refinements to my Kinesis keymap. Added a readme.md file. --- keyboards/kinesis/keymaps/xyverz/keymap.c | 195 +++++++++++++++------ keyboards/kinesis/keymaps/xyverz/readme.md | 131 +++++++++++++- 2 files changed, 270 insertions(+), 56 deletions(-) diff --git a/keyboards/kinesis/keymaps/xyverz/keymap.c b/keyboards/kinesis/keymaps/xyverz/keymap.c index fb2d3bc0..b8e06fe3 100644 --- a/keyboards/kinesis/keymaps/xyverz/keymap.c +++ b/keyboards/kinesis/keymaps/xyverz/keymap.c @@ -7,8 +7,8 @@ extern keymap_config_t keymap_config; #define _DV 0 // Dvorak layer #define _QW 1 // Qwerty layer #define _CM 2 // Colemak layer -#define _LO 3 // Media Layer -#define _RA 4 // Keypad Layer +#define _MD 3 // Media Layer +#define _KP 4 // Keypad Layer // Macro name shortcuts #define DVORAK M(_DV) @@ -23,30 +23,115 @@ extern keymap_config_t keymap_config; #define _______ KC_TRNS #define XXXXXXX KC_NO -/**************************************************************************************************** -* -* Keymap: Default Layer in Qwerty -* -* ,-------------------------------------------------------------------------------------------------------------------. -* | Esc | F1 | F2 | F3 | F4 | F5 | F6 | F8 | F9 | F10 | F12 | PSCR | SLCK | PAUS | FN0 | BOOT | -* |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------| -* | =+ | 1! | 2@ | 3# | 4$ | 5% | | 6^ | 7& | 8* | 9( | 0) | -_ | -* |--------+------+------+------+------+------| +------+------+------+------+------+--------| -* | Tab | Q | W | E | R | T | | Y | U | I | O | P | \| | -* |--------+------+------+------+------+------| |------+------+------+------+------+--------| -* | Caps | A | S | D | F | G | | H | J | K | L | ;: | '" | -* |--------+------+------+------+------+------| |------+------+------+------+------+--------| -* | Shift | Z | X | C | V | B | | N | M | ,. | .> | /? | Shift | -* `--------+------+------+------+------+------- `------+------+------+------+------+--------' -* | `~ | INS | Left | Right| | Up | Down | [{ | ]} | -* `---------------------------' `---------------------------' -* ,-------------. ,-------------. -* | Ctrl | Alt | | Gui | Ctrl | -* ,------|------|------| |------+------+------. -* | | | Home | | PgUp | | | -* | BkSp | Del |------| |------|Return| Space| -* | | | End | | PgDn | | | -* `--------------------' `--------------------' +/* + + Function Keys on All Layers (Keypad toggles): + ,-----------------------------------------------------------------. + | ESC | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | + `-----------------------------------------------------------------' + ,-----------------------------------------------------------------. + | F9 | F10 | F11 | F12 | PScr | SLck | Paus | Keypad | RESET | + `-----------------------------------------------------------------' + + Dvorak layer: + ,-------------------------------------------.,-------------------------------------------. + | ] | 1 | 2 | 3 | 4 | 5 || 6 | 7 | 8 | 9 | 0 | [ | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | Tab | ' | , | . | P | Y || F | G | C | R | L | \ | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | CapsLk | A | O | E | U | I || D | H | T | N | S | - | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | LShift | Z | X | C | V | X || B | M | W | V | Z | RShift | + `--------+------+------+------+------+------'`------+------+------+------+------+--------' + | ` | INS | Left | Rght | | Up | Dn | / | = | + `---------------------------' `---------------------------' + ,--------------.,--------------. + |Ctr/ESC| LAlt || RGUI |Ctr/ESC| + ,------|-------|------||------+-------+-------. + | | Del | Home || PgUp | Enter | | + | BkSp | / |------||------| / | Space | + | | Media | End || PgDn | KeyPd | | + `---------------------'`----------------------' + + QWERTY layer: + ,-------------------------------------------.,-------------------------------------------. + | = | 1 | 2 | 3 | 4 | 5 || 6 | 7 | 8 | 9 | 0 | - | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | Tab | Q | W | E | R | T || Y | U | I | O | P | \ | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | CapsLk | A | S | D | F | G || H | J | K | L | ; | ' | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | LShift | Z | X | C | V | B || N | M | , | . | / | RShift | + `--------+------+------+------+------+------'`------+------+------+------+------+--------' + | ` | INS | Left | Rght | | Up | Dn | [ | ] | + `---------------------------' `---------------------------' + ,--------------.,--------------. + |Ctr/ESC| LAlt || RGUI |Ctr/ESC| + ,------|-------|------||------+-------+-------. + | | Del | Home || PgUp | Enter | | + | BkSp | / |------||------| / | Space | + | | Media | End || PgDn | KeyPd | | + `---------------------'`----------------------' + + Colemak layer: + ,-------------------------------------------.,-------------------------------------------. + | = | 1 | 2 | 3 | 4 | 5 || 6 | 7 | 8 | 9 | 0 | - | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | Tab | Q | W | F | P | G || J | L | U | Y | ; | \ | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | BkSpc | A | R | S | T | D || H | N | E | I | O | ' | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | LShift | Z | X | C | V | B || K | M | , | . | / | RShift | + `--------+------+------+------+------+------'`------+------+------+------+------+--------' + | ` | INS | Left | Rght | | Up | Dn | [ | ] | + `---------------------------' `---------------------------' + ,--------------.,--------------. + |Ctr/ESC| LAlt || RGUI |Ctr/ESC| + ,------|-------|------||------+-------+-------. + | | Del | Home || PgUp | Enter | | + | BkSp | / |------||------| / | Space | + | | Media | End || PgDn | KeyPd | | + `---------------------'`----------------------' + + Media layer: + ,-------------------------------------------.,-------------------------------------------. + | F11 | F1 | F2 | F3 | F4 | F5 || F6 | F7 | F8 | F9 | F10 | F12 | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | | | | | | || | | | | | | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | | | | | | || | Mute | Vol- | Vol+ | | | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | | | | | | || Stop | Prev | Play | Next | Sel | | + `--------+------+------+------+------+------'`------+------+------+------+------+--------' + | | | | | | | | | | + `---------------------------' `---------------------------' + ,-------------.,-------------. + | | || | | + ,------|------|------||------+------+------. + | | | || | | | + | | |------||------| | | + | | | || | | | + `--------------------'`--------------------' + + Keypad layer: + ,-------------------------------------------.,-------------------------------------------. + | Power | | | | | || | NmLk | KP = | KP / | KP * | | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | Sleep | | | | | || | KP 7 | KP 8 | KP 9 | KP - | | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | Wake | | | | | || | KP 4 | KP 5 | KP 6 | KP + | | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | | |QWERTY|Colemk|Dvorak| || | KP 1 | KP 2 | KP 3 |KP Ent| | + `--------+------+------+------+------+------'`------+------+------+------+------+--------' + | | | | | | | | KP . |KP Ent| | + `---------------------------' `----------------------------------' + ,-------------.,-------------. + | | || | | + ,------|------|------||------+------+------. + | | | || | | | + | | |------||------| | KP 0 | + | | | || | | | + `--------------------'`--------------------' */ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -62,10 +147,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Left Thumb CTL_T(KC_ESC), KC_LALT, KC_HOME, - KC_BSPC, LT(_LO, KC_DEL), KC_END, + KC_BSPC, LT(_MD, KC_DEL), KC_END, // Right Hand - KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, MO(_LO), MO(_RA), + KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KP), RESET, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSLS, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, @@ -74,7 +159,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Right Thumb KC_RGUI, CTL_T(KC_ESC), KC_PGUP, - KC_PGDN, LT(_RA, KC_ENT), KC_SPC + KC_PGDN, LT(_KP, KC_ENT), KC_SPC ), [_QW] = KEYMAP( @@ -86,21 +171,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_GRV, KC_INS, KC_LEFT, KC_RGHT, // Left Thumb - KC_LCTL, KC_LALT, + CTL_T(KC_ESC), KC_LALT, KC_HOME, - KC_BSPC, LT(_LO, KC_DEL), KC_END, + KC_BSPC, LT(_MD, KC_DEL), KC_END, // Right Hand - KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, MO(_LO), MO(_RA), + KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KP), RESET, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL , KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DOWN, KC_LBRC, KC_RBRC, // Right Thumb - KC_RGUI, KC_RCTL, + KC_RGUI, CTL_T(KC_ESC), KC_PGUP, - KC_PGDN, LT(_RA, KC_ENT), KC_SPC + KC_PGDN, LT(_KP, KC_ENT), KC_SPC ), [_CM] = KEYMAP( @@ -112,30 +197,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_GRV, KC_INS, KC_LEFT, KC_RGHT, // Left Thumb - KC_LCTL, KC_LALT, + CTL_T(KC_ESC), KC_LALT, KC_HOME, - KC_BSPC, LT(_LO, KC_DEL), KC_END, + KC_BSPC, LT(_MD, KC_DEL), KC_END, // Right Hand - KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, MO(_LO), MO(_RA), + KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KP), RESET, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DOWN, KC_LBRC, KC_RBRC, // Right Thumb - KC_RGUI, KC_RCTL, + KC_RGUI, CTL_T(KC_ESC), KC_PGUP, - KC_PGDN, LT(_RA, KC_ENT), KC_SPC + KC_PGDN, LT(_KP, KC_ENT), KC_SPC ), -[_LO] = KEYMAP( +[_MD] = KEYMAP( // Left Hand _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, - _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, - _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, - _______, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSEL, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, // Left Thumb _______, _______, @@ -146,8 +231,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12, _______, _______, _______, _______, _______, _______, - _______, _______, KC_PLUS, KC_LCBR, KC_RCBR, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, + KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSEL, _______, _______, _______, _______, _______, // Right Thumb _______, _______, @@ -155,12 +240,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______ ), -[_RA] = KEYMAP( +[_KP] = KEYMAP( // Left Hand _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, - _______, _______, _______, _______, _______, _______, - _______, _______, QWERTY, COLEMAK, DVORAK, _______, + KC_PWR, _______, _______, _______, _______, _______, + KC_SLEP, _______, _______, _______, _______, _______, + KC_WAKE, _______, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, // Left Thumb @@ -169,16 +254,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, // Right Hand */ - _______, _______, _______, RESET, _______, _______, _______, _______, _______, - KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12, - _______, _______, _______, _______, _______, _______, - _______, _______, KC_EQL, KC_LBRC, KC_RBRC, _______, - _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, - _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_NLCK, KC_PEQL, KC_PSLS, KC_PAST, _______, + _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, + _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, + _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______, + _______, _______, KC_PDOT, KC_PENT, // Right Thumb _______, _______, _______, - _______, _______, _______ + _______, _______, KC_P0 ) }; diff --git a/keyboards/kinesis/keymaps/xyverz/readme.md b/keyboards/kinesis/keymaps/xyverz/readme.md index da033be1..3433a94c 100644 --- a/keyboards/kinesis/keymaps/xyverz/readme.md +++ b/keyboards/kinesis/keymaps/xyverz/readme.md @@ -1 +1,130 @@ -# The default keymap for kinesis-advantage +# Xyverz's Kinesis Keymap + +## About this keymap: + +The Dvorak layout shown here stems from my early Kinesis years, using the Contour PS/2 with a Dvorak software layout. Because of this, the RBRC and LBRC were on opposite sides of the board in the corner keys. I've decided to continue using this layout with my QMK Kinesis. + +The QWERTY layout shown here is based entirely on the Kinesis Advantage layout. The Colemak layout is merely an adaptation of that. + +I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar to the default Planck layouts. + +## Still to do: + + * Need to figure out a better position for the ESC key. + * Come up with a function for the empty keys shown in the alpha layers below. + * Fix the CapsLock, NumLock, and ScrLck LEDs. + +### Function Keys on All Layers (keypad toggles): + ,-----------------------------------------------------------------. + | ESC | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | + `-----------------------------------------------------------------' + ,-----------------------------------------------------------------. + | F9 | F10 | F11 | F12 | PScr | SLck | Paus | Keypad | RESET | + `-----------------------------------------------------------------' + +### Layer 0: Dvorak layer + + ,-------------------------------------------.,-------------------------------------------. + | ] | 1 | 2 | 3 | 4 | 5 || 6 | 7 | 8 | 9 | 0 | [ | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | Tab | ' | , | . | P | Y || F | G | C | R | L | \ | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | CapsLk | A | O | E | U | I || D | H | T | N | S | - | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | LShift | Z | X | C | V | X || B | M | W | V | Z | RShift | + `--------+------+------+------+------+------'`------+------+------+------+------+--------' + | ` | INS | Left | Rght | | Up | Dn | / | = | + `---------------------------' `---------------------------' + ,--------------.,--------------. + |Ctr/ESC| LAlt || RGUI |Ctr/ESC| + ,------|-------|------||------+-------+-------. + | | Del | Home || PgUp | Enter | | + | BkSp | / |------||------| / | Space | + | | Media | End || PgDn | KeyPd | | + `---------------------'`----------------------' + +### Layer 1: QWERTY layer + + ,-------------------------------------------.,-------------------------------------------. + | = | 1 | 2 | 3 | 4 | 5 || 6 | 7 | 8 | 9 | 0 | - | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | Tab | Q | W | E | R | T || Y | U | I | O | P | \ | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | CapsLk | A | S | D | F | G || H | J | K | L | ; | ' | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | LShift | Z | X | C | V | B || N | M | , | . | / | RShift | + `--------+------+------+------+------+------'`------+------+------+------+------+--------' + | ` | INS | Left | Rght | | Up | Dn | [ | ] | + `---------------------------' `---------------------------' + ,--------------.,--------------. + |Ctr/ESC| LAlt || RGUI |Ctr/ESC| + ,------|-------|------||------+-------+-------. + | | Del | Home || PgUp | Enter | | + | BkSp | / |------||------| / | Space | + | | Media | End || PgDn | KeyPd | | + `---------------------'`----------------------' + +### Keymap 2: Colemak layer + + ,-------------------------------------------.,-------------------------------------------. + | = | 1 | 2 | 3 | 4 | 5 || 6 | 7 | 8 | 9 | 0 | - | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | Tab | Q | W | F | P | G || J | L | U | Y | ; | \ | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | BkSpc | A | R | S | T | D || H | N | E | I | O | ' | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | LShift | Z | X | C | V | B || K | M | , | . | / | RShift | + `--------+------+------+------+------+------'`------+------+------+------+------+--------' + | ` | INS | Left | Rght | | Up | Dn | [ | ] | + `---------------------------' `---------------------------' + ,--------------.,--------------. + |Ctr/ESC| LAlt || RGUI |Ctr/ESC| + ,------|-------|------||------+-------+-------. + | | Del | Home || PgUp | Enter | | + | BkSp | / |------||------| / | Space | + | | Media | End || PgDn | KeyPd | | + `---------------------'`----------------------' + +### layer 3 : Media layer + + ,-------------------------------------------.,-------------------------------------------. + | F11 | F1 | F2 | F3 | F4 | F5 || F6 | F7 | F8 | F9 | F10 | F12 | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | | | | | | || | | | | | | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | | | | | | || | Mute | Vol- | Vol+ | | | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | | | | | | || Stop | Prev | Play | Next | Sel | | + `--------+------+------+------+------+------'`------+------+------+------+------+--------' + | | | | | | | | | | + `---------------------------' `---------------------------' + ,-------------.,-------------. + | | || | | + ,------|------|------||------+------+------. + | | | || | | | + | | |------||------| | | + | | | || | | | + `--------------------'`--------------------' + + + +### Keymap 4: Keypad layer + + ,-------------------------------------------.,-------------------------------------------. + | Power | | | | | || | NmLk | KP = | KP / | KP * | | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | Sleep | | | | | || | KP 7 | KP 8 | KP 9 | KP - | | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | Wake | | | | | || | KP 4 | KP 5 | KP 6 | KP + | | + |--------+------+------+------+------+------||------+------+------+------+------+--------| + | | |QWERTY|Colemk|Dvorak| || | KP 1 | KP 2 | KP 3 |KP Ent| | + `--------+------+------+------+------+------'`------+------+------+------+------+--------' + | | | | | | | | KP . |KP Ent| | + `---------------------------' `----------------------------------' + ,-------------.,-------------. + | | || | | + ,------|------|------||------+------+------. + | | | || | | | + | | |------||------| | KP 0 | + | | | || | | | + `--------------------'`--------------------' From 6fa6e6c4c6d772de6898bdd2ad303c5667339555 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Wed, 15 Feb 2017 23:01:27 -0800 Subject: [PATCH 026/117] Fixed inaccuracies in keymap comments and the readme. --- keyboards/kinesis/keymaps/xyverz/keymap.c | 4 ++-- keyboards/kinesis/keymaps/xyverz/readme.md | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/keyboards/kinesis/keymaps/xyverz/keymap.c b/keyboards/kinesis/keymaps/xyverz/keymap.c index b8e06fe3..f3184c14 100644 --- a/keyboards/kinesis/keymaps/xyverz/keymap.c +++ b/keyboards/kinesis/keymaps/xyverz/keymap.c @@ -119,9 +119,9 @@ extern keymap_config_t keymap_config; |--------+------+------+------+------+------||------+------+------+------+------+--------| | Sleep | | | | | || | KP 7 | KP 8 | KP 9 | KP - | | |--------+------+------+------+------+------||------+------+------+------+------+--------| - | Wake | | | | | || | KP 4 | KP 5 | KP 6 | KP + | | + | Wake | |QWERTY|Colemk|Dvorak| || | KP 4 | KP 5 | KP 6 | KP + | | |--------+------+------+------+------+------||------+------+------+------+------+--------| - | | |QWERTY|Colemk|Dvorak| || | KP 1 | KP 2 | KP 3 |KP Ent| | + | | | | | | || | KP 1 | KP 2 | KP 3 |KP Ent| | `--------+------+------+------+------+------'`------+------+------+------+------+--------' | | | | | | | | KP . |KP Ent| | `---------------------------' `----------------------------------' diff --git a/keyboards/kinesis/keymaps/xyverz/readme.md b/keyboards/kinesis/keymaps/xyverz/readme.md index 3433a94c..06cd6747 100644 --- a/keyboards/kinesis/keymaps/xyverz/readme.md +++ b/keyboards/kinesis/keymaps/xyverz/readme.md @@ -18,9 +18,9 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t ,-----------------------------------------------------------------. | ESC | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | `-----------------------------------------------------------------' - ,-----------------------------------------------------------------. - | F9 | F10 | F11 | F12 | PScr | SLck | Paus | Keypad | RESET | - `-----------------------------------------------------------------' + ,-----------------------------------------------------------------. + | F9 | F10 | F11 | F12 | PScr | SLck | Paus | Keypad | RESET | + `-----------------------------------------------------------------' ### Layer 0: Dvorak layer @@ -115,9 +115,9 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t |--------+------+------+------+------+------||------+------+------+------+------+--------| | Sleep | | | | | || | KP 7 | KP 8 | KP 9 | KP - | | |--------+------+------+------+------+------||------+------+------+------+------+--------| - | Wake | | | | | || | KP 4 | KP 5 | KP 6 | KP + | | + | Wake | |QWERTY|Colemk|Dvorak| || | KP 4 | KP 5 | KP 6 | KP + | | |--------+------+------+------+------+------||------+------+------+------+------+--------| - | | |QWERTY|Colemk|Dvorak| || | KP 1 | KP 2 | KP 3 |KP Ent| | + | | | | | | || | KP 1 | KP 2 | KP 3 |KP Ent| | `--------+------+------+------+------+------'`------+------+------+------+------+--------' | | | | | | | | KP . |KP Ent| | `---------------------------' `----------------------------------' From ca1ec7b121c973fae614e69093f40ee9ba25e629 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Thu, 16 Feb 2017 13:48:54 -0800 Subject: [PATCH 027/117] Fixed the TODO list. --- keyboards/kinesis/keymaps/xyverz/readme.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/kinesis/keymaps/xyverz/readme.md b/keyboards/kinesis/keymaps/xyverz/readme.md index 06cd6747..11aedec5 100644 --- a/keyboards/kinesis/keymaps/xyverz/readme.md +++ b/keyboards/kinesis/keymaps/xyverz/readme.md @@ -10,9 +10,7 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t ## Still to do: - * Need to figure out a better position for the ESC key. - * Come up with a function for the empty keys shown in the alpha layers below. - * Fix the CapsLock, NumLock, and ScrLck LEDs. + * Implement the CapsLock, NumLock, and ScrLck LEDs on the off-chance that I decide to actually solder some to the keyboard. ### Function Keys on All Layers (keypad toggles): ,-----------------------------------------------------------------. From 5abe05147c5b3113327d5d40db0ee12d759c73d3 Mon Sep 17 00:00:00 2001 From: nstickney Date: Sun, 19 Feb 2017 21:25:35 -0600 Subject: [PATCH 028/117] familiar layout v0.1 from ErgoDox-EZ configurator --- keyboards/ergodox/keymaps/familiar/keymap.c | 111 ++++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 keyboards/ergodox/keymaps/familiar/keymap.c diff --git a/keyboards/ergodox/keymaps/familiar/keymap.c b/keyboards/ergodox/keymaps/familiar/keymap.c new file mode 100644 index 00000000..7cd81a87 --- /dev/null +++ b/keyboards/ergodox/keymaps/familiar/keymap.c @@ -0,0 +1,111 @@ +#include "ergodox.h" +#include "debug.h" +#include "action_layer.h" +#include "version.h" + + +#include "keymap_german.h" + +#include "keymap_nordic.h" + + + +enum custom_keycodes { + PLACEHOLDER = SAFE_RANGE, // can always be here + EPRM, + VRSN, + RGB_SLD, + +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = KEYMAP(KC_ESCAPE,KC_1,KC_2,KC_3,KC_4,KC_5,KC_MINUS,KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_HOME,KC_TAB,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSPO,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_END,CTL_T(KC_LGUI),KC_APPLICATION,KC_GRAVE,KC_QUOTE,KC_BSLASH,KC_AUDIO_VOL_DOWN,KC_AUDIO_VOL_UP,KC_AUDIO_MUTE,ALT_T(KC_SPACE),MO(1),KC_RALT,KC_KP_PLUS,KC_6,KC_7,KC_8,KC_9,KC_0,KC_PSCREEN,KC_PGUP,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSPACE,KC_H,KC_J,KC_K,KC_L,KC_SCOLON,KC_ENTER,KC_PGDOWN,KC_N,KC_M,KC_COMMA,KC_DOT,KC_KP_SLASH,KC_RSPC,KC_LBRACKET,KC_RBRACKET,KC_TRANSPARENT,KC_APPLICATION,CTL_T(KC_RGUI),KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_RALT,MO(1),ALT_T(KC_SPACE)), + + [1] = KEYMAP(M(0),KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F11,KC_PAUSE,KC_TRANSPARENT,KC_TRANSPARENT,KC_UP,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LEFT,KC_DOWN,KC_RIGHT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PREV_TRACK,KC_MEDIA_STOP,KC_MEDIA_PLAY_PAUSE,KC_MEDIA_NEXT_TRACK,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_F12,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_INSERT,KC_LEFT,KC_DOWN,KC_UP,KC_RIGHT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT), + +}; + +const uint16_t PROGMEM fn_actions[] = { + [1] = ACTION_LAYER_TAP_TOGGLE(1) +}; + +// leaving this in place for compatibilty with old keymaps cloned and re-compiled. +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + switch(id) { + case 0: + if (record->event.pressed) { + SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); + } + break; + } + return MACRO_NONE; +}; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + // dynamically generate these. + case EPRM: + if (record->event.pressed) { + eeconfig_init(); + } + return false; + break; + case VRSN: + if (record->event.pressed) { + SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); + } + return false; + break; + case RGB_SLD: + if (record->event.pressed) { + rgblight_mode(1); + } + return false; + break; + + } + return true; +} + +void matrix_scan_user(void) { + + uint8_t layer = biton32(layer_state); + + ergodox_board_led_off(); + ergodox_right_led_1_off(); + ergodox_right_led_2_off(); + ergodox_right_led_3_off(); + switch (layer) { + case 1: + ergodox_right_led_1_on(); + break; + case 2: + ergodox_right_led_2_on(); + break; + case 3: + ergodox_right_led_3_on(); + break; + case 4: + ergodox_right_led_1_on(); + ergodox_right_led_2_on(); + break; + case 5: + ergodox_right_led_1_on(); + ergodox_right_led_3_on(); + break; + case 6: + ergodox_right_led_2_on(); + ergodox_right_led_3_on(); + break; + case 7: + ergodox_right_led_1_on(); + ergodox_right_led_2_on(); + ergodox_right_led_3_on(); + break; + default: + break; + } + +}; From 9b40dd796ea2aae9f342dc4d9e7d431d8448e1b9 Mon Sep 17 00:00:00 2001 From: nstickney Date: Thu, 23 Feb 2017 21:13:45 -0600 Subject: [PATCH 029/117] familiar layout graphics, etc --- keyboards/ergodox/keymaps/familiar/HNTR.svg | 7253 ++++++++++++++++ .../ergodox/keymaps/familiar/familiar.json | 865 ++ .../ergodox/keymaps/familiar/familiar.png | Bin 0 -> 102059 bytes .../ergodox/keymaps/familiar/familiar.svg | 7131 ++++++++++++++++ .../keymaps/familiar/familiar_stick.svg | 7592 +++++++++++++++++ keyboards/ergodox/keymaps/familiar/hntr.json | 634 ++ keyboards/ergodox/keymaps/familiar/hntr.png | Bin 0 -> 77473 bytes 7 files changed, 23475 insertions(+) create mode 100644 keyboards/ergodox/keymaps/familiar/HNTR.svg create mode 100644 keyboards/ergodox/keymaps/familiar/familiar.json create mode 100644 keyboards/ergodox/keymaps/familiar/familiar.png create mode 100644 keyboards/ergodox/keymaps/familiar/familiar.svg create mode 100644 keyboards/ergodox/keymaps/familiar/familiar_stick.svg create mode 100644 keyboards/ergodox/keymaps/familiar/hntr.json create mode 100644 keyboards/ergodox/keymaps/familiar/hntr.png diff --git a/keyboards/ergodox/keymaps/familiar/HNTR.svg b/keyboards/ergodox/keymaps/familiar/HNTR.svg new file mode 100644 index 00000000..a419e7ab --- /dev/null +++ b/keyboards/ergodox/keymaps/familiar/HNTR.svg @@ -0,0 +1,7253 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PanningHold down Scroll Wheel to pan with mouseUp/Down - Scroll WheelLeft/Right - Shift + Scroll WheelZooming- Ctrl + Scroll View to zoom in/out- Press 1, 2, 4, or 5 for preset zoom views.Zoom Tool (F3) :- Left click to zoom in- Right click to zoom out + + + Keyboards + + + + + + + + + To avoid delays and errors in your order you must convert all of your fonts and text to vector data + This layout is used for your legends only. Keycap colors need to be defined with the online designer tool.Please check out our online tutorials at support.wasdkeyboards.comfor help and instructions regarding layout creation. + + + Quick Start:1. Enable Layers by going to: Layer > Layers (Ctrl + Shift + L) *The layers window can be expanded by dragging the area under the opacity slider.2. Use the Eyeball Icons to toggle visibility for preset layers3. Use the Select tool to move and scale objects (F1)4. Use the Text Tool to add and edit text (F8) + + Managing Layers1. Enable Layers by pressing Ctrl + Shift + L2. The Layer window can be enlarged by dragging thearea under the Opacity slider.3. Use the Eyeball Icon to toggle layer visibility.4. Use the Lock Icon to toggle the ability to edit layer.5. To add a layer, use the button from Layers panel. + + + Manipulating ObjectsThe Select Tool (F1) allows you to select and move,scale, and delete objects. Select an object, then drag the object to move it. You can drag the arrows around the object to scale it.Holding Ctrl while moving will keep the object locked onthe same X or Y axis. Holding Ctrl while scaling will keep the size ratio locked. + Inkscape Tutorial + FAQ (Frequently Asked Questions)I can't see any layers, I just see one layer or no layers when I open the layers panel.This happens when you drag and drop the layout file into Inkscape which "imports" it instead of opening it. Please close your Inkscape window, go back to the original file, right click it and choose "edit with Inkscape". What are the grids for on the layout? Can I place objects outside the grid?Yes. The grids are for reference only. You can snap the grids to use our standard margins. You can print all the way to the edge of the frame. There is a +/-0.01" tolerance, so we suggest that you stay within the grids when possible.Can I put a graphic that spans over multiple keys? Yes. Large images will be cropped to the top face of the keys. The areas in between the keys will not be printed.Advanced users can use a clipping mask to get a better idea of what the final image will look like.How can I change the color of the printing?We have tutorials in our support center that can show you how to add colors to your text and images.Go to support.wasdkeyboards.comI want to edit the Mac-style layouts, but the text is not editable.The Mac layout text is not editable since the font is not common. The font used is VAG Rounded-Light. + Adding text1. Click on the Text Tool (F8)2. Click on the area where you want add text3. Type your text4. Font and size and can changed in the text toolbar5. Use the Select Tool (F1) to reposition thetext if necessary. + + + + Editing font type and size1. Use the Select Tool (F1) select the objects youwant to edit.2. Click on the Text Tool (F8)3. Use the text toolbar to change font type and text size + + + + + Editing textUse the Select Tool (F1) and double click a singletext object.-or-Use the Text Tool (F8) and click on a single text object. + + + + Adding stock artworkCommonly used icons and symbols are available within the file.1. Turn on the visibility of the layer titled: "Stock Artwork"2. Use the Select Tool (F1) to select the object you want to use.3. Press Ctrl + C to copy4. Select the layer you want to paste the object to, then press Ctrl + V5. You can then use the Select Tool (F1) to move and/or scale the object to proper size. See "Snapping" for tips on aligning objects. + Adding custom artNormal graphics can be added into the file, but you must convert thegraphic to a path.1. Copy the graphic from another program. (Usually Right Click > Copy)2. Select the layer you want to paste the graphic to, then press Ctrl + V-or-1. File > Import (Ctrl + I) and select the file you want to import.2. Select the Embed option and click OK.3. Select the graphic, and goto Path > Trace Bitmap (Shift + Alt + B)4. Make sure your graphic is selected, then select a Scan option andclick OK. The graphic will be traced, and will overlay the original object.5. Move the new object into position and delete the original image. + + + SnappingEnabling snapping allows you to snap objects at various reference points of other objects which will allow you to quickly and accurately align objects to each other.Make sure Snap Controls Toolbar is displayed on the right hand side. (View > Show/Hide > Snap Controls Bar)Make sure Snapping is enabled (Toggle with "%")Hover over the various points to see what snappingare available. You can turn each one on/off.Drag objects over other objects to snap. You may need to zoom in or out to snap to certain objects. Turning off irrelevant points will also make it easier to snap. + + Copy and PasteCtrl + C: Copy objectCtrl + V: Paste objectCtrl + Alt + V: Paste in placeShift + Ctrl + V: Paste style + Guide LinesYou can use Guides to help align objects. Click and drag from the rulerson the edge of the document.Enable snapping to guides in the Snap Control Bar You can Show/Hide Guides by going to View > Guides + + + WASD Keyboards 104/87-Key Design Template + IMPORTANT: + Before saving and uploading your file: select all of your text; go to Path > Object to Path (Ctrl+Shift+C) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 😎 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/keyboards/ergodox/keymaps/familiar/familiar.json b/keyboards/ergodox/keymaps/familiar/familiar.json new file mode 100644 index 00000000..e80f99e5 --- /dev/null +++ b/keyboards/ergodox/keymaps/familiar/familiar.json @@ -0,0 +1,865 @@ +[ + { + "name": "ErgoDox Familiar (CosmicStick Colors)", + "author": "Stick" + }, + [ + { + "x": 3.5, + "c": "#FFF8E7", + "t": "#403e3a", + "fa": [ + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 7, + 0 + ] + }, + "\n\n#\nF3\n\n\n³\n\n\n3", + { + "x": 10.5, + "fa": [ + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + "*\nF8\n\n\n\n\n\n¾\n\n8" + ], + [ + { + "y": -0.87, + "x": 2.5 + }, + "\n\n@\nF2\n\n\n²\n\n\n2", + { + "x": 1, + "fa": [ + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + "¤\n\n$\nF4\n\n\n£\n\n\n4", + { + "x": 8.5, + "fa": [ + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + "&\nF7\n\n\n\n\n\n½\n\n7", + { + "x": 1 + }, + "(\nF9\n\n\n\n\n\n‘\n\n9" + ], + [ + { + "y": -0.8699999999999999, + "x": 5.5 + }, + "\n\n%\nF5\n\n\n€\n\n\n5", + "\n\n_\nF11\n\n\n¥\n\n\n-", + { + "x": 4.5, + "fa": [ + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + "+\nF12\n÷\n\n\n\n\n×\n\n=", + "^\nF6\n\n\n\n\n\n¼\n\n6" + ], + [ + { + "y": -0.88, + "c": "#605d57", + "t": "#FFF8E7", + "a": 7, + "w": 1.5 + }, + "ESCAPE", + { + "c": "#FFF8E7", + "t": "#403e3a", + "a": 4, + "fa": [ + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + "¡\n\n!\nF1\n\n\n¹\n\n\n1", + { + "x": 14.5, + "fa": [ + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + ")\nF10\n\n/\n\n\n\n’\n\n0", + { + "c": "#605d57", + "t": "#FFF8E7", + "a": 7, + "w": 1.5 + }, + "SYSREQ" + ], + [ + { + "y": -0.3799999999999999, + "x": 3.5, + "c": "#993300", + "a": 4 + }, + "\n\n\n↑\n\n\né\n\n\nE", + { + "x": 10.5, + "c": "#FFF8E7", + "t": "#403e3a" + }, + "\n\n\n5\n\n\n\ní\n\nI" + ], + [ + { + "y": -0.8700000000000001, + "x": 2.5, + "a": 6, + "fa": [ + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 7 + ] + }, + "å\n\n\n\n\n\n\n\nW", + { + "x": 1 + }, + "®\n\n\n\n\n\n\n\nR", + { + "x": 8.5, + "a": 4, + "fa": [ + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 7, + 7, + 0 + ] + }, + "\n\n\n4\n\n\n\nú\n\nU", + { + "x": 1 + }, + "\n\n\n6\n\n\n\nó\n\nO" + ], + [ + { + "y": -0.8699999999999999, + "x": 5.5, + "a": 6 + }, + "þ\n\n\n\n\n\n\n\nT", + { + "c": "#605d57", + "t": "#FFF8E7", + "a": 7, + "f": 3, + "h": 1.5 + }, + "HOME", + { + "x": 4.5, + "f": 3, + "h": 1.5 + }, + "PAGE UP", + { + "c": "#FFF8E7", + "t": "#403e3a", + "a": 6, + "fa": [ + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 7 + ] + }, + "\n\nü\n\n\n\n\n\nY" + ], + [ + { + "y": -0.8799999999999999, + "c": "#605d57", + "t": "#FFF8E7", + "a": 4, + "w": 1.5 + }, + "\n\n\nBREAK\n\n\n\n\n\nDELETE", + { + "c": "#FFF8E7", + "t": "#403e3a", + "a": 6 + }, + "ä\n\n\n\n\n\n\n\nQ", + { + "x": 14.5, + "a": 4, + "fa": [ + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 7, + 7, + 0 + ] + }, + "\n\n\n×\n\n\n\nö\n\nP", + { + "c": "#605d57", + "t": "#FFF8E7", + "fa": [ + 1, + 1 + ], + "w": 1.5 + }, + "\nINSERT\n\n\n\n\n\n\n\nBCKSPC" + ], + [ + { + "y": -0.3799999999999999, + "x": 3.5, + "c": "#993300", + "fa": [ + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 7, + 0 + ] + }, + "Ð\n\n\n↓\n\n\nð\n\n\nD", + { + "x": 10.5, + "c": "#FFF8E7", + "t": "#403e3a" + }, + "\n\n\n2\n\n\n\n\n\nK" + ], + [ + { + "y": -0.8700000000000001, + "x": 2.5, + "c": "#993300", + "t": "#FFF8E7" + }, + "§\n\n\n←\n\n\nß\n\n\nS", + { + "x": 1 + }, + "\n\n\n→\n\n\n\n\n\nF", + { + "x": 8.5, + "c": "#FFF8E7", + "t": "#403e3a" + }, + "\n\n\n1\n\n\n\n\n\nJ", + { + "x": 1, + "fa": [ + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + "\n\n\n3\n\n\n\nø\n\nL" + ], + [ + { + "y": -0.8799999999999999, + "x": 5.5, + "a": 7, + "fa": [ + 7 + ] + }, + "G", + { + "x": 6.5 + }, + "H" + ], + [ + { + "y": -0.8700000000000001, + "c": "#605d57", + "t": "#FFF8E7", + "f": 3, + "w": 1.5 + }, + "TAB", + { + "c": "#FFF8E7", + "t": "#403e3a", + "a": 6, + "fa": [ + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 7 + ] + }, + "á\n\n\n\n\n\n\n\nA", + { + "x": 14.5, + "a": 4, + "fa": [ + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 7, + 7, + 0 + ] + }, + ":\n\n°\n-\n\n\n\n¶\n\n;", + { + "c": "#605d57", + "t": "#FFF8E7", + "a": 7, + "w": 1.5 + }, + "ENTER" + ], + [ + { + "y": -0.6299999999999999, + "x": 6.5, + "h": 1.5 + }, + "END", + { + "x": 4.5, + "h": 1.5 + }, + "PAGE DOWN" + ], + [ + { + "y": -0.75, + "x": 3.5, + "c": "#FFF8E7", + "t": "#403e3a", + "a": 4, + "fa": [ + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 7, + 7, + 0 + ] + }, + "¢\n\n\n\n\n\n©\n\n\nC", + { + "x": 10.5, + "fa": [ + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 7, + 7, + 0 + ] + }, + "<\n\n\n0\n\n\n\nç\n\n," + ], + [ + { + "y": -0.8700000000000001, + "x": 2.5, + "a": 7, + "fa": [ + 7 + ] + }, + "X", + { + "x": 1 + }, + "V", + { + "x": 8.5, + "a": 6, + "fa": [ + 7, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 7 + ] + }, + "\n\nµ\n\n\n\n\n\nM", + { + "x": 1, + "a": 4, + "fa": [ + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 7, + 7, + 0 + ] + }, + ">\n\n\n\n\n\n\n\n\n." + ], + [ + { + "y": -0.8799999999999999, + "x": 5.5, + "a": 7, + "fa": [ + 7 + ] + }, + "B", + { + "x": 6.5, + "a": 6, + "fa": [ + 7, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 7 + ] + }, + "\n\nñ\n\n\n\n\n\nN" + ], + [ + { + "y": -0.8700000000000001, + "c": "#403e3a", + "t": "#FFF8E7", + "a": 5, + "fa": [ + 1, + 0, + 1, + 0, + 0, + 0, + 7 + ], + "w": 1.5 + }, + "SHIFT\n\n\n\n\n\n(", + { + "c": "#FFF8E7", + "t": "#403e3a", + "a": 6, + "fa": [ + 1, + 0, + 1, + 0, + 0, + 0, + 7, + 0, + 7 + ] + }, + "æ\n\n\n\n\n\n\n\nZ", + { + "x": 14.5, + "a": 4, + "fa": [ + 0, + 0, + 1, + 1, + 0, + 0, + 7, + 1, + 7, + 7, + 0 + ] + }, + "?\n\n\n+\n\n\n\n¿\n\n/", + { + "c": "#403e3a", + "t": "#FFF8E7", + "a": 5, + "fa": [ + 1, + 0, + 1, + 1, + 0, + 0, + 7 + ], + "w": 1.5 + }, + "SHIFT\n\n\n\n\n\n)" + ], + [ + { + "y": -0.3799999999999999, + "x": 3.5, + "c": "#FFF8E7", + "t": "#403e3a", + "a": 4, + "fa": [ + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 7, + 0 + ] + }, + "¨\n\n\"\n\n\n\n´\n\n\n'", + { + "x": 10.5, + "fa": [ + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + "}\n\n\n\n\n\n\n»\n\n]" + ], + [ + { + "y": -0.8700000000000001, + "x": 2.5 + }, + "\n\n~\n\n\n\n\n\n\n`", + { + "x": 1, + "fa": [ + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + "¦\n\n|\n\n\n\n¬\n\n\n\\", + { + "x": 8.5, + "fa": [ + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + "{\n\n\n\n\n\n\n«\n\n[", + { + "x": 1, + "c": "#605d57", + "t": "#FFF8E7", + "a": 7 + }, + "PRNT SCRN" + ], + [ + { + "y": -0.75, + "x": 0.5, + "c": "#006699", + "a": 4, + "fa": [ + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ] + }, + "\n\n\nFLASH\n\n\n\n\nCTRL\nGUI", + { + "c": "#403e3a", + "a": 5, + "fa": [ + 1 + ] + }, + "CTL+SFT\n\n\n\n\n\nMENU", + { + "x": 14.5 + }, + "CTL+SFT\n\n\n\n\n\nMENU", + { + "c": "#006699", + "a": 4, + "fa": [ + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 1 + ] + }, + "\nFLASH\n\n\n\n\n\n\nCTRL\nGUI" + ], + [ + { + "r": 30, + "rx": 6.5, + "ry": 4.25, + "y": -1, + "x": 1, + "c": "#605d57", + "fa": [ + 1, + 1, + 0, + 1 + ] + }, + "\n\n\nKBDBRT-\n\n\n\n\n\nVOL-", + "\n\n\nKBDBRT+\n\n\n\n\n\nVOL+" + ], + [ + { + "c": "#FFF8E7", + "t": "#403e3a", + "a": 5, + "h": 2 + }, + "ALT", + { + "c": "#403e3a", + "t": "#FFF8E7", + "a": 7, + "f": 3, + "h": 2 + }, + "FN", + { + "c": "#605d57", + "f": 3 + }, + "MUTE" + ], + [ + { + "x": 2, + "c": "#403e3a", + "a": 5 + }, + "ALTGR\n\n\n\n\n\nLDR" + ], + [ + { + "r": -30, + "rx": 13, + "y": -1, + "x": -3, + "c": "#605d57", + "a": 4 + }, + "\n\n\nKBDBRT-\n\n\n\n\n\nBRT-", + "\n\n\nKBDBRT+\n\n\n\n\n\nBRT+" + ], + [ + { + "x": -3, + "a": 7, + "f": 3 + }, + "NUM LOCK", + { + "c": "#403e3a", + "f": 3, + "h": 2 + }, + "FN", + { + "c": "#FFF8E7", + "t": "#403e3a", + "a": 5, + "h": 2 + }, + "ALT" + ], + [ + { + "x": -3, + "c": "#403e3a", + "t": "#FFF8E7" + }, + "ALTGR\n\n\n\n\n\nLDR" + ] +] \ No newline at end of file diff --git a/keyboards/ergodox/keymaps/familiar/familiar.png b/keyboards/ergodox/keymaps/familiar/familiar.png new file mode 100644 index 0000000000000000000000000000000000000000..4d61846eb89d9a8f0a0cfde1359de0338e2735db GIT binary patch literal 102059 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 + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PanningHold down Scroll Wheel to pan with mouseUp/Down - Scroll WheelLeft/Right - Shift + Scroll WheelZooming- Ctrl + Scroll View to zoom in/out- Press 1, 2, 4, or 5 for preset zoom views.Zoom Tool (F3) :- Left click to zoom in- Right click to zoom out + + + Keyboards + + + + + + + + + To avoid delays and errors in your order you must convert all of your fonts and text to vector data + This layout is used for your legends only. Keycap colors need to be defined with the online designer tool.Please check out our online tutorials at support.wasdkeyboards.comfor help and instructions regarding layout creation. + + + Quick Start:1. Enable Layers by going to: Layer > Layers (Ctrl + Shift + L) *The layers window can be expanded by dragging the area under the opacity slider.2. Use the Eyeball Icons to toggle visibility for preset layers3. Use the Select tool to move and scale objects (F1)4. Use the Text Tool to add and edit text (F8) + + Managing Layers1. Enable Layers by pressing Ctrl + Shift + L2. The Layer window can be enlarged by dragging thearea under the Opacity slider.3. Use the Eyeball Icon to toggle layer visibility.4. Use the Lock Icon to toggle the ability to edit layer.5. To add a layer, use the button from Layers panel. + + + Manipulating ObjectsThe Select Tool (F1) allows you to select and move,scale, and delete objects. Select an object, then drag the object to move it. You can drag the arrows around the object to scale it.Holding Ctrl while moving will keep the object locked onthe same X or Y axis. Holding Ctrl while scaling will keep the size ratio locked. + Inkscape Tutorial + FAQ (Frequently Asked Questions)I can't see any layers, I just see one layer or no layers when I open the layers panel.This happens when you drag and drop the layout file into Inkscape which "imports" it instead of opening it. Please close your Inkscape window, go back to the original file, right click it and choose "edit with Inkscape". What are the grids for on the layout? Can I place objects outside the grid?Yes. The grids are for reference only. You can snap the grids to use our standard margins. You can print all the way to the edge of the frame. There is a +/-0.01" tolerance, so we suggest that you stay within the grids when possible.Can I put a graphic that spans over multiple keys? Yes. Large images will be cropped to the top face of the keys. The areas in between the keys will not be printed.Advanced users can use a clipping mask to get a better idea of what the final image will look like.How can I change the color of the printing?We have tutorials in our support center that can show you how to add colors to your text and images.Go to support.wasdkeyboards.comI want to edit the Mac-style layouts, but the text is not editable.The Mac layout text is not editable since the font is not common. The font used is VAG Rounded-Light. + Adding text1. Click on the Text Tool (F8)2. Click on the area where you want add text3. Type your text4. Font and size and can changed in the text toolbar5. Use the Select Tool (F1) to reposition thetext if necessary. + + + + Editing font type and size1. Use the Select Tool (F1) select the objects youwant to edit.2. Click on the Text Tool (F8)3. Use the text toolbar to change font type and text size + + + + + Editing textUse the Select Tool (F1) and double click a singletext object.-or-Use the Text Tool (F8) and click on a single text object. + + + + Adding stock artworkCommonly used icons and symbols are available within the file.1. Turn on the visibility of the layer titled: "Stock Artwork"2. Use the Select Tool (F1) to select the object you want to use.3. Press Ctrl + C to copy4. Select the layer you want to paste the object to, then press Ctrl + V5. You can then use the Select Tool (F1) to move and/or scale the object to proper size. See "Snapping" for tips on aligning objects. + Adding custom artNormal graphics can be added into the file, but you must convert thegraphic to a path.1. Copy the graphic from another program. (Usually Right Click > Copy)2. Select the layer you want to paste the graphic to, then press Ctrl + V-or-1. File > Import (Ctrl + I) and select the file you want to import.2. Select the Embed option and click OK.3. Select the graphic, and goto Path > Trace Bitmap (Shift + Alt + B)4. Make sure your graphic is selected, then select a Scan option andclick OK. The graphic will be traced, and will overlay the original object.5. Move the new object into position and delete the original image. + + + SnappingEnabling snapping allows you to snap objects at various reference points of other objects which will allow you to quickly and accurately align objects to each other.Make sure Snap Controls Toolbar is displayed on the right hand side. (View > Show/Hide > Snap Controls Bar)Make sure Snapping is enabled (Toggle with "%")Hover over the various points to see what snappingare available. You can turn each one on/off.Drag objects over other objects to snap. You may need to zoom in or out to snap to certain objects. Turning off irrelevant points will also make it easier to snap. + + Copy and PasteCtrl + C: Copy objectCtrl + V: Paste objectCtrl + Alt + V: Paste in placeShift + Ctrl + V: Paste style + Guide LinesYou can use Guides to help align objects. Click and drag from the rulerson the edge of the document.Enable snapping to guides in the Snap Control Bar You can Show/Hide Guides by going to View > Guides + + + WASD Keyboards 104/87-Key Design Template + IMPORTANT: + Before saving and uploading your file: select all of your text; go to Path > Object to Path (Ctrl+Shift+C) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/keyboards/ergodox/keymaps/familiar/familiar_stick.svg b/keyboards/ergodox/keymaps/familiar/familiar_stick.svg new file mode 100644 index 00000000..18ec937e --- /dev/null +++ b/keyboards/ergodox/keymaps/familiar/familiar_stick.svg @@ -0,0 +1,7592 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PanningHold down Scroll Wheel to pan with mouseUp/Down - Scroll WheelLeft/Right - Shift + Scroll WheelZooming- Ctrl + Scroll View to zoom in/out- Press 1, 2, 4, or 5 for preset zoom views.Zoom Tool (F3) :- Left click to zoom in- Right click to zoom out + + + Keyboards + + + + + + + + + To avoid delays and errors in your order you must convert all of your fonts and text to vector data + This layout is used for your legends only. Keycap colors need to be defined with the online designer tool.Please check out our online tutorials at support.wasdkeyboards.comfor help and instructions regarding layout creation. + + + Quick Start:1. Enable Layers by going to: Layer > Layers (Ctrl + Shift + L) *The layers window can be expanded by dragging the area under the opacity slider.2. Use the Eyeball Icons to toggle visibility for preset layers3. Use the Select tool to move and scale objects (F1)4. Use the Text Tool to add and edit text (F8) + + Managing Layers1. Enable Layers by pressing Ctrl + Shift + L2. The Layer window can be enlarged by dragging thearea under the Opacity slider.3. Use the Eyeball Icon to toggle layer visibility.4. Use the Lock Icon to toggle the ability to edit layer.5. To add a layer, use the button from Layers panel. + + + Manipulating ObjectsThe Select Tool (F1) allows you to select and move,scale, and delete objects. Select an object, then drag the object to move it. You can drag the arrows around the object to scale it.Holding Ctrl while moving will keep the object locked onthe same X or Y axis. Holding Ctrl while scaling will keep the size ratio locked. + Inkscape Tutorial + FAQ (Frequently Asked Questions)I can't see any layers, I just see one layer or no layers when I open the layers panel.This happens when you drag and drop the layout file into Inkscape which "imports" it instead of opening it. Please close your Inkscape window, go back to the original file, right click it and choose "edit with Inkscape". What are the grids for on the layout? Can I place objects outside the grid?Yes. The grids are for reference only. You can snap the grids to use our standard margins. You can print all the way to the edge of the frame. There is a +/-0.01" tolerance, so we suggest that you stay within the grids when possible.Can I put a graphic that spans over multiple keys? Yes. Large images will be cropped to the top face of the keys. The areas in between the keys will not be printed.Advanced users can use a clipping mask to get a better idea of what the final image will look like.How can I change the color of the printing?We have tutorials in our support center that can show you how to add colors to your text and images.Go to support.wasdkeyboards.comI want to edit the Mac-style layouts, but the text is not editable.The Mac layout text is not editable since the font is not common. The font used is VAG Rounded-Light. + Adding text1. Click on the Text Tool (F8)2. Click on the area where you want add text3. Type your text4. Font and size and can changed in the text toolbar5. Use the Select Tool (F1) to reposition thetext if necessary. + + + + Editing font type and size1. Use the Select Tool (F1) select the objects youwant to edit.2. Click on the Text Tool (F8)3. Use the text toolbar to change font type and text size + + + + + Editing textUse the Select Tool (F1) and double click a singletext object.-or-Use the Text Tool (F8) and click on a single text object. + + + + Adding stock artworkCommonly used icons and symbols are available within the file.1. Turn on the visibility of the layer titled: "Stock Artwork"2. Use the Select Tool (F1) to select the object you want to use.3. Press Ctrl + C to copy4. Select the layer you want to paste the object to, then press Ctrl + V5. You can then use the Select Tool (F1) to move and/or scale the object to proper size. See "Snapping" for tips on aligning objects. + Adding custom artNormal graphics can be added into the file, but you must convert thegraphic to a path.1. Copy the graphic from another program. (Usually Right Click > Copy)2. Select the layer you want to paste the graphic to, then press Ctrl + V-or-1. File > Import (Ctrl + I) and select the file you want to import.2. Select the Embed option and click OK.3. Select the graphic, and goto Path > Trace Bitmap (Shift + Alt + B)4. Make sure your graphic is selected, then select a Scan option andclick OK. The graphic will be traced, and will overlay the original object.5. Move the new object into position and delete the original image. + + + SnappingEnabling snapping allows you to snap objects at various reference points of other objects which will allow you to quickly and accurately align objects to each other.Make sure Snap Controls Toolbar is displayed on the right hand side. (View > Show/Hide > Snap Controls Bar)Make sure Snapping is enabled (Toggle with "%")Hover over the various points to see what snappingare available. You can turn each one on/off.Drag objects over other objects to snap. You may need to zoom in or out to snap to certain objects. Turning off irrelevant points will also make it easier to snap. + + Copy and PasteCtrl + C: Copy objectCtrl + V: Paste objectCtrl + Alt + V: Paste in placeShift + Ctrl + V: Paste style + Guide LinesYou can use Guides to help align objects. Click and drag from the rulerson the edge of the document.Enable snapping to guides in the Snap Control Bar You can Show/Hide Guides by going to View > Guides + + + WASD Keyboards 104/87-Key Design Template + IMPORTANT: + Before saving and uploading your file: select all of your text; go to Path > Object to Path (Ctrl+Shift+C) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/keyboards/ergodox/keymaps/familiar/hntr.json b/keyboards/ergodox/keymaps/familiar/hntr.json new file mode 100644 index 00000000..c1aae552 --- /dev/null +++ b/keyboards/ergodox/keymaps/familiar/hntr.json @@ -0,0 +1,634 @@ +[ + { + "name": "Infinity ErgoDox - H.NT.R" + }, + [ + { + "x": 3.5, + "c": "#e3e2dd", + "t": "#525554", + "fa": [ + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 5 + ] + }, + "\n\n#\nF3\n\n\n\n\n\n3", + { + "x": 10.5, + "fa": [ + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 5 + ] + }, + "*\nF8\n\n\n\n\n\n\n\n8" + ], + [ + { + "y": -0.875, + "x": 2.5 + }, + "\n\n@\nF2\n\n\n\n\n\n2", + { + "x": 1 + }, + "\n\n$\nF4\n\n\n\n\n\n4", + { + "x": 8.5 + }, + "&\nF7\n\n\n\n\n\n\n\n7", + { + "x": 1 + }, + "(\nF9\n\n\n\n\n\n\n\n9" + ], + [ + { + "y": -0.875, + "x": 5.5 + }, + "\n\n%\nF5\n\n\n\n\n\n5", + "\n\n\nF11", + { + "x": 4.5 + }, + "\nF12", + "^\nF6\n\n\n\n\n\n\n\n6" + ], + [ + { + "y": -0.875, + "c": "#525554", + "t": "#e3e2dd", + "a": 7, + "f": 3, + "w": 1.5 + }, + "CYCLE LAYER", + { + "c": "#e3e2dd", + "t": "#525554", + "a": 4, + "f": 3 + }, + "\n\n!\nF1\n\n\n\n\n\n1", + { + "x": 14.5, + "f": 3 + }, + ")\nF10\n\n\n/\n\n\n\n\n0", + { + "c": "#525554", + "t": "#e3e2dd", + "a": 7, + "f": 3, + "w": 1.5 + }, + "CYCLE LAYER" + ], + [ + { + "y": -0.375, + "x": 3.5, + "c": "#c0472c", + "a": 4, + "fa": [ + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 5 + ] + }, + "\n\n\nPG UP\n▲\n\n\n\ne\nO", + { + "x": 10.5, + "c": "#e3e2dd", + "t": "#525554" + }, + "\n]\n\n\n5\n\n\n\ni\nL" + ], + [ + { + "y": -0.875, + "x": 2.5, + "a": 7, + "fa": [ + 5 + ] + }, + "W", + { + "x": 1, + "a": 5, + "fa": [ + 1, + 0, + 0, + 0, + 0, + 0, + 5 + ] + }, + "r\n\n\n\n\n\nU", + { + "x": 8.5, + "a": 4, + "fa": [ + 1, + 1, + 0, + 0, + 0, + 0, + 5, + 0, + 1, + 5 + ] + }, + "\n[\n\n\n4\n\n\n\nu\nD", + { + "x": 1 + }, + "\n?\n\n\n6\n\n\n\no\nG" + ], + [ + { + "y": -0.875, + "x": 5.5, + "a": 5 + }, + "t\n\n\n\n\n\nJ", + { + "a": 7, + "h": 1.5 + }, + "", + { + "x": 4.5, + "h": 1.5 + }, + "", + { + "a": 5 + }, + "y\n\n\n\n\n\nK" + ], + [ + { + "y": -0.875, + "c": "#525554", + "t": "#e3e2dd", + "a": 7, + "f": 3, + "w": 1.5 + }, + "DELETE", + { + "c": "#e3e2dd", + "t": "#525554", + "fa": [ + 5 + ] + }, + "Q", + { + "x": 14.5, + "a": 4, + "fa": [ + 5, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 5 + ] + }, + "\n|\n\n\n×\n\n\n\n\nP", + { + "c": "#525554", + "t": "#e3e2dd", + "a": 7, + "f": 3, + "w": 1.5 + }, + "⌫" + ], + [ + { + "y": -0.375, + "x": 3.5, + "c": "#c0472c", + "a": 4, + "fa": [ + 5, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 5 + ] + }, + "\n\n\nPG DN\n▼\n\n\n\nd\nE", + { + "x": 10.5, + "c": "#e3e2dd", + "t": "#525554" + }, + "\n)\n\n\n2\n\n\n\nk\nN" + ], + [ + { + "y": -0.875, + "x": 2.5, + "c": "#c0472c", + "t": "#e3e2dd" + }, + "\n\n\nHOME\n◀\n\n\n\ns\nI", + { + "x": 1 + }, + "\n\n\nEND\n▶\n\n\n\nf\nA", + { + "x": 8.5, + "c": "#e3e2dd", + "t": "#525554" + }, + "\n(\n\n\n1\n\n\n\nj\nH", + { + "x": 1 + }, + "\n/\n\n\n3\n\n\n\nl\nT" + ], + [ + { + "y": -0.875, + "x": 5.5, + "fa": [ + 5, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 5 + ] + }, + "\n\n:\n\n\n\n\n\ng\n;", + { + "x": 6.5, + "a": 5, + "fa": [ + 1, + 1, + 1, + 1, + 0, + 0, + 5 + ] + }, + "h\n\n\n\n\n\nF" + ], + [ + { + "y": -0.875, + "c": "#525554", + "t": "#e3e2dd", + "a": 7, + "f": 3, + "w": 1.5 + }, + "TAB", + { + "c": "#e3e2dd", + "t": "#525554", + "a": 5 + }, + "a\n\n\n\n\n\nS", + { + "x": 14.5, + "a": 4, + "fa": [ + 1, + 1, + 1, + 1, + 0, + 0, + 5, + 0, + 1, + 5 + ] + }, + "\n\\\n\n\n-\n\n\n\n;\nR", + { + "c": "#525554", + "t": "#e3e2dd", + "a": 7, + "f": 3, + "w": 1.5 + }, + "ENTER" + ], + [ + { + "y": -0.625, + "x": 6.5, + "c": "#e3e2dd", + "t": "#525554", + "h": 1.5 + }, + "", + { + "x": 4.5, + "h": 1.5 + }, + "" + ], + [ + { + "y": -0.75, + "x": 3.5, + "a": 4 + }, + "\n\n\n-\n\n\n\n\n\nC", + { + "x": 10.5 + }, + "<\n}\n\n\n.\n\n\n\n\n," + ], + [ + { + "y": -0.875, + "x": 2.5 + }, + "\n\n\n=\n\n\n\n\n\nX", + { + "x": 1 + }, + "\n\n\n—\n\n\n\n\n\nV", + { + "x": 8.5 + }, + "\n{\n\n\n0\n\n\n\n\nM", + { + "x": 1 + }, + ">\n~\n\n\nENTER\n\n\n\n\n." + ], + [ + { + "y": -0.875, + "x": 5.5 + }, + "\n\n\n_\n\n\n\n\nb\nY", + { + "x": 6.5, + "a": 5 + }, + "n\n\n\n\n\n\nB" + ], + [ + { + "y": -0.875, + "c": "#525554", + "t": "#e3e2dd", + "a": 7, + "f": 3, + "w": 1.5 + }, + "ALT", + { + "c": "#e3e2dd", + "t": "#525554", + "a": 4 + }, + "\n\n\n+\n\n\n\n\n\nZ", + { + "x": 14.5 + }, + "\"\n`\n\n\n+\n\n\n\n/\n'", + { + "c": "#525554", + "t": "#e3e2dd", + "a": 7, + "f": 3, + "w": 1.5 + }, + "ALT" + ], + [ + { + "y": -0.375, + "x": 3.5, + "f": 3 + }, + "END", + { + "x": 10.5, + "f": 3 + }, + "PAGE UP" + ], + [ + { + "y": -0.875, + "x": 2.5, + "f": 3 + }, + "HOME", + { + "x": 1, + "f": 3 + }, + "🔒2", + { + "x": 8.5, + "f": 3 + }, + "🔒3", + { + "x": 1, + "f": 3 + }, + "PAGE DOWN" + ], + [ + { + "y": -0.75, + "x": 0.5, + "c": "#0075ad", + "a": 4, + "fa": [ + 1, + 1, + 1, + 1, + 0, + 0, + 5, + 0, + 1, + 9 + ] + }, + "\n\n\nFLASH\n\n\n\n\n\nΑ", + { + "c": "#525554", + "a": 7, + "f": 3 + }, + "MENU", + { + "x": 14.5, + "f": 3 + }, + "MENU", + { + "c": "#0075ad", + "a": 4, + "f": 3 + }, + "\nFLASH\n\n\n\n\n\n\n\nΩ" + ], + [ + { + "y": 1.125, + "c": "#c0472c", + "fa": [ + 1, + 1, + 1, + 1, + 0, + 0, + 5, + 0, + 1, + 5 + ], + "w": 6 + }, + "SHIFTED\nLAYER 4\nSHIFTED\nLAYER 4\nLAYER 2 (LEFT) / LAYER 3 (RIGHT)\n\n\n\nqwerty (layer 1)\nMAIN LAYER" + ], + [ + { + "r": 30, + "rx": 6.5, + "ry": 4.25, + "y": -1, + "x": 1, + "c": "#525554", + "fa": [ + 1, + 1, + 1, + 1 + ] + }, + "\n\n\n🔅-\n\n\n\n\n\n🔉", + "\n\n\n🔆+\n\n\n\n\n\n🔊" + ], + [ + { + "a": 7, + "f": 3, + "h": 2 + }, + "SHIFT", + { + "f": 3, + "h": 2 + }, + "ƒ4", + { + "f": 3 + }, + "🔒1" + ], + [ + { + "x": 2, + "f": 3 + }, + "CTRL" + ], + [ + { + "r": -30, + "rx": 13, + "y": -1, + "x": -3, + "a": 4, + "f": 3 + }, + "\n🔅-\n\n\n\n\n\n\n\n🔅-", + { + "f": 3 + }, + "\n🔆+\n\n\n\n\n\n\n\n🔆+" + ], + [ + { + "x": -3, + "a": 7, + "f": 3 + }, + "🔒1", + { + "f": 3, + "h": 2 + }, + "ƒ4", + { + "c": "#e3e2dd", + "t": "#525554", + "h": 2 + }, + "" + ], + [ + { + "x": -3, + "c": "#525554", + "t": "#e3e2dd", + "f": 3 + }, + "CTRL" + ] +] \ No newline at end of file diff --git a/keyboards/ergodox/keymaps/familiar/hntr.png b/keyboards/ergodox/keymaps/familiar/hntr.png new file mode 100644 index 0000000000000000000000000000000000000000..519d152df5817293c100034d04ab31a6d6fd9cd5 GIT binary patch literal 77473 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ð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 literal 0 HcmV?d00001 From 474f7ee3fdbbd949f55d68d8f5b2387dcf746e0f Mon Sep 17 00:00:00 2001 From: nstickney Date: Thu, 23 Feb 2017 22:24:32 -0600 Subject: [PATCH 030/117] initial layer of familiar layout) --- keyboards/ergodox/keymaps/familiar/keymap.c | 104 +++++++++++++------- 1 file changed, 67 insertions(+), 37 deletions(-) diff --git a/keyboards/ergodox/keymaps/familiar/keymap.c b/keyboards/ergodox/keymaps/familiar/keymap.c index 7cd81a87..3688eb1f 100644 --- a/keyboards/ergodox/keymaps/familiar/keymap.c +++ b/keyboards/ergodox/keymaps/familiar/keymap.c @@ -3,42 +3,82 @@ #include "action_layer.h" #include "version.h" - -#include "keymap_german.h" - -#include "keymap_nordic.h" - - +#define BASE 0 // default layer +//#define FUNC 1 // function, media, arrow keys +//#define NUMP 2 // numpad +//#define INTL 3 // international symbols enum custom_keycodes { PLACEHOLDER = SAFE_RANGE, // can always be here EPRM, VRSN, - RGB_SLD, - + RGB_SLD }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [0] = KEYMAP(KC_ESCAPE,KC_1,KC_2,KC_3,KC_4,KC_5,KC_MINUS,KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_HOME,KC_TAB,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSPO,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_END,CTL_T(KC_LGUI),KC_APPLICATION,KC_GRAVE,KC_QUOTE,KC_BSLASH,KC_AUDIO_VOL_DOWN,KC_AUDIO_VOL_UP,KC_AUDIO_MUTE,ALT_T(KC_SPACE),MO(1),KC_RALT,KC_KP_PLUS,KC_6,KC_7,KC_8,KC_9,KC_0,KC_PSCREEN,KC_PGUP,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSPACE,KC_H,KC_J,KC_K,KC_L,KC_SCOLON,KC_ENTER,KC_PGDOWN,KC_N,KC_M,KC_COMMA,KC_DOT,KC_KP_SLASH,KC_RSPC,KC_LBRACKET,KC_RBRACKET,KC_TRANSPARENT,KC_APPLICATION,CTL_T(KC_RGUI),KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_RALT,MO(1),ALT_T(KC_SPACE)), - - [1] = KEYMAP(M(0),KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F11,KC_PAUSE,KC_TRANSPARENT,KC_TRANSPARENT,KC_UP,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LEFT,KC_DOWN,KC_RIGHT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PREV_TRACK,KC_MEDIA_STOP,KC_MEDIA_PLAY_PAUSE,KC_MEDIA_NEXT_TRACK,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_F12,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_INSERT,KC_LEFT,KC_DOWN,KC_UP,KC_RIGHT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT), - +/* Keymap 0: Basic layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | ESC | 1 | 2 | 3 | 4 | 5 | - | | = | 6 | 7 | 8 | 9 | 0 | SYSREQ | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | DEL | Q | W | E | R | T | HOME | | PGUP | Y | U | I | O | P | BKSP | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | TAB | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | + * |--------+------+------+------+------+------| END | | PGDN |------+------+------+------+------+--------| + * | (/LSFT | Z | X | C | V | B | | | | N | M | , | . | / | )/RSFT | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * |LGUI/LCTRL|MENU| ` | ' | CAPS | | [ | ] | \ |MENU|RGUI/RCTRL| + * `------------------------------------' `------------------------------------' + * ,-------------. ,-------------. + * | VOL- | VOL+ | | BRT- | BRT+ | + * ,------|------|------| |------+------+------. + * | ALT/ | | MUTE | | NUM | | ALT/ | + * | SPC | LAY1 |------| |------| LAY1 | SPC | + * | | | LAY3 | | LAY2 | | | + * `--------------------' `--------------------' + */ +// If it accepts an argument (i.e, is a function), it doesn't need KC_. +// Otherwise, it needs KC_* +[BASE] = KEYMAP( // layer 0 : default + // left hand + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, + KC_DEL, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_HOME, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, + KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_END, + KC_LCTL, KC_LGUI,KC_GRV, KC_QUOT,KC_CAPS, + KC_VOLD, KC_VOLU, + KC_MUTE, + ALT_T(KC_SPC), MO(BASE), MO(BASE), + // right hand + KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_SYSREQ, + KC_PGUP, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENTER, + KC_PGDN, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, + KC_LBRC, KC_RBRC, KC_BSLS, KC_RGUI, KC_RCTL, + KC_VOLD, KC_VOLU, + KC_NLCK, + TT(BASE), MO(BASE), ALT_T(KC_SPC) + ), }; const uint16_t PROGMEM fn_actions[] = { - [1] = ACTION_LAYER_TAP_TOGGLE(1) + [1] = ACTION_LAYER_TAP_TOGGLE(BASE) // FN1 - Momentary Layer 1 (Function Keys) }; -// leaving this in place for compatibilty with old keymaps cloned and re-compiled. const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { + // MACRODOWN only works in this function switch(id) { case 0: if (record->event.pressed) { SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); } break; + case 1: + if (record->event.pressed) { // For resetting EEPROM + eeconfig_init(); + } + break; } return MACRO_NONE; }; @@ -60,15 +100,23 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { break; case RGB_SLD: if (record->event.pressed) { - rgblight_mode(1); + #ifdef RGBLIGHT_ENABLE + rgblight_mode(1); + #endif } return false; break; - } return true; } +// Runs just one time when the keyboard initializes. +void matrix_init_user(void) { + +}; + + +// Runs constantly in the background, in a loop. void matrix_scan_user(void) { uint8_t layer = biton32(layer_state); @@ -78,33 +126,15 @@ void matrix_scan_user(void) { ergodox_right_led_2_off(); ergodox_right_led_3_off(); switch (layer) { + // TODO: Make this relevant to the ErgoDox EZ. case 1: ergodox_right_led_1_on(); break; case 2: ergodox_right_led_2_on(); break; - case 3: - ergodox_right_led_3_on(); - break; - case 4: - ergodox_right_led_1_on(); - ergodox_right_led_2_on(); - break; - case 5: - ergodox_right_led_1_on(); - ergodox_right_led_3_on(); - break; - case 6: - ergodox_right_led_2_on(); - ergodox_right_led_3_on(); - break; - case 7: - ergodox_right_led_1_on(); - ergodox_right_led_2_on(); - ergodox_right_led_3_on(); - break; default: + // none break; } From ebc6948e969f0785619a4caa6e0a9574388a6dab Mon Sep 17 00:00:00 2001 From: nstickney Date: Fri, 24 Feb 2017 17:11:19 -0600 Subject: [PATCH 031/117] first two layers of ErgoDox Familiar completeC --- keyboards/ergodox/keymaps/familiar/keymap.c | 68 +++++++++++++++++---- 1 file changed, 55 insertions(+), 13 deletions(-) diff --git a/keyboards/ergodox/keymaps/familiar/keymap.c b/keyboards/ergodox/keymaps/familiar/keymap.c index 3688eb1f..e68e77f7 100644 --- a/keyboards/ergodox/keymaps/familiar/keymap.c +++ b/keyboards/ergodox/keymaps/familiar/keymap.c @@ -4,7 +4,7 @@ #include "version.h" #define BASE 0 // default layer -//#define FUNC 1 // function, media, arrow keys +#define ARRW 1 // function, media, arrow keys //#define NUMP 2 // numpad //#define INTL 3 // international symbols @@ -16,53 +16,95 @@ enum custom_keycodes { }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +// If it accepts an argument (i.e, is a function), it doesn't need KC_. +// Otherwise, it needs KC_* /* Keymap 0: Basic layer * * ,--------------------------------------------------. ,--------------------------------------------------. * | ESC | 1 | 2 | 3 | 4 | 5 | - | | = | 6 | 7 | 8 | 9 | 0 | SYSREQ | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | DEL | Q | W | E | R | T | HOME | | PGUP | Y | U | I | O | P | BKSP | + * | DEL | Q | W | E | R | T | HOME | | PGUP | Y | U | I | O | P | BKSP | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| * | TAB | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | * |--------+------+------+------+------+------| END | | PGDN |------+------+------+------+------+--------| * | (/LSFT | Z | X | C | V | B | | | | N | M | , | . | / | )/RSFT | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * |LGUI/LCTRL|MENU| ` | ' | CAPS | | [ | ] | \ |MENU|RGUI/RCTRL| + * | LCTRL | LGUI | ` | ' |PRTSCR| | [ | ] | \ | RGUI | RCTRL | * `------------------------------------' `------------------------------------' * ,-------------. ,-------------. * | VOL- | VOL+ | | BRT- | BRT+ | * ,------|------|------| |------+------+------. - * | ALT/ | | MUTE | | NUM | | ALT/ | + * | ALT/ | | MUTE | | NUMLK| | ALT/ | * | SPC | LAY1 |------| |------| LAY1 | SPC | - * | | | LAY3 | | LAY2 | | | + * | | | LAY3 | |TTLAY2| | | * `--------------------' `--------------------' */ -// If it accepts an argument (i.e, is a function), it doesn't need KC_. -// Otherwise, it needs KC_* [BASE] = KEYMAP( // layer 0 : default // left hand KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, KC_DEL, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_HOME, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_END, - KC_LCTL, KC_LGUI,KC_GRV, KC_QUOT,KC_CAPS, - KC_VOLD, KC_VOLU, + KC_LCTL, KC_LGUI,KC_GRV, KC_QUOT,KC_PSCR, + KC_VOLD, KC_VOLU, KC_MUTE, - ALT_T(KC_SPC), MO(BASE), MO(BASE), + ALT_T(KC_SPC), MO(ARRW), TT(BASE), // right hand KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_SYSREQ, KC_PGUP, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENTER, KC_PGDN, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_LBRC, KC_RBRC, KC_BSLS, KC_RGUI, KC_RCTL, - KC_VOLD, KC_VOLU, + KC_VOLD, KC_VOLU, KC_NLCK, - TT(BASE), MO(BASE), ALT_T(KC_SPC) + TT(BASE), MO(ARRW), ALT_T(KC_SPC) + ), + +/* Keymap 0: Basic layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | F1 | F2 | F3 | F4 | F5 | F11 | | F12 | F6 | F7 | F8 | F9 | F10 | | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | | | UP | | | | | | | | | | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | | LEFT | DOWN |RIGHT | |------| |------| LEFT | DOWN | UP | RIGHT| | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | |M_PREV|M_STOP|M_PLPS|M_NEXT| | | | | | | | | | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | | | | | | | | | + * `------------------------------------' `------------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | | | + * | | |------| |------| | | + * | | | | | | | | + * `--------------------' `--------------------' + */ +[ARRW] = KEYMAP(// layer 1 : functions and arrows + // left hand + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, + KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, + // right hand + KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS ), }; const uint16_t PROGMEM fn_actions[] = { - [1] = ACTION_LAYER_TAP_TOGGLE(BASE) // FN1 - Momentary Layer 1 (Function Keys) + [1] = ACTION_LAYER_TAP_TOGGLE(ARRW) // FN1 - Momentary Layer 1 (Function Keys) }; const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) From b69b214d524bb658152c5b2491cb270b8464aeb4 Mon Sep 17 00:00:00 2001 From: nstickney Date: Sat, 25 Feb 2017 22:04:21 -0600 Subject: [PATCH 032/117] making numbers more familiar --- keyboards/ergodox/keymaps/familiar/keymap.c | 224 ++++++++++++-------- 1 file changed, 131 insertions(+), 93 deletions(-) diff --git a/keyboards/ergodox/keymaps/familiar/keymap.c b/keyboards/ergodox/keymaps/familiar/keymap.c index e68e77f7..e79e9610 100644 --- a/keyboards/ergodox/keymaps/familiar/keymap.c +++ b/keyboards/ergodox/keymaps/familiar/keymap.c @@ -5,8 +5,10 @@ #define BASE 0 // default layer #define ARRW 1 // function, media, arrow keys -//#define NUMP 2 // numpad -//#define INTL 3 // international symbols +#define NUMP 2 // numpad +#define INTL 3 // international symbols + +#define _______ KC_TRNS // Make the layouts easier to read enum custom_keycodes { PLACEHOLDER = SAFE_RANGE, // can always be here @@ -18,60 +20,60 @@ enum custom_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // If it accepts an argument (i.e, is a function), it doesn't need KC_. // Otherwise, it needs KC_* -/* Keymap 0: Basic layer +/* layer 0 : default * * ,--------------------------------------------------. ,--------------------------------------------------. - * | ESC | 1 | 2 | 3 | 4 | 5 | - | | = | 6 | 7 | 8 | 9 | 0 | SYSREQ | + * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 8 | 9 | 0 | - | = | BCKSPC | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | DEL | Q | W | E | R | T | HOME | | PGUP | Y | U | I | O | P | BKSP | + * | TAB | Q | W | E | R | T | HOME | | PGUP | Y | U | I | O | P | DELETE | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | TAB | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | + * | INSERT | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | * |--------+------+------+------+------+------| END | | PGDN |------+------+------+------+------+--------| * | (/LSFT | Z | X | C | V | B | | | | N | M | , | . | / | )/RSFT | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | LCTRL | LGUI | ` | ' |PRTSCR| | [ | ] | \ | RGUI | RCTRL | + * | LCTRL | LGUI | | ' |PRTSCR| | [ | ] | \ | RGUI | RCTRL | * `------------------------------------' `------------------------------------' * ,-------------. ,-------------. * | VOL- | VOL+ | | BRT- | BRT+ | * ,------|------|------| |------+------+------. * | ALT/ | | MUTE | | NUMLK| | ALT/ | * | SPC | LAY1 |------| |------| LAY1 | SPC | - * | | | LAY3 | |TTLAY2| | | + * | | | LAY3 | | LAY2 | | | * `--------------------' `--------------------' */ -[BASE] = KEYMAP( // layer 0 : default +[BASE] = KEYMAP( // left hand - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, - KC_DEL, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_HOME, - KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, - KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_END, - KC_LCTL, KC_LGUI,KC_GRV, KC_QUOT,KC_PSCR, - KC_VOLD, KC_VOLU, - KC_MUTE, - ALT_T(KC_SPC), MO(ARRW), TT(BASE), + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_HOME, + KC_INS, KC_A, KC_S, KC_D, KC_F, KC_G, + KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_END, + KC_LCTL, KC_LGUI, _______, KC_QUOT, KC_PSCR, + KC_VOLD, KC_VOLU, + KC_MUTE, + ALT_T(KC_SPC), MO(ARRW), TG(INTL), // right hand - KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_SYSREQ, - KC_PGUP, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENTER, - KC_PGDN, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, - KC_LBRC, KC_RBRC, KC_BSLS, KC_RGUI, KC_RCTL, + KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_PGUP, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, + KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENTER, + KC_PGDN, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, + KC_LBRC, KC_RBRC, KC_BSLS, KC_RGUI, KC_RCTL, KC_VOLD, KC_VOLU, KC_NLCK, - TT(BASE), MO(ARRW), ALT_T(KC_SPC) + TG(NUMP), MO(ARRW), ALT_T(KC_SPC) ), -/* Keymap 0: Basic layer +/* layer 1 : functions and arrows * * ,--------------------------------------------------. ,--------------------------------------------------. - * | | F1 | F2 | F3 | F4 | F5 | F11 | | F12 | F6 | F7 | F8 | F9 | F10 | | + * | SYSREQ | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | PAUSE | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * | | | | UP | | | | | | | | | | | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| * | | | LEFT | DOWN |RIGHT | |------| |------| LEFT | DOWN | UP | RIGHT| | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | |M_PREV|M_STOP|M_PLPS|M_NEXT| | | | | | | | | | | + * | |M_PREV|M_STOP|M_PLPS|M_NEXT| | | | | | | | | UP | | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | | | | | | | | | | | | + * | | | | | | | | | LEFT | DOWN | RIGHT | * `------------------------------------' `------------------------------------' * ,-------------. ,-------------. * | | | | | | @@ -81,83 +83,117 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | * `--------------------' `--------------------' */ -[ARRW] = KEYMAP(// layer 1 : functions and arrows +[ARRW] = KEYMAP( // left hand - KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, - KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, + KC_SYSREQ, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, + _______, _______, _______, KC_UP, _______, _______, _______, + _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, + _______, + _______, _______, _______, // right hand - KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS + KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PAUSE, + _______, _______, _______, _______, _______, _______, _______, + KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, + _______, _______, _______, _______, _______, KC_UP, _______, + _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, + _______, _______, + _______, + _______, _______, _______ ), -}; -const uint16_t PROGMEM fn_actions[] = { - [1] = ACTION_LAYER_TAP_TOGGLE(ARRW) // FN1 - Momentary Layer 1 (Function Keys) -}; +/* layer 2 : numberpad + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | | | | | | | | | | | | | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | | | | | |------| |------| | | | | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | | | | | | | | | | | | | | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | | | | | | | | | + * `------------------------------------' `------------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | | | + * | | |------| |------| | | + * | | | | | | | | + * `--------------------' `--------------------' + */ +[NUMP] = KEYMAP( + // left hand + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, + _______, + _______, _______, _______, + // right hand + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, + _______, + _______, _______, _______ + ), -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - // MACRODOWN only works in this function - switch(id) { - case 0: - if (record->event.pressed) { - SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); - } - break; - case 1: - if (record->event.pressed) { // For resetting EEPROM - eeconfig_init(); - } - break; - } - return MACRO_NONE; +/* layer 3: International symbols, etc + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | | | | | | | | | | | | | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | | | | | |------| |------| | | | | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | | | | | | | | | | | | | | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | | | | | | | | | + * `------------------------------------' `------------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | | | + * | | |------| |------| | | + * | | | | | | | | + * `--------------------' `--------------------' + */ +[INTL] = KEYMAP( + // left hand + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, + _______, + _______, _______, _______, + // right hand + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, + _______, + _______, _______, _______ + ), }; -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - // dynamically generate these. - case EPRM: - if (record->event.pressed) { - eeconfig_init(); - } - return false; - break; - case VRSN: - if (record->event.pressed) { - SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); - } - return false; - break; - case RGB_SLD: - if (record->event.pressed) { - #ifdef RGBLIGHT_ENABLE - rgblight_mode(1); - #endif - } - return false; - break; - } - return true; -} - // Runs just one time when the keyboard initializes. void matrix_init_user(void) { }; - // Runs constantly in the background, in a loop. void matrix_scan_user(void) { @@ -168,13 +204,15 @@ void matrix_scan_user(void) { ergodox_right_led_2_off(); ergodox_right_led_3_off(); switch (layer) { - // TODO: Make this relevant to the ErgoDox EZ. case 1: ergodox_right_led_1_on(); break; case 2: ergodox_right_led_2_on(); break; + case 3: + ergodox_right_led_3_on(); + break; default: // none break; From 871ac5058acb413a3393a54cb5b33f0b52c630cf Mon Sep 17 00:00:00 2001 From: Xyverz Date: Sun, 26 Feb 2017 19:45:57 -0800 Subject: [PATCH 033/117] Minor changes to the keymap: Moved thumb-cluster ESC to Media and Keypad layers --- keyboards/kinesis/keymaps/xyverz/keymap.c | 30 +++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/keyboards/kinesis/keymaps/xyverz/keymap.c b/keyboards/kinesis/keymaps/xyverz/keymap.c index f3184c14..39b835b5 100644 --- a/keyboards/kinesis/keymaps/xyverz/keymap.c +++ b/keyboards/kinesis/keymaps/xyverz/keymap.c @@ -46,7 +46,7 @@ extern keymap_config_t keymap_config; | ` | INS | Left | Rght | | Up | Dn | / | = | `---------------------------' `---------------------------' ,--------------.,--------------. - |Ctr/ESC| LAlt || RGUI |Ctr/ESC| + | LCtl | LAlt || RGUI | RCtl | ,------|-------|------||------+-------+-------. | | Del | Home || PgUp | Enter | | | BkSp | / |------||------| / | Space | @@ -66,7 +66,7 @@ extern keymap_config_t keymap_config; | ` | INS | Left | Rght | | Up | Dn | [ | ] | `---------------------------' `---------------------------' ,--------------.,--------------. - |Ctr/ESC| LAlt || RGUI |Ctr/ESC| + | LCtl | LAlt || RGUI | RCtl | ,------|-------|------||------+-------+-------. | | Del | Home || PgUp | Enter | | | BkSp | / |------||------| / | Space | @@ -86,7 +86,7 @@ extern keymap_config_t keymap_config; | ` | INS | Left | Rght | | Up | Dn | [ | ] | `---------------------------' `---------------------------' ,--------------.,--------------. - |Ctr/ESC| LAlt || RGUI |Ctr/ESC| + | LCtl | LAlt || RGUI | RCtl | ,------|-------|------||------+-------+-------. | | Del | Home || PgUp | Enter | | | BkSp | / |------||------| / | Space | @@ -106,7 +106,7 @@ extern keymap_config_t keymap_config; | | | | | | | | | | `---------------------------' `---------------------------' ,-------------.,-------------. - | | || | | + | ESC | || | ESC | ,------|------|------||------+------+------. | | | || | | | | | |------||------| | | @@ -126,7 +126,7 @@ extern keymap_config_t keymap_config; | | | | | | | | KP . |KP Ent| | `---------------------------' `----------------------------------' ,-------------.,-------------. - | | || | | + | ESC | || | ESC | ,------|------|------||------+------+------. | | | || | | | | | |------||------| | KP 0 | @@ -145,7 +145,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_GRV, KC_INS, KC_LEFT, KC_RGHT, // Left Thumb - CTL_T(KC_ESC), KC_LALT, + KC_LCTL, KC_LALT, KC_HOME, KC_BSPC, LT(_MD, KC_DEL), KC_END, @@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, KC_UP, KC_DOWN, KC_SLSH, KC_EQL, // Right Thumb - KC_RGUI, CTL_T(KC_ESC), + KC_RGUI, KC_RCTL, KC_PGUP, KC_PGDN, LT(_KP, KC_ENT), KC_SPC ), @@ -171,7 +171,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_GRV, KC_INS, KC_LEFT, KC_RGHT, // Left Thumb - CTL_T(KC_ESC), KC_LALT, + KC_LCTL, KC_LALT, KC_HOME, KC_BSPC, LT(_MD, KC_DEL), KC_END, @@ -183,7 +183,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DOWN, KC_LBRC, KC_RBRC, // Right Thumb - KC_RGUI, CTL_T(KC_ESC), + KC_RGUI, KC_RCTL, KC_PGUP, KC_PGDN, LT(_KP, KC_ENT), KC_SPC ), @@ -197,7 +197,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_GRV, KC_INS, KC_LEFT, KC_RGHT, // Left Thumb - CTL_T(KC_ESC), KC_LALT, + KC_LCTL, KC_LALT, KC_HOME, KC_BSPC, LT(_MD, KC_DEL), KC_END, @@ -209,7 +209,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DOWN, KC_LBRC, KC_RBRC, // Right Thumb - KC_RGUI, CTL_T(KC_ESC), + KC_RGUI, KC_RCTL, KC_PGUP, KC_PGDN, LT(_KP, KC_ENT), KC_SPC ), @@ -223,7 +223,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, // Left Thumb - _______, _______, + KC_ESC, _______, _______, _______, _______, _______, @@ -235,7 +235,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSEL, _______, _______, _______, _______, _______, // Right Thumb - _______, _______, + _______, KC_ESC, _______, _______, _______, _______ ), @@ -249,7 +249,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, // Left Thumb - _______, _______, + KC_ESC, _______, _______, _______, _______, _______, @@ -261,7 +261,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______, _______, _______, KC_PDOT, KC_PENT, // Right Thumb - _______, _______, + _______, KC_ESC, _______, _______, _______, KC_P0 ) From d91e09f1169ebe7611f41f3a1a80151f18ee9247 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Sun, 26 Feb 2017 19:49:10 -0800 Subject: [PATCH 034/117] Updates to the README.md --- keyboards/kinesis/keymaps/xyverz/readme.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/kinesis/keymaps/xyverz/readme.md b/keyboards/kinesis/keymaps/xyverz/readme.md index 11aedec5..cfd631a5 100644 --- a/keyboards/kinesis/keymaps/xyverz/readme.md +++ b/keyboards/kinesis/keymaps/xyverz/readme.md @@ -34,7 +34,7 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t | ` | INS | Left | Rght | | Up | Dn | / | = | `---------------------------' `---------------------------' ,--------------.,--------------. - |Ctr/ESC| LAlt || RGUI |Ctr/ESC| + | LCtl | LAlt || RGUI | RCtl | ,------|-------|------||------+-------+-------. | | Del | Home || PgUp | Enter | | | BkSp | / |------||------| / | Space | @@ -55,7 +55,7 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t | ` | INS | Left | Rght | | Up | Dn | [ | ] | `---------------------------' `---------------------------' ,--------------.,--------------. - |Ctr/ESC| LAlt || RGUI |Ctr/ESC| + | LCtl | LAlt || RGUI | RCtl | ,------|-------|------||------+-------+-------. | | Del | Home || PgUp | Enter | | | BkSp | / |------||------| / | Space | @@ -76,7 +76,7 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t | ` | INS | Left | Rght | | Up | Dn | [ | ] | `---------------------------' `---------------------------' ,--------------.,--------------. - |Ctr/ESC| LAlt || RGUI |Ctr/ESC| + | LCtl | LAlt || RGUI | RCtl | ,------|-------|------||------+-------+-------. | | Del | Home || PgUp | Enter | | | BkSp | / |------||------| / | Space | @@ -97,7 +97,7 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t | | | | | | | | | | `---------------------------' `---------------------------' ,-------------.,-------------. - | | || | | + | ESC | || | ESC | ,------|------|------||------+------+------. | | | || | | | | | |------||------| | | @@ -120,7 +120,7 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t | | | | | | | | KP . |KP Ent| | `---------------------------' `----------------------------------' ,-------------.,-------------. - | | || | | + | ESC | || | ESC | ,------|------|------||------+------+------. | | | || | | | | | |------||------| | KP 0 | From 68808b22c09c020e33287480fc9c1ed9f42af059 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Fri, 3 Mar 2017 19:27:24 -0800 Subject: [PATCH 035/117] Final tweaks to my Kinesis keymap and readme --- keyboards/kinesis/keymaps/xyverz/keymap.c | 21 ++++++--------------- keyboards/kinesis/keymaps/xyverz/readme.md | 14 +++++++------- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/keyboards/kinesis/keymaps/xyverz/keymap.c b/keyboards/kinesis/keymaps/xyverz/keymap.c index 39b835b5..62f47773 100644 --- a/keyboards/kinesis/keymaps/xyverz/keymap.c +++ b/keyboards/kinesis/keymaps/xyverz/keymap.c @@ -19,10 +19,6 @@ extern keymap_config_t keymap_config; #define _______ KC_TRNS #define XXXXXXX KC_NO -// Fillers to make layering more clear -#define _______ KC_TRNS -#define XXXXXXX KC_NO - /* Function Keys on All Layers (Keypad toggles): @@ -106,7 +102,7 @@ extern keymap_config_t keymap_config; | | | | | | | | | | `---------------------------' `---------------------------' ,-------------.,-------------. - | ESC | || | ESC | + | | || | | ,------|------|------||------+------+------. | | | || | | | | | |------||------| | | @@ -126,7 +122,7 @@ extern keymap_config_t keymap_config; | | | | | | | | KP . |KP Ent| | `---------------------------' `----------------------------------' ,-------------.,-------------. - | ESC | || | ESC | + | | || | | ,------|------|------||------+------+------. | | | || | | | | | |------||------| | KP 0 | @@ -223,7 +219,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, // Left Thumb - KC_ESC, _______, + _______, _______, _______, _______, _______, _______, @@ -235,7 +231,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSEL, _______, _______, _______, _______, _______, // Right Thumb - _______, KC_ESC, + _______, _______, _______, _______, _______, _______ ), @@ -249,7 +245,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, // Left Thumb - KC_ESC, _______, + _______, _______, _______, _______, _______, _______, @@ -261,7 +257,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______, _______, _______, KC_PDOT, KC_PENT, // Right Thumb - _______, KC_ESC, + _______, _______, _______, _______, _______, KC_P0 ) @@ -304,8 +300,3 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) void matrix_init_user(void) { }; - -// Runs constantly in the background, in a loop. -void matrix_scan_user(void) { - -}; diff --git a/keyboards/kinesis/keymaps/xyverz/readme.md b/keyboards/kinesis/keymaps/xyverz/readme.md index cfd631a5..a10d7c2b 100644 --- a/keyboards/kinesis/keymaps/xyverz/readme.md +++ b/keyboards/kinesis/keymaps/xyverz/readme.md @@ -14,10 +14,10 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t ### Function Keys on All Layers (keypad toggles): ,-----------------------------------------------------------------. - | ESC | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | + | Esc | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | `-----------------------------------------------------------------' ,-----------------------------------------------------------------. - | F9 | F10 | F11 | F12 | PScr | SLck | Paus | Keypad | RESET | + | F9 | F10 | F11 | F12 | PScr | SLck | Paus | Keypad | Reset | `-----------------------------------------------------------------' ### Layer 0: Dvorak layer @@ -31,7 +31,7 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t |--------+------+------+------+------+------||------+------+------+------+------+--------| | LShift | Z | X | C | V | X || B | M | W | V | Z | RShift | `--------+------+------+------+------+------'`------+------+------+------+------+--------' - | ` | INS | Left | Rght | | Up | Dn | / | = | + | ` | Ins | Left | Rght | | Up | Dn | / | = | `---------------------------' `---------------------------' ,--------------.,--------------. | LCtl | LAlt || RGUI | RCtl | @@ -52,7 +52,7 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t |--------+------+------+------+------+------||------+------+------+------+------+--------| | LShift | Z | X | C | V | B || N | M | , | . | / | RShift | `--------+------+------+------+------+------'`------+------+------+------+------+--------' - | ` | INS | Left | Rght | | Up | Dn | [ | ] | + | ` | Ins | Left | Rght | | Up | Dn | [ | ] | `---------------------------' `---------------------------' ,--------------.,--------------. | LCtl | LAlt || RGUI | RCtl | @@ -73,7 +73,7 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t |--------+------+------+------+------+------||------+------+------+------+------+--------| | LShift | Z | X | C | V | B || K | M | , | . | / | RShift | `--------+------+------+------+------+------'`------+------+------+------+------+--------' - | ` | INS | Left | Rght | | Up | Dn | [ | ] | + | ` | Ins | Left | Rght | | Up | Dn | [ | ] | `---------------------------' `---------------------------' ,--------------.,--------------. | LCtl | LAlt || RGUI | RCtl | @@ -97,7 +97,7 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t | | | | | | | | | | `---------------------------' `---------------------------' ,-------------.,-------------. - | ESC | || | ESC | + | | || | | ,------|------|------||------+------+------. | | | || | | | | | |------||------| | | @@ -120,7 +120,7 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t | | | | | | | | KP . |KP Ent| | `---------------------------' `----------------------------------' ,-------------.,-------------. - | ESC | || | ESC | + | | || | | ,------|------|------||------+------+------. | | | || | | | | | |------||------| | KP 0 | From fbbf618a46efad60da0724211145f9e9401b96b4 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Sun, 5 Mar 2017 03:48:10 -0800 Subject: [PATCH 036/117] Removed preceeding underscore from MASTER_RIGHT in config.h --- keyboards/lets_split/keymaps/xyverz/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/lets_split/keymaps/xyverz/config.h b/keyboards/lets_split/keymaps/xyverz/config.h index 87808a97..1b5be030 100644 --- a/keyboards/lets_split/keymaps/xyverz/config.h +++ b/keyboards/lets_split/keymaps/xyverz/config.h @@ -19,7 +19,7 @@ along with this program. If not, see . #define USE_SERIAL #define MASTER_LEFT -// #define _MASTER_RIGHT +// #define MASTER_RIGHT // #define EE_HANDS #ifdef SUBPROJECT_rev1 From 4880e72b77cd934dfc2e9ae4397bd7466ca002e5 Mon Sep 17 00:00:00 2001 From: nstickney Date: Tue, 7 Mar 2017 22:30:43 -0600 Subject: [PATCH 037/117] SLASH and WHACK functions added (based on algernon's CT_TA) --- keyboards/ergodox/config.h | 2 +- keyboards/ergodox/keymaps/familiar/Makefile | 5 + keyboards/ergodox/keymaps/familiar/config.h | 37 +++++ keyboards/ergodox/keymaps/familiar/keymap.c | 146 +++++++++++++++----- 4 files changed, 157 insertions(+), 33 deletions(-) create mode 100644 keyboards/ergodox/keymaps/familiar/Makefile create mode 100644 keyboards/ergodox/keymaps/familiar/config.h diff --git a/keyboards/ergodox/config.h b/keyboards/ergodox/config.h index 36185983..994a8c64 100644 --- a/keyboards/ergodox/config.h +++ b/keyboards/ergodox/config.h @@ -34,4 +34,4 @@ #endif -#endif /* KEYBOARDS_ERGODOX_CONFIG_H_ */ \ No newline at end of file +#endif /* KEYBOARDS_ERGODOX_CONFIG_H_ */ diff --git a/keyboards/ergodox/keymaps/familiar/Makefile b/keyboards/ergodox/keymaps/familiar/Makefile new file mode 100644 index 00000000..f795271f --- /dev/null +++ b/keyboards/ergodox/keymaps/familiar/Makefile @@ -0,0 +1,5 @@ +TAP_DANCE_ENABLE = yes + +ifndef QUANTUM_DIR + include ../../../../Makefile +endif diff --git a/keyboards/ergodox/keymaps/familiar/config.h b/keyboards/ergodox/keymaps/familiar/config.h new file mode 100644 index 00000000..994a8c64 --- /dev/null +++ b/keyboards/ergodox/keymaps/familiar/config.h @@ -0,0 +1,37 @@ +#ifndef KEYBOARDS_ERGODOX_CONFIG_H_ +#define KEYBOARDS_ERGODOX_CONFIG_H_ + +#define MOUSEKEY_INTERVAL 20 +#define MOUSEKEY_DELAY 0 +#define MOUSEKEY_TIME_TO_MAX 5 +#define MOUSEKEY_MAX_SPEED 2 +#define MOUSEKEY_WHEEL_DELAY 0 + +#define TAPPING_TOGGLE 1 + +/* define if matrix has ghost */ +//#define MATRIX_HAS_GHOST + +#define TAPPING_TERM 200 +#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* key combination for command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ + keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \ +) + +#ifdef SUBPROJECT_ez + #include "ez/config.h" +#endif +#ifdef SUBPROJECT_infinity + #include "infinity/config.h" +#endif + + +#endif /* KEYBOARDS_ERGODOX_CONFIG_H_ */ diff --git a/keyboards/ergodox/keymaps/familiar/keymap.c b/keyboards/ergodox/keymaps/familiar/keymap.c index e79e9610..c4ecdee5 100644 --- a/keyboards/ergodox/keymaps/familiar/keymap.c +++ b/keyboards/ergodox/keymaps/familiar/keymap.c @@ -8,13 +8,14 @@ #define NUMP 2 // numpad #define INTL 3 // international symbols -#define _______ KC_TRNS // Make the layouts easier to read +// Fillers to make layering more clear +#define _______ KC_TRNS +#define XXXXXXX KC_NO -enum custom_keycodes { - PLACEHOLDER = SAFE_RANGE, // can always be here - EPRM, - VRSN, - RGB_SLD +// Tap Dance Codes +enum { + SLASH, + WHACK, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -23,51 +24,51 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* layer 0 : default * * ,--------------------------------------------------. ,--------------------------------------------------. - * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 8 | 9 | 0 | - | = | BCKSPC | + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 8 | 9 | 0 | - | = | BCKSPC | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * | TAB | Q | W | E | R | T | HOME | | PGUP | Y | U | I | O | P | DELETE | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | INSERT | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | + * | NOOP | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | * |--------+------+------+------+------+------| END | | PGDN |------+------+------+------+------+--------| - * | (/LSFT | Z | X | C | V | B | | | | N | M | , | . | / | )/RSFT | + * | (/LSFT | Z | X | C | V | B | | | | N | M | , | . | UP | )/RSFT | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | LCTRL | LGUI | | ' |PRTSCR| | [ | ] | \ | RGUI | RCTRL | + * | LCTRL | LGUI | MENU | ' | NOOP | | [ | ] | LEFT | DOWN | RIGHT | * `------------------------------------' `------------------------------------' * ,-------------. ,-------------. - * | VOL- | VOL+ | | BRT- | BRT+ | + * |PRTSCR| ESC | | VOL- | VOL+ | * ,------|------|------| |------+------+------. - * | ALT/ | | MUTE | | NUMLK| | ALT/ | - * | SPC | LAY1 |------| |------| LAY1 | SPC | + * | ALT/ | | NUMLK| | MUTE | | ALT/ | + * | SPC | SLASH|------| |------|WHACK | SPC | * | | | LAY3 | | LAY2 | | | * `--------------------' `--------------------' */ [BASE] = KEYMAP( // left hand - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_HOME, - KC_INS, KC_A, KC_S, KC_D, KC_F, KC_G, + XXXXXXX, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_END, - KC_LCTL, KC_LGUI, _______, KC_QUOT, KC_PSCR, - KC_VOLD, KC_VOLU, - KC_MUTE, - ALT_T(KC_SPC), MO(ARRW), TG(INTL), + KC_LCTL, KC_LGUI, KC_MENU, KC_QUOT, XXXXXXX, + KC_INS, KC_ESC, + KC_NLCK, + ALT_T(KC_SPC), TD(SLASH), TG(INTL), // right hand KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENTER, - KC_PGDN, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, - KC_LBRC, KC_RBRC, KC_BSLS, KC_RGUI, KC_RCTL, + KC_PGDN, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_RSPC, + KC_LBRC, KC_RBRC, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD, KC_VOLU, - KC_NLCK, - TG(NUMP), MO(ARRW), ALT_T(KC_SPC) + KC_MUTE, + TG(NUMP), TD(WHACK), ALT_T(KC_SPC) ), /* layer 1 : functions and arrows * * ,--------------------------------------------------. ,--------------------------------------------------. - * | SYSREQ | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | PAUSE | + * | | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | | | UP | | | | | | | | | | | | + * | | | | UP | | | | | | | | | | | INSERT | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| * | | | LEFT | DOWN |RIGHT | |------| |------| LEFT | DOWN | UP | RIGHT| | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| @@ -76,26 +77,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | | LEFT | DOWN | RIGHT | * `------------------------------------' `------------------------------------' * ,-------------. ,-------------. - * | | | | | | + * |SYSREQ| PAUSE| | | | * ,------|------|------| |------+------+------. - * | | | | | | | | + * | | | SCRLK| | | | | * | | |------| |------| | | * | | | | | | | | * `--------------------' `--------------------' */ [ARRW] = KEYMAP( // left hand - KC_SYSREQ, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, - _______, + KC_SYSREQ, KC_PAUSE, + KC_SLCK, _______, _______, _______, // right hand - KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PAUSE, - _______, _______, _______, _______, _______, _______, _______, + KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, + _______, _______, _______, _______, _______, _______, KC_INS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, @@ -189,6 +190,87 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; +// See https://github.com/algernon/ergodox-layout/blob/master/keymap.c +// When holding the SLASH or WHACK key, the ARRW layer activates while the key is held. +// Tapping the key produces the / or \ key. Double-tapping it toggles the ARRW layer +// on until a third tap. + +typedef struct { + bool layer_toggle; + bool sticky; +} td_ta_state_t; + +static void ang_tap_dance_s_finished (qk_tap_dance_state_t *state, void *user_data) { + td_ta_state_t *td_ta = (td_ta_state_t *) user_data; + + if (td_ta->sticky) { + td_ta->sticky = false; + td_ta->layer_toggle = false; + layer_off (ARRW); + return; + } + + if (state->count == 1 && !state->pressed) { + register_code (KC_SLSH); + td_ta->sticky = false; + td_ta->layer_toggle = false; + } else { + td_ta->layer_toggle = true; + layer_on (ARRW); + td_ta->sticky = (state->count == 2); + } +} + +static void ang_tap_dance_s_reset (qk_tap_dance_state_t *state, void *user_data) { + td_ta_state_t *td_ta = (td_ta_state_t *) user_data; + + if (!td_ta->layer_toggle) + unregister_code (KC_SLSH); + if (!td_ta->sticky) + layer_off (ARRW); +} + +static void ang_tap_dance_w_finished (qk_tap_dance_state_t *state, void *user_data) { + td_ta_state_t *td_ta = (td_ta_state_t *) user_data; + + if (td_ta->sticky) { + td_ta->sticky = false; + td_ta->layer_toggle = false; + layer_off (ARRW); + return; + } + + if (state->count == 1 && !state->pressed) { + register_code (KC_BSLS); + td_ta->sticky = false; + td_ta->layer_toggle = false; + } else { + td_ta->layer_toggle = true; + layer_on (ARRW); + td_ta->sticky = (state->count == 2); + } +} + +static void ang_tap_dance_w_reset (qk_tap_dance_state_t *state, void *user_data) { + td_ta_state_t *td_ta = (td_ta_state_t *) user_data; + + if (!td_ta->layer_toggle) + unregister_code (KC_BSLS); + if (!td_ta->sticky) + layer_off (ARRW); +} + +qk_tap_dance_action_t tap_dance_actions[] = { + [SLASH] = { + .fn = { NULL, ang_tap_dance_s_finished, ang_tap_dance_s_reset }, + .user_data = (void *)&((td_ta_state_t) { false, false }) + }, + [WHACK] = { + .fn = { NULL, ang_tap_dance_w_finished, ang_tap_dance_w_reset }, + .user_data = (void *)&((td_ta_state_t) { false, false }) + } +}; + // Runs just one time when the keyboard initializes. void matrix_init_user(void) { From 29e7003fc22de30d0b467ff9263a3462c3970dd9 Mon Sep 17 00:00:00 2001 From: nstickney Date: Tue, 7 Mar 2017 22:31:14 -0600 Subject: [PATCH 038/117] SLASH and WHACK functions added (based on algernon's CT_TA) --- keyboards/ergodox/keymaps/familiar/config.h | 37 --------------------- 1 file changed, 37 deletions(-) delete mode 100644 keyboards/ergodox/keymaps/familiar/config.h diff --git a/keyboards/ergodox/keymaps/familiar/config.h b/keyboards/ergodox/keymaps/familiar/config.h deleted file mode 100644 index 994a8c64..00000000 --- a/keyboards/ergodox/keymaps/familiar/config.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef KEYBOARDS_ERGODOX_CONFIG_H_ -#define KEYBOARDS_ERGODOX_CONFIG_H_ - -#define MOUSEKEY_INTERVAL 20 -#define MOUSEKEY_DELAY 0 -#define MOUSEKEY_TIME_TO_MAX 5 -#define MOUSEKEY_MAX_SPEED 2 -#define MOUSEKEY_WHEEL_DELAY 0 - -#define TAPPING_TOGGLE 1 - -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - -#define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* key combination for command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ - keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \ -) - -#ifdef SUBPROJECT_ez - #include "ez/config.h" -#endif -#ifdef SUBPROJECT_infinity - #include "infinity/config.h" -#endif - - -#endif /* KEYBOARDS_ERGODOX_CONFIG_H_ */ From fa44e8d4dca234847548656f4f38bce14bf33b31 Mon Sep 17 00:00:00 2001 From: nstickney Date: Wed, 8 Mar 2017 16:26:45 -0600 Subject: [PATCH 039/117] corralled image files --- .../keymaps/familiar/{ => img}/HNTR.svg | 0 .../keymaps/familiar/{ => img}/familiar.json | 0 .../keymaps/familiar/{ => img}/familiar.png | Bin .../keymaps/familiar/{ => img}/familiar.svg | 0 .../familiar/{ => img}/familiar_stick.svg | 0 .../keymaps/familiar/{ => img}/hntr.json | 0 .../keymaps/familiar/{ => img}/hntr.png | Bin keyboards/ergodox/keymaps/familiar/keymap.c | 26 +++++++++--------- 8 files changed, 13 insertions(+), 13 deletions(-) rename keyboards/ergodox/keymaps/familiar/{ => img}/HNTR.svg (100%) rename keyboards/ergodox/keymaps/familiar/{ => img}/familiar.json (100%) rename keyboards/ergodox/keymaps/familiar/{ => img}/familiar.png (100%) rename keyboards/ergodox/keymaps/familiar/{ => img}/familiar.svg (100%) rename keyboards/ergodox/keymaps/familiar/{ => img}/familiar_stick.svg (100%) rename keyboards/ergodox/keymaps/familiar/{ => img}/hntr.json (100%) rename keyboards/ergodox/keymaps/familiar/{ => img}/hntr.png (100%) diff --git a/keyboards/ergodox/keymaps/familiar/HNTR.svg b/keyboards/ergodox/keymaps/familiar/img/HNTR.svg similarity index 100% rename from keyboards/ergodox/keymaps/familiar/HNTR.svg rename to keyboards/ergodox/keymaps/familiar/img/HNTR.svg diff --git a/keyboards/ergodox/keymaps/familiar/familiar.json b/keyboards/ergodox/keymaps/familiar/img/familiar.json similarity index 100% rename from keyboards/ergodox/keymaps/familiar/familiar.json rename to keyboards/ergodox/keymaps/familiar/img/familiar.json diff --git a/keyboards/ergodox/keymaps/familiar/familiar.png b/keyboards/ergodox/keymaps/familiar/img/familiar.png similarity index 100% rename from keyboards/ergodox/keymaps/familiar/familiar.png rename to keyboards/ergodox/keymaps/familiar/img/familiar.png diff --git a/keyboards/ergodox/keymaps/familiar/familiar.svg b/keyboards/ergodox/keymaps/familiar/img/familiar.svg similarity index 100% rename from keyboards/ergodox/keymaps/familiar/familiar.svg rename to keyboards/ergodox/keymaps/familiar/img/familiar.svg diff --git a/keyboards/ergodox/keymaps/familiar/familiar_stick.svg b/keyboards/ergodox/keymaps/familiar/img/familiar_stick.svg similarity index 100% rename from keyboards/ergodox/keymaps/familiar/familiar_stick.svg rename to keyboards/ergodox/keymaps/familiar/img/familiar_stick.svg diff --git a/keyboards/ergodox/keymaps/familiar/hntr.json b/keyboards/ergodox/keymaps/familiar/img/hntr.json similarity index 100% rename from keyboards/ergodox/keymaps/familiar/hntr.json rename to keyboards/ergodox/keymaps/familiar/img/hntr.json diff --git a/keyboards/ergodox/keymaps/familiar/hntr.png b/keyboards/ergodox/keymaps/familiar/img/hntr.png similarity index 100% rename from keyboards/ergodox/keymaps/familiar/hntr.png rename to keyboards/ergodox/keymaps/familiar/img/hntr.png diff --git a/keyboards/ergodox/keymaps/familiar/keymap.c b/keyboards/ergodox/keymaps/familiar/keymap.c index c4ecdee5..46069b0d 100644 --- a/keyboards/ergodox/keymaps/familiar/keymap.c +++ b/keyboards/ergodox/keymaps/familiar/keymap.c @@ -37,9 +37,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-------------. ,-------------. * |PRTSCR| ESC | | VOL- | VOL+ | * ,------|------|------| |------+------+------. - * | ALT/ | | NUMLK| | MUTE | | ALT/ | - * | SPC | SLASH|------| |------|WHACK | SPC | - * | | | LAY3 | | LAY2 | | | + * | ALT/ |SLASH/| NUMLK| | MUTE |WHACK/| ALT/ | + * | SPC |MO(1)/|------| |------|MO(1)/| SPC | + * | |TG(1) | LAY3 | | LAY2 |TG(1) | | * `--------------------' `--------------------' */ [BASE] = KEYMAP( @@ -72,9 +72,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| * | | | LEFT | DOWN |RIGHT | |------| |------| LEFT | DOWN | UP | RIGHT| | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | |M_PREV|M_STOP|M_PLPS|M_NEXT| | | | | | | | | UP | | + * | |M_PREV|M_STOP|M_PLPS|M_NEXT| | | | | | | | | PGUP | | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | | | | | | | | | LEFT | DOWN | RIGHT | + * | | | | | | | | | HOME | PGDN | END | * `------------------------------------' `------------------------------------' * ,-------------. ,-------------. * |SYSREQ| PAUSE| | | | @@ -98,8 +98,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, KC_INS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, - _______, _______, _______, _______, _______, KC_UP, _______, - _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, + _______, _______, _______, _______, _______, KC_PGUP, _______, + _______, _______, KC_HOME, KC_PGDN, KC_END, _______, _______, _______, _______, _______, _______ @@ -200,7 +200,7 @@ typedef struct { bool sticky; } td_ta_state_t; -static void ang_tap_dance_s_finished (qk_tap_dance_state_t *state, void *user_data) { +static void slash_finished (qk_tap_dance_state_t *state, void *user_data) { td_ta_state_t *td_ta = (td_ta_state_t *) user_data; if (td_ta->sticky) { @@ -221,7 +221,7 @@ static void ang_tap_dance_s_finished (qk_tap_dance_state_t *state, void *user_da } } -static void ang_tap_dance_s_reset (qk_tap_dance_state_t *state, void *user_data) { +static void slash_reset (qk_tap_dance_state_t *state, void *user_data) { td_ta_state_t *td_ta = (td_ta_state_t *) user_data; if (!td_ta->layer_toggle) @@ -230,7 +230,7 @@ static void ang_tap_dance_s_reset (qk_tap_dance_state_t *state, void *user_data) layer_off (ARRW); } -static void ang_tap_dance_w_finished (qk_tap_dance_state_t *state, void *user_data) { +static void whack_finished (qk_tap_dance_state_t *state, void *user_data) { td_ta_state_t *td_ta = (td_ta_state_t *) user_data; if (td_ta->sticky) { @@ -251,7 +251,7 @@ static void ang_tap_dance_w_finished (qk_tap_dance_state_t *state, void *user_da } } -static void ang_tap_dance_w_reset (qk_tap_dance_state_t *state, void *user_data) { +static void whack_reset (qk_tap_dance_state_t *state, void *user_data) { td_ta_state_t *td_ta = (td_ta_state_t *) user_data; if (!td_ta->layer_toggle) @@ -262,11 +262,11 @@ static void ang_tap_dance_w_reset (qk_tap_dance_state_t *state, void *user_data) qk_tap_dance_action_t tap_dance_actions[] = { [SLASH] = { - .fn = { NULL, ang_tap_dance_s_finished, ang_tap_dance_s_reset }, + .fn = { NULL, slash_finished, slash_reset }, .user_data = (void *)&((td_ta_state_t) { false, false }) }, [WHACK] = { - .fn = { NULL, ang_tap_dance_w_finished, ang_tap_dance_w_reset }, + .fn = { NULL, whack_finished, whack_reset }, .user_data = (void *)&((td_ta_state_t) { false, false }) } }; From 82cbe71bb52403f0c9cd23925c10cfdc97021919 Mon Sep 17 00:00:00 2001 From: nstickney Date: Wed, 8 Mar 2017 22:28:18 -0600 Subject: [PATCH 040/117] found LT(layer, kc) so I could take out TapDance code --- keyboards/ergodox/keymaps/familiar/Makefile | 5 - keyboards/ergodox/keymaps/familiar/keymap.c | 127 +++----------------- 2 files changed, 20 insertions(+), 112 deletions(-) delete mode 100644 keyboards/ergodox/keymaps/familiar/Makefile diff --git a/keyboards/ergodox/keymaps/familiar/Makefile b/keyboards/ergodox/keymaps/familiar/Makefile deleted file mode 100644 index f795271f..00000000 --- a/keyboards/ergodox/keymaps/familiar/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -TAP_DANCE_ENABLE = yes - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif diff --git a/keyboards/ergodox/keymaps/familiar/keymap.c b/keyboards/ergodox/keymaps/familiar/keymap.c index 46069b0d..34c48d5f 100644 --- a/keyboards/ergodox/keymaps/familiar/keymap.c +++ b/keyboards/ergodox/keymaps/familiar/keymap.c @@ -12,12 +12,6 @@ #define _______ KC_TRNS #define XXXXXXX KC_NO -// Tap Dance Codes -enum { - SLASH, - WHACK, -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // If it accepts an argument (i.e, is a function), it doesn't need KC_. // Otherwise, it needs KC_* @@ -28,30 +22,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * | TAB | Q | W | E | R | T | HOME | | PGUP | Y | U | I | O | P | DELETE | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | NOOP | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | + * | CLEAR | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | * |--------+------+------+------+------+------| END | | PGDN |------+------+------+------+------+--------| * | (/LSFT | Z | X | C | V | B | | | | N | M | , | . | UP | )/RSFT | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | LCTRL | LGUI | MENU | ' | NOOP | | [ | ] | LEFT | DOWN | RIGHT | + * | LCTRL | LGUI | MENU | ' | " | | [ | ] | LEFT | DOWN | RIGHT | * `------------------------------------' `------------------------------------' * ,-------------. ,-------------. * |PRTSCR| ESC | | VOL- | VOL+ | * ,------|------|------| |------+------+------. * | ALT/ |SLASH/| NUMLK| | MUTE |WHACK/| ALT/ | - * | SPC |MO(1)/|------| |------|MO(1)/| SPC | - * | |TG(1) | LAY3 | | LAY2 |TG(1) | | + * | SPC | MO(1)|------| |------|MO(1) | SPC | + * | | | LAY3 | | LAY2 | | | * `--------------------' `--------------------' */ [BASE] = KEYMAP( // left hand KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_HOME, - XXXXXXX, KC_A, KC_S, KC_D, KC_F, KC_G, + KC_CLEAR, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_END, - KC_LCTL, KC_LGUI, KC_MENU, KC_QUOT, XXXXXXX, + KC_LCTL, KC_LGUI, KC_MENU, KC_QUOT, S(KC_QUOT), KC_INS, KC_ESC, KC_NLCK, - ALT_T(KC_SPC), TD(SLASH), TG(INTL), + ALT_T(KC_SPC), LT(ARRW,KC_SLSH), TG(INTL), // right hand KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, @@ -60,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LBRC, KC_RBRC, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD, KC_VOLU, KC_MUTE, - TG(NUMP), TD(WHACK), ALT_T(KC_SPC) + TG(NUMP), LT(ARRW,KC_BSLS), ALT_T(KC_SPC) ), /* layer 1 : functions and arrows @@ -70,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * | | | | UP | | | | | | | | | | | INSERT | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | | LEFT | DOWN |RIGHT | |------| |------| LEFT | DOWN | UP | RIGHT| | | + * |CAPSLOCK| | LEFT | DOWN |RIGHT | |------| |------| LEFT | DOWN | UP | RIGHT| | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| * | |M_PREV|M_STOP|M_PLPS|M_NEXT| | | | | | | | | PGUP | | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' @@ -88,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // left hand _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, _______, _______, KC_UP, _______, _______, _______, - _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, + KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SYSREQ, KC_PAUSE, @@ -108,15 +102,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* layer 2 : numberpad * * ,--------------------------------------------------. ,--------------------------------------------------. - * | | | | | | | | | | | | | | | | + * | | | | | | | | | | | ( | ) | ÷ | × | | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | | | | | | | | | | | | | | | + * | | | | | | | | | | | 7 | 8 | 9 | - | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | | | | | |------| |------| | | | | | | + * | | | | | | |------| |------| | 4 | 5 | 6 | + | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | | | | | | | | | | | | | | | + * | | | | | | | | | | | 1 | 2 | 3 | = | | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | | | | | | | | | | | | + * | | | | | | | 0 | . | , | ENTER| | * `------------------------------------' `------------------------------------' * ,-------------. ,-------------. * | | | | | | @@ -137,11 +131,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, // right hand - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, + _______, _______, S(KC_9), S(KC_0), KC_PSLS, KC_PAST, _______, + _______, _______, KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS, _______, + _______, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, _______, + _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_PEQL, _______, + KC_KP_0, KC_KP_DOT, KC_PCMM, KC_PENT, _______, _______, _______, _______, _______, _______, _______ @@ -190,87 +184,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; -// See https://github.com/algernon/ergodox-layout/blob/master/keymap.c -// When holding the SLASH or WHACK key, the ARRW layer activates while the key is held. -// Tapping the key produces the / or \ key. Double-tapping it toggles the ARRW layer -// on until a third tap. - -typedef struct { - bool layer_toggle; - bool sticky; -} td_ta_state_t; - -static void slash_finished (qk_tap_dance_state_t *state, void *user_data) { - td_ta_state_t *td_ta = (td_ta_state_t *) user_data; - - if (td_ta->sticky) { - td_ta->sticky = false; - td_ta->layer_toggle = false; - layer_off (ARRW); - return; - } - - if (state->count == 1 && !state->pressed) { - register_code (KC_SLSH); - td_ta->sticky = false; - td_ta->layer_toggle = false; - } else { - td_ta->layer_toggle = true; - layer_on (ARRW); - td_ta->sticky = (state->count == 2); - } -} - -static void slash_reset (qk_tap_dance_state_t *state, void *user_data) { - td_ta_state_t *td_ta = (td_ta_state_t *) user_data; - - if (!td_ta->layer_toggle) - unregister_code (KC_SLSH); - if (!td_ta->sticky) - layer_off (ARRW); -} - -static void whack_finished (qk_tap_dance_state_t *state, void *user_data) { - td_ta_state_t *td_ta = (td_ta_state_t *) user_data; - - if (td_ta->sticky) { - td_ta->sticky = false; - td_ta->layer_toggle = false; - layer_off (ARRW); - return; - } - - if (state->count == 1 && !state->pressed) { - register_code (KC_BSLS); - td_ta->sticky = false; - td_ta->layer_toggle = false; - } else { - td_ta->layer_toggle = true; - layer_on (ARRW); - td_ta->sticky = (state->count == 2); - } -} - -static void whack_reset (qk_tap_dance_state_t *state, void *user_data) { - td_ta_state_t *td_ta = (td_ta_state_t *) user_data; - - if (!td_ta->layer_toggle) - unregister_code (KC_BSLS); - if (!td_ta->sticky) - layer_off (ARRW); -} - -qk_tap_dance_action_t tap_dance_actions[] = { - [SLASH] = { - .fn = { NULL, slash_finished, slash_reset }, - .user_data = (void *)&((td_ta_state_t) { false, false }) - }, - [WHACK] = { - .fn = { NULL, whack_finished, whack_reset }, - .user_data = (void *)&((td_ta_state_t) { false, false }) - } -}; - // Runs just one time when the keyboard initializes. void matrix_init_user(void) { From 9895e376e76ed528d042e6892a529ec448fea736 Mon Sep 17 00:00:00 2001 From: nstickney Date: Sun, 12 Mar 2017 14:51:33 -0500 Subject: [PATCH 041/117] added US-International support --- keyboards/ergodox/keymaps/familiar/Makefile | 1 + keyboards/ergodox/keymaps/familiar/keymap.c | 156 +++++++++++++------- 2 files changed, 104 insertions(+), 53 deletions(-) create mode 100644 keyboards/ergodox/keymaps/familiar/Makefile diff --git a/keyboards/ergodox/keymaps/familiar/Makefile b/keyboards/ergodox/keymaps/familiar/Makefile new file mode 100644 index 00000000..61c3c227 --- /dev/null +++ b/keyboards/ergodox/keymaps/familiar/Makefile @@ -0,0 +1 @@ +UNIS_ENABLE = yes diff --git a/keyboards/ergodox/keymaps/familiar/keymap.c b/keyboards/ergodox/keymaps/familiar/keymap.c index 34c48d5f..08640b9f 100644 --- a/keyboards/ergodox/keymaps/familiar/keymap.c +++ b/keyboards/ergodox/keymaps/familiar/keymap.c @@ -3,10 +3,12 @@ #include "action_layer.h" #include "version.h" +// Layers #define BASE 0 // default layer -#define ARRW 1 // function, media, arrow keys -#define NUMP 2 // numpad -#define INTL 3 // international symbols +#define INTL 1 // international symbols +#define INSF 2 // international symbols shifted +#define NUMP 3 // numpad +#define ARRW 4 // function, media, arrow keys // Fillers to make layering more clear #define _______ KC_TRNS @@ -22,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * | TAB | Q | W | E | R | T | HOME | | PGUP | Y | U | I | O | P | DELETE | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | CLEAR | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | + * | MO(3) | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | * |--------+------+------+------+------+------| END | | PGDN |------+------+------+------+------+--------| * | (/LSFT | Z | X | C | V | B | | | | N | M | , | . | UP | )/RSFT | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' @@ -40,10 +42,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // left hand KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_HOME, - KC_CLEAR, KC_A, KC_S, KC_D, KC_F, KC_G, + MO(INTL), KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_END, KC_LCTL, KC_LGUI, KC_MENU, KC_QUOT, S(KC_QUOT), - KC_INS, KC_ESC, + KC_PSCR, KC_ESC, KC_NLCK, ALT_T(KC_SPC), LT(ARRW,KC_SLSH), TG(INTL), // right hand @@ -57,52 +59,96 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TG(NUMP), LT(ARRW,KC_BSLS), ALT_T(KC_SPC) ), -/* layer 1 : functions and arrows +/* layer 1: International symbols, etc * * ,--------------------------------------------------. ,--------------------------------------------------. - * | | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | | + * | ´ | ¡ | ² | ³ | ¤ | € | ¼ | | ½ | ¾ | ‘ | ’ | ¥ | × | | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | | | UP | | | | | | | | | | | INSERT | + * | | ä | å | é | ® | þ | | | | ü | ú | í | ó | ö | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * |CAPSLOCK| | LEFT | DOWN |RIGHT | |------| |------| LEFT | DOWN | UP | RIGHT| | | + * | | á | ß | ð | | |------| |------| | | | Ø | ° | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | |M_PREV|M_STOP|M_PLPS|M_NEXT| | | | | | | | | PGUP | | + * |MO(INSF)| æ | | © | | | | | | ñ | µ | ç | | |MO(INSF)| * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | | | | | | | | | HOME | PGDN | END | + * | | | | ¬ | ¿ | | « | » | | | | * `------------------------------------' `------------------------------------' * ,-------------. ,-------------. - * |SYSREQ| PAUSE| | | | + * | | | | | | * ,------|------|------| |------+------+------. - * | | | SCRLK| | | | | + * | | | | | | | | * | | |------| |------| | | * | | | | | | | | * `--------------------' `--------------------' */ -[ARRW] = KEYMAP( +[INTL] = KEYMAP( // left hand - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, - _______, _______, _______, KC_UP, _______, _______, _______, - KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, - KC_SYSREQ, KC_PAUSE, - KC_SLCK, + UC(0x00B4), UC(0x00A1), UC(0x00B2), UC(0x00B3), UC(0x00A4), UC(0x20AC), UC(0x00BC), + _______, UC(0x00E4), UC(0x00E5), UC(0x00E9), UC(0x00AE), UC(0x00FE), _______, + _______, UC(0x00E1), UC(0x00DF), UC(0x00F0), _______, _______, + MO(INSF), UC(0x00E6), _______, UC(0x00A9), _______, _______, _______, + _______, _______, _______, UC(0x00AC), UC(0x00BF), + _______, _______, + _______, + _______, _______, _______, + // right hand + UC(0x00BD), UC(0x00BE), UC(0x2018), UC(0x2019), UC(0x00A5), UC(0x00D7), _______, + _______, UC(0x00FC), UC(0x00FA), UC(0x00ED), UC(0x00F3), UC(0x00F6), _______, + _______, _______, _______, UC(0x00D8), UC(0x00B0), _______, + _______, UC(0x00F1), UC(0x00B5), UC(0x00E7), _______, _______, MO(INSF), + UC(0x00AB), UC(0x00BB), _______, _______, _______, + _______, _______, + _______, + _______, _______, _______ + ), + +/* layer 2 : international symbols, shifted + * This layer is an ugly workaround; it pretends that SHIFT still works normally on keys + * which don't produce an "upper case" or "shifted" international symobol. + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | ¨ | ¹ | | | £ | | | | | | | | | ÷ | | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | Ä | Å | É | | Þ | | | | Ü | Ú | Í | Ó | Ö | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | Á | § | Ð | | |------| |------| | | | Ø | ° | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | Æ | | ¢ | | | | | | Ñ | | Ç | | | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | ¦ | | | | | | | | + * `------------------------------------' `------------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | | | + * | | |------| |------| | | + * | | | | | | | | + * `--------------------' `--------------------' + */ +[INSF] = KEYMAP( + // left hand + UC(0x00A8), UC(0x00B9), S(KC_2), S(KC_3), UC(0x00A3), UC(0x2014), S(KC_6), + _______, UC(0x00C4), UC(0x00C5), UC(0x00C9), S(KC_R), UC(0x00DE), _______, + _______, UC(0x00C1), UC(0x00A7), UC(0x00D0), S(KC_F), S(KC_G), + _______, UC(0x00C6), S(KC_X), UC(0x00A2), S(KC_V), S(KC_B), _______, + _______, _______, _______, UC(0x00A6), _______, + _______, _______, + _______, _______, _______, _______, // right hand - KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, - _______, _______, _______, _______, _______, _______, KC_INS, - KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, - _______, _______, _______, _______, _______, KC_PGUP, _______, - _______, _______, KC_HOME, KC_PGDN, KC_END, + S(KC_7), S(KC_8), S(KC_9), S(KC_0), S(KC_MINS), UC(0x00F7), _______, + _______, UC(0x00DC), UC(0x00DA), UC(0x00CD), UC(0x00D3), UC(0x00D6), _______, + S(KC_H), S(KC_J), S(KC_K), UC(0x00D8), UC(0x00B0), _______, + _______, UC(0x00D1), S(KC_M), UC(0x00C7), S(KC_DOT), _______, _______, + S(KC_LBRC), S(KC_RBRC), _______, _______, _______, _______, _______, _______, _______, _______, _______ ), -/* layer 2 : numberpad +/* layer 3: numberpad * * ,--------------------------------------------------. ,--------------------------------------------------. - * | | | | | | | | | | | ( | ) | ÷ | × | | + * | | | | | | | | | | | ( | ) | / | * | | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * | | | | | | | | | | | 7 | 8 | 9 | - | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| @@ -141,43 +187,43 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______ ), -/* layer 3: International symbols, etc +/* layer 4 : functions and arrows * * ,--------------------------------------------------. ,--------------------------------------------------. - * | | | | | | | | | | | | | | | | + * | ESCAPE | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | | | | | | | | | | | | | | | + * | | | | UP | | | | | | | | | | | INSERT | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | | | | | |------| |------| | | | | | | + * |CAPSLOCK| | LEFT | DOWN |RIGHT | |------| |------| LEFT | DOWN | UP | RIGHT| | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | | | | | | | | | | | | | | | + * | |M_PREV|M_STOP|M_PLPS|M_NEXT| | | | | | | | | PGUP | | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | | | | | | | | | | | | + * | | | | | | | | | HOME | PGDN | END | * `------------------------------------' `------------------------------------' * ,-------------. ,-------------. - * | | | | | | + * |SYSREQ| PAUSE| | | | * ,------|------|------| |------+------+------. - * | | | | | | | | + * | | | SCRLK| | | | | * | | |------| |------| | | * | | | | | | | | * `--------------------' `--------------------' */ -[INTL] = KEYMAP( +[ARRW] = KEYMAP( // left hand - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, + _______, _______, _______, KC_UP, _______, _______, _______, + KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, - _______, - _______, _______, _______, + KC_SYSREQ, KC_PAUSE, + KC_SLCK, + _______, _______, _______, // right hand - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, + KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, + _______, _______, _______, _______, _______, _______, KC_INS, + KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, + _______, _______, _______, _______, _______, KC_PGUP, _______, + _______, _______, KC_HOME, KC_PGDN, KC_END, _______, _______, _______, _______, _______, _______ @@ -186,7 +232,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Runs just one time when the keyboard initializes. void matrix_init_user(void) { - + set_unicode_input_mode(UC_LNX); // Linux + //set_unicode_input_mode(UC_OSX); // Mac OSX + //set_unicode_input_mode(UC_WIN); // Windows (with registry key, see wiki) + //set_unicode_input_mode(UC_WINC); // Windows (with WinCompose, see wiki) }; // Runs constantly in the background, in a loop. @@ -199,13 +248,14 @@ void matrix_scan_user(void) { ergodox_right_led_2_off(); ergodox_right_led_3_off(); switch (layer) { - case 1: + case INTL: + case INSF: ergodox_right_led_1_on(); break; - case 2: + case NUMP: ergodox_right_led_2_on(); break; - case 3: + case ARRW: ergodox_right_led_3_on(); break; default: From d9efa02cfbd9aebd691711c326645ad6f8af71b1 Mon Sep 17 00:00:00 2001 From: nstickney Date: Sun, 12 Mar 2017 22:43:44 -0500 Subject: [PATCH 042/117] added README.md --- keyboards/ergodox/keymaps/familiar/README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 keyboards/ergodox/keymaps/familiar/README.md diff --git a/keyboards/ergodox/keymaps/familiar/README.md b/keyboards/ergodox/keymaps/familiar/README.md new file mode 100644 index 00000000..0b248534 --- /dev/null +++ b/keyboards/ergodox/keymaps/familiar/README.md @@ -0,0 +1,3 @@ +# Familiar Layout for ErgoDox # +An ErgoDox layout meant to be as easy to learn as possible for typists coming from a standard +QWERTY US-International layout. From a03d946d0c4edf0c3e50812af7f3c826b958c945 Mon Sep 17 00:00:00 2001 From: Stick Date: Mon, 27 Mar 2017 21:18:12 -0500 Subject: [PATCH 043/117] fixed unicode input issue --- keyboards/ergodox/keymaps/familiar/Makefile | 1 - keyboards/ergodox/keymaps/familiar/keymap.c | 35 +++++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 keyboards/ergodox/keymaps/familiar/Makefile diff --git a/keyboards/ergodox/keymaps/familiar/Makefile b/keyboards/ergodox/keymaps/familiar/Makefile deleted file mode 100644 index 61c3c227..00000000 --- a/keyboards/ergodox/keymaps/familiar/Makefile +++ /dev/null @@ -1 +0,0 @@ -UNIS_ENABLE = yes diff --git a/keyboards/ergodox/keymaps/familiar/keymap.c b/keyboards/ergodox/keymaps/familiar/keymap.c index 08640b9f..153d7304 100644 --- a/keyboards/ergodox/keymaps/familiar/keymap.c +++ b/keyboards/ergodox/keymaps/familiar/keymap.c @@ -20,29 +20,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* layer 0 : default * * ,--------------------------------------------------. ,--------------------------------------------------. - * | ` | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 8 | 9 | 0 | - | = | BCKSPC | + * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 8 | 9 | 0 | - | = | BCKSPC | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | TAB | Q | W | E | R | T | HOME | | PGUP | Y | U | I | O | P | DELETE | + * | ` | Q | W | E | R | T | HOME | | PGUP | Y | U | I | O | P | DELETE | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | MO(3) | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | + * | TAB | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | * |--------+------+------+------+------+------| END | | PGDN |------+------+------+------+------+--------| * | (/LSFT | Z | X | C | V | B | | | | N | M | , | . | UP | )/RSFT | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' * | LCTRL | LGUI | MENU | ' | " | | [ | ] | LEFT | DOWN | RIGHT | * `------------------------------------' `------------------------------------' * ,-------------. ,-------------. - * |PRTSCR| ESC | | VOL- | VOL+ | + * | VOL- | VOL+ | | VOL- | VOL+ | * ,------|------|------| |------+------+------. - * | ALT/ |SLASH/| NUMLK| | MUTE |WHACK/| ALT/ | - * | SPC | MO(1)|------| |------|MO(1) | SPC | + * | SPC/ |SLASH/| MUTE | |NUMLCK|WHACK/| SPC/ | + * | ALT | MO(1)|------| |------|MO(1) | ALT | * | | | LAY3 | | LAY2 | | | * `--------------------' `--------------------' */ [BASE] = KEYMAP( // left hand - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_HOME, - MO(INTL), KC_A, KC_S, KC_D, KC_F, KC_G, + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, + KC_GRV, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_HOME, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_END, KC_LCTL, KC_LGUI, KC_MENU, KC_QUOT, S(KC_QUOT), KC_PSCR, KC_ESC, @@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * | | ä | å | é | ® | þ | | | | ü | ú | í | ó | ö | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | á | ß | ð | | |------| |------| | | | Ø | ° | | + * | | á | ß | ð | | |------| |------| | | | ø | ¶ | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| * |MO(INSF)| æ | | © | | | | | | ñ | µ | ç | | |MO(INSF)| * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' @@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // right hand UC(0x00BD), UC(0x00BE), UC(0x2018), UC(0x2019), UC(0x00A5), UC(0x00D7), _______, _______, UC(0x00FC), UC(0x00FA), UC(0x00ED), UC(0x00F3), UC(0x00F6), _______, - _______, _______, _______, UC(0x00D8), UC(0x00B0), _______, + _______, _______, _______, UC(0x00F8), UC(0x00B6), _______, _______, UC(0x00F1), UC(0x00B5), UC(0x00E7), _______, _______, MO(INSF), UC(0x00AB), UC(0x00BB), _______, _______, _______, _______, _______, @@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * which don't produce an "upper case" or "shifted" international symobol. * * ,--------------------------------------------------. ,--------------------------------------------------. - * | ¨ | ¹ | | | £ | | | | | | | | | ÷ | | + * | ¨ | ¹ | | | £ | | | | | | | | — | ÷ | | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * | | Ä | Å | É | | Þ | | | | Ü | Ú | Í | Ó | Ö | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| @@ -126,8 +126,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [INSF] = KEYMAP( // left hand - UC(0x00A8), UC(0x00B9), S(KC_2), S(KC_3), UC(0x00A3), UC(0x2014), S(KC_6), - _______, UC(0x00C4), UC(0x00C5), UC(0x00C9), S(KC_R), UC(0x00DE), _______, + UC(0x00A8), UC(0x00B9), _______, _______, UC(0x00A3), _______, _______, + _______, UC(0x00C4), UC(0x00C5), UC(0x00C9), _______, UC(0x00DE), _______, _______, UC(0x00C1), UC(0x00A7), UC(0x00D0), S(KC_F), S(KC_G), _______, UC(0x00C6), S(KC_X), UC(0x00A2), S(KC_V), S(KC_B), _______, _______, _______, _______, UC(0x00A6), _______, @@ -135,11 +135,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, // right hand - S(KC_7), S(KC_8), S(KC_9), S(KC_0), S(KC_MINS), UC(0x00F7), _______, + _______, _______, _______, _______, UC(0x2014), UC(0x00F7), _______, _______, UC(0x00DC), UC(0x00DA), UC(0x00CD), UC(0x00D3), UC(0x00D6), _______, S(KC_H), S(KC_J), S(KC_K), UC(0x00D8), UC(0x00B0), _______, - _______, UC(0x00D1), S(KC_M), UC(0x00C7), S(KC_DOT), _______, _______, - S(KC_LBRC), S(KC_RBRC), _______, _______, _______, + _______, UC(0x00D1), _______, UC(0x00C7), S(KC_DOT), _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ @@ -188,6 +188,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* layer 4 : functions and arrows + * This layer is at the top so that the functions still work no matter what layers are active. * * ,--------------------------------------------------. ,--------------------------------------------------. * | ESCAPE | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | | From b6280d0cac59c741db62a63072efd5de4887fc01 Mon Sep 17 00:00:00 2001 From: Stick Date: Mon, 27 Mar 2017 21:56:47 -0500 Subject: [PATCH 044/117] unsatisfied with ESC/GRV/TAB positioning --- keyboards/ergodox/keymaps/familiar/keymap.c | 32 ++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/keyboards/ergodox/keymaps/familiar/keymap.c b/keyboards/ergodox/keymaps/familiar/keymap.c index 153d7304..c5f94afd 100644 --- a/keyboards/ergodox/keymaps/familiar/keymap.c +++ b/keyboards/ergodox/keymaps/familiar/keymap.c @@ -22,16 +22,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,--------------------------------------------------. ,--------------------------------------------------. * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 8 | 9 | 0 | - | = | BCKSPC | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | ` | Q | W | E | R | T | HOME | | PGUP | Y | U | I | O | P | DELETE | + * | TAB | Q | W | E | R | T | HOME | | PGUP | Y | U | I | O | P | DELETE | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | TAB | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | + * | ` | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | * |--------+------+------+------+------+------| END | | PGDN |------+------+------+------+------+--------| * | (/LSFT | Z | X | C | V | B | | | | N | M | , | . | UP | )/RSFT | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' * | LCTRL | LGUI | MENU | ' | " | | [ | ] | LEFT | DOWN | RIGHT | * `------------------------------------' `------------------------------------' * ,-------------. ,-------------. - * | VOL- | VOL+ | | VOL- | VOL+ | + * | VOL- | VOL+ | | | | * ,------|------|------| |------+------+------. * | SPC/ |SLASH/| MUTE | |NUMLCK|WHACK/| SPC/ | * | ALT | MO(1)|------| |------|MO(1) | ALT | @@ -41,12 +41,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [BASE] = KEYMAP( // left hand KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, - KC_GRV, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_HOME, - KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_HOME, + KC_GRV, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_END, KC_LCTL, KC_LGUI, KC_MENU, KC_QUOT, S(KC_QUOT), - KC_PSCR, KC_ESC, - KC_NLCK, + KC_VOLD, KC_VOLU, + KC_MUTE, ALT_T(KC_SPC), LT(ARRW,KC_SLSH), TG(INTL), // right hand KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, @@ -54,8 +54,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENTER, KC_PGDN, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_RSPC, KC_LBRC, KC_RBRC, KC_LEFT, KC_DOWN, KC_RGHT, - KC_VOLD, KC_VOLU, - KC_MUTE, + _______, _______, + KC_NLCK, TG(NUMP), LT(ARRW,KC_BSLS), ALT_T(KC_SPC) ), @@ -191,7 +191,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * This layer is at the top so that the functions still work no matter what layers are active. * * ,--------------------------------------------------. ,--------------------------------------------------. - * | ESCAPE | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | | + * | ESCAPE | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | SYSREQ | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * | | | | UP | | | | | | | | | | | INSERT | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| @@ -202,9 +202,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | | HOME | PGDN | END | * `------------------------------------' `------------------------------------' * ,-------------. ,-------------. - * |SYSREQ| PAUSE| | | | + * | | PAUSE| | | | * ,------|------|------| |------+------+------. - * | | | SCRLK| | | | | + * | | | | |SCRLK | | | * | | |------| |------| | | * | | | | | | | | * `--------------------' `--------------------' @@ -216,17 +216,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_SYSREQ, KC_PAUSE, - KC_SLCK, + _______, KC_PAUSE, + _______, _______, _______, _______, // right hand - KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, + KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_SYSREQ, _______, _______, _______, _______, _______, _______, KC_INS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, KC_HOME, KC_PGDN, KC_END, _______, _______, - _______, + KC_SLCK, _______, _______, _______ ), }; From 571f39da663632b2f0592f1ad41d2985763bfcc2 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Wed, 29 Mar 2017 22:32:39 -0700 Subject: [PATCH 045/117] Tidied up keymaps, Makefiles that actually work, Clueboard make v1.0 --- keyboards/clueboard/keymaps/xyverz/Makefile | 49 ++++++++++++++++++++ keyboards/clueboard/keymaps/xyverz/keymap.c | 49 +++++++++++--------- keyboards/lets_split/keymaps/xyverz/keymap.c | 4 +- keyboards/planck/keymaps/xyverz/Makefile | 6 +++ keyboards/planck/keymaps/xyverz/keymap.c | 12 ++--- keyboards/planck/keymaps/xyverz/makefile.mk | 25 ---------- 6 files changed, 89 insertions(+), 56 deletions(-) create mode 100644 keyboards/clueboard/keymaps/xyverz/Makefile create mode 100644 keyboards/planck/keymaps/xyverz/Makefile delete mode 100644 keyboards/planck/keymaps/xyverz/makefile.mk diff --git a/keyboards/clueboard/keymaps/xyverz/Makefile b/keyboards/clueboard/keymaps/xyverz/Makefile new file mode 100644 index 00000000..950dadf8 --- /dev/null +++ b/keyboards/clueboard/keymaps/xyverz/Makefile @@ -0,0 +1,49 @@ +#---------------------------------------------------------------------------- +# On command line: +# +# make all = Make software. +# +# make clean = Clean out built project files. +# +# make coff = Convert ELF to AVR COFF. +# +# make extcoff = Convert ELF to AVR Extended COFF. +# +# make program = Download the hex file to the device. +# Please customize your programmer settings(PROGRAM_CMD) +# +# make teensy = Download the hex file to the device, using teensy_loader_cli. +# (must have teensy_loader_cli installed). +# +# make dfu = Download the hex file to the device, using dfu-programmer (must +# have dfu-programmer installed). +# +# make flip = Download the hex file to the device, using Atmel FLIP (must +# have Atmel FLIP installed). +# +# make dfu-ee = Download the eeprom file to the device, using dfu-programmer +# (must have dfu-programmer installed). +# +# make flip-ee = Download the eeprom file to the device, using Atmel FLIP +# (must have Atmel FLIP installed). +# +# make debug = Start either simulavr or avarice as specified for debugging, +# with avr-gdb or avr-insight as the front end for debugging. +# +# make filename.s = Just compile filename.c into the assembler code only. +# +# make filename.i = Create a preprocessed source file for use in submitting +# bug reports to the GCC project. +# +# To rebuild project do "make clean" then "make all". +#---------------------------------------------------------------------------- + +# Build Options +# change to "no" to disable the options, or define them in the makefile.mk in +# the appropriate keymap folder that will get included automatically +# +RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. + +ifndef QUANTUM_DIR + include ../../../../Makefile +endif \ No newline at end of file diff --git a/keyboards/clueboard/keymaps/xyverz/keymap.c b/keyboards/clueboard/keymaps/xyverz/keymap.c index 01f158bf..45391197 100644 --- a/keyboards/clueboard/keymaps/xyverz/keymap.c +++ b/keyboards/clueboard/keymaps/xyverz/keymap.c @@ -1,3 +1,6 @@ +// Xyverz' keymap. +// It's based on the default keymap, but Dvorak! + #include "clueboard.h" // Used for SHIFT_ESC @@ -14,23 +17,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap _BL: (Base Layer) Default Layer * ,--------------------------------------------------------------------------. ,----. - * |Esc~| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \| BS| |PGUP| + * |Esc~| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| [| ]| \| BS| |PGUP| * |--------------------------------------------------------------------------| |----| - * | Tab| Q| W| E| R| T| Y| U| I| O| P| [| ]| \| |PGDN| + * | Tab| '| ,| .| P| Y| F| G| C| R| L| /| =| \| |PGDN| * |--------------------------------------------------------------------------| `----' - * |Capslck| A| S| D| F| G| H| J| K| L| ;| '| # | Ent| + * |_FL/Caps| A| O| E| U| I| H| D| H| T| N| S| - | Ent| * |-----------------------------------------------------------------------------. - * |Shift| BS| Z| X| C| V| B| N| M| ,| .| /| BS|Shift| UP| + * |Shift| BS| ;| Q| J| K| X| B| M| W| V| Z| BS|Shift| UP| * |------------------------------------------------------------------------|----|----. * | Ctrl| Gui| Alt| MHen| Space| Space| Hen| Alt| Ctrl| _FL|LEFT|DOWN|RGHT| * `----------------------------------------------------------------------------------' */ [_BL] = KEYMAP( - F(0), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC, KC_PGUP, \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, \ - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, \ - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_RSFT, KC_UP, \ - KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, KC_SPC,KC_SPC, KC_HENK, KC_RALT, KC_RCTL, MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT), + F(0), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_GRV, KC_BSPC, KC_PGUP, \ + KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSLS, KC_PGDN, \ + LT(_FL, KC_CAPS), KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_NUHS, KC_ENT, \ + KC_LSFT, KC_RO, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_SLSH, KC_RSFT, KC_UP, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_MHEN, KC_SPC, KC_SPC, KC_HENK, KC_RGUI, KC_RCTL, MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT), /* Keymap _FL: Function Layer * ,--------------------------------------------------------------------------. ,----. @@ -46,31 +49,31 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `----------------------------------------------------------------------------------' */ [_FL] = KEYMAP( - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL, BL_STEP, \ - KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, MO(_RS),KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FL), KC_HOME, KC_PGDN, KC_END), + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_DEL, BL_STEP, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, MO(_RS), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FL), KC_HOME, KC_PGDN, KC_END), /* Keymap _RS: Reset layer * ,--------------------------------------------------------------------------. ,----. - * | | | | | | | | | | | | | | | | | | + * | | | | | | | | | | | | | | | RGB| |VAL+| * |--------------------------------------------------------------------------| |----| - * | | | | |RESET| | | | | | | | | | | | + * | | | | |RESET| | | | | | | | | | |VAL-| * |--------------------------------------------------------------------------| `----' * | | | _RS| | | | | | | | | | | | * |-----------------------------------------------------------------------------. - * | | | | | | | | | | | | | | | | + * | | | | | | | | | | | | | | |SAT+| * |------------------------------------------------------------------------|----|----. - * | | | | | | | | | | _FL| | | | + * | | | | | | | | | | _FL|HUE-|SAT-|HUE+| * `----------------------------------------------------------------------------------' */ [_RS] = KEYMAP( - KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAI, \ - KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,RESET, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, \ - KC_TRNS, KC_TRNS, MO(_RS),KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - MO(_FL), KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FL), RGB_SAI, \ - KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, RGB_MOD, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUD, RGB_SAD, RGB_HUI), + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAI, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, \ + KC_TRNS, KC_TRNS, MO(_RS), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + MO(_FL), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FL), RGB_SAI, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUD, RGB_SAD, RGB_HUI), }; enum function_id { diff --git a/keyboards/lets_split/keymaps/xyverz/keymap.c b/keyboards/lets_split/keymaps/xyverz/keymap.c index d52eb40a..216e9469 100644 --- a/keyboards/lets_split/keymaps/xyverz/keymap.c +++ b/keyboards/lets_split/keymaps/xyverz/keymap.c @@ -122,9 +122,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Adjust (Lower + Raise) * ,-----------------------------------------------------------------------------------. - * | | Reset| | | | | | | | | | Del | + * | F11 | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F12 | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak| | | + * | | Reset| |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak| | | * |------+------+------+------+------+------|------+------+------+------+------+------| * | |RGB ON| MODE | HUE+ | HUE- | SAT+ | SAT- | VAL+ | VAL- | | | | * |------+------+------+------+------+------+------+------+------+------+------+------| diff --git a/keyboards/planck/keymaps/xyverz/Makefile b/keyboards/planck/keymaps/xyverz/Makefile new file mode 100644 index 00000000..55bf853a --- /dev/null +++ b/keyboards/planck/keymaps/xyverz/Makefile @@ -0,0 +1,6 @@ +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality +AUDIO_ENABLE = no # Audio output on port C6 + +ifndef QUANTUM_DIR + include ../../../../Makefile +endif diff --git a/keyboards/planck/keymaps/xyverz/keymap.c b/keyboards/planck/keymaps/xyverz/keymap.c index 94ace2af..329bb043 100644 --- a/keyboards/planck/keymaps/xyverz/keymap.c +++ b/keyboards/planck/keymaps/xyverz/keymap.c @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------|------+------+------+------+------+------| * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Brite| Ctrl | Alt | GUI |Lower | Bksp |Space |Raise | Left | Down | Up |Right | + * | Ctrl | Alt | Left |Right |Lower | Bksp |Space |Raise | Up | Down | GUI |Enter | * `-----------------------------------------------------------------------------------' */ [_QWERTY] = { @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------|------+------+------+------+------+------| * | Shift| Z | X | C | V | B | K | M | , | . | / |Enter | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Brite| Ctrl | Alt | GUI |Lower | Bksp |Space |Raise | Left | Down | Up |Right | + * | Ctrl | Alt | Left |Right |Lower | Bksp |Space |Raise | Up | Down | GUI |Enter | * `-----------------------------------------------------------------------------------' */ [_COLEMAK] = { @@ -128,9 +128,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Adjust (Lower + Raise) * ,-----------------------------------------------------------------------------------. - * | | Reset| | | | | | | | | | Del | + * | F11 | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F12 | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak| | | + * | | Reset| |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak| | | * |------+------+------+------+------+------|------+------+------+------+------+------| * | |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof| | | | | | * |------+------+------+------+------+------+------+------+------+------+------+------| @@ -138,8 +138,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = { - {_______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL}, - {_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______}, + {KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 }, + {_______, RESET, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______}, {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______}, {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} } diff --git a/keyboards/planck/keymaps/xyverz/makefile.mk b/keyboards/planck/keymaps/xyverz/makefile.mk deleted file mode 100644 index 93a89bb4..00000000 --- a/keyboards/planck/keymaps/xyverz/makefile.mk +++ /dev/null @@ -1,25 +0,0 @@ - - -# Build Options -# change to "no" to disable the options, or define them in the Makefile in -# the appropriate keymap folder that will get included automatically -# -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = yes # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -CONSOLE_ENABLE = no # Console for debug(+400) -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -MIDI_ENABLE = no # MIDI controls -AUDIO_ENABLE = yes # Audio output on port C6 -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. - -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif From e508b5e04eaac5f56698333bdd2a9c2ffa89ab75 Mon Sep 17 00:00:00 2001 From: = <=> Date: Sun, 2 Apr 2017 18:27:24 +0900 Subject: [PATCH 046/117] Adds tong92's keymap to tv44 --- keyboards/tv44/keymaps/tong92/Makefile | 21 ++++ keyboards/tv44/keymaps/tong92/config.h | 12 +++ keyboards/tv44/keymaps/tong92/keymap.c | 138 ++++++++++++++++++++++++ keyboards/tv44/keymaps/tong92/readme.md | 52 +++++++++ 4 files changed, 223 insertions(+) create mode 100644 keyboards/tv44/keymaps/tong92/Makefile create mode 100644 keyboards/tv44/keymaps/tong92/config.h create mode 100644 keyboards/tv44/keymaps/tong92/keymap.c create mode 100644 keyboards/tv44/keymaps/tong92/readme.md diff --git a/keyboards/tv44/keymaps/tong92/Makefile b/keyboards/tv44/keymaps/tong92/Makefile new file mode 100644 index 00000000..e60e3c5c --- /dev/null +++ b/keyboards/tv44/keymaps/tong92/Makefile @@ -0,0 +1,21 @@ +# Build Options +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +EXTRAKEY_ENABLE = no # Audio control and System control(+450) +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality +MIDI_ENABLE = no # MIDI controls +AUDIO_ENABLE = no # Audio output on port C6 +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend + +ifndef QUANTUM_DIR + include ../../../../Makefile +endif \ No newline at end of file diff --git a/keyboards/tv44/keymaps/tong92/config.h b/keyboards/tv44/keymaps/tong92/config.h new file mode 100644 index 00000000..be959a82 --- /dev/null +++ b/keyboards/tv44/keymaps/tong92/config.h @@ -0,0 +1,12 @@ +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "../../config.h" + +// place overrides here +#ifdef BACKLIGHT_ENABLE + #define BACKLIGHT_PIN B2 + #define BACKLIGHT_LEVELS 7 +#endif + +#endif diff --git a/keyboards/tv44/keymaps/tong92/keymap.c b/keyboards/tv44/keymaps/tong92/keymap.c new file mode 100644 index 00000000..4a16b355 --- /dev/null +++ b/keyboards/tv44/keymaps/tong92/keymap.c @@ -0,0 +1,138 @@ +// This is the canonical layout file for the Quantum project. If you want to add another keyboard, +// this is the style you want to emulate. +//Author: tong92 + +#include "tv44.h" +#include "action_layer.h" +#include "eeconfig.h" +#ifdef BACKLIGHT_ENABLE + #include "backlight.h" +#endif + +// Fillers to make layering more clear +#define _______ KC_TRNS +#define LOWER F(1) +#define RAISE F(2) +#define FTN MO(4) +#define MOUSE M(10) +#define GO_DEFT M(99) +#define XXXXXXX KC_NO + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Qwerty + * ,--------------------------------------------------------------------------. + * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | + * |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------| + * | Ctrl | A | S | D | F | G | H | J | K | L | ; | Enter| + * |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------| + * | Shift | Z | X | C | V | B | N | M | , | . | / |Shift| + * |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----| + * | Ftn1 | GUI | Alt | Space/LOWER | Space/RAISE | ' | [ | ] | Alt | + * `--------------------------------------------------------------------------' + */ +[0] = { +{KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, +{KC_LCTL,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_ENT}, +{KC_LSFT,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT,KC_SLSH,KC_RSFT }, +{FTN ,KC_LGUI,KC_LALT,LOWER,XXXXXXX,XXXXXXX,XXXXXXX,RAISE,KC_QUOT,KC_LBRC,KC_RBRC,KC_RALT} +}, +/* LOWER + * ,--------------------------------------------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | | + * |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------| + * | | F1 | F2 | F3 | F4 | F5 | F6 | - | + | [ | ] | \ | + * |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------| + * | | F7 | F8 | F9 | F10 | F11 | F12 | | HOME| PgUp| UP | PgDo| + * |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----| + * | | | | | | END | LEFT| Down|RIGHT| + * `--------------------------------------------------------------------------' + */ +[1] = { +{KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______}, +{_______,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS,KC_PLUS,KC_LBRC,KC_RBRC,KC_BSLS }, +{_______,KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX,KC_HOME,KC_PGUP,KC_UP ,KC_PGDN }, +{XXXXXXX,_______,_______,_______,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_END, KC_LEFT,KC_DOWN,KC_RIGHT} +}, +/* RAISE + * ,--------------------------------------------------------------------------. + * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | | + * |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------| + * | | F1 | F2 | F3 | F4 | F5 | F6 | _ | = | { | } | | | + * |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------| + * | | F7 | F8 | F9 | F10 | F11 | F12 | | HOME| PgUp| UP | PgDo| + * |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----| + * | | | | | | END | LEFT| Down|RIGHT| + * `--------------------------------------------------------------------------' + */ +[2] ={ +{KC_TILD,KC_EXLM,KC_AT, KC_HASH,KC_DLR, KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,_______ }, +{_______,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS,KC_EQL, KC_LCBR,KC_RCBR,KC_PIPE }, +{_______,KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,KC_HOME,KC_PGUP,KC_UP ,KC_PGDN }, +{XXXXXXX,_______,_______,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______,KC_END, KC_LEFT,KC_DOWN,KC_RIGHT} +}, +/* FTN + * ,--------------------------------------------------------------------------. + * | ESC |WinOf|WinUp| | |Sh+Ca| | PgUp| UP | PgDo|PrtSc| DELET | + * |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------| + * | |WinLe|WinDo|WinRi| |Al+Ca|CapsL| LEFT| DOWN|RIGHT| | | + * |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------| + * | |WinLW|WinRW| | |Ct+Ca|ScroL| HOME| | END | | Ctrl| + * |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----| + * | | DeskL | DeskR| Task Manager| DeskX | MOUSE| | | LED | + * `--------------------------------------------------------------------------' + */ +[4] = { +{KC_ESC ,LALT(KC_F4) ,LGUI(KC_UP) ,XXXXXXX ,XXXXXXX ,S(KC_CAPS) ,XXXXXXX,KC_PGUP,KC_UP,KC_PGDN,KC_PSCR,KC_DELT}, +{_______,LGUI(KC_LEFT) ,LGUI(KC_DOWN) ,LGUI(KC_RIGHT) ,XXXXXXX ,LALT(KC_CAPS),KC_CAPS,KC_LEFT,KC_DOWN,KC_RIGHT,XXXXXXX,XXXXXXX}, +{_______,LGUI(LSFT(KC_LEFT)),LGUI(LSFT(KC_RIGHT)),XXXXXXX ,XXXXXXX ,LCTL(KC_CAPS),KC_SLCK,KC_HOME,XXXXXXX,KC_END,XXXXXXX,KC_RCTL}, +{_______,LGUI(LCTL(KC_LEFT)),LGUI(LCTL(KC_RIGHT)),LCTL(LALT(KC_DELT)),XXXXXXX,XXXXXXX,XXXXXXX,LGUI(LCTL(KC_F4)),MOUSE,XXXXXXX,XXXXXXX,M(0)} +}, +/* MOUSE + * ,--------------------------------------------------------------------------. + * | | | |Mo_Up| | | |M_WhL|M_WhU|M_WhR| | RESET | + * |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------| + * | | |Mo_Le|Mo_Do|Mo_Ri| | |M_Bt1|M_WhD|M_Bt2| | | + * |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------| + * | | | | | | | |M_AC0|M_AC1|M_AC2| | | + * |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----| + * | | | | GO_DEFAULT | GO_DEFAULT | | | | | + * `--------------------------------------------------------------------------' + */ +[10] ={ +{XXXXXXX,XXXXXXX,XXXXXXX,KC_MS_U,XXXXXXX,XXXXXXX,XXXXXXX,KC_WH_L,KC_WH_U,KC_WH_R,XXXXXXX,RESET}, +{XXXXXXX,XXXXXXX,KC_MS_L,KC_MS_D,KC_MS_R,XXXXXXX,XXXXXXX,KC_BTN1,KC_WH_D,KC_BTN2,XXXXXXX,XXXXXXX}, +{XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_ACL0,KC_ACL1,KC_ACL2,XXXXXXX,XXXXXXX}, +{XXXXXXX,XXXXXXX,XXXXXXX,GO_DEFT,XXXXXXX,XXXXXXX,XXXXXXX,GO_DEFT,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX} +} +}; + +const uint16_t PROGMEM fn_actions[] = { + [1] = ACTION_LAYER_TAP_KEY(1, KC_SPC), + [2] = ACTION_LAYER_TAP_KEY(2, KC_SPC) +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + switch(id) { + case 0: + if (record->event.pressed) { + #ifdef BACKLIGHT_ENABLE + backlight_step(); + #endif + } + break; + case 10: + if (record->event.pressed) { + layer_on(10); + } + break; + case 99: + if (record->event.pressed) { + layer_off(10); + layer_off(4); + } + break; + } + return MACRO_NONE; +}; \ No newline at end of file diff --git a/keyboards/tv44/keymaps/tong92/readme.md b/keyboards/tv44/keymaps/tong92/readme.md new file mode 100644 index 00000000..82085725 --- /dev/null +++ b/keyboards/tv44/keymaps/tong92/readme.md @@ -0,0 +1,52 @@ +# The tong92's keymap for tv44 + +- Arrow Layout (45key) +- my keymap for Window User +- Mouse Layer : space -> Default Layer + +## Qwerty + ,--------------------------------------------------------------------------. + | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | + |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------| + | Ctrl | A | S | D | F | G | H | J | K | L | ; | Enter| + |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------| + | Shift | Z | X | C | V | B | N | M | , | . | / |Shift| + |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----| + | Ftn1 | GUI | Alt | Space/LOWER | Space/RAISE | ' | [ | ] | Alt | + `--------------------------------------------------------------------------' + + +## RAISE + ,--------------------------------------------------------------------------. + | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | | + |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------| + | | F1 | F2 | F3 | F4 | F5 | F6 | _ | = | { | } | | | + |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------| + | | F7 | F8 | F9 | F10 | F11 | F12 | | HOME| PgUp| UP | PgDo| + |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----| + | | | | | | END | LEFT| Down|RIGHT| + `--------------------------------------------------------------------------' + + +## FTN + ,--------------------------------------------------------------------------. + | ESC |WinOf|WinUp| | |Sh+Ca| | PgUp| UP | PgDo|PrtSc| DELET | + |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------| + | |WinLe|WinDo|WinRi| |Al+Ca|CapsL| LEFT| DOWN|RIGHT| | | + |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------| + | |WinLW|WinRW| | |Ct+Ca|ScroL| HOME| | END | | Ctrl| + |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----| + | | DeskL | DeskR| Task Manager| DeskX | MOUSE| | | LED | + `--------------------------------------------------------------------------' + + +## MOUSE + ,--------------------------------------------------------------------------. + | | | |Mo_Up| | | |M_WhL|M_WhU|M_WhR| | RESET | + |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------| + | | |Mo_Le|Mo_Do|Mo_Ri| | |M_Bt1|M_WhD|M_Bt2| | | + |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------| + | | | | | | | |M_AC0|M_AC1|M_AC2| | | + |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----| + | | | | GO_DEFAULT | GO_DEFAULT | | | | | + `--------------------------------------------------------------------------' From f8ed4ed573c798bd40a1063072fd619732a2d49a Mon Sep 17 00:00:00 2001 From: Nurahmadie Date: Tue, 21 Feb 2017 09:39:51 +0700 Subject: [PATCH 047/117] Initial work for my kbod support in qmk_firmware - Wiring layout done No actual keymap yet --- keyboards/handwired/kbod/Makefile | 3 + keyboards/handwired/kbod/config.h | 162 ++++++++++++++++++ keyboards/handwired/kbod/kbod.c | 28 +++ keyboards/handwired/kbod/kbod.h | 25 +++ .../handwired/kbod/keymaps/default/Makefile | 21 +++ .../handwired/kbod/keymaps/default/config.h | 8 + .../handwired/kbod/keymaps/default/keymap.c | 44 +++++ .../handwired/kbod/keymaps/default/readme.md | 1 + keyboards/handwired/kbod/readme.md | 28 +++ keyboards/handwired/kbod/rules.mk | 68 ++++++++ 10 files changed, 388 insertions(+) create mode 100644 keyboards/handwired/kbod/Makefile create mode 100644 keyboards/handwired/kbod/config.h create mode 100644 keyboards/handwired/kbod/kbod.c create mode 100644 keyboards/handwired/kbod/kbod.h create mode 100644 keyboards/handwired/kbod/keymaps/default/Makefile create mode 100644 keyboards/handwired/kbod/keymaps/default/config.h create mode 100644 keyboards/handwired/kbod/keymaps/default/keymap.c create mode 100644 keyboards/handwired/kbod/keymaps/default/readme.md create mode 100644 keyboards/handwired/kbod/readme.md create mode 100644 keyboards/handwired/kbod/rules.mk diff --git a/keyboards/handwired/kbod/Makefile b/keyboards/handwired/kbod/Makefile new file mode 100644 index 00000000..4e2a6f00 --- /dev/null +++ b/keyboards/handwired/kbod/Makefile @@ -0,0 +1,3 @@ +ifndef MAKEFILE_INCLUDED + include ../../Makefile +endif \ No newline at end of file diff --git a/keyboards/handwired/kbod/config.h b/keyboards/handwired/kbod/config.h new file mode 100644 index 00000000..e73b7d08 --- /dev/null +++ b/keyboards/handwired/kbod/config.h @@ -0,0 +1,162 @@ +/* +Copyright 2012 Jun Wako + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#ifndef CONFIG_H +#define CONFIG_H + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x6060 +#define DEVICE_VER 0x0001 +#define MANUFACTURER fudanchii +#define PRODUCT kbod +#define DESCRIPTION Keyboard of Disapproval + +/* key matrix size */ +#define MATRIX_ROWS 8 +#define MATRIX_COLS 8 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * +*/ +#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5, B6, B7, D6 } +#define MATRIX_COL_PINS { D0, D1, F0, F1, F4, F5, F6, F7 } +#define UNUSED_PINS + +/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */ +#define DIODE_DIRECTION COL2ROW + +// #define BACKLIGHT_PIN B7 +// #define BACKLIGHT_BREATHING +// #define BACKLIGHT_LEVELS 3 + + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCING_DELAY 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* number of backlight levels */ + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* + * Force NKRO + * + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the + * makefile for this to work.) + * + * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) + * until the next keyboard reset. + * + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * fully operational during normal computer usage. + * + * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) + * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by + * bootmagic, NKRO mode will always be enabled until it is toggled again during a + * power-up. + * + */ +//#define FORCE_NKRO + +/* + * Magic Key Options + * + * Magic keys are hotkey commands that allow control over firmware functions of + * the keyboard. They are best used in combination with the HID Listen program, + * found here: https://www.pjrc.com/teensy/hid_listen.html + * + * The options below allow the magic key functionality to be changed. This is + * useful if your keyboard/keypad is missing keys and you want magic key support. + * + */ + +/* key combination for magic key command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) + +/* control how magic key switches layers */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false + +/* override magic key keymap */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM +//#define MAGIC_KEY_HELP1 H +//#define MAGIC_KEY_HELP2 SLASH +//#define MAGIC_KEY_DEBUG D +//#define MAGIC_KEY_DEBUG_MATRIX X +//#define MAGIC_KEY_DEBUG_KBD K +//#define MAGIC_KEY_DEBUG_MOUSE M +//#define MAGIC_KEY_VERSION V +//#define MAGIC_KEY_STATUS S +//#define MAGIC_KEY_CONSOLE C +//#define MAGIC_KEY_LAYER0_ALT1 ESC +//#define MAGIC_KEY_LAYER0_ALT2 GRAVE +//#define MAGIC_KEY_LAYER0 0 +//#define MAGIC_KEY_LAYER1 1 +//#define MAGIC_KEY_LAYER2 2 +//#define MAGIC_KEY_LAYER3 3 +//#define MAGIC_KEY_LAYER4 4 +//#define MAGIC_KEY_LAYER5 5 +//#define MAGIC_KEY_LAYER6 6 +//#define MAGIC_KEY_LAYER7 7 +//#define MAGIC_KEY_LAYER8 8 +//#define MAGIC_KEY_LAYER9 9 +//#define MAGIC_KEY_BOOTLOADER PAUSE +//#define MAGIC_KEY_LOCK CAPS +//#define MAGIC_KEY_EEPROM E +//#define MAGIC_KEY_NKRO N +//#define MAGIC_KEY_SLEEP_LED Z + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT +//#define NO_ACTION_MACRO +//#define NO_ACTION_FUNCTION + +#endif diff --git a/keyboards/handwired/kbod/kbod.c b/keyboards/handwired/kbod/kbod.c new file mode 100644 index 00000000..9a12cae0 --- /dev/null +++ b/keyboards/handwired/kbod/kbod.c @@ -0,0 +1,28 @@ +#include "kbod.h" + +void matrix_init_kb(void) { + // put your keyboard start-up code here + // runs once when the firmware starts up + + matrix_init_user(); +} + +void matrix_scan_kb(void) { + // put your looping keyboard code here + // runs every cycle (a lot) + + matrix_scan_user(); +} + +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + // put your per-action keyboard code here + // runs for every action, just before processing by the firmware + + return process_record_user(keycode, record); +} + +void led_set_kb(uint8_t usb_led) { + // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here + + led_set_user(usb_led); +} diff --git a/keyboards/handwired/kbod/kbod.h b/keyboards/handwired/kbod/kbod.h new file mode 100644 index 00000000..629fb3ea --- /dev/null +++ b/keyboards/handwired/kbod/kbod.h @@ -0,0 +1,25 @@ +#ifndef KBOD_H +#define KBOD_H + +#include "quantum.h" + +// This a shortcut to help you visually see your layout. +// The following is an example using the Planck MIT layout +// The first section contains all of the arguements +// The second converts the arguments into a two-dimensional array +#define KEYMAP( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, K2C, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \ + k40, k41, k42, k43, k44, k45, k46, k47 \ +) \ +{ \ + { k00, k01, k02, k03, k04, k05, k06, k07 }, { k08, k09, k0A, k0B, k0C, k0D, KC_NO, KC_NO }, \ + { k10, k11, k12, k13, k14, k15, k16, k17 }, { k18, k19, k1A, k1B, k1C, k1D, KC_NO, k3B }, \ + { k20, k21, k22, k23, k24, k25, k26, k27 }, { k28, k29, k2A, k2B, k2C, k38, k39, k3A }, \ + { k30, k31, k32, k33, k34, k35, k36, k37 }, \ + { k40, k41, k42, k43, k44, k45, k46, k47 }, \ +} + +#endif diff --git a/keyboards/handwired/kbod/keymaps/default/Makefile b/keyboards/handwired/kbod/keymaps/default/Makefile new file mode 100644 index 00000000..0d9def93 --- /dev/null +++ b/keyboards/handwired/kbod/keymaps/default/Makefile @@ -0,0 +1,21 @@ +# Build Options +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +MIDI_ENABLE = no # MIDI controls +AUDIO_ENABLE = no # Audio output on port C6 +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend + +ifndef QUANTUM_DIR + include ../../../../Makefile +endif \ No newline at end of file diff --git a/keyboards/handwired/kbod/keymaps/default/config.h b/keyboards/handwired/kbod/keymaps/default/config.h new file mode 100644 index 00000000..df06a262 --- /dev/null +++ b/keyboards/handwired/kbod/keymaps/default/config.h @@ -0,0 +1,8 @@ +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "../../config.h" + +// place overrides here + +#endif \ No newline at end of file diff --git a/keyboards/handwired/kbod/keymaps/default/keymap.c b/keyboards/handwired/kbod/keymaps/default/keymap.c new file mode 100644 index 00000000..9245270e --- /dev/null +++ b/keyboards/handwired/kbod/keymaps/default/keymap.c @@ -0,0 +1,44 @@ +#include "kbod.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = KEYMAP( /* Base */ + KC_A, KC_1, KC_H, \ + KC_TAB, KC_SPC \ +), +}; + +const uint16_t PROGMEM fn_actions[] = { + +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + // MACRODOWN only works in this function + switch(id) { + case 0: + if (record->event.pressed) { + register_code(KC_RSFT); + } else { + unregister_code(KC_RSFT); + } + break; + } + return MACRO_NONE; +}; + + +void matrix_init_user(void) { + +} + +void matrix_scan_user(void) { + +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + return true; +} + +void led_set_user(uint8_t usb_led) { + +} \ No newline at end of file diff --git a/keyboards/handwired/kbod/keymaps/default/readme.md b/keyboards/handwired/kbod/keymaps/default/readme.md new file mode 100644 index 00000000..3fe84c61 --- /dev/null +++ b/keyboards/handwired/kbod/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for kbod \ No newline at end of file diff --git a/keyboards/handwired/kbod/readme.md b/keyboards/handwired/kbod/readme.md new file mode 100644 index 00000000..179ab1d7 --- /dev/null +++ b/keyboards/handwired/kbod/readme.md @@ -0,0 +1,28 @@ +kbod keyboard firmware +====================== + +## Quantum MK Firmware + +For the full Quantum feature list, see [the parent readme](/). + +## Building + +Download or clone the whole firmware and navigate to the keyboards/kbod folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. + +Depending on which keymap you would like to use, you will have to compile slightly differently. + +### Default + +To build with the default keymap, simply run `make default`. + +### Other Keymaps + +Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create a folder with the name of your keymap in the keymaps folder, and see keymap documentation (you can find in top readme.md) and existant keymap files. + +To build the firmware binary hex file with a keymap just do `make` with a keymap like this: + +``` +$ make [default|jack|] +``` + +Keymaps follow the format **__\.c__** and are stored in the `keymaps` folder. diff --git a/keyboards/handwired/kbod/rules.mk b/keyboards/handwired/kbod/rules.mk new file mode 100644 index 00000000..4fcd147a --- /dev/null +++ b/keyboards/handwired/kbod/rules.mk @@ -0,0 +1,68 @@ +# MCU name +#MCU = at90usb1287 +MCU = atmega32u4 + +# Processor frequency. +# This will define a symbol, F_CPU, in all source code files equal to the +# processor frequency in Hz. You can then use this symbol in your source code to +# calculate timings. Do NOT tack on a 'UL' at the end, this will be done +# automatically to create a 32-bit value in your source code. +# +# This will be an integer division of F_USB below, as it is sourced by +# F_USB after it has run through any CPU prescalers. Note that this value +# does not *change* the processor frequency - it should merely be updated to +# reflect the processor speed set externally so that the code can use accurate +# software delays. +F_CPU = 16000000 + + +# +# LUFA specific +# +# Target architecture (see library "Board Types" documentation). +ARCH = AVR8 + +# Input clock frequency. +# This will define a symbol, F_USB, in all source code files equal to the +# input clock frequency (before any prescaling is performed) in Hz. This value may +# differ from F_CPU if prescaling is used on the latter, and is required as the +# raw input clock is fed directly to the PLL sections of the AVR for high speed +# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' +# at the end, this will be done automatically to create a 32-bit value in your +# source code. +# +# If no clock division is performed on the input clock inside the AVR (via the +# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. +F_USB = $(F_CPU) + +# Interrupt driven control endpoint task(+60) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + + +# Boot Section Size in *bytes* +# Teensy halfKay 512 +# Teensy++ halfKay 1024 +# Atmel DFU loader 4096 +# LUFA bootloader 4096 +# USBaspLoader 2048 +OPT_DEFS += -DBOOTLOADER_SIZE=4096 + + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) +EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) +CONSOLE_ENABLE ?= no # Console for debug(+400) +COMMAND_ENABLE ?= no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE ?= no # USB Nkey Rollover +BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default +MIDI_ENABLE ?= no # MIDI controls +UNICODE_ENABLE ?= no # Unicode +BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE ?= no # Audio output on port C6 +FAUXCLICKY_ENABLE ?= no # Use buzzer to emulate clicky switches From 8b206e1e75f487a473b8a58223c857363ce0a6e4 Mon Sep 17 00:00:00 2001 From: Nurahmadie Date: Wed, 22 Feb 2017 06:40:48 +0700 Subject: [PATCH 048/117] Add initial keymap *crossfingers* --- keyboards/handwired/kbod/kbod.h | 4 - .../handwired/kbod/keymaps/default/keymap.c | 97 ++++++++++++++----- 2 files changed, 73 insertions(+), 28 deletions(-) diff --git a/keyboards/handwired/kbod/kbod.h b/keyboards/handwired/kbod/kbod.h index 629fb3ea..04ecdd39 100644 --- a/keyboards/handwired/kbod/kbod.h +++ b/keyboards/handwired/kbod/kbod.h @@ -3,10 +3,6 @@ #include "quantum.h" -// This a shortcut to help you visually see your layout. -// The following is an example using the Planck MIT layout -// The first section contains all of the arguements -// The second converts the arguments into a two-dimensional array #define KEYMAP( \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ diff --git a/keyboards/handwired/kbod/keymaps/default/keymap.c b/keyboards/handwired/kbod/keymaps/default/keymap.c index 9245270e..137ddf38 100644 --- a/keyboards/handwired/kbod/keymaps/default/keymap.c +++ b/keyboards/handwired/kbod/keymaps/default/keymap.c @@ -1,43 +1,92 @@ #include "kbod.h" +#define _____ KC_TRNS + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = KEYMAP( /* Base */ - KC_A, KC_1, KC_H, \ - KC_TAB, KC_SPC \ -), + KEYMAP( /* Base */ + F(0), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQUAL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOT, KC_ENTER, + KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSPO, + LT(1, KC_LEAD), KC_LCTL, KC_LALT, KC_SPACE, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + ), + KEYMAP( /* Cursor layer */ + KC_GRAVE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_INSERT, + _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_HOME, KC_END, _____, + _____, _____, _____, _____, _____, _____, _____, _____, KC_PGUP, KC_PGDN, KC_UP, _____, + _____, _____, _____, _____, _____, KC_LEFT, KC_DOWN, KC_RIGHT, _____ + ), + KEYMAP( /* Multimedia layer */ + _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, + _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, + _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, + _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_MS_BTN1, KC_MS_UP, _____, + LT(3, KC_LEAD), _____, _____, _____, _____, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_BTN3 + ), + KEYMAP( /* Multimedia layer */ + _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, + _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, + _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, + _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_MS_BTN1, KC_MS_WH_UP, _____, + _____, _____, _____, _____, _____, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_RIGHT, KC_MS_BTN3 + ), }; const uint16_t PROGMEM fn_actions[] = { - + [0] = ACTION_FUNCTION(0), }; -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - // MACRODOWN only works in this function - switch(id) { - case 0: - if (record->event.pressed) { - register_code(KC_RSFT); - } else { - unregister_code(KC_RSFT); - } - break; +void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { + static uint8_t shift_esc_shift_mask; + switch (id) { + case 0: + shift_esc_shift_mask = get_mods()&MODS_CTRL_MASK; + if (record->event.pressed) { + if (shift_esc_shift_mask) { + add_key(KC_GRV); + send_keyboard_report(); + } else { + add_key(KC_ESC); + send_keyboard_report(); + } + } else { + if (shift_esc_shift_mask) { + del_key(KC_GRV); + send_keyboard_report(); + } else { + del_key(KC_ESC); + send_keyboard_report(); + } } - return MACRO_NONE; -}; - + break; + } +} -void matrix_init_user(void) { -} +LEADER_EXTERNS(); void matrix_scan_user(void) { + LEADER_DICTIONARY() { + leading = false; + leader_end(); + SEQ_ONE_KEY(KC_B) { + layer_switch(0); + } + SEQ_ONE_KEY(KC_C) { + layer_switch(1); + } + SEQ_ONE_KEY(KC_M) { + layer_switch(2); + } + } } -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -} +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + return MACRO_NONE; +}; void led_set_user(uint8_t usb_led) { From 7614c6b7a75c93b248d36f039f919ab925afde32 Mon Sep 17 00:00:00 2001 From: Nurahmadie Date: Fri, 24 Feb 2017 12:06:10 +0700 Subject: [PATCH 049/117] Remove lead keys, fix some typos, rearrange layers --- keyboards/handwired/kbod/kbod.h | 2 +- .../handwired/kbod/keymaps/default/keymap.c | 37 +++++-------------- 2 files changed, 10 insertions(+), 29 deletions(-) diff --git a/keyboards/handwired/kbod/kbod.h b/keyboards/handwired/kbod/kbod.h index 04ecdd39..35606362 100644 --- a/keyboards/handwired/kbod/kbod.h +++ b/keyboards/handwired/kbod/kbod.h @@ -6,7 +6,7 @@ #define KEYMAP( \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, K2C, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \ k40, k41, k42, k43, k44, k45, k46, k47 \ ) \ diff --git a/keyboards/handwired/kbod/keymaps/default/keymap.c b/keyboards/handwired/kbod/keymaps/default/keymap.c index 137ddf38..463b1fc8 100644 --- a/keyboards/handwired/kbod/keymaps/default/keymap.c +++ b/keyboards/handwired/kbod/keymaps/default/keymap.c @@ -7,29 +7,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { F(0), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQUAL, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOT, KC_ENTER, - KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSPO, - LT(1, KC_LEAD), KC_LCTL, KC_LALT, KC_SPACE, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSPC, + MO(1), KC_LCTL, KC_LALT, KC_SPACE, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), KEYMAP( /* Cursor layer */ KC_GRAVE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_INSERT, - _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_HOME, KC_END, _____, + TO(3), _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_INSERT, + TO(2), _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_HOME, KC_END, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_PGUP, KC_PGDN, KC_UP, _____, - _____, _____, _____, _____, _____, KC_LEFT, KC_DOWN, KC_RIGHT, _____ + _____, _____, _____, _____, KC_LEFT, KC_DOWN, KC_RIGHT, _____ ), KEYMAP( /* Multimedia layer */ _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_MS_BTN1, KC_MS_UP, _____, - LT(3, KC_LEAD), _____, _____, _____, _____, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_BTN3 + TO(0), _____, _____, _____, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_BTN3 ), KEYMAP( /* Multimedia layer */ _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_MS_BTN1, KC_MS_WH_UP, _____, - _____, _____, _____, _____, _____, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_RIGHT, KC_MS_BTN3 + TO(0), _____, _____, _____, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_RIGHT, KC_MS_BTN3 ), }; @@ -37,6 +37,7 @@ const uint16_t PROGMEM fn_actions[] = { [0] = ACTION_FUNCTION(0), }; +#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { static uint8_t shift_esc_shift_mask; switch (id) { @@ -63,31 +64,11 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { } } - -LEADER_EXTERNS(); - -void matrix_scan_user(void) { - LEADER_DICTIONARY() { - leading = false; - leader_end(); - - SEQ_ONE_KEY(KC_B) { - layer_switch(0); - } - SEQ_ONE_KEY(KC_C) { - layer_switch(1); - } - SEQ_ONE_KEY(KC_M) { - layer_switch(2); - } - } -} - const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { return MACRO_NONE; }; void led_set_user(uint8_t usb_led) { - + } \ No newline at end of file From af7430b896bdc15dd007b2227ed0b6f2feb0634a Mon Sep 17 00:00:00 2001 From: Nurahmadie Date: Sat, 25 Feb 2017 12:36:53 +0700 Subject: [PATCH 050/117] Add capslock led, and audio buttons - Also change layer switch to momentary --- .../handwired/kbod/keymaps/default/keymap.c | 42 ++++++++++++------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/keyboards/handwired/kbod/keymaps/default/keymap.c b/keyboards/handwired/kbod/keymaps/default/keymap.c index 463b1fc8..3514ffb9 100644 --- a/keyboards/handwired/kbod/keymaps/default/keymap.c +++ b/keyboards/handwired/kbod/keymaps/default/keymap.c @@ -2,34 +2,36 @@ #define _____ KC_TRNS +#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KEYMAP( /* Base */ F(0), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQUAL, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOT, KC_ENTER, - KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSPC, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSFT, MO(1), KC_LCTL, KC_LALT, KC_SPACE, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), KEYMAP( /* Cursor layer */ KC_GRAVE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - TO(3), _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_INSERT, - TO(2), _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_HOME, KC_END, _____, - _____, _____, _____, _____, _____, _____, _____, _____, KC_PGUP, KC_PGDN, KC_UP, _____, - _____, _____, _____, _____, KC_LEFT, KC_DOWN, KC_RIGHT, _____ + MO(3), _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_INSERT, + MO(2), _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_HOME, _____, + _____, _____, _____, _____, _____, _____, _____, _____, KC_PGUP, KC_PGDN, KC_END, KC_UP, + _____, _____, _____, _____, _____, KC_LEFT, KC_DOWN, KC_RIGHT ), KEYMAP( /* Multimedia layer */ - _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, - _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, + TO(0), _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, _____, + _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_PSCR, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, - _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_MS_BTN1, KC_MS_UP, _____, - TO(0), _____, _____, _____, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_BTN3 + _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, + _____, _____, _____, _____, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_BTN3 ), KEYMAP( /* Multimedia layer */ - _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, - _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, + TO(0), _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, _____, + _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_PSCR, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, - _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_MS_BTN1, KC_MS_WH_UP, _____, - TO(0), _____, _____, _____, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_RIGHT, KC_MS_BTN3 + _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_MS_BTN1, KC_MS_WH_UP, KC_MS_BTN2, + _____, _____, _____, _____, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_RIGHT, KC_MS_BTN3 ), }; @@ -37,7 +39,7 @@ const uint16_t PROGMEM fn_actions[] = { [0] = ACTION_FUNCTION(0), }; -#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) + void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { static uint8_t shift_esc_shift_mask; switch (id) { @@ -66,9 +68,17 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { - return MACRO_NONE; + return MACRO_NONE; }; void led_set_user(uint8_t usb_led) { - + if (usb_led & _BV(USB_LED_CAPS_LOCK)) { + PORTB |= _BV(PB0); + } else { + PORTB &= ~_BV(PB0); + } +} + +void matrix_init_user(void) { + DDRB |= _BV(PB0); } \ No newline at end of file From c9dd11d5abec11aa046031c12b1aa5edc5efae77 Mon Sep 17 00:00:00 2001 From: Nurahmadie Date: Sat, 25 Feb 2017 13:30:18 +0700 Subject: [PATCH 051/117] Enable alt-F4 without [Fn] - Add led indicator when keymap not on base layer \o/ --- .../handwired/kbod/keymaps/default/keymap.c | 62 ++++++++++++------- 1 file changed, 41 insertions(+), 21 deletions(-) diff --git a/keyboards/handwired/kbod/keymaps/default/keymap.c b/keyboards/handwired/kbod/keymaps/default/keymap.c index 3514ffb9..6f2805d9 100644 --- a/keyboards/handwired/kbod/keymaps/default/keymap.c +++ b/keyboards/handwired/kbod/keymaps/default/keymap.c @@ -2,11 +2,31 @@ #define _____ KC_TRNS -#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) +#define MODS_PRESSED(btn) (get_mods() & (MOD_BIT(KC_L##btn)|MOD_BIT(KC_R##btn))) + +#define SET_WHETHER(mask, btn1, btn2) \ +if (record->event.pressed) { \ + if (mask) { \ + add_key(btn2); \ + send_keyboard_report(); \ + } else { \ + add_key(btn1); \ + send_keyboard_report(); \ + } \ +} else { \ + if (mask) { \ + del_key(btn2); \ + send_keyboard_report(); \ + } else { \ + del_key(btn1); \ + send_keyboard_report(); \ + } \ +} \ + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KEYMAP( /* Base */ - F(0), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQUAL, KC_BSPC, + F(0), KC_1, KC_2, KC_3, F(1), KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQUAL, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOT, KC_ENTER, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSFT, @@ -37,31 +57,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM fn_actions[] = { [0] = ACTION_FUNCTION(0), + [1] = ACTION_FUNCTION(1), }; void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { - static uint8_t shift_esc_shift_mask; + static uint8_t shift_esc_mask; + static uint8_t alt_mask; switch (id) { case 0: - shift_esc_shift_mask = get_mods()&MODS_CTRL_MASK; - if (record->event.pressed) { - if (shift_esc_shift_mask) { - add_key(KC_GRV); - send_keyboard_report(); - } else { - add_key(KC_ESC); - send_keyboard_report(); - } - } else { - if (shift_esc_shift_mask) { - del_key(KC_GRV); - send_keyboard_report(); - } else { - del_key(KC_ESC); - send_keyboard_report(); - } - } + shift_esc_mask = MODS_PRESSED(SHIFT); + SET_WHETHER(shift_esc_mask, KC_ESC, KC_GRAVE) + break; + case 1: + alt_mask = MODS_PRESSED(ALT); + SET_WHETHER(alt_mask, KC_4, KC_F4); break; } } @@ -81,4 +91,14 @@ void led_set_user(uint8_t usb_led) { void matrix_init_user(void) { DDRB |= _BV(PB0); + DDRC |= _BV(PC7); +} + +void matrix_scan_user(void) { + uint8_t layer = biton32(layer_state); + if (layer) { + PORTC |= _BV(PC7); + } else { + PORTC &= ~_BV(PC7); + } } \ No newline at end of file From 10105f645a7fdcf0d636e0eb2c768754521602a3 Mon Sep 17 00:00:00 2001 From: Nurahmadie Date: Sun, 26 Feb 2017 11:41:03 +0700 Subject: [PATCH 052/117] Add README --- .../handwired/kbod/keymaps/default/readme.md | 6 ++++- keyboards/handwired/kbod/readme.md | 25 ++++++------------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/keyboards/handwired/kbod/keymaps/default/readme.md b/keyboards/handwired/kbod/keymaps/default/readme.md index 3fe84c61..35c22ec0 100644 --- a/keyboards/handwired/kbod/keymaps/default/readme.md +++ b/keyboards/handwired/kbod/keymaps/default/readme.md @@ -1 +1,5 @@ -# The default keymap for kbod \ No newline at end of file +# The default keymap for kbod + +This is the default keymap for kbod, + +it consists of a base layer with QWERTY layout, a momentary cursor-layer, and mouse-keys and multimedia layers. \ No newline at end of file diff --git a/keyboards/handwired/kbod/readme.md b/keyboards/handwired/kbod/readme.md index 179ab1d7..bd58fdd3 100644 --- a/keyboards/handwired/kbod/readme.md +++ b/keyboards/handwired/kbod/readme.md @@ -1,28 +1,19 @@ -kbod keyboard firmware +KBOD keyboard firmware ====================== +KBOD is a 60% Keyboard kit, hand-wired, with Arduino Micro as its controller. It's utilize 8x8 matrix and has layout similar to GH-60 + ## Quantum MK Firmware For the full Quantum feature list, see [the parent readme](/). ## Building -Download or clone the whole firmware and navigate to the keyboards/kbod folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. - -Depending on which keymap you would like to use, you will have to compile slightly differently. - -### Default - -To build with the default keymap, simply run `make default`. +Download or clone the whole firmware and use ```make handwired-kbod-default``` to generate the .hex file. You may flash it with avrdude -### Other Keymaps - -Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create a folder with the name of your keymap in the keymaps folder, and see keymap documentation (you can find in top readme.md) and existant keymap files. - -To build the firmware binary hex file with a keymap just do `make` with a keymap like this: +## Flashing +Something along this line: ``` -$ make [default|jack|] -``` - -Keymaps follow the format **__\.c__** and are stored in the `keymaps` folder. +avrdude -p m32u4 -c avr109 -P -C -e -u flash:w:handwired_kbod_default.hex +``` \ No newline at end of file From f5d78c739d48bad32409b3819c8d624d5e78c017 Mon Sep 17 00:00:00 2001 From: Nurahmadie Date: Sun, 26 Feb 2017 11:44:21 +0700 Subject: [PATCH 053/117] Forgot semicolon, and add reference link --- keyboards/handwired/kbod/keymaps/default/keymap.c | 2 +- keyboards/handwired/kbod/readme.md | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/keyboards/handwired/kbod/keymaps/default/keymap.c b/keyboards/handwired/kbod/keymaps/default/keymap.c index 6f2805d9..a6c09dd5 100644 --- a/keyboards/handwired/kbod/keymaps/default/keymap.c +++ b/keyboards/handwired/kbod/keymaps/default/keymap.c @@ -67,7 +67,7 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { switch (id) { case 0: shift_esc_mask = MODS_PRESSED(SHIFT); - SET_WHETHER(shift_esc_mask, KC_ESC, KC_GRAVE) + SET_WHETHER(shift_esc_mask, KC_ESC, KC_GRAVE); break; case 1: alt_mask = MODS_PRESSED(ALT); diff --git a/keyboards/handwired/kbod/readme.md b/keyboards/handwired/kbod/readme.md index bd58fdd3..67bf711b 100644 --- a/keyboards/handwired/kbod/readme.md +++ b/keyboards/handwired/kbod/readme.md @@ -16,4 +16,6 @@ Something along this line: ``` avrdude -p m32u4 -c avr109 -P -C -e -u flash:w:handwired_kbod_default.hex -``` \ No newline at end of file +``` + +[More info](https://github.com/fudanchii/keyboard_of_disapproval) \ No newline at end of file From 15ddaa7f1929aa301a325b03c57e267524d56ea8 Mon Sep 17 00:00:00 2001 From: Nurahmadie Date: Sat, 11 Mar 2017 20:52:52 +0700 Subject: [PATCH 054/117] Fix layer stuck, and add numpad support --- keyboards/handwired/kbod/config.h | 5 +++++ .../handwired/kbod/keymaps/default/keymap.c | 20 +++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/keyboards/handwired/kbod/config.h b/keyboards/handwired/kbod/config.h index e73b7d08..f3d0c8bf 100644 --- a/keyboards/handwired/kbod/config.h +++ b/keyboards/handwired/kbod/config.h @@ -159,4 +159,9 @@ along with this program. If not, see . //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION +#define PREVENT_STUCK_MODIFIERS + +#undef TAPPING_TOGGLE +#define TAPPING_TOGGLE 2 + #endif diff --git a/keyboards/handwired/kbod/keymaps/default/keymap.c b/keyboards/handwired/kbod/keymaps/default/keymap.c index a6c09dd5..65c5f552 100644 --- a/keyboards/handwired/kbod/keymaps/default/keymap.c +++ b/keyboards/handwired/kbod/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOT, KC_ENTER, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSFT, - MO(1), KC_LCTL, KC_LALT, KC_SPACE, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + TT(1), KC_LCTL, KC_LALT, KC_SPACE, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), KEYMAP( /* Cursor layer */ KC_GRAVE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, @@ -39,19 +39,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _____, _____, _____, _____, _____, _____, _____, _____, KC_PGUP, KC_PGDN, KC_END, KC_UP, _____, _____, _____, _____, _____, KC_LEFT, KC_DOWN, KC_RIGHT ), - KEYMAP( /* Multimedia layer */ - TO(0), _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, _____, - _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_PSCR, - _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, - _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, + KEYMAP( /* Keypad layer */ + TO(0), _____, _____, _____, _____, _____, _____, KC_P7, KC_P8, KC_P9, _____, KC_PMNS, KC_PPLS, _____, + _____, _____, _____, _____, _____, _____, _____, KC_P4, KC_P5, KC_P6, _____, _____, _____, _____, + _____, _____, _____, _____, _____, _____, _____, KC_P1, KC_P2, KC_P3, _____, _____, _____, + _____, _____, _____, _____, _____, _____, _____, KC_P0, _____, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, _____, _____, _____, _____, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_BTN3 ), KEYMAP( /* Multimedia layer */ TO(0), _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, _____, - _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_PSCR, - _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, - _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_MS_BTN1, KC_MS_WH_UP, KC_MS_BTN2, - _____, _____, _____, _____, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_RIGHT, KC_MS_BTN3 + _____, _____, KC_WAKE, _____, _____, _____, _____, _____, _____, _____, KC_MSTP, KC_MPRV, KC_MNXT, _____, + _____, _____, KC_SLEP, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, + _____, _____, KC_PWR, _____, _____, _____, _____, _____, _____, KC_MS_BTN1, KC_MS_WH_UP, KC_MS_BTN2, + _____, _____, _____, KC_MPLY, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_RIGHT, KC_MS_BTN3 ), }; From 649d08742a7aec4001193bb5a7a35ca7935a9753 Mon Sep 17 00:00:00 2001 From: Nurahmadie Date: Tue, 28 Mar 2017 16:17:10 +0700 Subject: [PATCH 055/117] Use tap-toggle to move between layers. - Add PDOT key --- keyboards/handwired/kbod/keymaps/default/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/handwired/kbod/keymaps/default/keymap.c b/keyboards/handwired/kbod/keymaps/default/keymap.c index 65c5f552..1386b742 100644 --- a/keyboards/handwired/kbod/keymaps/default/keymap.c +++ b/keyboards/handwired/kbod/keymaps/default/keymap.c @@ -34,16 +34,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), KEYMAP( /* Cursor layer */ KC_GRAVE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - MO(3), _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_INSERT, - MO(2), _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_HOME, _____, + TT(3), _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_INSERT, + TT(2), _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_HOME, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_PGUP, KC_PGDN, KC_END, KC_UP, _____, _____, _____, _____, _____, KC_LEFT, KC_DOWN, KC_RIGHT ), KEYMAP( /* Keypad layer */ - TO(0), _____, _____, _____, _____, _____, _____, KC_P7, KC_P8, KC_P9, _____, KC_PMNS, KC_PPLS, _____, + TO(0), KC_1, KC_2, KC_3, F(1), KC_5, KC_6, KC_P7, KC_P8, KC_P9, KC_P0, KC_PMNS, KC_PPLS, KC_BSPC, _____, _____, _____, _____, _____, _____, _____, KC_P4, KC_P5, KC_P6, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, KC_P1, KC_P2, KC_P3, _____, _____, _____, - _____, _____, _____, _____, _____, _____, _____, KC_P0, _____, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, + _____, _____, _____, _____, _____, _____, _____, KC_P0, KC_PDOT, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, _____, _____, _____, _____, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_BTN3 ), KEYMAP( /* Multimedia layer */ From 787304647961f4cb654188ddb88c22dd7991ab87 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Sun, 2 Apr 2017 14:48:33 -0700 Subject: [PATCH 056/117] removed my handwired boards to a new branch. --- keyboards/handwired/atreus50/Makefile | 3 - keyboards/handwired/atreus50/atreus50.c | 1 - keyboards/handwired/atreus50/atreus50.h | 18 -- keyboards/handwired/atreus50/config.h | 58 ------- .../atreus50/keymaps/default/Makefile | 21 --- .../atreus50/keymaps/default/keymap.c | 128 -------------- keyboards/handwired/atreus50/rules.mk | 56 ------ keyboards/handwired/xk66/Makefile | 3 - keyboards/handwired/xk66/config.h | 162 ------------------ .../handwired/xk66/keymaps/default/Makefile | 21 --- .../handwired/xk66/keymaps/default/config.h | 8 - .../handwired/xk66/keymaps/default/keymap.c | 90 ---------- .../handwired/xk66/keymaps/default/readme.md | 1 - keyboards/handwired/xk66/readme.md | 28 --- keyboards/handwired/xk66/rules.mk | 67 -------- keyboards/handwired/xk66/xk66.c | 8 - keyboards/handwired/xk66/xk66.h | 25 --- 17 files changed, 698 deletions(-) delete mode 100644 keyboards/handwired/atreus50/Makefile delete mode 100644 keyboards/handwired/atreus50/atreus50.c delete mode 100644 keyboards/handwired/atreus50/atreus50.h delete mode 100644 keyboards/handwired/atreus50/config.h delete mode 100644 keyboards/handwired/atreus50/keymaps/default/Makefile delete mode 100644 keyboards/handwired/atreus50/keymaps/default/keymap.c delete mode 100644 keyboards/handwired/atreus50/rules.mk delete mode 100644 keyboards/handwired/xk66/Makefile delete mode 100644 keyboards/handwired/xk66/config.h delete mode 100644 keyboards/handwired/xk66/keymaps/default/Makefile delete mode 100644 keyboards/handwired/xk66/keymaps/default/config.h delete mode 100644 keyboards/handwired/xk66/keymaps/default/keymap.c delete mode 100644 keyboards/handwired/xk66/keymaps/default/readme.md delete mode 100644 keyboards/handwired/xk66/readme.md delete mode 100644 keyboards/handwired/xk66/rules.mk delete mode 100644 keyboards/handwired/xk66/xk66.c delete mode 100644 keyboards/handwired/xk66/xk66.h diff --git a/keyboards/handwired/atreus50/Makefile b/keyboards/handwired/atreus50/Makefile deleted file mode 100644 index bd09e588..00000000 --- a/keyboards/handwired/atreus50/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -ifndef MAKEFILE_INCLUDED - include ../../../Makefile -endif diff --git a/keyboards/handwired/atreus50/atreus50.c b/keyboards/handwired/atreus50/atreus50.c deleted file mode 100644 index dd0dbdaa..00000000 --- a/keyboards/handwired/atreus50/atreus50.c +++ /dev/null @@ -1 +0,0 @@ -#include "atreus50.h" diff --git a/keyboards/handwired/atreus50/atreus50.h b/keyboards/handwired/atreus50/atreus50.h deleted file mode 100644 index 5d27109c..00000000 --- a/keyboards/handwired/atreus50/atreus50.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef ATREUS50_H -#define ATREUS50_H - -#include "quantum.h" - -#define KEYMAP( \ - K000, K001, K002, K003, K004, K005, K007, K008, K009, K010, K011, K012, \ - K100, K101, K102, K103, K104, K105, K107, K108, K109, K110, K111, K112, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312 \ -) { \ - { K000, K001, K002, K003, K004, K005, KC_NO, K007, K008, K009, K010, K011, K012 }, \ - { K100, K101, K102, K103, K104, K105, KC_NO, K107, K108, K109, K110, K111, K112 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312 } \ -} - -#endif \ No newline at end of file diff --git a/keyboards/handwired/atreus50/config.h b/keyboards/handwired/atreus50/config.h deleted file mode 100644 index 0248032a..00000000 --- a/keyboards/handwired/atreus50/config.h +++ /dev/null @@ -1,58 +0,0 @@ -#ifndef CONFIG_H -#define CONFIG_H - -#include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER qmkbuilder -#define PRODUCT Atreus50 -#define DESCRIPTION Keyboard - -/* key matrix size */ -#define MATRIX_ROWS 4 -#define MATRIX_COLS 13 - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B6, B2, B3 } -#define UNUSED_PINS - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* number of backlight levels */ - -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 3 -#endif - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCING_DELAY 5 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE - -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* key combination for command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - -/* prevent stuck modifiers */ -#define PREVENT_STUCK_MODIFIERS - - -#ifdef RGB_DI_PIN -#define RGBLIGHT_ANIMATIONS -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif - -#endif \ No newline at end of file diff --git a/keyboards/handwired/atreus50/keymaps/default/Makefile b/keyboards/handwired/atreus50/keymaps/default/Makefile deleted file mode 100644 index 43fee266..00000000 --- a/keyboards/handwired/atreus50/keymaps/default/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Build Options -# change to "no" to disable the options, or define them in the Makefile in -# the appropriate keymap folder that will get included automatically -# -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = yes # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -CONSOLE_ENABLE = no # Console for debug(+400) -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -MIDI_ENABLE = no # MIDI controls -AUDIO_ENABLE = no # Audio output on port C6 -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif \ No newline at end of file diff --git a/keyboards/handwired/atreus50/keymaps/default/keymap.c b/keyboards/handwired/atreus50/keymaps/default/keymap.c deleted file mode 100644 index b3dc17cb..00000000 --- a/keyboards/handwired/atreus50/keymaps/default/keymap.c +++ /dev/null @@ -1,128 +0,0 @@ -// This is the canonical layout file for the Quantum project. If you want to add another keyboard, -// this is the style you want to emulate. - -#include "atreus50.h" -#include "action_layer.h" -#include "eeconfig.h" - -extern keymap_config_t keymap_config; - -// Each layer gets a name for readability, which is then used in the keymap matrix below. -// The underscores don't mean anything - you can have a layer called STUFF or any other name. -// Layer names don't all need to be of the same length, obviously, and you can also skip them -// entirely and just use numbers. -#define _DVORAK 0 -#define _QWERTY 1 -#define _COLEMAK 2 -#define _LOWER 3 -#define _RAISE 4 -#define _ADJUST 16 - -enum planck_keycodes { - DVORAK = SAFE_RANGE, - QWERTY, - COLEMAK, - LOWER, - RAISE, - BACKLIT -}; - -// Fillers to make layering more clear -#define _______ KC_TRNS -#define XXXXXXX KC_NO - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_DVORAK] = { /* dvorak */ - { KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, _______, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH }, - { KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, _______, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS }, - { KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_ENT, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT }, - { KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_BSPC, KC_LGUI, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_RCTL } - }, - - [_QWERTY] = { /* qwerty */ - { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, _______, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL }, - { KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, _______, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT }, - { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT }, - { KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_BSPC, KC_LGUI, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_RCTL } - }, - - [_COLEMAK] = { /* colemak */ - { KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, _______, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL }, - { KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, _______, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT }, - { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ENT, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT }, - { KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER, KC_BSPC, KC_LGUI, KC_SPC, RAISE, KC_UP, KC_DOWN, KC_RGUI, KC_RCTL} - }, - - [_LOWER] = { - { KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______ }, - { KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE }, - { _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, KC_F12, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______ }, - { _______, _______, KC_HOME, KC_END, _______, KC_DEL, _______, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______ } - }, - [_RAISE] = { - { KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, _______, KC_6, KC_7, KC_8, KC_9, KC_0, _______ }, - { KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS }, - { _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, KC_F12, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______ }, - { _______, _______, KC_HOME, KC_END, _______, KC_DEL, _______, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______ } - }, - [_ADJUST] = { - { KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 }, - { _______, RESET, _______, _______, _______, _______, _______, _______, QWERTY, COLEMAK, DVORAK, _______, _______ }, - { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }, - { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ } - }, - -}; - -const uint16_t PROGMEM fn_actions[] = { - -}; - -void persistant_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QWERTY: - if (record->event.pressed) { - persistant_default_layer_set(1UL<<_QWERTY); - } - return false; - break; - case COLEMAK: - if (record->event.pressed) { - persistant_default_layer_set(1UL<<_COLEMAK); - } - return false; - break; - case DVORAK: - if (record->event.pressed) { - persistant_default_layer_set(1UL<<_DVORAK); - } - return false; - break; - case LOWER: - if (record->event.pressed) { - layer_on(_LOWER); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } else { - layer_off(_LOWER); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } - return false; - break; - case RAISE: - if (record->event.pressed) { - layer_on(_RAISE); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } else { - layer_off(_RAISE); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } - return false; - break; - } - return true; -}; \ No newline at end of file diff --git a/keyboards/handwired/atreus50/rules.mk b/keyboards/handwired/atreus50/rules.mk deleted file mode 100644 index 1f8e943b..00000000 --- a/keyboards/handwired/atreus50/rules.mk +++ /dev/null @@ -1,56 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -F_CPU = 16000000 - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB = $(F_CPU) - -# Interrupt driven control endpoint task(+60) -OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT - - -# Boot Section Size in *bytes* -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - - -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE ?= yes # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) -EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) -CONSOLE_ENABLE ?= no # Console for debug(+400) -COMMAND_ENABLE ?= no # Commands for debug and configuration -SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend -NKRO_ENABLE ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality -AUDIO_ENABLE ?= no -RGBLIGHT_ENABLE ?= no \ No newline at end of file diff --git a/keyboards/handwired/xk66/Makefile b/keyboards/handwired/xk66/Makefile deleted file mode 100644 index bd09e588..00000000 --- a/keyboards/handwired/xk66/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -ifndef MAKEFILE_INCLUDED - include ../../../Makefile -endif diff --git a/keyboards/handwired/xk66/config.h b/keyboards/handwired/xk66/config.h deleted file mode 100644 index 02ff2a6b..00000000 --- a/keyboards/handwired/xk66/config.h +++ /dev/null @@ -1,162 +0,0 @@ -/* -Copyright 2012 Jun Wako - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#ifndef CONFIG_H -#define CONFIG_H - -#include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Xyverz -#define PRODUCT XK-66 -#define DESCRIPTION A hand-wired 66-key keyboard by Xyverz - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B5, B4, D7, D6, D4 } -#define MATRIX_COL_PINS { B6, F7, F6, F5, F4, F1, F0, D1, D0, B7, B3, B2, B1, B0 } -#define UNUSED_PINS - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -// #define BACKLIGHT_PIN B7 -// #define BACKLIGHT_BREATHING -// #define BACKLIGHT_LEVELS 3 - - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCING_DELAY 5 - -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - -/* number of backlight levels */ - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - * - */ -//#define FORCE_NKRO - -/* - * Magic Key Options - * - * Magic keys are hotkey commands that allow control over firmware functions of - * the keyboard. They are best used in combination with the HID Listen program, - * found here: https://www.pjrc.com/teensy/hid_listen.html - * - * The options below allow the magic key functionality to be changed. This is - * useful if your keyboard/keypad is missing keys and you want magic key support. - * - */ - -/* key combination for magic key command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - -/* control how magic key switches layers */ -//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true -//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true -//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false - -/* override magic key keymap */ -//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS -//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS -//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM -//#define MAGIC_KEY_HELP1 H -//#define MAGIC_KEY_HELP2 SLASH -//#define MAGIC_KEY_DEBUG D -//#define MAGIC_KEY_DEBUG_MATRIX X -//#define MAGIC_KEY_DEBUG_KBD K -//#define MAGIC_KEY_DEBUG_MOUSE M -//#define MAGIC_KEY_VERSION V -//#define MAGIC_KEY_STATUS S -//#define MAGIC_KEY_CONSOLE C -//#define MAGIC_KEY_LAYER0_ALT1 ESC -//#define MAGIC_KEY_LAYER0_ALT2 GRAVE -//#define MAGIC_KEY_LAYER0 0 -//#define MAGIC_KEY_LAYER1 1 -//#define MAGIC_KEY_LAYER2 2 -//#define MAGIC_KEY_LAYER3 3 -//#define MAGIC_KEY_LAYER4 4 -//#define MAGIC_KEY_LAYER5 5 -//#define MAGIC_KEY_LAYER6 6 -//#define MAGIC_KEY_LAYER7 7 -//#define MAGIC_KEY_LAYER8 8 -//#define MAGIC_KEY_LAYER9 9 -//#define MAGIC_KEY_BOOTLOADER PAUSE -//#define MAGIC_KEY_LOCK CAPS -//#define MAGIC_KEY_EEPROM E -//#define MAGIC_KEY_NKRO N -//#define MAGIC_KEY_SLEEP_LED Z - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT -//#define NO_ACTION_MACRO -//#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/handwired/xk66/keymaps/default/Makefile b/keyboards/handwired/xk66/keymaps/default/Makefile deleted file mode 100644 index f4671a9d..00000000 --- a/keyboards/handwired/xk66/keymaps/default/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Build Options -# change to "no" to disable the options, or define them in the Makefile in -# the appropriate keymap folder that will get included automatically -# -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = yes # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -CONSOLE_ENABLE = no # Console for debug(+400) -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -MIDI_ENABLE = no # MIDI controls -AUDIO_ENABLE = no # Audio output on port C6 -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif \ No newline at end of file diff --git a/keyboards/handwired/xk66/keymaps/default/config.h b/keyboards/handwired/xk66/keymaps/default/config.h deleted file mode 100644 index df06a262..00000000 --- a/keyboards/handwired/xk66/keymaps/default/config.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include "../../config.h" - -// place overrides here - -#endif \ No newline at end of file diff --git a/keyboards/handwired/xk66/keymaps/default/keymap.c b/keyboards/handwired/xk66/keymaps/default/keymap.c deleted file mode 100644 index 61b3bd97..00000000 --- a/keyboards/handwired/xk66/keymaps/default/keymap.c +++ /dev/null @@ -1,90 +0,0 @@ -#include "xk66.h" -#include "action_layer.h" -#include "eeconfig.h" - -extern keymap_config_t keymap_config; - -// Each layer gets a name for readability, which is then used in the keymap matrix below. -// The underscores don't mean anything - you can have a layer called STUFF or any other name. -// Layer names don't all need to be of the same length, obviously, and you can also skip them -// entirely and just use numbers. -#define _DV 0 -#define _QW 1 -#define _CM 2 -#define _FL 3 - -// Macro name shortcuts -#define QWERTY M(_QW) -#define DVORAK M(_DV) -#define COLEMAK M(_CM) - -// Fillers to make layering more clear -#define _______ KC_TRNS -#define XXXXXXX KC_NO - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[_DV] = KEYMAP ( /* Dvorak */ - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, \ - KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSLS, \ - MO(_FL), KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_ENT, \ - KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_LEFT, KC_RGHT, KC_BSPC, KC_SPC, KC_UP, KC_DOWN, KC_RGUI, KC_RALT, KC_RCTL, MO(_FL) - ), - -[_QW] = KEYMAP ( /* Qwerty */ - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ - MO(_FL), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_LEFT, KC_RGHT, KC_BSPC, KC_SPC, KC_UP, KC_DOWN, KC_RGUI, KC_RALT, KC_RCTL, MO(_FL) - ), - -[_CM] = KEYMAP ( /* Colemak */ - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ - KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, \ - MO(_FL), KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, \ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_LEFT, KC_RGHT, KC_BSPC, KC_SPC, KC_UP, KC_DOWN, KC_RGUI, KC_RALT, KC_RCTL, MO(_FL) - ), - -[_FL] = KEYMAP ( /* Function Layer 1 */ - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, QWERTY, DVORAK, COLEMAK, _______, _______, _______, \ - KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, \ - RESET, _______, _______, KC_HOME, KC_END, KC_DEL, KC_INS, KC_PGUP, KC_PGDN, _______, _______, _______, _______ - ), - -}; - - -const uint16_t PROGMEM fn_actions[] = { - -}; - -void persistant_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - switch(id) { - case _DV: - if (record->event.pressed) { - persistant_default_layer_set(1UL<<_DV); - } - break; - case _QW: - if (record->event.pressed) { - persistant_default_layer_set(1UL<<_QW); - } - break; - case _CM: - if (record->event.pressed) { - persistant_default_layer_set(1UL<<_CM); - } - break; - } - return MACRO_NONE; -}; diff --git a/keyboards/handwired/xk66/keymaps/default/readme.md b/keyboards/handwired/xk66/keymaps/default/readme.md deleted file mode 100644 index 6940fdd7..00000000 --- a/keyboards/handwired/xk66/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for handwired/xk66 \ No newline at end of file diff --git a/keyboards/handwired/xk66/readme.md b/keyboards/handwired/xk66/readme.md deleted file mode 100644 index 2aac6bde..00000000 --- a/keyboards/handwired/xk66/readme.md +++ /dev/null @@ -1,28 +0,0 @@ -handwired/xk66 keyboard firmware -====================== - -## Quantum MK Firmware - -For the full Quantum feature list, see [the parent readme](/). - -## Building - -Download or clone the whole firmware and navigate to the keyboards/handwired/xk66 folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. - -Depending on which keymap you would like to use, you will have to compile slightly differently. - -### Default - -To build with the default keymap, simply run `make default`. - -### Other Keymaps - -Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create a folder with the name of your keymap in the keymaps folder, and see keymap documentation (you can find in top readme.md) and existant keymap files. - -To build the firmware binary hex file with a keymap just do `make` with a keymap like this: - -``` -$ make [default|jack|] -``` - -Keymaps follow the format **__\.c__** and are stored in the `keymaps` folder. diff --git a/keyboards/handwired/xk66/rules.mk b/keyboards/handwired/xk66/rules.mk deleted file mode 100644 index 707a5385..00000000 --- a/keyboards/handwired/xk66/rules.mk +++ /dev/null @@ -1,67 +0,0 @@ -# MCU name -#MCU = at90usb1287 -MCU = atmega32u4 - -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -F_CPU = 16000000 - - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB = $(F_CPU) - -# Interrupt driven control endpoint task(+60) -OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT - - -# Boot Section Size in *bytes* -# Teensy halfKay 512 -# Teensy++ halfKay 1024 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -# USBaspLoader 2048 -OPT_DEFS += -DBOOTLOADER_SIZE=512 - - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE ?= yes # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) -EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) -CONSOLE_ENABLE ?= yes # Console for debug(+400) -COMMAND_ENABLE ?= yes # Commands for debug and configuration -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE ?= no # USB Nkey Rollover -BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default -MIDI_ENABLE ?= no # MIDI controls -UNICODE_ENABLE ?= no # Unicode -BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE ?= no # Audio output on port C6 diff --git a/keyboards/handwired/xk66/xk66.c b/keyboards/handwired/xk66/xk66.c deleted file mode 100644 index 3c3e3194..00000000 --- a/keyboards/handwired/xk66/xk66.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "xk66.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} diff --git a/keyboards/handwired/xk66/xk66.h b/keyboards/handwired/xk66/xk66.h deleted file mode 100644 index 38fe129e..00000000 --- a/keyboards/handwired/xk66/xk66.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef XK66_H -#define XK66_H - -#include "quantum.h" -#include "led.h" - - -// This a shortcut to help you visually see your layout. -// The first section contains all of the arguements -// The second converts the arguments into a two-dimensional array -#define KEYMAP( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2d, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, \ - K40, K41, K42, K43, K44, K45, K46, K48, K49, K4a, K4b, K4c, K4d \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, KC_NO, K2d }, \ - { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, KC_NO }, \ - { K40, K41, K42, K43, K44, K45, K46, KC_NO, K48, K49, K4a, K4b, K4c, K4d } \ -} - -#endif \ No newline at end of file From 570b4605b2bdc7e2c9b83ab4991d4582148efb12 Mon Sep 17 00:00:00 2001 From: Alexander Schaefer Date: Sun, 2 Apr 2017 18:44:15 -0600 Subject: [PATCH 057/117] Update readme.md There's no readme specifically for the Ergodox EZ now, so link to the Ergodox readme. --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index b2dfc5f7..f7bf14b6 100644 --- a/readme.md +++ b/readme.md @@ -32,7 +32,7 @@ The OLKB product firmwares are maintained by [Jack Humbert](https://github.com/j This is not a tiny project. While this is the main readme, there are many other files you might want to consult. Here are some points of interest: * [**The Wiki**](https://github.com/qmk/qmk_firmware/wiki) - the entirety of the readme has been moved here -* The readme for your own keyboard: This is found under `keyboards//`. So for the ErgoDox EZ, it's [here](keyboards/ergodox/ez/); for the Planck, it's [here](keyboards/planck/) and so on. +* The readme for your own keyboard: This is found under `keyboards//`. So for the ErgoDox, it's [here](keyboards/ergodox/); for the Planck, it's [here](keyboards/planck/) and so on. * The list of possible keycodes you can use in your keymap is actually spread out in a few different places: * [doc/keycode.txt](doc/keycode.txt) - an explanation of those same keycodes. * [quantum/quantum_keycodes.h](quantum/quantum_keycodes.h) - this is where the QMK-specific aliases are all set up. Things like the Hyper and Meh key, the Leader key, and all of the other QMK innovations. These are also explained and documented below, but `quantum_keycodes.h` is where they're actually defined. From 344ebbac43ef510b29cdcdff2688186ee3ffead7 Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Mon, 3 Apr 2017 11:32:54 -0400 Subject: [PATCH 058/117] Revert removal of avrdude make option --- keyboards/lets_split/rules.mk | 14 +++++++++++++- keyboards/lets_split/split_util.c | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/keyboards/lets_split/rules.mk b/keyboards/lets_split/rules.mk index ff159e0f..79860ea3 100644 --- a/keyboards/lets_split/rules.mk +++ b/keyboards/lets_split/rules.mk @@ -1,7 +1,7 @@ SRC += matrix.c \ i2c.c \ split_util.c \ - serial.c\ + serial.c \ ssd1306.c # MCU name @@ -74,3 +74,15 @@ USE_I2C ?= yes SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend CUSTOM_MATRIX = yes + +avrdude: build + ls /dev/tty* > /tmp/1; \ + echo "Reset your Pro Micro now"; \ + while [[ -z $$USB ]]; do \ + sleep 1; \ + ls /dev/tty* > /tmp/2; \ + USB=`diff /tmp/1 /tmp/2 | grep -o '/dev/tty.*'`; \ + done; \ + avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex + +.PHONY: avrdude diff --git a/keyboards/lets_split/split_util.c b/keyboards/lets_split/split_util.c index 46586fbc..39639c3b 100644 --- a/keyboards/lets_split/split_util.c +++ b/keyboards/lets_split/split_util.c @@ -21,7 +21,7 @@ static void setup_handedness(void) { #ifdef EE_HANDS isLeftHand = eeprom_read_byte(EECONFIG_HANDEDNESS); #else - // I2c_MASTER_RIGHT ish deprecate use MASTER_RIGHT instead since this works for both serial and i2c: + // I2C_MASTER_RIGHT is deprecated, use MASTER_RIGHT instead, since this works for both serial and i2c #if defined(I2C_MASTER_RIGHT) || defined(MASTER_RIGHT) isLeftHand = !has_usb(); #else From 48f4c5997bd0e041379f592f3e1e0c306e5a5e4d Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Mon, 3 Apr 2017 12:06:28 -0400 Subject: [PATCH 059/117] Move defines for RGB to after the config.h include --- keyboards/lets_split/keymaps/hexwire/config.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/keyboards/lets_split/keymaps/hexwire/config.h b/keyboards/lets_split/keymaps/hexwire/config.h index 9c8c6d7f..e5a779f6 100644 --- a/keyboards/lets_split/keymaps/hexwire/config.h +++ b/keyboards/lets_split/keymaps/hexwire/config.h @@ -20,13 +20,6 @@ along with this program. If not, see . #define TAPPING_TERM 150 -#undef RGBLED_NUM -#define RGBLIGHT_ANIMATIONS -#define RGBLED_NUM 8 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 - #ifdef SUBPROJECT_rev1 #include "../../rev1/config.h" #define COMPACT_KEYMAP( \ @@ -68,3 +61,10 @@ along with this program. If not, see . #ifdef SUBPROJECT_rev2fliphalf #include "../../rev2fliphalf/config.h" #endif + +#undef RGBLED_NUM +#define RGBLIGHT_ANIMATIONS +#define RGBLED_NUM 8 +#define RGBLIGHT_HUE_STEP 8 +#define RGBLIGHT_SAT_STEP 8 +#define RGBLIGHT_VAL_STEP 8 From de52bd5d8970a9b195d85c5367d4ecd125458976 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Mon, 3 Apr 2017 12:42:58 -0400 Subject: [PATCH 060/117] quick fix for space cadet shift --- quantum/quantum.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/quantum/quantum.c b/quantum/quantum.c index 62d9ef92..4f4cee4e 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -135,7 +135,7 @@ void reset_keyboard(void) { #endif static bool shift_interrupted[2] = {0, 0}; -static uint16_t scs_timer = 0; +static uint16_t scs_timer[2] = {0, 0}; bool process_record_quantum(keyrecord_t *record) { @@ -395,7 +395,7 @@ bool process_record_quantum(keyrecord_t *record) { case KC_LSPO: { if (record->event.pressed) { shift_interrupted[0] = false; - scs_timer = timer_read (); + scs_timer[0] = timer_read (); register_mods(MOD_BIT(KC_LSFT)); } else { @@ -405,7 +405,7 @@ bool process_record_quantum(keyrecord_t *record) { shift_interrupted[1] = true; } #endif - if (!shift_interrupted[0] && timer_elapsed(scs_timer) < TAPPING_TERM) { + if (!shift_interrupted[0] && timer_elapsed(scs_timer[0]) < TAPPING_TERM) { register_code(LSPO_KEY); unregister_code(LSPO_KEY); } @@ -418,7 +418,7 @@ bool process_record_quantum(keyrecord_t *record) { case KC_RSPC: { if (record->event.pressed) { shift_interrupted[1] = false; - scs_timer = timer_read (); + scs_timer[1] = timer_read (); register_mods(MOD_BIT(KC_RSFT)); } else { @@ -428,7 +428,7 @@ bool process_record_quantum(keyrecord_t *record) { shift_interrupted[1] = true; } #endif - if (!shift_interrupted[1] && timer_elapsed(scs_timer) < TAPPING_TERM) { + if (!shift_interrupted[1] && timer_elapsed(scs_timer[1]) < TAPPING_TERM) { register_code(RSPC_KEY); unregister_code(RSPC_KEY); } From 4e51c1e3ca75c9abe45673866d026cc0f810a410 Mon Sep 17 00:00:00 2001 From: ishtob Date: Mon, 3 Apr 2017 13:17:41 -0400 Subject: [PATCH 061/117] Update ssd1306.c --- keyboards/lets_split/ssd1306.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/lets_split/ssd1306.c b/keyboards/lets_split/ssd1306.c index 3c7816bb..4bf3a874 100644 --- a/keyboards/lets_split/ssd1306.c +++ b/keyboards/lets_split/ssd1306.c @@ -1,3 +1,4 @@ +#ifdef SSD1306OLED #include "config.h" #include "i2c.h" #include @@ -466,3 +467,4 @@ void iota_gfx_task(void) { iota_gfx_off(); } } +#endif From d0cfaba6d2f4ddf6aee7f05408971a0d4712bd60 Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Mon, 3 Apr 2017 12:15:14 -0400 Subject: [PATCH 062/117] Revise KEYMAP macro to make left and right halves more clear --- keyboards/lets_split/rev1/rev1.h | 24 +++++----- keyboards/lets_split/rev2/rev2.h | 80 ++++++++++++++++---------------- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/keyboards/lets_split/rev1/rev1.h b/keyboards/lets_split/rev1/rev1.h index 4667c9fb..6bf9f0f0 100644 --- a/keyboards/lets_split/rev1/rev1.h +++ b/keyboards/lets_split/rev1/rev1.h @@ -9,20 +9,20 @@ //void promicro_bootloader_jmp(bool program); #define KEYMAP( \ - k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \ - k10, k11, k12, k13, k14, k15, k50, k51, k52, k53, k54, k55, \ - k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \ - k30, k31, k32, k33, k34, k35, k70, k71, k72, k73, k74, k75 \ + L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ + L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ + L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ + L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ ) \ { \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 }, \ - { k40, k41, k42, k43, k44, k45 }, \ - { k50, k51, k52, k53, k54, k55 }, \ - { k60, k61, k62, k63, k64, k65 }, \ - { k70, k71, k72, k73, k74, k75 } \ + { L00, L01, L02, L03, L04, L05 }, \ + { L10, L11, L12, L13, L14, L15 }, \ + { L20, L21, L22, L23, L24, L25 }, \ + { L30, L31, L32, L33, L34, L35 }, \ + { R00, R01, R02, R03, R04, R05 }, \ + { R10, R11, R12, R13, R14, R15 }, \ + { R20, R21, R22, R23, R24, R25 }, \ + { R30, R31, R32, R33, R34, R35 } \ } #endif \ No newline at end of file diff --git a/keyboards/lets_split/rev2/rev2.h b/keyboards/lets_split/rev2/rev2.h index 05473136..0603827e 100644 --- a/keyboards/lets_split/rev2/rev2.h +++ b/keyboards/lets_split/rev2/rev2.h @@ -10,62 +10,62 @@ #ifdef USE_I2C #include #ifdef __AVR__ -#include -#include + #include + #include #endif #ifdef SSD1306OLED -extern bool iota_gfx_init(void); -extern void iota_gfx_task(void); -extern bool iota_gfx_off(void); -extern bool iota_gfx_on(void); -extern void iota_gfx_flush(void); -extern void iota_gfx_write_char(uint8_t c); -extern void iota_gfx_write(const char *data); -extern void iota_gfx_write_P(const char *data); -extern void iota_gfx_clear_screen(void); + extern bool iota_gfx_init(void); + extern void iota_gfx_task(void); + extern bool iota_gfx_off(void); + extern bool iota_gfx_on(void); + extern void iota_gfx_flush(void); + extern void iota_gfx_write_char(uint8_t c); + extern void iota_gfx_write(const char *data); + extern void iota_gfx_write_P(const char *data); + extern void iota_gfx_clear_screen(void); #endif #endif //void promicro_bootloader_jmp(bool program); #ifndef FLIP_HALF -//Standard Keymap +// Standard Keymap +// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left) #define KEYMAP( \ - k40, k41, k42, k43, k44, k45, k05, k04, k03, k02, k01, k00, \ - k50, k51, k52, k53, k54, k55, k15, k14, k13, k12, k11, k10, \ - k60, k61, k62, k63, k64, k65, k25, k24, k23, k22, k21, k20, \ - k70, k71, k72, k73, k74, k75, k35, k34, k33, k32, k31, k30 \ + L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ + L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ + L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ + L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ ) \ { \ - { k45, k44, k43, k42, k41, k40 }, \ - { k55, k54, k53, k52, k51, k50 }, \ - { k65, k64, k63, k62, k61, k60 }, \ - { k75, k74, k73, k72, k71, k70 }, \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 } \ + { L00, L01, L02, L03, L04, L05 }, \ + { L10, L11, L12, L13, L14, L15 }, \ + { L20, L21, L22, L23, L24, L25 }, \ + { L30, L31, L32, L33, L34, L35 }, \ + { R05, R04, R03, R02, R01, R00 }, \ + { R15, R14, R13, R12, R11, R10 }, \ + { R25, R24, R23, R22, R21, R20 }, \ + { R35, R34, R33, R32, R31, R30 } \ } - #else -// Keymap with one side flipped +// Keymap with right side flipped +// (TRRS jack on both halves are to the right) #define KEYMAP( \ - k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \ - k10, k11, k12, k13, k14, k15, k50, k51, k52, k53, k54, k55, \ - k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \ - k30, k31, k32, k33, k34, k35, k70, k71, k72, k73, k74, k75 \ + L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ + L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ + L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ + L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ ) \ { \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 }, \ - { k45, k44, k43, k42, k41, k40 }, \ - { k55, k54, k53, k52, k51, k50 }, \ - { k65, k64, k63, k62, k61, k60 }, \ - { k75, k74, k73, k72, k71, k70 } \ + { L00, L01, L02, L03, L04, L05 }, \ + { L10, L11, L12, L13, L14, L15 }, \ + { L20, L21, L22, L23, L24, L25 }, \ + { L30, L31, L32, L33, L34, L35 }, \ + { R00, R01, R02, R03, R04, R05 }, \ + { R10, R11, R12, R13, R14, R15 }, \ + { R20, R21, R22, R23, R24, R25 }, \ + { R30, R31, R32, R33, R34, R35 } \ } #endif - -#endif \ No newline at end of file +#endif From 563961328be1605a7f3942f042572a0160ac2959 Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Mon, 3 Apr 2017 12:31:38 -0400 Subject: [PATCH 063/117] Rename COMPACT_KEYMAP to KC_KEYMAP and move to lets_split.h --- keyboards/lets_split/keymaps/hexwire/config.h | 36 +------------------ keyboards/lets_split/keymaps/hexwire/keymap.c | 12 +++---- keyboards/lets_split/lets_split.h | 14 ++++++++ 3 files changed, 21 insertions(+), 41 deletions(-) diff --git a/keyboards/lets_split/keymaps/hexwire/config.h b/keyboards/lets_split/keymaps/hexwire/config.h index e5a779f6..27c24fe4 100644 --- a/keyboards/lets_split/keymaps/hexwire/config.h +++ b/keyboards/lets_split/keymaps/hexwire/config.h @@ -19,47 +19,13 @@ along with this program. If not, see . #define USE_SERIAL #define TAPPING_TERM 150 +#define FLIP_HALF #ifdef SUBPROJECT_rev1 #include "../../rev1/config.h" - #define COMPACT_KEYMAP( \ - k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \ - k10, k11, k12, k13, k14, k15, k50, k51, k52, k53, k54, k55, \ - k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \ - k30, k31, k32, k33, k34, k35, k70, k71, k72, k73, k74, k75 \ - ) \ - { \ - { KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05 }, \ - { KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15 }, \ - { KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25 }, \ - { KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35 }, \ - { KC_##k40, KC_##k41, KC_##k42, KC_##k43, KC_##k44, KC_##k45 }, \ - { KC_##k50, KC_##k51, KC_##k52, KC_##k53, KC_##k54, KC_##k55 }, \ - { KC_##k60, KC_##k61, KC_##k62, KC_##k63, KC_##k64, KC_##k65 }, \ - { KC_##k70, KC_##k71, KC_##k72, KC_##k73, KC_##k74, KC_##k75 } \ - } #endif #ifdef SUBPROJECT_rev2 #include "../../rev2/config.h" - #define COMPACT_KEYMAP( \ - k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \ - k10, k11, k12, k13, k14, k15, k55, k54, k53, k52, k51, k50, \ - k20, k21, k22, k23, k24, k25, k65, k64, k63, k62, k61, k60, \ - k30, k31, k32, k33, k34, k35, k75, k74, k73, k72, k71, k70 \ - ) \ - { \ - { KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05 }, \ - { KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15 }, \ - { KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25 }, \ - { KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35 }, \ - { KC_##k40, KC_##k41, KC_##k42, KC_##k43, KC_##k44, KC_##k45 }, \ - { KC_##k50, KC_##k51, KC_##k52, KC_##k53, KC_##k54, KC_##k55 }, \ - { KC_##k60, KC_##k61, KC_##k62, KC_##k63, KC_##k64, KC_##k65 }, \ - { KC_##k70, KC_##k71, KC_##k72, KC_##k73, KC_##k74, KC_##k75 } \ - } -#endif -#ifdef SUBPROJECT_rev2fliphalf - #include "../../rev2fliphalf/config.h" #endif #undef RGBLED_NUM diff --git a/keyboards/lets_split/keymaps/hexwire/keymap.c b/keyboards/lets_split/keymaps/hexwire/keymap.c index f8370490..fcf3cde7 100644 --- a/keyboards/lets_split/keymaps/hexwire/keymap.c +++ b/keyboards/lets_split/keymaps/hexwire/keymap.c @@ -39,7 +39,7 @@ enum custom_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = COMPACT_KEYMAP( + [_QWERTY] = KC_KEYMAP( //,----+----+----+----+----+----. ,----+----+----+----+----+----. TAB , Q , W , E , R , T , Y , U , I , O , P ,MINS, //|----+----+----+----+----+----| |----+----+----+----+----+----| @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`----+----+----+----+----+----' `----+----+----+----+----+----' ), - [_COLEMAK] = COMPACT_KEYMAP( + [_COLEMAK] = KC_KEYMAP( //,----+----+----+----+----+----. ,----+----+----+----+----+----. TAB , Q , W , F , P , G , J , L , U , Y ,SCLN,MINS, //|----+----+----+----+----+----| |----+----+----+----+----+----| @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`----+----+----+----+----+----' `----+----+----+----+----+----' ), - [_DVORAK] = COMPACT_KEYMAP( + [_DVORAK] = KC_KEYMAP( //,----+----+----+----+----+----. ,----+----+----+----+----+----. TAB ,QUOT,COMM,DOT , P , Y , F , G , C , R , L ,MINS, //|----+----+----+----+----+----| |----+----+----+----+----+----| @@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`----+----+----+----+----+----' `----+----+----+----+----+----' ), - [_LOWER] = COMPACT_KEYMAP( + [_LOWER] = KC_KEYMAP( //,----+----+----+----+----+----. ,----+----+----+----+----+----. , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 , , //|----+----+----+----+----+----| |----+----+----+----+----+----| @@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`----+----+----+----+----+----' `----+----+----+----+----+----' ), - [_RAISE] = COMPACT_KEYMAP( + [_RAISE] = KC_KEYMAP( //,----+----+----+----+----+----. ,----+----+----+----+----+----. ,EXLM, AT ,HASH,DLR ,PERC, CIRC,AMPR,ASTR,LPRN,RPRN, , //|----+----+----+----+----+----| |----+----+----+----+----+----| @@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`----+----+----+----+----+----' `----+----+----+----+----+----' ), - [_FN3] = COMPACT_KEYMAP( + [_FN3] = KC_KEYMAP( //,----+----+----+----+----+----. ,----+----+----+----+----+----. F12 , F1 , F2 , F3 , F4 , F5 , F6 , F7 , F8 , F9 ,F10 ,F11 , //|----+----+----+----+----+----| |----+----+----+----+----+----| diff --git a/keyboards/lets_split/lets_split.h b/keyboards/lets_split/lets_split.h index 0de308c7..1892bf2c 100644 --- a/keyboards/lets_split/lets_split.h +++ b/keyboards/lets_split/lets_split.h @@ -11,6 +11,20 @@ #include "rev2fliphalf.h" #endif +// Used to create a keymap using only KC_ prefixed keys +#define KC_KEYMAP( \ + L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ + L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ + L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ + L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ + ) \ + KEYMAP( \ + KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \ + KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \ + KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \ + KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \ + ) + #include "quantum.h" #endif \ No newline at end of file From d90ac762958eb77222a5277d64474f2aa3349176 Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Mon, 3 Apr 2017 12:51:31 -0400 Subject: [PATCH 064/117] Move defines for RGB to after the config.h include --- .../lets_split/keymaps/OLED_sample/config.h | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/keyboards/lets_split/keymaps/OLED_sample/config.h b/keyboards/lets_split/keymaps/OLED_sample/config.h index 353ea368..8389ba11 100644 --- a/keyboards/lets_split/keymaps/OLED_sample/config.h +++ b/keyboards/lets_split/keymaps/OLED_sample/config.h @@ -27,19 +27,16 @@ along with this program. If not, see . #define TAPPING_FORCE_HOLD #define TAPPING_TERM 100 +#ifdef SUBPROJECT_rev1 + #include "../../rev1/config.h" +#endif +#ifdef SUBPROJECT_rev2 + #include "../../rev2/config.h" +#endif + #undef RGBLED_NUM #define RGBLIGHT_ANIMATIONS #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 17 - - - - -#ifdef SUBPROJECT_rev1 - #include "../../rev1/config.h" -#endif -#ifdef SUBPROJECT_rev2 - #include "../../rev2/config.h" -#endif \ No newline at end of file From e3aeab356afd52299bf6cf05b5c99995ce167275 Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Mon, 3 Apr 2017 13:04:34 -0400 Subject: [PATCH 065/117] Move SSD1306 function declarations to header file --- .../lets_split/keymaps/OLED_sample/keymap.c | 3 +++ keyboards/lets_split/rev2/rev2.c | 1 - keyboards/lets_split/rev2/rev2.h | 11 ----------- keyboards/lets_split/ssd1306.c | 3 +-- keyboards/lets_split/ssd1306.h | 17 +++++++++++++++++ 5 files changed, 21 insertions(+), 14 deletions(-) create mode 100644 keyboards/lets_split/ssd1306.h diff --git a/keyboards/lets_split/keymaps/OLED_sample/keymap.c b/keyboards/lets_split/keymaps/OLED_sample/keymap.c index 072b825a..493ebcd3 100644 --- a/keyboards/lets_split/keymaps/OLED_sample/keymap.c +++ b/keyboards/lets_split/keymaps/OLED_sample/keymap.c @@ -6,6 +6,9 @@ #ifdef AUDIO_ENABLE #include "audio.h" #endif +#ifdef SSD1306OLED + #include "ssd1306.h" +#endif extern keymap_config_t keymap_config; diff --git a/keyboards/lets_split/rev2/rev2.c b/keyboards/lets_split/rev2/rev2.c index 8bfa171d..20a4c6be 100644 --- a/keyboards/lets_split/rev2/rev2.c +++ b/keyboards/lets_split/rev2/rev2.c @@ -37,4 +37,3 @@ void shutdown_user(void) { stop_all_notes(); #endif } - diff --git a/keyboards/lets_split/rev2/rev2.h b/keyboards/lets_split/rev2/rev2.h index 0603827e..0c4e8e7d 100644 --- a/keyboards/lets_split/rev2/rev2.h +++ b/keyboards/lets_split/rev2/rev2.h @@ -13,17 +13,6 @@ #include #include #endif -#ifdef SSD1306OLED - extern bool iota_gfx_init(void); - extern void iota_gfx_task(void); - extern bool iota_gfx_off(void); - extern bool iota_gfx_on(void); - extern void iota_gfx_flush(void); - extern void iota_gfx_write_char(uint8_t c); - extern void iota_gfx_write(const char *data); - extern void iota_gfx_write_P(const char *data); - extern void iota_gfx_clear_screen(void); -#endif #endif //void promicro_bootloader_jmp(bool program); diff --git a/keyboards/lets_split/ssd1306.c b/keyboards/lets_split/ssd1306.c index 3c7816bb..76348ab7 100644 --- a/keyboards/lets_split/ssd1306.c +++ b/keyboards/lets_split/ssd1306.c @@ -1,8 +1,7 @@ +#include "ssd1306.h" #include "config.h" #include "i2c.h" -#include #include -#include #include "print.h" #include "lets_split.h" #include "common/glcdfont.c" diff --git a/keyboards/lets_split/ssd1306.h b/keyboards/lets_split/ssd1306.h new file mode 100644 index 00000000..b0c74f98 --- /dev/null +++ b/keyboards/lets_split/ssd1306.h @@ -0,0 +1,17 @@ +#ifndef SSD1306_H +#define SSD1306_H + +#include +#include + +bool iota_gfx_init(void); +void iota_gfx_task(void); +bool iota_gfx_off(void); +bool iota_gfx_on(void); +void iota_gfx_flush(void); +void iota_gfx_write_char(uint8_t c); +void iota_gfx_write(const char *data); +void iota_gfx_write_P(const char *data); +void iota_gfx_clear_screen(void); + +#endif From 133ed52466f1a6d29974f1efc1deddcdafe773a8 Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Mon, 3 Apr 2017 13:23:23 -0400 Subject: [PATCH 066/117] =?UTF-8?q?Update=20Let=E2=80=99s=20Split=20readme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- keyboards/lets_split/readme.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/keyboards/lets_split/readme.md b/keyboards/lets_split/readme.md index ecce3f41..a8525a2e 100644 --- a/keyboards/lets_split/readme.md +++ b/keyboards/lets_split/readme.md @@ -7,6 +7,12 @@ Split keyboard firmware for Arduino Pro Micro or other ATmega32u4 based boards. +## Build Guide + +A build guide for putting together the Let's Split v2 can be found here: [An Overly Verbose Guide to Building a Let's Split Keyboard](https://github.com/nicinabox/lets-split-guide) + +There is additional information there about flashing and adding RGB underglow. + ## First Time Setup Download or clone the whole firmware and navigate to the keyboards/lets_split directory. Once your dev env is setup, you'll be able to generate the default .hex using: @@ -62,8 +68,8 @@ Apart from diodes and key switches for the keyboard matrix in each half, you will need: * 2 Arduino Pro Micro's. You can find theses on aliexpress for ≈3.50USD each. -* 2 TRS sockets -* 1 TRS cable. +* 2 TRRS sockets +* 1 TRRS cable. Alternatively, you can use any sort of cable and socket that has at least 3 wires. If you want to use I2C to communicate between halves, you will need a @@ -77,7 +83,7 @@ A speaker can be hooked-up to either side to the `5` (`C6`) pin and `GND`, and t Wiring ------ -The 3 wires of the TRS cable need to connect GND, VCC, and digital pin 3 (i.e. +The 3 wires of the TRRS cable need to connect GND, VCC, and digital pin 3 (i.e. PD0 on the ATmega32u4) between the two Pro Micros. Then wire your key matrix to any of the remaining 17 IO pins of the pro micro From ed9c18e86650496627e3a94c29c370e76a6e8313 Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Mon, 3 Apr 2017 14:00:33 -0400 Subject: [PATCH 067/117] Remove flip-half from keymap --- keyboards/lets_split/keymaps/hexwire/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/lets_split/keymaps/hexwire/config.h b/keyboards/lets_split/keymaps/hexwire/config.h index 27c24fe4..e315d8c0 100644 --- a/keyboards/lets_split/keymaps/hexwire/config.h +++ b/keyboards/lets_split/keymaps/hexwire/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #define USE_SERIAL #define TAPPING_TERM 150 -#define FLIP_HALF #ifdef SUBPROJECT_rev1 #include "../../rev1/config.h" From 13c882a1fbd3fe3d4f703628df46f18fc69e09ea Mon Sep 17 00:00:00 2001 From: Erez Zukerman Date: Mon, 3 Apr 2017 15:11:42 -0400 Subject: [PATCH 068/117] disables space cadet rollover --- keyboards/ergodox/ez/config.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/ergodox/ez/config.h b/keyboards/ergodox/ez/config.h index e4f95c30..a3347de4 100644 --- a/keyboards/ergodox/ez/config.h +++ b/keyboards/ergodox/ez/config.h @@ -49,6 +49,9 @@ along with this program. If not, see . #define RGBLIGHT_SAT_STEP 255 #define RGBLIGHT_VAL_STEP 12 +/* fix space cadet rollover issue */ +#define DISABLE_SPACE_CADET_ROLLOVER + // #define RGB_MIDI #define RGBW_BB_TWI From fbd9d04559962cb0db3a584d397f49371a4d7fb6 Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Mon, 3 Apr 2017 16:16:46 -0400 Subject: [PATCH 069/117] Include use of either TRS or TRRS --- keyboards/lets_split/readme.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/keyboards/lets_split/readme.md b/keyboards/lets_split/readme.md index a8525a2e..7e5a5460 100644 --- a/keyboards/lets_split/readme.md +++ b/keyboards/lets_split/readme.md @@ -68,8 +68,7 @@ Apart from diodes and key switches for the keyboard matrix in each half, you will need: * 2 Arduino Pro Micro's. You can find theses on aliexpress for ≈3.50USD each. -* 2 TRRS sockets -* 1 TRRS cable. +* 2 TRRS sockets and 1 TRRS cable, or 2 TRS sockets and 1 TRS cable Alternatively, you can use any sort of cable and socket that has at least 3 wires. If you want to use I2C to communicate between halves, you will need a @@ -83,7 +82,7 @@ A speaker can be hooked-up to either side to the `5` (`C6`) pin and `GND`, and t Wiring ------ -The 3 wires of the TRRS cable need to connect GND, VCC, and digital pin 3 (i.e. +The 3 wires of the TRS/TRRS cable need to connect GND, VCC, and digital pin 3 (i.e. PD0 on the ATmega32u4) between the two Pro Micros. Then wire your key matrix to any of the remaining 17 IO pins of the pro micro From 1454d466e7180dd8f55a635a13153fc04a32d8bb Mon Sep 17 00:00:00 2001 From: Dan Saunders Date: Mon, 3 Apr 2017 15:14:45 -0600 Subject: [PATCH 070/117] Create twolayer.c fixed issue where Default.c "function key" does not work (actually it's changing my LED steps). Changed layout to be more user friendly for people that use the standard spacebar milled top plate. --- keyboards/atomic/keymaps/twolayer.c | 72 +++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 keyboards/atomic/keymaps/twolayer.c diff --git a/keyboards/atomic/keymaps/twolayer.c b/keyboards/atomic/keymaps/twolayer.c new file mode 100644 index 00000000..8ea045d8 --- /dev/null +++ b/keyboards/atomic/keymaps/twolayer.c @@ -0,0 +1,72 @@ +#include "atomic.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* QWERTY - MIT ENHANCED / GRID COMPATIBLE + * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. + * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | XXXXXX . BACKSP | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| + * | TAB | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | DEL | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| + * | LCTRL1 | A | S | D | F | G | H | J | K | L | ; | ' | XXXXXX . ENTER | PG UP | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| + * | LSHIFT | Z | X | C | V | B | N | M | , | . | / | XXXXXX . RSHIFT | UP | PG DN | + * |--------+--------+--------+--------+--------+- 6.25u ---------+--------+--------+--------+--------+-----------------+--------+--------| + * | BRITE | LALT | FN | XXXXXX . SPACE | RCTRL | RALT | FN | LEFT | DOWN | RIGHT | + * '--------------------------------------------------------------------------------------------------------------------------------------' + */ + + [0] = { /* QWERTY */ + { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC }, + { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL }, + { KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_ENT, KC_PGUP }, + { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, KC_PGDN }, + { M(0), KC_ALT, MO(1), KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RCTL, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT }, + }, + + +/* FUNCTION + * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. + * | GRV | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | XXXXXX . | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| + * | SCR LK | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 | F21 | F22 | F23 | F24 | PAUSE | PR SCR | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| + * | CAP LK | MS BT5 | MS BT4 | MS BT3 | MS BT2 | SLOW M | FAST M | NEXT | VOL+ | VOL- | PLAY | | XXXXXX . | WHEEL+ | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| + * | NUM LK | | | | | | | | INSERT | END1 | HOME | XXXXXX . | MOUS U | WHEEL- | + * |--------+--------+--------+--------+--------+- 6.25 ------------+--------+--------+------+--------+-----------------+--------+--------| + * | | | FN | XXXXXX . MS BT1 | | | FN | MOUS L | MOUS D | MOUS R | + * '--------------------------------------------------------------------------------------------------------------------------------------' + */ + + [1] = { /* FUNCTION LAYER*/ + { KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___ }, + { KC_SLCK, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_PAUS, KC_PSCR }, + { KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U }, + { KC_NLCK, _______, _______, _______, _______, _______, _______, _______, KC_INSERT, KC_END, KC_HOME, ___T___, ___T___, KC_MS_U, KC_WH_D }, + { _______, _______, MO(1), _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, MO(1), KC_MS_L, KC_MS_D, KC_MS_R }, + }, +}; + +const uint16_t PROGMEM fn_actions[] = { + [1] = ACTION_LAYER_MOMENTARY(1), + [2] = ACTION_LAYER_MOMENTARY(1), +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + // MACRODOWN only works in this function + switch(id) { + case 0: + if (record->event.pressed) { + register_code(KC_RSFT); + #ifdef BACKLIGHT_ENABLE + backlight_step(); + #endif + } else { + unregister_code(KC_RSFT); + } + break; + } + return MACRO_NONE; +}; From e18768aa77985e3695f34b71f0e84547293e8104 Mon Sep 17 00:00:00 2001 From: Adam YH Lee Date: Mon, 21 Nov 2016 08:22:14 -0800 Subject: [PATCH 071/117] Add B1gtuna Miuni32 Miuni32 is a 30% ortholinear board. Please visit www.bigtuna.io for more information. --- keyboards/miuni32/Makefile | 3 + keyboards/miuni32/config.h | 170 ++++++++++++++++++++ keyboards/miuni32/keymaps/default/Makefile | 21 +++ keyboards/miuni32/keymaps/default/config.h | 8 + keyboards/miuni32/keymaps/default/keymap.c | 49 ++++++ keyboards/miuni32/keymaps/default/readme.md | 1 + keyboards/miuni32/miuni32.c | 28 ++++ keyboards/miuni32/miuni32.h | 15 ++ keyboards/miuni32/readme.md | 28 ++++ keyboards/miuni32/rules.mk | 67 ++++++++ 10 files changed, 390 insertions(+) create mode 100644 keyboards/miuni32/Makefile create mode 100644 keyboards/miuni32/config.h create mode 100644 keyboards/miuni32/keymaps/default/Makefile create mode 100644 keyboards/miuni32/keymaps/default/config.h create mode 100644 keyboards/miuni32/keymaps/default/keymap.c create mode 100644 keyboards/miuni32/keymaps/default/readme.md create mode 100644 keyboards/miuni32/miuni32.c create mode 100644 keyboards/miuni32/miuni32.h create mode 100644 keyboards/miuni32/readme.md create mode 100644 keyboards/miuni32/rules.mk diff --git a/keyboards/miuni32/Makefile b/keyboards/miuni32/Makefile new file mode 100644 index 00000000..57b2ef62 --- /dev/null +++ b/keyboards/miuni32/Makefile @@ -0,0 +1,3 @@ +ifndef MAKEFILE_INCLUDED + include ../../Makefile +endif diff --git a/keyboards/miuni32/config.h b/keyboards/miuni32/config.h new file mode 100644 index 00000000..4f9b6855 --- /dev/null +++ b/keyboards/miuni32/config.h @@ -0,0 +1,170 @@ +/* +Copyright 2012 Jun Wako + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#ifndef CONFIG_H +#define CONFIG_H + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x6060 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Bigtuna.io +#define PRODUCT Miuni32 +#define DESCRIPTION A custom keyboard for writers + +/* key matrix size */ +#define MATRIX_ROWS 3 +#define MATRIX_COLS 11 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * +*/ +#define MATRIX_ROW_PINS { F0, F4, D7} +#define MATRIX_COL_PINS { C6, C7, F7, F6, F1, E6, B7, B3, B2, B1, B0} +#define UNUSED_PINS + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION ROW2COL + +// #define BACKLIGHT_PIN B7 +// #define BACKLIGHT_BREATHING +// #define BACKLIGHT_LEVELS 3 + + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCING_DELAY 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* number of backlight levels */ + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* + * Force NKRO + * + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the + * makefile for this to work.) + * + * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) + * until the next keyboard reset. + * + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * fully operational during normal computer usage. + * + * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) + * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by + * bootmagic, NKRO mode will always be enabled until it is toggled again during a + * power-up. + * + */ +//#define FORCE_NKRO + +/* + * Magic Key Options + * + * Magic keys are hotkey commands that allow control over firmware functions of + * the keyboard. They are best used in combination with the HID Listen program, + * found here: https://www.pjrc.com/teensy/hid_listen.html + * + * The options below allow the magic key functionality to be changed. This is + * useful if your keyboard/keypad is missing keys and you want magic key support. + * + */ + +/* key combination for magic key command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) + +/* control how magic key switches layers */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false + +/* override magic key keymap */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM +//#define MAGIC_KEY_HELP1 H +//#define MAGIC_KEY_HELP2 SLASH +//#define MAGIC_KEY_DEBUG D +//#define MAGIC_KEY_DEBUG_MATRIX X +//#define MAGIC_KEY_DEBUG_KBD K +//#define MAGIC_KEY_DEBUG_MOUSE M +//#define MAGIC_KEY_VERSION V +//#define MAGIC_KEY_STATUS S +//#define MAGIC_KEY_CONSOLE C +//#define MAGIC_KEY_LAYER0_ALT1 ESC +//#define MAGIC_KEY_LAYER0_ALT2 GRAVE +//#define MAGIC_KEY_LAYER0 0 +//#define MAGIC_KEY_LAYER1 1 +//#define MAGIC_KEY_LAYER2 2 +//#define MAGIC_KEY_LAYER3 3 +//#define MAGIC_KEY_LAYER4 4 +//#define MAGIC_KEY_LAYER5 5 +//#define MAGIC_KEY_LAYER6 6 +//#define MAGIC_KEY_LAYER7 7 +//#define MAGIC_KEY_LAYER8 8 +//#define MAGIC_KEY_LAYER9 9 +//#define MAGIC_KEY_BOOTLOADER PAUSE +//#define MAGIC_KEY_LOCK CAPS +//#define MAGIC_KEY_EEPROM E +//#define MAGIC_KEY_NKRO N +//#define MAGIC_KEY_SLEEP_LED Z + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT +//#define NO_ACTION_MACRO +//#define NO_ACTION_FUNCTION + +#define RGBLIGHT_TIMER +#define RGB_DI_PIN D0 // The pin your RGB strip is wired to +#define RGBLIGHT_TIMER // Require for fancier stuff (not compatible with audio) +#define RGBLED_NUM 7 // Number of LEDs +#define RGBLIGHT_HUE_STEP 10 +#define RGBLIGHT_SAT_STEP 17 +#define RGBLIGHT_VAL_STEP 17 + +#endif diff --git a/keyboards/miuni32/keymaps/default/Makefile b/keyboards/miuni32/keymaps/default/Makefile new file mode 100644 index 00000000..88a3aea7 --- /dev/null +++ b/keyboards/miuni32/keymaps/default/Makefile @@ -0,0 +1,21 @@ +# Build Options +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +MIDI_ENABLE = no # MIDI controls +AUDIO_ENABLE = no # Audio output on port C6 +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend + +ifndef QUANTUM_DIR + include ../../../../Makefile +endif diff --git a/keyboards/miuni32/keymaps/default/config.h b/keyboards/miuni32/keymaps/default/config.h new file mode 100644 index 00000000..df06a262 --- /dev/null +++ b/keyboards/miuni32/keymaps/default/config.h @@ -0,0 +1,8 @@ +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "../../config.h" + +// place overrides here + +#endif \ No newline at end of file diff --git a/keyboards/miuni32/keymaps/default/keymap.c b/keyboards/miuni32/keymaps/default/keymap.c new file mode 100644 index 00000000..15e2fa45 --- /dev/null +++ b/keyboards/miuni32/keymaps/default/keymap.c @@ -0,0 +1,49 @@ +#include "miuni32.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] ={ + {KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, + {KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_RSFT, KC_ENT}, + {KC_Z, KC_X, KC_C, KC_V, KC_V, KC_SPC, KC_B, KC_N, KC_M , MO(1), KC_RCTL} + }, +[1] ={ + {KC_PGUP, KC_UP, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL}, + {KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_HOME, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_END, KC_TRNS}, + {RGB_TOG, RGB_HUI, RGB_HUD, RGB_SAI, KC_TRNS, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, RGB_MOD}, + } +}; +const uint16_t PROGMEM fn_actions[] = { + +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + // MACRODOWN only works in this function + switch(id) { + case 0: + if (record->event.pressed) { + register_code(KC_RSFT); + } else { + unregister_code(KC_RSFT); + } + break; + } + return MACRO_NONE; +}; + + +void matrix_init_user(void) { + +} + +void matrix_scan_user(void) { + +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + return true; +} + +void led_set_user(uint8_t usb_led) { + +} diff --git a/keyboards/miuni32/keymaps/default/readme.md b/keyboards/miuni32/keymaps/default/readme.md new file mode 100644 index 00000000..4cff8ef5 --- /dev/null +++ b/keyboards/miuni32/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for miuni32 \ No newline at end of file diff --git a/keyboards/miuni32/miuni32.c b/keyboards/miuni32/miuni32.c new file mode 100644 index 00000000..1c1983a5 --- /dev/null +++ b/keyboards/miuni32/miuni32.c @@ -0,0 +1,28 @@ +#include "miuni32.h" + +void matrix_init_kb(void) { + // put your keyboard start-up code here + // runs once when the firmware starts up + + matrix_init_user(); +} + +void matrix_scan_kb(void) { + // put your looping keyboard code here + // runs every cycle (a lot) + + matrix_scan_user(); +} + +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + // put your per-action keyboard code here + // runs for every action, just before processing by the firmware + + return process_record_user(keycode, record); +} + +void led_set_kb(uint8_t usb_led) { + // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here + + led_set_user(usb_led); +} diff --git a/keyboards/miuni32/miuni32.h b/keyboards/miuni32/miuni32.h new file mode 100644 index 00000000..eecb17f8 --- /dev/null +++ b/keyboards/miuni32/miuni32.h @@ -0,0 +1,15 @@ +#ifndef MIUNI32_H +#define MIUNI32_H + +#include "quantum.h" + +#define KEYMAP( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A ) { \ + { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0A }, \ + { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1A }, \ + { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K2A } \ +} + +#endif diff --git a/keyboards/miuni32/readme.md b/keyboards/miuni32/readme.md new file mode 100644 index 00000000..36696ddb --- /dev/null +++ b/keyboards/miuni32/readme.md @@ -0,0 +1,28 @@ +miuni32 keyboard firmware +====================== + +## Quantum MK Firmware + +For the full Quantum feature list, see [the parent readme](/). + +## Building + +Download or clone the whole firmware and navigate to the keyboards/miuni32 folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. + +Depending on which keymap you would like to use, you will have to compile slightly differently. + +### Default + +To build with the default keymap, simply run `make default`. + +### Other Keymaps + +Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create a folder with the name of your keymap in the keymaps folder, and see keymap documentation (you can find in top readme.md) and existant keymap files. + +To build the firmware binary hex file with a keymap just do `make` with a keymap like this: + +``` +$ make [default|jack|] +``` + +Keymaps follow the format **__\.c__** and are stored in the `keymaps` folder. diff --git a/keyboards/miuni32/rules.mk b/keyboards/miuni32/rules.mk new file mode 100644 index 00000000..55898147 --- /dev/null +++ b/keyboards/miuni32/rules.mk @@ -0,0 +1,67 @@ +# MCU name +#MCU = at90usb1287 +MCU = atmega32u4 + +# Processor frequency. +# This will define a symbol, F_CPU, in all source code files equal to the +# processor frequency in Hz. You can then use this symbol in your source code to +# calculate timings. Do NOT tack on a 'UL' at the end, this will be done +# automatically to create a 32-bit value in your source code. +# +# This will be an integer division of F_USB below, as it is sourced by +# F_USB after it has run through any CPU prescalers. Note that this value +# does not *change* the processor frequency - it should merely be updated to +# reflect the processor speed set externally so that the code can use accurate +# software delays. +F_CPU = 16000000 + + +# +# LUFA specific +# +# Target architecture (see library "Board Types" documentation). +ARCH = AVR8 + +# Input clock frequency. +# This will define a symbol, F_USB, in all source code files equal to the +# input clock frequency (before any prescaling is performed) in Hz. This value may +# differ from F_CPU if prescaling is used on the latter, and is required as the +# raw input clock is fed directly to the PLL sections of the AVR for high speed +# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' +# at the end, this will be done automatically to create a 32-bit value in your +# source code. +# +# If no clock division is performed on the input clock inside the AVR (via the +# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. +F_USB = $(F_CPU) + +# Interrupt driven control endpoint task(+60) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + + +# Boot Section Size in *bytes* +# Teensy halfKay 512 +# Teensy++ halfKay 1024 +# Atmel DFU loader 4096 +# LUFA bootloader 4096 +# USBaspLoader 2048 +OPT_DEFS += -DBOOTLOADER_SIZE=512 + + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) +EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) +CONSOLE_ENABLE ?= yes # Console for debug(+400) +COMMAND_ENABLE ?= yes # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE ?= no # USB Nkey Rollover +BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default +MIDI_ENABLE ?= no # MIDI controls +UNICODE_ENABLE ?= no # Unicode +BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE ?= no # Audio output on port C6 From 8e7be3adda577ab58ed942d83e0d2ebd4ab07f88 Mon Sep 17 00:00:00 2001 From: Adam Lee Date: Tue, 4 Apr 2017 10:21:32 -0700 Subject: [PATCH 072/117] Set Bootloader Size to 4K Use Atmel's default bootloader size, rather than Teensy 2.0's [1]. [1] https://github.com/qmk/qmk_firmware/pull/1207#discussion_r109712786 --- keyboards/miuni32/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/miuni32/rules.mk b/keyboards/miuni32/rules.mk index 55898147..ef8daf3c 100644 --- a/keyboards/miuni32/rules.mk +++ b/keyboards/miuni32/rules.mk @@ -45,7 +45,7 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT # Atmel DFU loader 4096 # LUFA bootloader 4096 # USBaspLoader 2048 -OPT_DEFS += -DBOOTLOADER_SIZE=512 +OPT_DEFS += -DBOOTLOADER_SIZE=4096 # Build Options From 154305ce1be16b2c8abce5e5d4dee421f295d6b3 Mon Sep 17 00:00:00 2001 From: Gabe Y Date: Tue, 4 Apr 2017 22:39:28 -0700 Subject: [PATCH 073/117] Fix formatting in BUILD_GUIDE.md (#1208) --- doc/BUILD_GUIDE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/BUILD_GUIDE.md b/doc/BUILD_GUIDE.md index 17501918..78cf00b9 100644 --- a/doc/BUILD_GUIDE.md +++ b/doc/BUILD_GUIDE.md @@ -96,7 +96,7 @@ The keyboard `config.h` is included only if the keymap one doesn't exist. The fo ``` #undef MY_SETTING #define MY_SETTING 4 -```c +``` For a value of `4` for this imaginary setting. So we `undef` it first, then `define` it. From 3a5f9faca969487bbf7eeaf0ba921dc0d9bef6d2 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Thu, 6 Apr 2017 22:02:38 -0700 Subject: [PATCH 074/117] Reworked Atreus keymap, added README --- keyboards/atreus/keymaps/xyverz/keymap.c | 190 +++++++++++++++++------ 1 file changed, 146 insertions(+), 44 deletions(-) diff --git a/keyboards/atreus/keymaps/xyverz/keymap.c b/keyboards/atreus/keymaps/xyverz/keymap.c index 66fdebb5..4471b9ca 100644 --- a/keyboards/atreus/keymaps/xyverz/keymap.c +++ b/keyboards/atreus/keymaps/xyverz/keymap.c @@ -12,49 +12,129 @@ extern keymap_config_t keymap_config; // The underscores don't mean anything - you can have a layer called STUFF or any other name. // Layer names don't all need to be of the same length, obviously, and you can also skip them // entirely and just use numbers. -#define _DV 0 -#define _QW 1 -#define _CM 2 -#define _L1 3 -#define _L2 4 +#define _DVORAK 0 +#define _QWERTY 1 +#define _COLEMAK 2 +#define _LOWER 3 +#define _RAISE 4 +#define _ADJUST 16 -// Macro name shortcuts -#define DVORAK M(_DV) -#define QWERTY M(_QW) -#define COLEMAK M(_CM) +enum planck_keycodes { + DVORAK = SAFE_RANGE, + QWERTY, + COLEMAK, + LOWER, + RAISE, + BACKLIT +}; +// Fillers to make layering more clear +#define _______ KC_TRNS +#define XXXXXXX KC_NO const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_DV] = { /* Dvorak */ - {KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_NO, KC_F, KC_G, KC_C, KC_R, KC_L }, - {KC_A, KC_O, KC_E, KC_U, KC_I, KC_NO, KC_D, KC_H, KC_T, KC_N, KC_S }, - {SFT_T(KC_SCLN), KC_Q, KC_J, KC_K, KC_X, CTL_T(KC_DEL), KC_B, KC_M, KC_W, KC_V, SFT_T(KC_Z) }, - {KC_ESC, KC_TAB, KC_LGUI, MO(_L2), KC_BSPC, ALT_T(KC_ENT), KC_SPC, MO(_L1), KC_MINS, KC_SLSH, KC_EQL} +/* Dvorak Layer + ,----------------------------------. ,----------------------------------. + | ' | , | . | P | Y | | F | G | C | R | L | + |------+------+------+------+------| |------+------+------+------+------| + | A | O | E | U | I | | D | H | T | N | S | + |------+------+------+------+------|------.,------|------+------+------+------+------| + |SFT/ ;| Q | J | K | X | CTRL ||Alt / | B | M | W | V |SFT/ Z| + |------+------+------+------+------| ||Enter |------+------+------+------+------| + | Esc | Tab | GUI | LOWER| BkSp |------'`------| Spc | RAISE| - | / | \ | + `----------------------------------' `----------------------------------' */ + [_DVORAK] = { + {KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, XXXXXXX, KC_F, KC_G, KC_C, KC_R, KC_L }, + {KC_A, KC_O, KC_E, KC_U, KC_I, XXXXXXX, KC_D, KC_H, KC_T, KC_N, KC_S }, + {SFT_T(KC_SCLN), KC_Q, KC_J, KC_K, KC_X, KC_LCTL, KC_B, KC_M, KC_W, KC_V, SFT_T(KC_Z)}, + {KC_ESC, KC_TAB, KC_LGUI, LOWER, KC_BSPC, ALT_T(KC_ENT), KC_SPC, RAISE, KC_MINS, KC_SLSH, KC_BSLS } }, - [_QW] = { /* Qwerty */ - {KC_Q, KC_W, KC_E, KC_R, KC_T, KC_NO, KC_Y, KC_U, KC_I, KC_O, KC_P }, - {KC_A, KC_S, KC_D, KC_F, KC_G, KC_NO, KC_H, KC_J, KC_K, KC_L, KC_SCLN}, - {SFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, CTL_T(KC_DEL), KC_N, KC_M, KC_COMM, KC_DOT, SFT_T(KC_SLSH) }, - {KC_ESC, KC_TAB, KC_LGUI, MO(_L2), KC_BSPC, ALT_T(KC_ENT), KC_SPC, MO(_L1), KC_MINS, KC_QUOT, KC_EQL} + +/* QWERTY Layer + ,----------------------------------. ,----------------------------------. + | Q | W | E | R | T | | Y | U | I | O | P | + |------+------+------+------+------| |------+------+------+------+------| + | A | S | D | F | G | | H | J | K | L | ; | + |------+------+------+------+------|------.,------|------+------+------+------+------| + |SFT/ Z| X | C | V | B | CTRL ||Alt / | N | M | , | . |SFT/ /| + |------+------+------+------+------| ||Enter |------+------+------+------+------| + | Esc | Tab | GUI | LOWER| BkSp |------'`------| Spc | RAISE| - | ' | \ | + `----------------------------------' `----------------------------------' */ + [_QWERTY] = { + {KC_Q, KC_W, KC_E, KC_R, KC_T, XXXXXXX, KC_Y, KC_U, KC_I, KC_O, KC_P }, + {KC_A, KC_S, KC_D, KC_F, KC_G, XXXXXXX, KC_H, KC_J, KC_K, KC_L, KC_SCLN}, + {SFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_LCTL, KC_N, KC_M, KC_COMM, KC_DOT, SFT_T(KC_SLSH)}, + {KC_ESC, KC_TAB, KC_LGUI, LOWER, KC_BSPC, ALT_T(KC_ENT), KC_SPC, RAISE, KC_MINS, KC_QUOT, KC_BSLS } }, - [_CM] = { /* Colemak */ - {KC_Q, KC_W, KC_F, KC_P, KC_G, KC_NO, KC_J, KC_L, KC_U, KC_Y, KC_SCLN}, - {KC_A, KC_R, KC_S, KC_T, KC_D, KC_NO, KC_H, KC_N, KC_E, KC_I, KC_O }, - {SFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, CTL_T(KC_DEL), KC_K, KC_M, KC_COMM, KC_DOT, SFT_T(KC_SLSH) }, - {KC_ESC, KC_TAB, KC_LGUI, MO(_L2), KC_BSPC, ALT_T(KC_ENT), KC_SPC, MO(_L1), KC_MINS, KC_QUOT, KC_EQL} + +/* Colemak Layer + ,----------------------------------. ,----------------------------------. + | Q | W | F | P | G | | J | L | U | Y | L | + |------+------+------+------+------| |------+------+------+------+------| + | A | R | S | T | D | | H | N | E | I | S | + |------+------+------+------+------|------.,------|------+------+------+------+------| + |SFT/ Z| X | C | V | B | CTRL ||Alt / | K | M | , | . |SFT/ /| + |------+------+------+------+------| ||Enter |------+------+------+------+------| + | Esc | Tab | GUI | LOWER| BkSp |------'`------| Spc | RAISE| - | ' | RGUI | + `----------------------------------' `----------------------------------'*/ + [_COLEMAK] = { + {KC_Q, KC_W, KC_F, KC_P, KC_G, XXXXXXX, KC_J, KC_L, KC_U, KC_Y, KC_SCLN}, + {KC_A, KC_R, KC_S, KC_T, KC_D, XXXXXXX, KC_H, KC_N, KC_E, KC_I, KC_O }, + {SFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_LCTL, KC_K, KC_M, KC_COMM, KC_DOT, SFT_T(KC_SLSH)}, + {KC_ESC, KC_TAB, KC_LGUI, LOWER, KC_BSPC, ALT_T(KC_ENT), KC_SPC, RAISE, KC_MINS, KC_QUOT, KC_BSLS } }, - [_L1] = { /* LAYER 1 */ - {KC_1, KC_2, KC_3, KC_4, KC_5, KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0 }, - {KC_TAB, KC_INS, KC_UP, KC_DEL, KC_HOME, KC_NO, KC_PGUP, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS}, - {KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_LCTL, KC_PGDN, KC_MPRV, KC_MPLY, KC_MNXT, KC_BSLS}, - {KC_TRNS, KC_GRV, KC_LGUI, KC_TRNS, KC_DEL, KC_LALT, KC_SPC, KC_TRNS, KC_LBRC, KC_RBRC, KC_ENT } + +/* LOWER Layer + ,----------------------------------. ,----------------------------------. + | ! | @ | # | $ | % | | ^ | & | * | ( | ) | + |------+------+------+------+------| |------+------+------+------+------| + | CAPS | | UP | | Home | | PgDn | | + | { | } | + |------+------+------+------+------|------.,------|------+------+------+------+------| + | | Left | Down | Right| End | || | PgUp | Mute | Vol- | Vol+ | | + |------+------+------+------+------| || |------+------+------+------+------| + | ~ | | | | Del |------'`------| Ins | | | | | + `----------------------------------' `----------------------------------'*/ + [_LOWER] = { + {KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, XXXXXXX, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN}, + {KC_CAPS, _______, KC_UP, _______, KC_HOME, XXXXXXX, KC_PGUP, _______, KC_PLUS, KC_LCBR, KC_RCBR}, + {_______, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, _______, KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______}, + {KC_TILD, _______, _______, _______, KC_DEL, _______, KC_INS, _______, _______, _______, _______} }, - [_L2] = { /* LAYER 2 */ - {KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_NO, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN}, - {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO, KC_TRNS, KC_F6, KC_F7, KC_F8, KC_PIPE}, - {KC_TRNS, KC_TRNS, DVORAK, QWERTY, COLEMAK, KC_LCTL, KC_TRNS, KC_F9, KC_F10, KC_F11, KC_F12 }, - {KC_TRNS, KC_TRNS, KC_LGUI, KC_TRNS, KC_BSPC, KC_LALT, KC_SPC, KC_TRNS, LSFT(KC_LBRC), LSFT(KC_RBRC), RESET} + +/* RAISE Layer + ,----------------------------------. ,----------------------------------. + | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | + |------+------+------+------+------| |------+------+------+------+------| + | CAPS | | UP | | Home | | PgDn | | = | [ | ] | + |------+------+------+------+------|------.,------|------+------+------+------+------| + | | Left | Down | Right| End | || | PgUp | Prev | Play | Next | | + |------+------+------+------+------| || |------+------+------+------+------| + | ` | | | | Del |------'`------| Ins | | | | | + `----------------------------------' `----------------------------------'*/ + [_RAISE] = { + {KC_1, KC_2, KC_3, KC_4, KC_5, XXXXXXX, KC_6, KC_7, KC_8, KC_9, KC_0 }, + {KC_CAPS, _______, KC_UP, _______, KC_HOME, XXXXXXX, KC_PGUP, _______, KC_EQL, KC_LBRC, KC_RBRC}, + {_______, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, _______, KC_PGDN, KC_MPRV, KC_MPLY, KC_MNXT, _______}, + {KC_GRV, _______, _______, _______, KC_DEL, _______, KC_INS, _______, _______, _______, _______} + }, + +/* ADJUST Layer + ,----------------------------------. ,----------------------------------. + | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | + |------+------+------+------+------| |------+------+------+------+------| + | F11 | | | | | | | | | | F12 | + |------+------+------+------+------|------.,------|------+------+------+------+------| + | |QWERTY|COLEMK|DVORAK| | || | | | | | | + |------+------+------+------+------| || |------+------+------+------+------| + | | | | | |------'`------| | | | | RESET| + `----------------------------------' `----------------------------------'*/ + [_ADJUST] = { + {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, XXXXXXX, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 }, + {KC_F11, _______, _______, _______, _______, XXXXXXX, _______, _______, _______, _______, KC_F12 }, + {_______, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, _______, _______, _______}, + {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET } } + }; const uint16_t PROGMEM fn_actions[] = { @@ -66,24 +146,46 @@ void persistant_default_layer_set(uint16_t default_layer) { default_layer_set(default_layer); } -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - switch(id) { - case _DV: +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case QWERTY: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_QWERTY); + } + return false; + break; + case COLEMAK: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_COLEMAK); + } + return false; + break; + case DVORAK: if (record->event.pressed) { - persistant_default_layer_set(1UL<<_DV); + persistant_default_layer_set(1UL<<_DVORAK); } + return false; break; - case _QW: + case LOWER: if (record->event.pressed) { - persistant_default_layer_set(1UL<<_QW); + layer_on(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); } + return false; break; - case _CM: + case RAISE: if (record->event.pressed) { - persistant_default_layer_set(1UL<<_CM); + layer_on(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); } + return false; break; } - return MACRO_NONE; + return true; }; From 8813365ec5c091c0185563943bbf73ec53d846e0 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Thu, 6 Apr 2017 22:03:17 -0700 Subject: [PATCH 075/117] Added readme --- keyboards/atreus/keymaps/xyverz/readme.md | 89 +++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 keyboards/atreus/keymaps/xyverz/readme.md diff --git a/keyboards/atreus/keymaps/xyverz/readme.md b/keyboards/atreus/keymaps/xyverz/readme.md new file mode 100644 index 00000000..29c0422b --- /dev/null +++ b/keyboards/atreus/keymaps/xyverz/readme.md @@ -0,0 +1,89 @@ +# Xyverz's Atreus Keymap + +## About this keymap: + +This is the second iteration of my Atreus keymap. The first one was as close to the planck as I could get at the +time, but still very much like the original Atreus keymap. I've managed to get things working better now and have +implemented (more like copied) the RAISE/LOWER/ADJUST layers. This is a work in progress, but I think I'm closer +to a final go with this. + +I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar to the default Planck layouts. + +## Still to do: + + * Tidy the keymap up so that it's readable. + * Learn how to make alias macros for mod_tap keys. + +### Layer 0: Dvorak layer + + ,----------------------------------. ,----------------------------------. + | ' | , | . | P | Y | | F | G | C | R | L | + |------+------+------+------+------| |------+------+------+------+------| + | A | O | E | U | I | | D | H | T | N | S | + |------+------+------+------+------|------.,------|------+------+------+------+------| + |Shft ;| Q | J | K | X | CTRL ||Alt / | B | M | W | V |Shft Z| + |------+------+------+------+------| ||Enter |------+------+------+------+------| + | Esc | Tab | GUI | LOWER| BkSp |------'`------| Spc | RAISE| - | / | \ | + `----------------------------------' `----------------------------------' + +### Layer 1: QWERTY layer + + ,----------------------------------. ,----------------------------------. + | Q | W | E | R | T | | Y | U | I | O | P | + |------+------+------+------+------| |------+------+------+------+------| + | A | S | D | F | G | | H | J | K | L | ; | + |------+------+------+------+------|------.,------|------+------+------+------+------| + |Shft Z| X | C | V | B | CTRL ||Alt / | N | M | , | . |Shft /| + |------+------+------+------+------| ||Enter |------+------+------+------+------| + | Esc | Tab | GUI | LOWER| BkSp |------'`------| Spc | RAISE| - | ' | \ | + `----------------------------------' `----------------------------------' + +### Keymap 2: Colemak layer + + ,----------------------------------. ,----------------------------------. + | Q | W | F | P | G | | J | L | U | Y | L | + |------+------+------+------+------| |------+------+------+------+------| + | A | R | S | T | D | | H | N | E | I | S | + |------+------+------+------+------|------.,------|------+------+------+------+------| + |Shft Z| X | C | V | B | CTRL ||Alt / | K | M | , | . |Shft /| + |------+------+------+------+------| ||Enter |------+------+------+------+------| + | Esc | Tab | GUI | LOWER| BkSp |------'`------| Spc | RAISE| - | ' | RGUI | + `----------------------------------' `----------------------------------' + +### layer 3 : LOWER layer + + ,----------------------------------. ,----------------------------------. + | ! | @ | # | $ | % | | ^ | & | * | ( | ) | + |------+------+------+------+------| |------+------+------+------+------| + | CAPS | | UP | | Home | | PgDn | | + | { | } | + |------+------+------+------+------|------.,------|------+------+------+------+------| + | | Left | Down | Right| End | || | PgUp | Mute | Vol- | Vol+ | | + |------+------+------+------+------| || |------+------+------+------+------| + | ~ | | | | Del |------'`------| Ins | | | | | + `----------------------------------' `----------------------------------' + + +### Keymap 4: RAISE layer + + ,----------------------------------. ,----------------------------------. + | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | + |------+------+------+------+------| |------+------+------+------+------| + | CAPS | | UP | | Home | | PgDn | | = | [ | ] | + |------+------+------+------+------|------.,------|------+------+------+------+------| + | | Left | Down | Right| End | || | PgUp | Prev | Play | Next | | + |------+------+------+------+------| || |------+------+------+------+------| + | ` | | | | Del |------'`------| Ins | | | | | + `----------------------------------' `----------------------------------' + +### Keymap 5: ADJUST layer + + ,----------------------------------. ,----------------------------------. + | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | + |------+------+------+------+------| |------+------+------+------+------| + | F11 | | | | | | | | | | F12 | + |------+------+------+------+------|------.,------|------+------+------+------+------| + | |QWERTY|COLEMK|DVORAK| | || | | | | | | + |------+------+------+------+------| || |------+------+------+------+------| + | | | | | |------'`------| | | | | RESET| + `----------------------------------' `----------------------------------' + From 3607522c12a11c4ff1b45ec8cb6495c96fdd6724 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Thu, 6 Apr 2017 22:26:13 -0700 Subject: [PATCH 076/117] More tweaks to keymap and readme. --- keyboards/atreus/keymaps/xyverz/keymap.c | 20 +++++++++++++------- keyboards/atreus/keymaps/xyverz/readme.md | 3 +-- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/keyboards/atreus/keymaps/xyverz/keymap.c b/keyboards/atreus/keymaps/xyverz/keymap.c index 4471b9ca..3c61d66d 100644 --- a/keyboards/atreus/keymaps/xyverz/keymap.c +++ b/keyboards/atreus/keymaps/xyverz/keymap.c @@ -28,6 +28,12 @@ enum planck_keycodes { BACKLIT }; +// Adding macros to make the keymaps below much easier to read. +#define SFTSCLN SFT_T(KC_SCLN) +#define SFTSLSH SFT_T(KC_SLSH) +#define SFTZED SFT_T(KC_Z) +#define ALTENT ALT_T(KC_ENT) + // Fillers to make layering more clear #define _______ KC_TRNS #define XXXXXXX KC_NO @@ -46,8 +52,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_DVORAK] = { {KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, XXXXXXX, KC_F, KC_G, KC_C, KC_R, KC_L }, {KC_A, KC_O, KC_E, KC_U, KC_I, XXXXXXX, KC_D, KC_H, KC_T, KC_N, KC_S }, - {SFT_T(KC_SCLN), KC_Q, KC_J, KC_K, KC_X, KC_LCTL, KC_B, KC_M, KC_W, KC_V, SFT_T(KC_Z)}, - {KC_ESC, KC_TAB, KC_LGUI, LOWER, KC_BSPC, ALT_T(KC_ENT), KC_SPC, RAISE, KC_MINS, KC_SLSH, KC_BSLS } + {SFTSCLN, KC_Q, KC_J, KC_K, KC_X, KC_LCTL, KC_B, KC_M, KC_W, KC_V, SFTZED }, + {KC_ESC, KC_TAB, KC_LGUI, LOWER, KC_BSPC, ALTENT, KC_SPC, RAISE, KC_MINS, KC_SLSH, KC_BSLS} }, /* QWERTY Layer @@ -63,8 +69,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = { {KC_Q, KC_W, KC_E, KC_R, KC_T, XXXXXXX, KC_Y, KC_U, KC_I, KC_O, KC_P }, {KC_A, KC_S, KC_D, KC_F, KC_G, XXXXXXX, KC_H, KC_J, KC_K, KC_L, KC_SCLN}, - {SFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_LCTL, KC_N, KC_M, KC_COMM, KC_DOT, SFT_T(KC_SLSH)}, - {KC_ESC, KC_TAB, KC_LGUI, LOWER, KC_BSPC, ALT_T(KC_ENT), KC_SPC, RAISE, KC_MINS, KC_QUOT, KC_BSLS } + {SFTZED, KC_X, KC_C, KC_V, KC_B, KC_LCTL, KC_N, KC_M, KC_COMM, KC_DOT, SFTSLSH}, + {KC_ESC, KC_TAB, KC_LGUI, LOWER, KC_BSPC, ALTENT, KC_SPC, RAISE, KC_MINS, KC_QUOT, KC_BSLS} }, /* Colemak Layer @@ -75,13 +81,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |------+------+------+------+------|------.,------|------+------+------+------+------| |SFT/ Z| X | C | V | B | CTRL ||Alt / | K | M | , | . |SFT/ /| |------+------+------+------+------| ||Enter |------+------+------+------+------| - | Esc | Tab | GUI | LOWER| BkSp |------'`------| Spc | RAISE| - | ' | RGUI | + | Esc | Tab | GUI | LOWER| BkSp |------'`------| Spc | RAISE| - | ' | \ | `----------------------------------' `----------------------------------'*/ [_COLEMAK] = { {KC_Q, KC_W, KC_F, KC_P, KC_G, XXXXXXX, KC_J, KC_L, KC_U, KC_Y, KC_SCLN}, {KC_A, KC_R, KC_S, KC_T, KC_D, XXXXXXX, KC_H, KC_N, KC_E, KC_I, KC_O }, - {SFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_LCTL, KC_K, KC_M, KC_COMM, KC_DOT, SFT_T(KC_SLSH)}, - {KC_ESC, KC_TAB, KC_LGUI, LOWER, KC_BSPC, ALT_T(KC_ENT), KC_SPC, RAISE, KC_MINS, KC_QUOT, KC_BSLS } + {SFTZED, KC_X, KC_C, KC_V, KC_B, KC_LCTL, KC_K, KC_M, KC_COMM, KC_DOT, SFTSLSH}, + {KC_ESC, KC_TAB, KC_LGUI, LOWER, KC_BSPC, ALTENT, KC_SPC, RAISE, KC_MINS, KC_QUOT, KC_BSLS} }, /* LOWER Layer diff --git a/keyboards/atreus/keymaps/xyverz/readme.md b/keyboards/atreus/keymaps/xyverz/readme.md index 29c0422b..5187e5d3 100644 --- a/keyboards/atreus/keymaps/xyverz/readme.md +++ b/keyboards/atreus/keymaps/xyverz/readme.md @@ -11,8 +11,7 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t ## Still to do: - * Tidy the keymap up so that it's readable. - * Learn how to make alias macros for mod_tap keys. + * Enjoy this revision; figure out new things later. ### Layer 0: Dvorak layer From bcf70c0203e003d3f9c47d11bd2d57f7a3cd3bf8 Mon Sep 17 00:00:00 2001 From: Stick Date: Fri, 7 Apr 2017 16:04:43 -0500 Subject: [PATCH 077/117] ErgoDox Familiar layout v1 --- keyboards/ergodox/keymaps/familiar/README.md | 72 +- .../ergodox/keymaps/familiar/familiar.png | Bin 0 -> 149846 bytes .../ergodox/keymaps/familiar/img/HNTR.svg | 7253 ---------------- .../keymaps/familiar/img/familiar.json | 865 -- .../ergodox/keymaps/familiar/img/familiar.png | Bin 102059 -> 0 bytes .../ergodox/keymaps/familiar/img/familiar.svg | 7131 ---------------- .../keymaps/familiar/img/familiar_stick.svg | 7592 ----------------- .../ergodox/keymaps/familiar/img/hntr.json | 634 -- .../ergodox/keymaps/familiar/img/hntr.png | Bin 77473 -> 0 bytes 9 files changed, 69 insertions(+), 23478 deletions(-) create mode 100644 keyboards/ergodox/keymaps/familiar/familiar.png delete mode 100644 keyboards/ergodox/keymaps/familiar/img/HNTR.svg delete mode 100644 keyboards/ergodox/keymaps/familiar/img/familiar.json delete mode 100644 keyboards/ergodox/keymaps/familiar/img/familiar.png delete mode 100644 keyboards/ergodox/keymaps/familiar/img/familiar.svg delete mode 100644 keyboards/ergodox/keymaps/familiar/img/familiar_stick.svg delete mode 100644 keyboards/ergodox/keymaps/familiar/img/hntr.json delete mode 100644 keyboards/ergodox/keymaps/familiar/img/hntr.png diff --git a/keyboards/ergodox/keymaps/familiar/README.md b/keyboards/ergodox/keymaps/familiar/README.md index 0b248534..e4336d9b 100644 --- a/keyboards/ergodox/keymaps/familiar/README.md +++ b/keyboards/ergodox/keymaps/familiar/README.md @@ -1,3 +1,69 @@ -# Familiar Layout for ErgoDox # -An ErgoDox layout meant to be as easy to learn as possible for typists coming from a standard -QWERTY US-International layout. +# ErgoDox Familiar Layout +Familiar layout for those who regularly switch back and forth from ErgoDox to regular QWERTY. + +[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](../../../../license_GPLv3.md../../../../license_GPLv3.md) [![standard-readme compliant](https://img.shields.io/badge/readme%20style-standard-brightgreen.svg)](https://github.com/RichardLitt/standard-readme) + +## Table of Contents + +- [Background](#background) +- [Install](#install) +- [Usage](#usage) + - [Layers](#layers) +- [Contribute](#contribute) + - [Issues](#issues) +- [License](#license) + +## Background + +This layout is built to be as familiar as possible for users coming directly from a default (QWERTY US) keyboard, while gaining as much advantage as possible from the ErgoDox and QMK featureset. I use an ErgoDoxEZ at home, but I don't have a regular office (CS grad student) so I regularly use either my laptop or a default-setup lab computer; I context switch daily so this layout is meant to reduce the mental overhead as much as possible. + +The default ErgoDoxEZ layout is probably more optimized as a solo daily driver - as are a lot of the others available keymaps. The focus of this layout is to get as much from the 'Dox as possible without overly disrupting long-established muscle memory. + +Key features of the familiar layout: +1. QWERTY default layout. +1. International symbols layer, mapped in the US-International layout default positions, through [UCIS](https://github.com/qmk/qmk_firmware/wiki/Unicode-and-additional-language-support#ucis_enable). +1. Numpad layer on right hand. +1. Thumb cluster holds spacebar, ALT, and access to secondary layers. +1. Function-layer arrow keys in both the first-person-shooter (actually ESDF instead of WASD) and vim (HJKL) locations. + +## Install + +If you are on Windows or Mac, choose the proper line in [`keymap.c`](keymap.c) for [unicode/international character support](https://github.com/qmk/qmk_firmware/wiki/Unicode-and-additional-language-support#ucis_enable) (starts at line 235). +```c +void matrix_init_user(void) { + set_unicode_input_mode(UC_LNX); // Linux + //set_unicode_input_mode(UC_OSX); // Mac OSX + //set_unicode_input_mode(UC_WIN); // Windows (with registry key, see wiki) + //set_unicode_input_mode(UC_WINC); // Windows (with WinCompose, see wiki) +}; +``` + +For instructions on building and installing this keymap, [go to the wiki](https://github.com/qmk/qmk_firmware/tree/master/keyboards/ergodox#build-dependencies). Below is the command for me; it may be different for you. +```sh +$ make ergodox-ez-familiar-teensy +``` + +## Usage + +[![Familiar Layout](familiar.png)](http://www.keyboard-layout-editor.com/#/gists/13508a9f99cff381d58b7be6f7dcc644) + +### Layers +1. Base Layer: QWERTY, with arrow keys at bottom right. +1. UCIS Layer: US-International symbols layer, plus —. Accessed by toggling the `INTL` layer using the UCIS key (bottom of left thumb cluster). +1. UCIS-Shifted Layer: Making shift work for UCIS characters. An ugly workaround. Any ideas? Accessed through holding shift while the UCIS layer is active (toggles the `INSF` layer). +1. Numpad Layer: Right hand number pad. Accessed by toggling the `NUMP` layer using the NPAD key (bottom of right thumb cluster). +1. Function Layer: F1-F12, arrows on ESDF and HJKL, media player controls. Accessed by holding either FN key (center key of each thumb cluster), which toggles the `ARRW` layer. I know, I need to work on my naming conventions. + +## Contribute + +[Contributor Covenant](http://contributor-covenant.org/) + +I'm terrible at this; I have no background in human-computer interaction, kinesiology, or keyboard-ology. Please send comments/issues/pull requests/angry tweets/etc. If you think there is a better way to take advantage of the ErgoDox/QMK comination without straying far from 84/101-key QWERTY, I want to know it. + +### Issues +1. The top two keys of the right thumb cluster are currently unused. I wanted them for screen brightness, but I haven't found a solution I like. +1. The `'`, `"`, `[`, and `]` keys are terrible to access; I want to put them somewhere else but I haven't figured out where. +1. The `INSF` layer is an ugly workaround. I should write a function for doing different things in the `INTL` layer depending on whether SHIFT is being held. Or something. Ideas? + +## License +QMK is licensed ([mostly](https://github.com/qmk/qmk_firmware/issues/1038)) under the [GPLv2](blob/master/license_GPLv2.md). Accordingly, to whatever extent applicable, this keymap is licensed under the [GPLv3](../../../../license_GPLv3.md). diff --git a/keyboards/ergodox/keymaps/familiar/familiar.png b/keyboards/ergodox/keymaps/familiar/familiar.png new file mode 100644 index 0000000000000000000000000000000000000000..f8b50e75ecef48cb155ddd1dbf1d608e01a7ea48 GIT binary patch literal 149846 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
9;c>WD? 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ΖVs+`X-GagVXyZ{(h%*QgfbUWK;F1(&YgYeoarqJAF$<|`VFjIk31wd5uet# za*bZ;UU0RZ_CP)weQPlh+R~Os>$l;Vgh>}@Q9PXf$#Rfx@zA*G$E)K%`;^HzFQX`vct=H6-Ddd8XCLu z)4}=A#qj|-5)RQRkc@mwb7uRCQpPV%xLthrqm2mi5~=@WTpQ;_Hp#z%*Bcnp>27l$0pY+|Vb#9N z50=&0ZsUN6HQEQVaHhw@M3b$IzN8xqO}TMT^QBabuZWc_BkA}%cKT4CGbT^-?{Bj6 zg;5z>IwT{*DzF+9x=QP7a6Y(v?cqE%?W=h*1bAQD`+|Z6GQm}UJjkzD^>iAbuU=_A z{nl5KC769B0QE-5i%nLjuJu@&RMJJNyW@4$Z57Wg?397lO^S=r0+t8UebT9muhohy zM+6XL_~KsMwyD+4khXRgG2Jahr;eQhFC9W(7Lm!#_~%*c z%p$>lUNilY6%ZNv^)#+CTt&8;OaRyl{&BEeqU4E z4%&YeCJOTN36NRBTzK5Zytuy)X2WEtd85EKrY=nf%g@Ey#UNn^+H8A5(538-a)RH= z^)8H>i!$wiXcY;}R5}qALmVDjVC+w3;aFv;VPk!#CEC)iJfhY}od{lLVed>{bk*ki zuF?a=EJAIt1vkdVX(Xf1>B*{O=pUVmU`@02oR6kAYf;PsZhpaLpiAw!^MrN8#(+-m znKM7ci~ZI9v~H=YTxC?MXxq*lc^(v;-P0epX%MIuKH~fPJU%uV3rMFKz*K@B905BT zOi91YVo_H>gbX0SgMo1k*odD$H#i`Ia}TJ49E+ZO%A#@I)K-4v2u@jcTYjEj`}AGK zqbWrM-O^*(73WglkI*mUcBhnitzOj|@S2qVD>#>{#F7LgpIe*PQxS2Crb8k^>PXpz z#;0)^&kr!4Zx53p8(N<(zdY^I13N0iWo})7wN}gxnVZSXz=zuj5xe)IVO9HFYhtGM!uk@E2IY=~o?b52F<gLH%0&e(xL7FxYNF(j_sN$v3x!4zvNdI~`A4qzAaez~zm(^kNVZ6q2 z!JM&QXi021g-z(eO5EN=wAmAvdr80^x6d{BIaV)@vTAt?D{HY}NvG>M-ygj7$=~+? zl?Tm9<$@t!OQN3E2#6!>Xpvxlyim-Ils%#J)aOc*5A11=446p}a-UmKu(2)Kd^)YG zkOEa#{DT&|AOH3mJb%`0N2tDJdPv;xdy5h7UfKE4nNKlh(+Jc%WO^!E3_Zr?oE%%S)kv-Xb6$ztQoOV)P1QOQC(W2W|3A=YxJ0J0)AQT*$Q2@+jOoEaF3IRJ6Gkj9dgO-P-i3&khc-BBg0TNblGfH?93wB7@ zalkl8=0CSOFjh`Y7-)22BUR`$fWeCA*Ujp>H#LctJD^A;7(nquL%UC@sDuC1r8#tk z(9?2DLWLu`W86$}NzP&3fu0=DX@uwNpFNIQPhNb=fJcbHc;}?{?!0;JyK_MQouRPX zVzUOH*yh}sJ~PF}aQXo$o$v(f?@Vuta-Ce_PLUT_K(YjiG=eE79KsxiwCQ1COvMA1 z+CP}h-WF>wJOR$k+4ZAB$7JlghB^MuxRt{ebSRah<>_7-gp@@>0;gRvut;O}Lbv_u z9*%~Sd;Le5x1Agjqj?T>ikux!{^HwBm;)qg3?XXwq8@ocVQ=GebdCF5y8lz7*nT^Z zv1@-fG<)Tvg`9el*Hg5|%Mxik>7%ObNICjM#iaUje_GsSp#~k4aoITI{$qEwA1(OJ zL8+p_L%#e{xSD?k_I&}B`25b8#2M*2tD=cvj}NN;SEDJMZP$^|BykP)5*Cu^H+q7K zX)0ihmk|K(u7J2J9zU#2^8daa3WM(K*jU}~09=F2&l*l{W!gFr!taiC5D4mVi8}bG zhriwaT4SyIM#WA0#kXyf!Tcu`X32jd9>om7zt3`zHaJeiywN);GOl%M)B9|?FsV0jd{kyL)|88$j13My zRdjJRLgpLP!P=ToGenX@cSn={fH3 zx5M9QI5p2nsSM@5DPLMleh`^JdC_>0gZQ89st^{)u3jOFthkvqec(a+m=7b?PnP{j zN0i^oLI}9XiIdJ5)HAqA;%UD-uEP1Om`1e_Kc)D+I7{ZD0k-cpfPC9=v^8F^P3J?38X#c$e~m)E8PN5aR=*+eVOl#vmNqMYd^ z1L7RNNwJ~BAfM^g8rxmJ$B~q8}fwg4YlLLe}(EtVs z&=BKDB`35kUu{@rJ8T$iT*6)!-K*zFJwuNmS6>rq388rMRRbTH^b1K=c*`80DE%c$ zJ{03m*SBYN<8z<|9LMQ%*|O?%>aqB<%+%>hJxuisP7;P6U&vA~)o&j^opKBV^*P<$ z;kazUHUH31Q}w9ITY!tk(3OxplyLY>u7r*p%y~@c^+|AAwJvY?-Xn*1K_~gkmdr?hmX5}Zv85AQJup6st&3toU!lU^dLGd z`EA7{hq$OKhiLTp%AY)GEvY5?pv*6ryG4U|8NKZ-|Ua!joM6sXj20yXPVRM z6BaHiukUVvrt&er_RIhLD(i87KxwX%PyW$j3p^%$xG$d~4-3iI&8%~ep^^252BfYB z_Q`Nb_Q6{sG7O^l-TT!m$79y9oX3hYTCfYzmZqtP803OXwNt;9ccb1_(Ee2~{p)7SiV=~Gz?_O@a(WPn9 z=}*XZIe#qVq!|*IEw~DecW{Ksm$bHiDvyB4P({+?4Oc5#&(9Q>du#UbCi1au9J6L< z{}aT5s!pfWR0rHBqdNMOxHxQNmk|JAkv);NTK(6i;c@%VF-x*fr{uxf=mOb{vcZNy z!CR>|)9@bOy>%n8*S~n%10N*Js#5KKYl-de;O)Syp&TEfqEHE#I9TuF5qP#;sQVt6 z&fh=B_JS@)*uv5I>1l}nC5(nKgCsH`Ah0_O+YXFfd7*2A+N&#LEVjLPobGY!jQzo@ zh(75pvU0M{ps-%bEY&@T`1MN}?YGGh zKetAxcNafA*sgLEmW2b72INxtCmBN*z&;aOP;&D2hQXcDqM7%wel%NXYCw<_v?nzm z{xuX+tf^PhYt+)t;HANY0$q|QJxQReUnO7z47#D}HD{Yc*d@yMHbBKkd|U&s{ca9v z?EXrd*FB(Q6Uh`sRzlDz1+qLL)#a4<9WHYj`{h0MScOT7jet$^m} zbF?&|JEImFw7Q-WSF!?z|I%H2JJ{qGQBW_!C{SYFG(1UrGzS99MSl|bZJ6y&3c^oM zI{mX(c|+kdGsw68+n_yi5~R3AlDEgxDW*1jhpLoTS!uyR)qK(^6huk?PxY+lw$S|fY0#F>TJc&>VocWr9Kbh z5Fd|`inGNJ8#W3u_}kYf%DwjMwXh$eZtkzor%J=@qAoe zs>fDz?hpU|Iiogh_hYl{@Q!Et3RdLU9+o2zm!r}N$Mc}PR}N4!jKQ}7#<Tp3y#{}mV< z$ULK260xG1)lTF0&Z8kJyN$naG!nV(kG0Gh8l95WpPohFf1BGCb&88}AuUn4lyiH? zhD%!F{&~CZ^*55r5Q!%aiwAh58|Qmxq~wx7@~!73+5s<-^y`&}{xlwP%zn2)sVL!J z^WOj^;^pBkm-63d-<4tZQwMZty0Qcv)o}zfR2EpD{+ujzC*=SA$m&zqjt&Ep(QxU@>(uMq ze*CJobn-3^R_HbE&EAN~U^b8FaU=GkhgqLY4$79aCfi+TddECanUq9I0-KwU@gB(t zuF9b|FSf?o>H)HY-}uGD+v{gii*8lGD|$dx)AX}3;E#E0SaF%*bpdxek7l+ch3m{U zwy0IL1`bj{m?Xy@#@n9~d-Ip%2^}&k*_m-?yfr{T8A9ROg z*=!+1DZ*!B+q`zB?aWx!QnJ#gCojnCj+4oF2G4(tnq8TA%GT7EU{M*Kk zV{a$Mfsn)0aM|^04fw+?>3@x(ohOC~7S!ASRwhT8FH1z;y42w=ddBMf=&`vu=b>-)Nza|p2fgg*f_`eS?Ru&d z63wjK7?P%663N2%o){hCou?1`4+t}3UCRmjdcu!E2$l+<+eiP%Fj0DuikanftH4D%o$8Lnl8R^yVRM-`vWhzQ%jXA;Z0CV#-nhSCjjU@FuFnPZBoG zi+&BF6!xW;V(}if-rm9%d5@o4Qh)MxXE>qjqVW{L2=1}&{63|vD>VP~V&G0Dh@1eN z=@e_f+$MoI%)3ws5)Fayiz=hyhUzpV1YRGCpDPnX#dqAi$54BO(p8fXs zv3FgN%LPW|NCHQ@{j}^sqFbB->u^*2M#jUc8yc|Vm?&^1k#j+<5J;*EJq71)%zZ)s zT;3kk(@uvtWG#;oN1Q2Xm!O{CWvv<2o)z+(C7m1evbmtqfJiwTcD60T-)8KwYGa=o zx}2Nd6ZdN|<;a#kZKwsqylkwj?N*lh^7+?k@HDN--op1n<_PkVpL0LG9W2FyWtks- z!^ju5esi%O2UCBq{o(i5+Ow0FbZU5tBOz=wo2n%xEXWk9?^kN`u{fkNZ!FQCAa&LD z46t53Wj`;)d1M$83G#0Kc?BgYjI_Cx$^fAE(nxl+2WeQFv48hbX;^&(+VVGbx{}hg zMVCyY1@0DTDTCt+QiTV3^;8rJ1edA-iQTl~4?^V}78mhF6|F4wche@ba-+teR48CL zn~87^#}zeUFHD=&GlULlH;63ljNDB7wNDgSp z$aKnrQsIZK>)XZwvT=a)73kK9|AD>j_x?Q>3?G=5xnhIG-Q+W7ok6KX&=gX^25Tb;kRO-& zdT-CE;kzQk%8)9-$;bW(mpHOCPCfFEga+(s@Hh;wSthMd=jIrzbhXiB3<6^d_|CK1 zoqcTqs<<3L{yBWf1ynD~qN1Xjd%qVO(ho+hdGuRtuAnG|HY*V={yVsGc{IqkS_1pC zP0#K^6CN&h=hn4wa^{bh8WcSCLc4wrq_`+4jW!IZc?yS)6Y!$;D@s&!dNRiDU6HC8oge8d;4QQsN%&Y)jMrK2Jfy>;1T2u;5?9Da+&hz{q&cLFBgIhRc+k< zS)#kUaCEPU+wG9;K}?gnMa!|nBM#)0K#SjW8E5~#lNd|#59o<>TfX=( zl=@<(F`1Jz+$O48fZ(PKi5=GVka6#a(!W8JsojV&sI2N0>k~Z7-!s?8@>-0gCnqNh zyg1hPiyxh-nHLoDeGlu4$-;(~W?>HgdEVqW&K^ljTUFN@?=C5x6Kw|uhe#r;hW0XL zM}}q`sLMa5P=A?~p~9L4?x_1TN+v-|H@`O~i*fz0~n{RT*yzCA>#B?05? z>EcSG>&f2npjo+3`1{~1`S+`Fc_-3<-SMsT>nM?nJ2w51%=XO5=(RvP{yU8bwdWz0 zzp(6dLZg|)Qb+SYW<|d=CxA7cOyV@8yk}0wBfNGt71w0GKzfKe)vIr=u@I5K=PfXAyJ9WlFgeB4W*2jE3Z5fwwMQB_(hB$xmC_sRH702~6Sq1wp?D()qLihE_ng$RX1?Cf6H(n~=8B}h0mKH-k+lm4v|pdPYSfO(pyB@xF6 z6>t9HDFQRlEqRqPNoVvvT`JKvZt|w0_E|qC^~){F_4a{tXHt6wcWvkS!?LaYO0rAJ zrH9x)@cBZ}-&p^&>>u>v%y8n1>_8r!%im`%H*DogS73Ky(k@uLaM%5Pas2~DcXR>;X^nfnR3Dp9!2gmS#s+yhRSI8t zRjm+?)AacL!w=Sx-8qjRtX|Z9cB?l*HIQ_)fqxMO?4quZ75r~?R^A`BwU{Od_-LXD zzxV-ZV&Bg$8{mAMT!vJtmvsgwT?#B*T(Ht1YIONFC7^&aBPb|H_oI`RPXGYDNw)Mo z2nAJcfcVY&f-guH^`+exSBkbzV-vRkfdw9|bT1IT=XU}vm0ln^b?!e^z}OE$h}qU! zfGh^lao?u^D5gT5Ugi>kEVs&O5pk*J9tOYw@4e=q|uDiHqW0ELx5t2>6cbea{*ptSpD$~_+(@! zabXY;R|t^*wG#*3~!6JJrB9`kU4SZHwO|-+o1pdtt5%{2`7I0>2F{H;3Tj# zK68rRjx((6RJUYARJ~5yA|5~imP5>|hnhs<<6P=1e(U17jkrwyVGuYoQ#0}w2;snB zVp0Wm*ueL%OZ^m?Hc4&l{YMs;whN7Bm2ndBe5a9~;m!9tLxWKWeH(0mv9IaYGWrGd=HO+B!qB>zZcXn*miXlBw^QV;{jMKc4^xr=(E(iZo0dsBn)!wurA-kEwA=hvPojK9E<^=r!*7LL1H_&nivBmlbTFFKSN(QXD`sGYZTnLS(-b+S`5(|N9`CF_2gq!NLu<|v>0JMPf1|aNv`m zC`V>6O`HXEAcf0;N+LB$cw!{k4+ZaGwVvLUZq*mT#^s)yr}!Wa)){ZCGz?K+4m(PI!s|x4dM5u1{w2pRdbkYBdOGRzT^D+Hn6V#mA6Vx2kkfNn7 zeEM=H4@ZdWd+*fmYx)mko2{m^xPq09tij2iG4@$5mzmHQ-ugB?%A0E~bK_36mxo?2 zS^s_BK^|Kyd2q1JotkJ=~J~@1kwVfD{xvLe8ExJpq(#rV2vw z(oSg}prPm?up`^HxPWN+VFG3-u|fHDFW}79xEuH-zu-JWN~*P{X5GgU-hBph`TP7t z!8h5UVjN0^g&)-s@Q0Ra)CPyo;&EtPYsu5me22S^UXSx#HK3RhZVshVSa$}6JM!{m zZQ!S;Ce`hr>VN_Nty^pEIDL49^UU~e42=DoN-O!B;8NAO?a|_8i$~+fO(~tkZLwY( zmp-n}=$lGu6dXAt@7_N8+x_C71Es4wUTA2jvX!Lu>hBCLe`Ap@wR*|W|1G;JZoM8$ zBF>)rtKmdlJiZ2A8slKMMm~zxU5x{Glm85j7h1tbwKdoKh4vbu(SWpD{zY2B!@)$l zu@RLR_ZlqxbcCDlDA}cr=Lg$ka9J00Odhvn=$32ZgW`%OOUUP^XP59UwQh-?f(1sL zn-2HIM`8)1h|7}|A+#c&qkYYQR9<5aK=%PB^4n5V-{c!3TN64N9|E5v=@8)}Jf~c9 zz#O_vx4u`diTt6{T!&?;%VX9c=6!U5d+b_~fC(dI3Ftp>BfWp0*uI~{*OfFJrqpcg zu=RRxij6BSi;4lW#Pri=g;*-SIsbUG}dnNody`?%r%M37GS zn{g1rqXI((94$^`@2Uhz)ib}BjfasbAD)FBR8$r2|8g#}G`DKA{W%C)-0b;`o1TRD z#>7xPKkOOLc#`R~##8nS3##7UgQh`M>hMg-7EbpdlzMYjE~E4(Iux%fOY{Xk$nY6a zF~UEdXVQI8TFVkgFzx(6omp1t0PhG7xHfx$^vIx-J&uJH*lSe$QyI-cghSl0?+?%^ z6pq!n#&g7&7<@cr19P z!d0}x|JEf}My)-YikY5^@VgujY<+nqLQ$PAL4k@t9j>ykQG<_DPk!&cc$680dBvmG zGB5{I9AADE0vS)k1W+O(P|NM5CtIn$C6jL|t$)VlY_P-)%NAX3I7AQwiuI0*+FNn5 ztYcT-A}=(W?9U&e068mSPuj^B<&w!;wzH1=?O^>v$nhhqwe_lH!RemKqbi`Qt{OLD z*r!fc8);B_ZKFwicLN9D0Qua}21kvO3U8H*BK>?)P-o{&{QP=FAM0z(kodqf-QV7U ziMLK)j5*o=AwZ_JSmh5mFK~iv4%i<%lBtvIHQeAhk|*K(7ml$4AnShepH`=9H!3a* zji80!GGWKf2U39Cob$Ay0OJ4E8*!iBm8CcH&oznk|8cxCXyDgOgB%goli-f{3sXg& zw_NLd_p0WI|7VEKP(AzLHap2bZk`qEZrM z))qYEWC9b8-bjkb%(mWrA-+YG+AGAK+gf|mgq6|}**cS@<)`3{=xix|10O5ajO#xm z)aB94Wy&HQ@3{=*!O>xzZl=NLf!((ZtGd@`P9GWj&vy8`W;v3gzdtf>B=0EBcb010 z1*lF>%6}IKG+?Q4WKWYyI>x0vYVu=<{XC1MTF4}1FUIvU)8Mf6{t4PI(f>o#S4LIU zMQa0x&LepU5$T3QgVNn4DS7A;>6S(s1e9*+ZjgpUNp~rwba%tIeeb>F`-Oua4ENe= zuQlg0pZHJ0ME6g^^uu*GZ%{DwryTa;z;s{UMaJRQ=o=tyoO&=AHv)%zE(~CZlm1#y z#wU<05lpY4cznc|-M#u5{crUcU&{8?VPaY-( z(f~x4t-46g8+@8d*h~Xz2VTO>e#F1dwx$G6@z71A2H;|87rWr}*9>?rZVnd@9#=wv zeK}$9=qo-64(y~nAzu7Wr4XukK%oSfTt#&Beh&ADf2+qOmyc$SuKm3qmD<5}!^rh# z3*dJU+1dEH^GnPm;60d-4c=`7>X7yIb+x7shC4I4FR^!5^{v{W#b&7nJ!R7BS4a= zYjJyOD?lBmH7mp}cdffo?MunL0rcH#cMa)E0go@am~Da!0h{+7zWJrK`_(otEWk`c z+}fJ)I~)h+vC)202oTBu#g3TLnEU>mVG6g^i@(x=eW;#~gzN@D1w`MEDf@RpL6?9O zP;~hkxo5D8jr^FZ1k^UFMwP1;xPTbXYv}i!!bnIno`Vn5BsB@S!uPYk;(^)^uO8WF zo$<}K>8_vh#E*elQ8c|GhW-DFiBf;-M}XTF!sLCuseV?ar;~&J3J^$I{vO0jmhFn5 zrgD#_2LAz4g+3B>qav{+Q28{etv{$0eZbNEVa}WJ#^Z~yQLBnuv35I`Ief|hFi+{n zo%kT=Z28%=_nu}D{67w`zv2f02iSL2>ZAsShOZI2BZ`aVP+|49zp(+Su{@#Xud^IK zF`{K2RJ}yJS0a2s2%MJ+w0PpRK2$QHsU0*NIEa2!b3;9^RA)qv$9|OYzhQJNT0#0j(errSto>;`!!(V znea7{kaY+3@$On|__v^1nL96|PG$W8y%b=g!slFuoJ?VAP1q_nk(6HI!EL5^J!4_5 zAGe>pPf8x%pWeU#T{ltCr~bQy~NfxlaEy8<6&T{r#+!oa@wcQ}?|tR`3*wyxMr znm@WAuT-zR?_{ZD&WV*x{-Qq%m?amOB~5J+(g|%w3@uulR*YhPdJrHS%Wg$hPUi($ z#joPnKL(Wa2FUg~1o6TY4EGo7Q~^5JxOLP6dx6mcAf5*t~9}rm(l&< z%47u#r!c-9{!bN35*QK$@w;~m{x_Bc(v1Q5~b+VKu6AYl;2?2cg@yPw@{tZDv)Fwc>(MV(>!#HPuXp|!6 zO^xRZ>(5=!fV*c`1VPc{UM>5-5Rh7ie(}={QL*PhVUwO4n-iW3!8diKo$o^a&*IaU zWyhFKIV}VV-w}nM+{Aj5BN6mkjYwSy5G8U#UGS4NIUYuAV2o}mfMBdvEE-T7ir*}w z7weW#v@!sK_<+E8nG{071rqXU_{S0Tq5by`NH8^r#)Jc`!^MIiEo#4_1X!^H;_e8+ z#@;OXMC>IAKv}G{-tY`>l>;W&VXYpoa(c(#5WZDJ>HEZr2@rG5F57=>eBamy18{sa zPPMbuSc*mh3H)<`c8{2!g%UXBmpqla1{E3iJiK~4eDr^`dI{*dNHA+GpV}7m?vUxC zv2H*`BI9&(%t<^f4rraw%1#}T=nIw3KLa>*ci6Lo>F1e$W+KT@Z`#;6>^eE*81N01 zAt?8E=QB9SYJ{8Vpyhnkui9f=JP}Y{WNBsyS|u){#-wD#D5TF5nJ0P~}z;&3y&V0iJtxVjEbzZWgc>qcQ`L94A;QIC!r@YgONA zV2A#X6plrMPW|@<$vrJtCQmjjg|0sZ0*GS5*wUXZuymIk6w>+F+9VLa+cA1>Z6r{< zeTyaziZ_j zmpRsx649yRF7}suS~*(jg=-?7NvLqSI9zL5B!xfrfH{}0O%VdD-hLK)YgDgX<6;H| zYXg8Re!LYxx}5a(-&drkg#CJ;&<=psKp%k|6G9fYDApq4gxNc_w9p!jdGEPQHYNWw zuq1vX|2!)a6qq_s1m@C4Uyxxwnybw6kwEN3I&FXRK?E%+3_5&M{mM09#ePQS|27~s zTY?7_qtl-)hi?p|)kqWlnPiR=l-X-;b^OYCWZS#~rD&DRC8!^<GN{It+VkBfOA&uh|G!z#m4Z#%!9M(^I59U@u*-aPpGHyTVZUe&!>PE zilMzGXWzkF?0Fm_N)mvtMT?DCbO^f76cqB)A&Ij{z-6pZiasoUxlK0km+&B`kn0KK zyK-IPrFsW;K#i#o00=}hru4_NxFfE9Z~=qO|5S^?BFf7h)s``~gUoVvSBe?eD9mM2 zONLZZC9XEJK@v~UXdk2UCw2|3s?y(ojj~Kw11CkQii@pNge-^^+kPf7b*ntj0Xclv ztM7A+S3krHDcfd-a!15?VZR#2ufiZ0;G7Hnv|M9`$ByeE26)Wm0wg%VMT#msH)Nkv zgi5AgiFD1_70CpSuh2hxMEhd>IH0%)8KxE_*|3F3V70?afgK1z_6^DZYN}B$tpr5< z%}9|@=9Q`R?mvTqIF~Bvfa7;1H7>j5T)K-4IHzeJ27G#jS*w0ExO7IoDEe?Dc@K*i z^1E^AcD@R~mh-r|J7gKbej-?;_~-Z-2H58Sp-qNVTDCgrfG#^lGlSPEaYH6d@LNfW z!37Y)RQ=(QzS;eeo&}%+Ch_%tH&DrQG-VxkD*(3XRmK4Jz{IZ?y8mC;SG-5y#Z4Iq z(CEa*vxIRv#KxdAq8wJJ(7B3bbU^OgC2gpW`c_I-Rx(qFmrAn#B06)j!Uydo_#bz6 zus#J1ATWmh8-BI%Sts9L?sICZBmm^p|0F;g0AL6MM_Enw5baH+>VhS;*v?;ppky0v zDFA(Bq0xc?Fh-Gc5hep@DskzUz&vFxfC$;-AK$y{fCw-ndxHkOF(0H^`~J@uQ@z^c z6C}u_ufC-2AN!OH9Nb^}ts-sBQw!AA{-C=ne?_rqvQzzOWb&`TQbSn#C#=+JKxX{5 z&Tmt(^3} zOghjjfd5a;!iB`F!^A;us_KxVA#X>0Xd^bZZ85$(GUL6t-~_CrnggGna_HwytwoX_ zn+@B7KlfV0w>(cK)CaRgJNucxsE8dwd0dUguwhE@mj^Fs!UDz@5N2v1gT%1_7;Hu* z4Gtm#p_PiU26i+9UH!t%I3I+knE&BjUdp81(l_nzZ=ssIM!I>XFct93+#}H|`Y=Fs ziF_9O>P>IR>4P7GBr+FUaRefCCxe{70&jEp85_Vbfg?+sn^07j5^?{(T_%`B$effd z_yt{zCB5t<4)EFSxrxX(dHkXLY;`Pzkk9<%sDS=r1^IP=LRBPn@dY(;Bqp8boK$Ehykxeo6;2}rW|9Vyq*wcBNg+&}(gQ22#gSNytbA@R8nodiDsGA?qRG)&%? z=5ez28U;ps9S=+S#MT%it!|LtkV=29g*`;H4{_NJx9w+)x*=`stJsskTlo-%`!e{m? z?yQO~2l5Q|C?caDUMXk2O%FRQsTUD6s^6ip{e7qYlSVQ>@vYH@h(^PDF_n#89NVLP ztvF)6c$}v1t!Dl*O^0akx1XqH8upi`k+6vab@%ze&=U{VUw$WRrrr(n!$y4wxdM2( z5icSI)fqRv1AhfxcomHELaAwJym&k1C#PkEeiPu=!{JgvF{UyOdJ8~C1glcBoIoSr zVXNk-{`DEt_HE9-q~np@!9tD5>P~JowmWERZox^iuO!Os{mB^q-DdJ5kE=B;me*J1 z*FXE< z-di%G-(>8SKSi$1^gvoH(b4(dY*{%PSDNiiu|j)FZk~b8K`eI`vZ5vk){K9Z!Rtc# z*vDgw0h5Z!Qt(*S%(}z#{AxF{?P7BId0r_Rljx{W$Ji%TCMH8FnWKh13<=7$M_hdL z26P>O1PzM&y*&(BqXn(e$Xb7EQr3%FPrY(b$_^9u`BVU?a~VJJyDjN5YkXG=b20)k zUTDm(Ts)yUMhQ$ppH2xuH_mMrpB=Jr2_8tJ0BDk*)+Ntmg# z-^Ffy+B!LNvi>6sFHBmSBHyN(W2EQuJ_rr{Vrf_Pbo%eAjek@A$(?_Cn-2PvjWG-O zfshY)`L+SQv?dRupV8W>f5W=93S}ZWd}4dCr$M` z7ul#AI!XR9*=MM1DI5=QG`-Ni5Cp*`@+(mmKyBT#&v!`WM1OF zin>W^nKc_Nc32*m9*w;C6DN}Iv+#tI1_7)Oiqaq6^1!+!AIO;xI8K=wo}|o#queDf z&Kp*KmjGNycB@)Ze%w=v+Z)&2^h42!1iDw#F5{xg03yNPUUl5DEPu>ls8ZE&SNm}c z_#FJju@`WA`gQ7Jz7}QBLP(0~=7S-S>Pik_)fX1SoZMzYIHYs)Lz!@O0?;3w;8aM; zpU8+WJ<9U!2A5*!m%z&+41X;i-Gi;9WIpL!7nXukL$2Qsf_~7v{@`bQn&5>57c=m@ zIuK+Y`ruC5kbz9xpPNG9^>x3*Hx;wC&Z5yintW%8&yvyYa3wC5l2>RewSs{O32LxQ znGqFLMA71+?m3q6{^7PIa?kpFRvv@rH$VM=;XEGCCMPJ$e^^X` zfbr9N3K%A+tb4UTTH+AvP2X^n^LdBsH`*t#Uw_qL-u=p=Q|#aQFf3Ubp7IjF@YclRdt&{k-G_0tS3x(mXzfl zqQa-h0EhZX2X1NL*xEo?%fOqJP-|Q%4)e5S-DV zIbLpLAexl5eCrbDS~%yKah=L#cWM(G4Yo$wEiP83Jz9Je>=r_G=<%?MZn5C;cQp%Uk%_^YZ# zZ1iOS-f>i690`7^AWD0Nd*}Sm6DBh$Oi5oSf7Ferxzod(rHly&}J*+Sn#7JQiXy|aeCss}|`A`!X@ZoZg14F`! zO}Cj<7lP$D`kpa^SxqA-M{^Zizt-^zrkqLg#!ZfYf~jCFS_^3mh%$#%p^oHv?d>vz zo-E8`TT+<@oGc7Zf}{}&Js7$lD96UB@T11Po>-!0C*&1oGm9zZS#-ZQgU?Qnz(gB<`s-X(T?JKb?cJG16G<_%|2CfJ z!yuijBNLd$t6GyhN&%ejlqhSxKfgMaSdJ2AZn%p3^eF|9-f;Bq`>3pNlM#T<&v{yX zM*ldciQ+y>1DhD!lhqeRqD2+f3rk$`vi{0N>akV?yfm?}R^X+nl!;**9yV5`KrrE) zl~Nu0;nnMGhP6uJ;1w?``PZ=#Qe}c@Jl*JHYoCbgcC57683Ns91h6=NUM*Ll?N&6c z{4rr638tWdmuOW7Ksq04;}FbUeb-67|9)6#zP>n>&7R8X_S>PHGnP}GkVjI; zJyJoEey*BxoWne^-=u9~3Jms_RmK+7O|fI73p5(GZB(8OhIk$!FvAWoYePT&>5oJA z(cZ~5FttKJfqkbv)U47H1`7$tq@{-m;*a*L+JY0XCWF@i!Yx?55mvq@*6HkLvp5D0f*{v={A zCAtp3IOG>a2ZMM%oqF{SI7Jwi-(dE^!wZ1?_8+c0oXgxb*}!XXOV@T?Ym#*3-YoZS=jG#Co~xa=Vq;sLM!W3u{)q(&WY?3ePRG zt@hjuD)JR%6pt>8&fwTGcN0y8oOv{1e}a-%mN)f{C`wxJE85e<|n8{Bz}3} zdg8sQf-e+N`h#E=ROwAsL4_I;s!qmbd13y;`4&^zf^QW~QS|i=Oc1rs#5mv!)N>6| z^9*#MUskf3{}yBhSAK59FePOBnum z%dvr+gzMqEZWB9xT!U?9+7m*$(IFE{VeLcP79;Hx;FgjK0Wy-ee10efLP*OEhIN#p z)y9*9@!>Zo!9=cKZALgw?U`5cy1-grDn(a7Q`LBkQPqILum8&LYC2>vWP`kSbp zc7~XIhr#58F$P52Rcn3qjBUaSvxHq@`J*FX+;Cq68cA#iuJ{+x@~2OaXd&B={?D2C zh(rpU%sM4h)+vDRqP(Ta_qaJ(+hKO9UlE#o0TC^FEND1I*XSntwG9v{U0zH1kH3?P zP-a)pISYWXs-_Azz}Q%~@ED4C6ePgQKrEMw^2;p}(PGN~-;&q{1**1%7>}qVvZHjl z|I8diDX0hci`_>So6GH`wy~e#i4-JaL2#iBHLh6gk?7Uhm7i-*5ilhdUOi`?hSwbKA6u`j&7)VEGG=R1$t;OS3mN?6PH>aGh#u*D7Ln0R z)#5hYKv(Y}0GzsTr2`V9Md_^x(pF!XMa2r*k zTa$MICt!p3qcp;CQK6LPFEWz2fRe`4AR)*v&~TuVQh-#ZZ2SjirmoKG1)#EDx2cXL z2^vb}UIG6gndlT-Zu5FmabwOa9rKd;f+)yAGNhTcUgQD?R?Ap|u#9-eATWBq?FSsd z0ttd{UrW)rV0hn&;9d9m+bV^j2S!ebeIh<5>-bVsRZdJ1W}H~>RnS8u$gwP(;#}I$ zuU3~G*5W{z-iga-nwvNttn0Vk6g-tDOYswM@Q5az8P*=N5I4 zR{-c0bxp!hE)15!_IA!37N9R+v%zX=fyuHg`XnInL`PGYc zv}|N-cvrp6T={F^MMc99` zRj&rkPF@ylvuddzonAKIc^!q0B&ZQdH$|&>P zN0$I2l)YWeyolTsNWUKxk|;ZZw!?~WD$=`23&^bS&rN|8`XmlxN-_f85b=tSo%C^$ zJs$6GQuh^oFP_~Ahv56#l@CFDP6*s)Tb|-LsKuvB_k1(;Ho-Zl&=pUYABjbmtytft zR7DS8AmFgxKWNeaQ4TWE=F4l5pnGqGmCMlj$g7R6N{%vz!{hJ>_E+DeWwy~0&hhS= z00AF7b2a5+S-a7exd(n7MHx0nOCT*k2W>TsgND91CoU| z3Q$F<)u5Mfflm*{PA4JG4%KD3c7ZoI*Sk0bAbmwmPu!fNPRG^Uhn2u@NKiFY?DTi- zjII1oJ{XN|S>9~9UW}2Y198&WpY{?qRdlU>iQ<*yDzSg3u5e$WXBexF3KHQ{D9I9* zEGnsI97H5beIYgpz&uc3I|=f2f1!k`SK^YtPG*U1$K^i~s02;U`L%rE@41|bKcvdG zqWzW4^QkNVqR*ZhQBt61AHlV!^g08@@v8IoZytbLZyfKozYfYo5VA?G9LK7N(`s{4 z%_OGFGIiwhegihad1uT89TAH*_J7P=G{Y)(+1}pC{mfe!CR*Hy30Kqm?{L*V46F}= z$hqf6LCx;Sk*ra65W@OGoVY`O*V#|Rka4?*Gjhu?g(K^t;p~nEWkTPD{R5XRmjmXk zvV9_Jxd+u#d7(05c)?Bv1J3wNBER+lY+Jh_C>Q2l8ayBo>nHO2hWPj@Ri; zRHz3P{7x-fG5hnOvBVeRe<=wEzc18eAYTV2qyjzs);_b+n@>0LJEl2aAXpa>)=;~W zxpxQB3#EN@pETjmS+MlgTN8Iukc-&>4iTNi$Bn=OFJQM8_>2%owgeZ^E=+rpo@1`| z<^Au;%=76RGBnSsla8;p(cu*V2Hwo^>L;HUG325dyUX)L;a|GNuqWOWDQB|S&!9rd zWj~w=_#ytp>mNfX{0hsz&^fav0)x(<9j-`ZV@k}k+a_v?Vq%xt-y0W>G!_*tdh@l5 zW3#dY4nQOfoPaeq{sD@feu5FXtiGC`2UUM%W~=l|{-5ck?<)Q_c@>LcmlZnh{dk85 z)b1GJr^Dm-=ol~c0UNH}Ks4KFLj!6qes7USx4*>*&=VKhzo`(ymF9K3Zn#tgH9Xg} zMJTa5R;n@b8?cD)$a#v#M`8>wc8ju?#iH+Z>vk5mvn^j-i|zv8OZB5cRRqvPBbBdn zdi{i8nhl=={l&yt^N0$o!0f=v<4G@GAp~BHx#oxp^BsYeh;pZsJz{Qm776g362m82 z69p(SkpU|af>e*odY?!KDhVtr;$5NZr~Bd1H!92SX$xM}E6JS+kM(f-gaQ-kkNrAS zGR51&;ux@hGYk=v&k2AuixWp!JsbhH9xM`uf5kI(Cz%-$$Q4qfuE`|w^i~rC%|*fh zUQHQTiB8+9mK($hDdAwjpsa{XVy#Ai8tpD-AN?p}&0e~Ap+c{X3I%(98j2>hmUTTk zqnNGm$!1%_=G%%U1*)SWe^1<=(xqi4Ga?r1SgcU81w|E=<}(rMI%9@%bas~{*@QF3Sh}Rt1Holn6azug*As|4@zJfTHV7d$nRL~crleuxGA7${=pTL&19b8FJLr^SU7 z=x+xCKZ{yFXu|+(QVi70@2V>rdGKbWRtY;mwOCn3jMr>S;Dz;20Jp9xBvSZ$B>VH8nR2mZqnBMF%fnzn(`8F8p@Ci&lU#z#^DfR_8hRt$P0O?co@ z7Qtg9V-0E7M&9)=%@sTPew}g>z6^0!xElfwAXkR#n<|)fJ7E@~xSmWE;NXf3S|EO#+f?=K`x9UjCHZ-5>3Fgr5fAKv$5j5Sr>RH6ad?;X>n&0M>py3>#Moc{cg-gMMTiss+ltL zA-tRZU>6r2V1{9!b&)Qx$EnT|6EON}$3tI?!J{XuS(Sr5 zLkjrr1K(W$Fya&{EN8g$#uw!GbgMHH7JB&FJZ(}OdnYfq4Y8;n&@D8*TMS*K*@&>X zd%gb{C>V_Yeo?>a(>sAv6uwxKT3t61Q2w}h zCYxGyz(x*3-CxZ;wo*7OviPHe9TP4Zk>F zHDaaMnLq=~({EUqR21zKzd_!wj0djb*3e9lp#rlI4F7})+u(fK`sH%4*=k!V{C3@5 z9qFy}43!AuFtzqTG$w3q#Z=NTq#~}>&1cf9sCqEBlmFCoFe#B07A47gqgfaW^>lcT zqlXE!UvB$NJ&8ZOW0(OgbCau&$+TVI;l;+YL70;qU+xQ7D9YTdbm2S_dH89XupOm% z%UiUvanakq`Q_-VDWCqte4HEMm-Ybkw#ou&Nz87a=@^rbQXsV%$c;7$bNg}5Y<+O_ zkJ^PDD*x_*Dj%^xhz%NaV(~NXOk)p!8VsI%q6=+2`-1kg6cJ-0<&QRe9p+^;7Q9H)&f`Ks$!bC@TtiBpJ&ll~_6ddd?yv>#nknWP{SpIOQc0X*DPNP8V$ELDEyn_z5c zYO@X%o73szX?dtdQYih)bRq+1+VIy^H~|^}S0QvX%f6b$;nteKcC~{I3%seIW1E*+ z%}|c;XRHs46ZO36IlxFFe$+UP8+cNoYz>ZgK($TPC7dIMy$axue6%N`Pd8DJZs1K0 z`du^_1^Xhwic=21DSOTt*X*Rt?pq%&UA}Aj@N(~RX?T~cZm2fl-(ZI|WB6MXxJKxw zLf71J*MX~t#qiV2wBoTdemRSYK;Y#i{yyxj+O^1^52jyy1$zS^MJj!mc1!{ZJhl%X zCxRiL@t*14mA>+C3-#PV#fC6VNIu*H(+h)P9_fr5K%h3C6UK%{v4l}PDGQ9P%36=v zlPinOs8p^%I52}Y&xjASbn011x6(*}PM!lRK=JeYl>sLz<5_}La-TLjOBiQq6 zoR%CYeMP_Ow(zw7K=f_P!Fk!Fp2Hpi^|XfiV2VTDg*6=0DuQ=-=eX z7Y#<$AvSt9TQ*M^zD@&{?6ZGDgI1&Fn1gO*gHbPw1qY;ehv4Dc0yo#7&!I7g^Y1%y zX~&AvcV8-C^mx&OMaJDXM;M;Vw)N2Y zSG2+Zyffp|)`1N5s@)T*z$5(m;&9&Bzlh(+xNFduztpH*0a&XP1HiGhAlrY1g|Eh+ zR61nM)P3$_SG#e$x0YuFfc8!j!U57)3pgamM6GNfZF!rHgY!wLwj4M~0pofhqI8%9 zjG7LbVp@QTDj7>5sDy}ZPz12{K3?wJ^l(cIDt$`?=(;-S7XV767C`bdELtuQqV4^2 zrs3a>2&kw9JJ9=hF|Vx~7W&(wX+1ONe?^$wM@Hnr_?`nH0<)iwkX;SHRk=!td_BU( zy9oec@`=`ecIcASPo;~(f+POE)CVSOs7%)x86uut47{TUb<$=OkRjB%pe*4&TzfmlP^|dn9 zu0CVmQSDxKg;5jGr1a_lUDI|mA?ToF=~}x9!$;zTpggQ7+lDRRP2E)V1^DVB^hQg6 zKUoqgeiFtG85vLe;XVr@EkGkA==Grw<7hxH-}<|`-#(R0B~vXDr5(Qb>t(>v@-=zI z!-31|g9!Zn(?3=dW)*2Qg+sxZ@Q*33MKBnX@VUj~rqY@dY!yT%=$r#wK`v^5*@!Zh z-hvB)?UbHqPrY6UK!Iq%7Tdiv6#LBF_9RyDmkn;o1F<9ET>nFdd{3zX?PhR`Kt_&{C`&1Wjo5u z(nrpMxbMD*LOnk(g*DbkZL@%TZ!sWT0+B~;b+qkst*yXH6Trp1`gYU-ACDXyUYjMV z9r5UyW<%e8#vL8NAxO)D0MR+6;bK8REK{M%8Q*^{rW9w=|MII1TPynPods}NY!#^( zwgU68Bg8(qni94@CsYG;lir8W{cynqmJEbsUD7D?FevlTZn_}gBmyo~6Owqd1>0{# zD*juiiF?V<(H0&7wKEkyMZm2>SGmAAE__YsBWR^cd^2PH@T7Dl z**(WBa)tLZn?sfJIPl7D9RBB}w$j70eLi03sRmV8yjoakEm&g?`D-G-!0+)*n^gWH z%Ns%*WFr4{E``J68`4PT(NC3+u{-bx0txH68YX%fYgVQ`_IG%Lm#+x}wRLzbXwb;y7tYl+BXt*`m7uLZk1&5zlxfq`oz-BO& z>G1VG!Z_JCkK~Rj1Q?->3pcOe0l@>K%T0``Pe|0MwFyK_2~|-}PDwF#J!e~Ps7%#e zeAW{I)IQfad~y6&rT!I9d9%j8qdZTl)_~zu;ka{kT(W2uM_C4YC@g4glzwxR+wEWh zO7_N`70~lV0b)QoAgk{CzjJD}!%q)cu#^8)u2H@>mATK_!|geb)fff4qMhJIh{PSxNj6&EuqfjZfP(0X&o2C~zzGg57c`uMRN?|HL139M;u%_PKYe1F> zb-bn3J)8Y(4%3!U`Q-UJ4^wQQ1`)2?U`w=&Cq1=dNFGX~#MuN?&Kjd=Y105ZyhJ@; zrVu!1;&d2Aje)V3|6P1i!#`sZ;Twd_pQJMK{Eli@Cm9#V5t;{Ror#wTc_l8}W8Dus zrFJ^P@q3iIwdN5Ey_CMy?7#I&kquRw74&K?^I3EVcFSlYlJEC4>sKcj|AL^b1;{$-g0k@5i)OY2c>U(pC(%XnlK(!8>6wy5wHdUHVlu5v( zvijiP(>7p+ueWY;o@66~L3opZ6`l>?9Ze|gfXC!3CiFEAi)~X#LcK2}I)2w8Wk*sjiyHciu74SS0Kk-9fk0=81#`ilx0t z@~F@g&54grd98l;S2=BTYOMKrdG_)d0L6r3?HyIvdH!dDE&te8`MzEhJMp+2(zT6V z!}BxW#-0tZljBgn14g#!9l~@oKw@c~o=-P6P~-#i*7BibDFAJQ?I&F@ z)_kV==uKvtAw)E+h2_Fzd!VMtCN?RE37;rg-!JBT`aa<4`;Lu^Q5zBZbbp+LzyVB? zbzOhU6%zgSQ}wz#8&~FGqOk znbnnLmsoSJPJ$q*-Snb+1yyiw*2J10`Px9ts6G{7_>VHI-cpTmim zYKUw+YvPHou=`G(FMTtG$z@y4HZ8gbIHAWCe-l7gni~yvNrU5-fk zo>ey|;3Gxtyo&w+3@~^va|IlyP4^ELreHOgr603J+Dqhn@5V4l89o%#vArwKkz1%V zRQwJk=Y)sg%4gK)gcyg?#DCoM-Pi^WxQ21KF8(Z}?yuLWhbxV}DuK z(A2)tcPAbFl`KuHfUY<-^sQ;Cxg|MPl$OW!X8wZE+AEr4tTZ}Hs@F(&z{~{|+H?CZ zLG|w?Odf$aG)SYCF#-Gz|G65Ar3Ea<^{W_>vF|RkZH2b#O;FzF>NYq2__D5pav@8)3{JP`xpVE&OOyoQ&3nrY3}R0^9ug_2OMCAK!1R5tni|&#USu z$?czf)}R+)yX}reJPW;Fy{n=7MIEUa;7sM=LmTPV5B11N#0;TPKK{O)9CO%GR`7Q zUIe&>hbG)qM9$BK1Su_9G7tWAcMf7Xx;tT7wS7qXmeju85pR~VGcc@`$)U25d+wY# zj8#5U%QgFkHM*OKAl(@8MRgZz8YzJ!^1|B{VB7w(d}GGapyVs6m!QfqQpwUlg=&2c zT%h^PM41)!Uv#O&S-K7gG1jcHi6%9Nx_%Nh`gKt2lHv1Ay;qT7CA@={mQYs1@Skyzh^blikJK!m&NqARzv1c>m+$e`VzSb>T47d*)VfgGhRD6sC6`Y&c z2f>CIYBUbUzedScb5xT$v;{e_|FqMl3iG=FB$*Nz7&=U{S0gHtnBQ-8vw1 zNeShBMYm~?Od1?o-Bcv$8%MB|ixe)t+~>E?JKH?QH<6K&lHyc-?RF^s3-oav(bMVg zpz#G`9mn@0lr6q4tZEkL?IA_exBk3q68@O<6WFI@etH-PZ>u>+>uoCyJEhmx1#M0@ z`k3~3fs3QKb?UMYAKoP`W-QldPo}8)jlG%K^d#xst>&*c`F-}?lxD3+qSMQn@UqYW z>f73)ZJg_~>s5cvLclZV7rV|_YTCYM-4VV}L8Gl~`7eyG&FKrfhRbaFZ+^kB~dZUf2D_dHj{ z85xuPERgLyU{aBf`a&`w+VWc|x|k!^iGH4^(*_su)>8H>JzT^(pQ%G zW;ksfBlj1KR|e#B<&P4&wRv!+8wBo)>4hV!8A1e_5jP$^vkm6 zrw#yD_vuE0nZr+Osh3IjGx4w9^<@31ePJ`acT*%xHOtstngL&xuX!W;(hP-^?nxRY?3GAbvd`!($xVHd_h?IsJ{uepxeO)6rV0Dkjuj)M(@+fd0o-V08a z9TSBIo=U{G-L!j&+r4Z(TzpBra0NQQUn&T z4Y(7Y}Wt_nycP`p+wdoc`xO&ou8g!OcmDby~fOfK3ZFOwj8 zZQSYaUO1w+Q>SG-0l;PG5s9;@5HwuCxT_zf5WTlkh&r!c77Y4>V*3PiO~GodZ~>ID z>`u8CL`NhCuYOJM5k*OjdNS6VJ!gCm8(oTcZv$T=Tn2~qIH*IWXFHc}cmtV_l|c=D zfKAXvm)~rrQ7jy{XlMcxjPaSD6}x+CBKe!#M^MBD&JXWPvZw-j^(%Y#_UHrOQ6GS+ zAw-gVp4kLn~YEi!HJ<_Je;mDjV8w-}| z)^#`2>RuKIyAMUeDKpc779aO)Xf7{&9_2&W(Br!UZZscedb5AbFO;LU90UZfAme_* zA{?~Rw_~ig%b9lxMw`QBG7BZyeeb0~@)AK8d`1Cwr1>7`m-;MybWPtN#8*{#d z1VyABVLv_LH6enf<<)7*`)&%5CwZOU!=ysv`|%N6*SLu7;k`}TT(Y_rvMQ7D2>2Z! zC@uEYJ1{c(@7;Zrm-7TGASr=tsJz=3dsuQ@ zmKo&Dl*aAI1mfNgeaTLCRHm>QnUwkg_0sQmUirm%=X1pUnT#1y{oN~%!#tSunc#2! zgzA$MiU+~lkzqM|yO^7(-ZUB%k<37sM-n<(gFjq}$hlv?0Cr*TYm>W>!uRJKa{!OG zD0~9PBf4TV6~nf1AB1~61zEt#UAltOL418Es3Gl0I)U+3;11tbv*z2}%;shjGsv~b z?mHO$S&3dHJ!Z~W&C7d+FtTcqB>rz@&BH1?N52Tb z535eH7@3>7WtwW+*>AX<3@+oo=uzhhrAxGSP%fNq-@L>>)+~Y{-~3$wzKKwzaMQ-F zupk^#WGW}-aLB8J9P~ML^vZ7$-BBEj#vKnmuf?)1hVOg&jY|K%6i?>)>~#1z-g%HK z5sFEAH2iyEjgXK*jV+D$VoGCHYGfLFP%Njc#D_kZT!uL853gxvz)cbITRJry#h(NW zs&$FeufOcL9sLq)E=>Eep&ad1xuORlhy8SW*E!p^-dILU1_b{OYpxE8 z9Pfy z;^i9=8cL=zZm7X;o#I%XA8aEcHydiBm%bCcM*bm2z6-z8eK%A#F10L9NW%8u?m*sO zKA;kh_|mkWKS-d4(>#$KuW;8SGg!?)dsL{RFNW=V6hXicB9~^Sh!OrJt0$|(0_N$W zzn&VATf_Ms{LLt?Yc|Cuuqn%JJvJ~GV_yD^iE8A8_g`XHy$6zL9B-^j9ukSmj*<&-kCc$ach- zH5eCdw|FW6erN9JbNl~zdaJOwwl3PXa1R#TCAeE~cP9iW+}+(h5In)%HMqOGyL*t} z?ta()&pG#nj|X0;f>m>l(Oc`fxx6)4VUCf&P@bOpO8FZ$4O-vW(6^59Jb{285Jo){ z>0I@h-^Sz=5(`UHQ_O3X>%Z1Z_%!i9DM~j_?#D|DvIAG^BzZH0{0Z&OA}WP6M3%nv zIqOKbu2u$;2M|~S#QcA!OlHw~6Q)vg9m3(uwr0@(_C9K@(-`%V{v8hp=(Z(zU_ZH- zx3mK88Lie^Uzo`!55Pc{(72P%FGPIFKHIo~n*vPta&gvJlX~T|&0v@MzX!uHxjuGHGJU zLJ|^tPxk9A;En&r$E#%2$c=Oau%Wrx(RpyCSGyfj7b!(~69C&qV*7~$+4DRp{CT85 zCjR4xwDT=v&MpU;U&M|(gQ5ihBms%}$B~Dn9|WsI>1SDW)j&d$4mBg1yWDnWO0cfp z>Gpi#Qi@l_s0>F^P+M&zupFpHlJLX-YL`-h`ZfY~XmEt)5VUM5E{;c5g6IG@We*JL#f}?0U|9c6Xb+z& zFNFBEy;qA?kr@`oeX}=8{{!$2a7nTGuo0{ZBfbOu8UOXgt^E@P7F{Lx9i07LYU5^l zRD|9;LUbzaDRVc$;#hF(0Lk^&Ozfx=vgL849mAluIEh>V*+wtdgmeFov(M8@iHyAi zi?^tc$^Tyaumn>RG>VGDCcw~gA5tcCmY&~+!kQqA48pxs&IYE^u1Cv@jfA!@_tX)D z+;KfoL1cJ3efv58jh^3A8(nl0Y?cWIaY{D_ct}O_3YR8&{@~ZvNnH3^AjzYo@oCi` zH&I?a-w`02>0rp@1nxlS#%Uq|_f`+p``Ck5UR)8s&%o6SJw3M7Gz zACYWEyY8G$ppBQK^$3-dX$zvdw7h(|+}MJWpss|}FJcs46+@*P*%%EUA3}+#6k!yS zN@H)N)3z5BTt)3BI}}>dJ_0l-&}6mY?jQFHVuooweuA)B?{R24Quic-f)BP5PK0#W+2;&u5TEx(6XUP{O`Lp}Wb?2fS#3Me zKnL?8!WK)6&&iv26X|}?)lHGc!3Ro$7`^`gAymk`N8ydJ(Vr@*DCmC!qlxrKf81;{ zT$rnwg`>EDPkM=M3cp(mC&?Go@2v>SOx6h`hZ~-r$owz;cLUm7HRL(xi-W$w{yQO+K zd`TdU46o7UL+*{QAv!<~9E$)x_$`Bz5y<(w!WdwI!<}4UBZds*M#En>1-hn>l{OvQ z{$&dJhv!jEv4#d{qGC`Z=1G+ zI`bD3F#@ZL4xL)Lw0i=JR*}`VHj@f3d7P9_F)jTtypDyPE-gKMYPnCN43sC zd*V4?Z6u4ohEHP>K)2%DuJSwo8=tX><#R14`Rn_nIlk*gRd2Z!Y_(WQ#0HA_N(w8> z1PF?$N0|U+XK@NHFN8dd(PNANLBxOfooZ`M+QC?s;Fkf?&{yI4Pewa1c?13Z(?H!e z)RmgxM@$S6-#0*ZBQJzgTnzB1cTeuHJ5WRyK=Mv9eI_9f7zNoD`5?nD?zZ}^e8!~M zze@x%NyAPN0z!7VVYBYs0+V0uMfLZosKrukjp9nkPG>tvBK_b06VM@Q;XqW&_V(7Q z#GIyPo)Z8Ai2|~q5@re!9R!fW-eDkz-zf(+b(GS3M-rNPl}ZS)?Lq=J^K%%0XtOFm z2vj6K$DhuF!J^c=ESm^0l-^W#zQYSQ)V!l*L2$HEINruvoE%f&jK;Mh9a5WRVo~(Tn@k`RSJ(L1uxdg z^1l5UGXvqjn5GzrIZyJ|@woH9Wy2RiqOsB90yMbsQ3&W|hwB0oFFf7WJM1)!XHII| zMFq=0s|AL>#bW~<Pu{9YFQh+%JC|+ zo5DM_nnLWZE+BntfgD6$xwO%p?SayZ1+Y{Mk}cD6cmT;t@VOicyPjA;`qx7A2XPnh z4{!z8uZp{Y7V15tQ;DSi{oe3|`$Cfk8zRy;mq#d3$@u)TT6^}AQ>T;Yh$AbC-SyI{ z@BnE&_Jo9UL`8ktyp%qkHWJU5Orz~=qk?&W(T!|x)lear4}6gQm-huE`opH;55TT0 znlyC1P1!8WL)n2V!k>K-Qan_(4=ssq9xfo-Ic#Tt$A?*mR>c*s0FPw?mP=r}tQL{=mL!cx zR{r#gG^K0``!$K-ImIu;7@;^+v(^MF$qSxXDTAB#^RX_cx6x1)+WgDBC34Qc2VUwr zO&*ciugwDdAFnsPp=u4==Mc-qm4)1U)-ezJ2Oc*>dXd{qfl@MGC zD$DyjjAf1)H2%Akr#IOkAx6XZ$2kx}ln`)w;Y!>eGf)x44UZ)=1I9(G@sS(}Ma|>B z6RGv1xrFQnxmxonyOb1~t;iDPpVf+RZQ9{YK;W08+@MHX#A>xZ5ST>68yTQV*>Jmn zDHXEsc~Nj5@v#_E^b>3i`Pajfe$s^nzM=EXP@pbw3N#}WWkQf1+}pe3I&~KdQl8^D_2ihO$e!=>n{lo`S5>K!0$bc4+(&Q@>G1L^o-k)s+E zZM=U~d(40R;Mx;{RD3CIGy~#>q!hP2`?}Vo(#gMCN1g667Z`)2_(T+ltZ>siN#o>3 zdzGCYQ?K8kS$TX4-X|3Fz9;OdfzHV>MuJ8Av>O7hy^H^)dRsrkWq|t$69*48IcP1+ zjih1rmlESD9eTN{4r&(5%p7p*O&@iVm9+1@DFt4UchNyh}2qo<$R>t)|@FO*;F71%jpR!qdZP=ou z4}e8dhr{d6z!(nQDElMtUQ^!gKqQ`)ACO#jzogYwzaR<^wjJ4+slQ_ z@n$|I5Kcy&+elU+7m8fQ#OL%2%kp}bdA^Q}uJ@dCL&r^|QHjd(tt8stQC$Xz)l!L}j0Zr`_2XF&IJ*r9wc#PPbij$|>M4I=31IfWqK_Xg#?f zwOp>v4fq9U@eqgNBNP{OHTe0p!|GFSDmyc>JVoX$mJ9Y(h_%b;+-ftBL3NeCyS z#=eJ$Ii1%tcd2Ga&>Z;2{%rXyuWlH0NJ=W%j%Kb zS(`eg{!u{FOh!r*C^pboeQ-xGibxdj)OFBfX0?YX)j0_M735RB1Al4v;zsRi>dU5M zO|zN2K$ymWWMq)%a&}vOwkN76oRMQ_95ma+h>Hffxf&k&Mkz)DI;3thmo2Ih{Cu;b z_+`K1qvT=K|v9wNC*B#{7|#2)=h68I-X@8J zSbZNTj-O<4%#8Zyis={OkM{%~5*|)y<*V6P3+j6EV4Q6mR-F_{!+vm^#d2!8Y^QeUWM79SIT!--b639mB^ z^2!-@rrW?6WQWu4Mn9$L3nByefRN9V<9I_!w9dG1weHzDyFzP!X+MS47c4v2%CBry zJF;(hU-%~BSKVeY2fq3R+<=(<-aWrISZvP!nMYU(GVxovo)Q;uIZNX_yl139`?&;K zcGLK@Upn7^sJNp&rnV&7FxV390ZUq%x_=xZhtTdX315_ql}5-a0NX5Cg#ZfYO{JFh&3x^kNMc(p@GnGYETqyIO9Jdf0? z=C_Coc=7QhEvmt!i8TaXY&ANK0ut^;B9>~6P&1=u{3>V1tAt=w+}=meyO1xHE6)i@ zo+-nu>f}|CW?Ipyy>eky?CC#y{Pfi$YZy_CJmNpgnM?vsNUHxva4EByeMhOWGLDj+ z%mKL4rCc_TXwV(m02tA(>|U^K;2l>roW#ZQ3`PB8=8>Yk z$mIko%D&m9IusMB4#MKE%n-5-2a`WU@9iT27mQ}+dq!VTxxGlyq{3xx+a>BfMx;bJ zcslObg!}BLa{}e$)GQD`8)L&_e3D{S@{B{tj2uywy3+bBE|<)Z57k99|3e`Dj8^|} zJ_~bv_Ed*W3|cIvLS|0t5&w7&h>H$X{W#RB1(h^0AX8jc9K~fAX)qodaMxb5-5mHg zUL)l`>Qc1Lu959;* z-vl5NR_pA$K!sUW58OiTUr}^PyCt&5zQn0*>Q0!7@r2_MP*fz9QNgjqn0|?I##mqsJbEB=ikD8=*eW-yLJBa&-+IWibOs-fIL?(X!^qv!-N>GhWr@i;X7~6M zq>#vNHo9KOd11Bt!HZ660N~)9AcqnLVc<Od^!J}5@p zPa|RYRKPnA1fbaJ=6d@9ys1X4id9Rq^gAs|;$99i=^${HjhGwJWZ$e0#D%A$QovJS z^|?mx9Vu+p))uD0Ez;SQ3$(5s*u$7fWM~`iNT_+&U_;O9ZC;#$5Ia4 zUq1HjoqCXk@vx~ly3Y!!{ObszBC5(xjqRK)wVYZ8X%-KGR7gt^u?;z&bZ%nR%8Es` zt}863-PMadD!{-zZUv@M@06IYF(c0dwZmW z=$0GC4M&z<8@9x}VpSD4>$L+!wMIw@O;#)&)>x`ue8!Ly^JtPllwtjb0v*(nU>n@8RRrvJ0^VNPy1Zz(^@dH^2Rzh8^>QFA5Ma9E>aL7VZoVijUZXg_M zR5^(zSA5NeOh0j@FtTa|UdMa>d%&n_MtZD~4U7>mSXTeETPZ)Nv5hPo#VoibZM!BQ zY5cf%(+eYL`i~{wsL;Cv2#|?>#taab6^UA)?@*yjE#O({*TN!uWNzCD`Yg`7+(ViOf6&e9#o397JO?d_>!J+Jtb z`Di7uj|EE|-5z;@+EB=xzL-*NI_qBt&7L9>cU+0GER9Pqf}Fr%KC7t`Mv~UqnNh<$ zQ??}F%26I0NUJamc_^_yup;?E^|brn6Bn12o;Co}bw585J>*bUh`|}8wAvHa#v|?) zSytWx5x{m!m{sSVA|tI=nHYH(nQT93FzZq&5B*IzSPoio;=~n34tVrf5|Ty^P7P;o-h~qbmLy%)J@M|P*aiePsJ<^8i+U^m1?K| zQj?s?VhpuUJ;D$zFMZo`N-j0&FgjNHTDwRP@e=#?6CH%5TnlBG4}%i;Pk~@X9K&>p zJh!g{XZJ-CWL=4~Jvk$i_01X|l0x#6fkJS{f6A%inP7{pA2Jj_mJeE)zapRzl^pyc z`5GM8oPCRs^`4+*Y_c3L^mbu@_tRuyeCF?R7wb-%6B`RK>JltI>8XQVxBy*XzG14Bn`*JaI5TmRpn_##V<&}ofSTey|GS{aoNfiQU*drT zPGi29Yxa>cv#$`|*(zsg+yt8S)(lz&jbstClmU#7eLPPRfnYnyTAbuu_21ZbX3LX2 zEQ?oQ4E8!U$?pH=nn3KgC(<-GkS*g_LiGX+9kRfrS&KyaAAk}9*uUVQ<@XZ}l*p%k z6QH}s9c7=!>JHhG`K?8GmOM)u5;1hya4X^7)&8n0k*lKJdECq$# zq#OdrQnD0;7S6L4Yxa);QHG!9+~OOv@#K2b4@NS@=eGsnrL9l+Zk8X^UcWd>sAa{A z97vIil5If1KjUob9oy)1bIB2M+UMNBVEufUo8(zQE+b#^$eUbha%FH^hyvdB2mJ_( z7O+h_G~E@q-*}F83CCpQuA!{a3-2_H>h5L9nzxRTq8Sm@?HYuf&QL7S8`L1+dh%_5 zTbBeFjRnM5-BlUsPh54J|^I^k%Aj2}L^t!Ve zmFk5hP-YWEps(QDZl~_f^{;BPwMTtOV$AwBIn9ys5o^}AX4xAJ_s|cCPkMCX!N$mrJZjZWZ~;Z z@2AnrqoH_svs|fF^C5R$00AyV0$CtC7^92qR}I7B;V-_zw<3{Ge|I?Ox6oR&E@Q{K zwvXMx?jO$G;{X0s3}D!Oi7T0fbcfS4e}*+maunhE>Qbn=Qu0sdZ|=2`Xi2iQHr(|U z$h0h5uW|;nKgN0;g}`{%3Fr-*u~7LITkrYq^Bzp{_7rD6G}1 z%oVcyp*h<<#|Duv6AHd=dHjmGw4Bc&>wpP1I?s4gJg4l;UH|B|DdKDP>#UcXfX?7( zodt<}^9}6zL*SE#Oe(f`m@mFR)fF>Wvpe+0rYD$jo%BSLz!vC>-gEEgzNI#({tV$p z0*bOJw~hTZK*(vW(*}iS2f7)_l!WF`Vi^LdZ}{7D7JJ{D{`oApzLxV%PQ0JU!v8t< zyVZcXH4H)Dk~|ZS9%rdW{vnLkY=-mylV8{jNk!WVMT3_07NXuB9l>MrHf>NK#0p%0lRh`~zD0K81GUe%|9rweiR z6nIA~TOWWy6NFM#b-RLM&oLC)Y;~n~oc?QxqVnGmxPP*zl0NI7Y|dBD|323#bcLhd zx`=aB^5JIa)Q{jOpil=7tiPrN;cmiv=Vd?xU@wajn~^?1nf9{P2qgcJj$9xEgh?Nr zQ1ySy7-7-!=}yq=O(mX&1ts}3V2sxD08c5_jzv}HszL(svMZj6W^g8Y4o;dp^Y<;_ z5Lf2+JN$Jqy6lhH9b#y5;rutX2=BZP_v*T->;1A4?}?_JuMv4gv)0pD=TSvLqnzRvkVJ@SVbMM#%TG)7(C#;AksVo?JLK6OVfFN3|B{dBcyr@||Y zgC)g#fVK?+#JQTX4!FBk{YrWFU22GY~%nry|J!m%=W2Gqq}+5=#VsprQXVQ z+NUVtRJ@IsQ{WH8^WqBS8(RQi2G#t3wy%)ek9i~$f_u} z9QSdbXc42L*^QTy_f<|hWE=@V{C1;F`SNTlzP z_Gd-Y@_zg)N*!5#FfNUZN5ztX*5x_j40AQyOY|AN^s!09hx&a?=6KLg%|bcN;sR#XKD%2)u|@_E2CRTP1Zfz#;l_b0i9=kXtE zdFF(&;UlgS;l1%xid506Oe@K*5j&J!DkM4egp`8)1T1_~U<2W1{U?o_KsGZncp|Ys z80CvF{&LOe1UEl_#)W+th}+SMewJ@drlD=l+Iu?UU1)+ULE1uBvoxyEiAN7uf8~|T^wHF6m^;!hTPth1-qD@J zIIPf=EqZWX^&k13;u*dO816Wr!!_gF$(xzL3!v~(hz0!AxlYVpQW?UwNh$*x)RoiV z6rys)C@e=4EbzzO3UHfl&5S_pxa?YWyOKy;Xi(k@ogHu%GkK^-e}9sE{<5BhF=qfW zchFalkYN1^&|M4H8AUj>Xnh4QKw@2}aEAJ&6J)-vNG=l9_V~TPduo!LG*A@*lB>=M zWBxwd^hA8nK-E!Q&wr2-MGJJ1wf+-zb z#bYm;DBSWFvU!Y%`ed}-pG%OuET6(68s_Eqv@iMm)@{fH^_&eX393(fzhRY!8vpcn z!nlFPBx8CHl9E#sFo3?A0zO?dD7QR>AUmkDd=daq=Nv509}F5@udqR^crU9}v!5o=XiRxf_v^G2oeieES50 znqw(48YF2bybtuQD4*v8<$ai^L&(w;^t(*}yVg^1Q8GG?e|V$aT2|53wVO`GYb%g9 z4HLAOuZF;4_&rqQ9oPZkOEO7b)`HtS*G;YQ6YHKQcMB7E4mgjC>ln7A1q%@r$~|5G zNFR4sD$n1$lKS&wfI*{YvTb~vsqQHY7=jTAyepOdH*0l0pO4K8eQ2nN_2|s;g_xO? z*Q`Y>#!aoyDMphrh=y{Aj6)v^b=2+=zL4lV&mtrMAOvD}gztw+NoW4erB$ZE(9RfRRq612p;sRQgJ-7iMU}{hl&R>Z@ zZSQ%#XS_}MQy><{Gh@>48`Zt^sm|wRAvZ~zt*6=o0ppKX|NGSfHTu!fn^~8J`b;&{&E6D<3g5=C34dAc$8^QvK6lPP@+Qi}scrgj$p>@Ut+(2Rgh) z4EZbx`tXZENzjnpVTK2YszaZc%E0g8-eYP}0;B#8D1%oGP&iqGn-;96E%tZY>2<@! zJU7x+*?|xGhSe9dg-Au87@LEDO!Upj)Anae@!>1FKGK8#R^hEUhZNOwIi9hJ*{mu$ zyVXpit{-PjI0%O8ixniU$M8B|1D;}$&+pGSGSAJT37w~VOF|66ICz)RCb09Iu&O$m zm3HQ>?~4`M0;uA=U7~@w_+T4#a(aKe!ez;FC_yHr0M)6Ut&be9y9;+dg8vTB$nt0a zT468)fFA7d#y9cq+^I8jzcyTJj8Y0>40leV`w&fW0JymVc(lQ>78D-W^zmg9tAXk@ zTFP@k*~4qWE*AmF!G(0eBtmbuNYtBr(AH+uCnh$VwV9GpxZ4RPAJ=1oxkxH4vJy-e zUKt`kbVBi$v@;0x4^9w`%jVh{Txd={H2iBq$l;<$o6Cfm`_kj3G?GedDOmh}N8vDl zr_Cx5GejZhCr2_OF|9f{1JhwtDu04d@wrNsel=Q2*2rVMyA0qn+47M+mpc6IoxkzV zl<=H*c1=J0dEt*i-M!N>GE&|)_qc`nF@aDCd_xd)wxb0lzTN=x=-`R&nq)#ma^qg}3Ky!*zI3DP6vxyBI~t)y6rClbAs4?GLb9UEz-UrDJT zhh%Rm6#FF8Ar}q*z>x9dhxPXsQJ!KyHgKgC=DIa@jIZLd2%r6u5F;(R`^ELUZ9qol zJhTwhGA<5|xfbsidzLRrWlrs+@U4#sy%XhkQ&=r-B%fnOja@J*%qbCzEupq}NUMlp zOX+{SC78?%X#vdf{bFoQfJ#{;kdB)5$TIP?m}v!7?H}OR3OcCo1zQ**625-NTnYk z2yzH^iU+zhrllB2Uta>nMn>$Z7Hg+n(1rEgO$<#YuoVIH2sq6|yeO0bSDiWNM{VeHDIe%wW2 zSbmKvJ*jjqyF$rm;v#C-@yLbO^})dmbb0x@Q17jQRS~qCkgO;Q0*d(Q9zY0k&56HE zhRZ#YR2HJ?EnOLM-9{R=-r!9_c5S);KfD&0a>5(zXu2_ex6+3z-;3L|ik_>o2GrtZ z1Is`tD-{B89+JWqh0swuV#|Izr~HE|m!F@{bEzk>#>L?Nj0P^Ha?HtU683|OC?iU7 zK;9{I3%WX3Jz4T?31@Q-@QXg_pK^%X$P_`=uzhVlnvcW0rBkDyr5@9$oApvC)qc>^ z?q>RG(=HSnpF%K>4M7iuK!$JCLjm^-(C0jMIP2zmt0+gpf^P4dmfPdiKO&mr#Bp zwr?@yuGOBwkyUF|SeeefNM0XLep{HVcGloEcBz;KqALD($5=gr!r|d2Gs4WfCgYlJ zwJS0y@tJ(qdEq_lNer5zDaNRR;N)`}psUO~aL&i`12|PUL8gt5(&{9Go83+w%v%t1 z7xevKGACK3R|*UTitS*3hwz+6vqz&>vpF-!tgw@=;O=C(nzC_iQ$4kSNMSc{%3-F1 z9H39f|9vVqqgO9yxRoX(U{LKz3LLijFB!0bbmq;Z!UYS{m%Q_2pw;4U$bGBp#3xw~C)%0hgyAK< zD50q-SE}TsGTYU9Ea%x$K-PMMYGm*cpq=#DtTD*7e8op?pRzOq`bIP{zQBOwQrsBDS)-S~F6xtUV}t#OD6Z zq)P*w>5Vv0x13$(gs~jTX}$T|Knli-BB*df=nU&#Ng8%q@BBTF+ZD{>Z+T4>gO?h9 z?HI@6crBfV`Ns9;yT`4{E;pS+=4XTP~l z{nEB+*t`yruFnZk39x>E;Kx1b$jp=`>_G}PlVp>F%8tG}%6yXRA33@q$}Zx&V6bfF zD%V(BLBwb*r;xnIL5SF;{b76=ljMCw+)#|F8!)zF38 zojz|BKv|)c2^)#~xC1oYz22N)bAWW&8*909&Uaau^z8HhvH-{_D-}VBA$xvnMVwsT zmgR;xOgaWl=uCGbnL~}Acp-70{Xgyww(580I5{koNz4=~@-LQAioAa@eXrEPTOGN= z1>h&U55DCvPzj|U1(A@*!AmyYTBvLjSG%e^P#I;bLHc8 zC*`5}m%(0=pC3DSc-_YWjoJ!F9-3DG;xLi@uzw~JTl_Yp(S_d?o#>GbaADrZXV za-3dvoA4U+lTb<8(jV1G;%(Kjua5^qPv1$WNe6u&7V;EzvrNYdw))=!BYe$|zO`?E z&7tro$!|Jf#8?7?@y0ntLJD`#fMy6#(~2#Ks+Z%&|kE)@%My772<=tF-V=h8j{UZce>4UD)F%Q-W^;eonVrOU(K z<4GCYMb8Wcxf#^#F@+|`kVYgB{{DIc&j_ym&N7u{VqO#)O`Hb=Kj1?L=NL+~gCUrF z<6pY)`b4vJ(gT~lP*B{H%3_0uZa7A$gmvi~g@bUf-+xx?(g{;3$t)htnOh>Rl_{q3 zN)mRWn73U5l_dyhh!<*6FfUQO1HHWivWfMqNrVH^6_Z(5Cyl>gZulp}D5i@>Wq_nE41EhT&}3o@Sc9t#bbKz~5eXJ>)Au4XdC@>IGZcnrw5632 zVgk2yQ;oa$6Mta`A-}(o_~*f(knm1ocLQ7Uv%N5tHyB(T5BCyF_5&O|*iqGn0faT{3_c*bqza62vSh(Xy^?Dy|6TRHRjeIuK z@cHNA=u^@Vw=^3)ww*_3iv88{sa%9hK(ei@2g`Eo#K=8p@Kl?4+8otJh#E;{Aa$qfzfv{iPZ>qjqk8RFo~{)r6bG^H z<&;ve7=k#EeJK>rPqDSdi4vxLPSe!%>gd8q9g3eYo}24xIP4N;^6=#Abx!?YBo$;A zyE}bD(Nju5FxjR>3>eK{H^IXDV-m{gz{t;uW86{0I?%VGuF5(F@ZES>)ayhW3naYy zz*7-r?77Q~sa1y<{IPAoh6fs11iT|406`N~#%^opyvnH*iT`V=2UnJnBrwX3>HtpZ zw0`G0@8$X*KpjhvPESK{O}1|w?GhekrQ+Lo8ucMgF46(b;& zf741iKn((qla%FdH5Wb3nTz8k7(=B+V8h?8sa;x#H~Uf-nKZy)KLGo!N#@34CZgzl zi^mPkd#foJq&br-UMckuYEm(M*&tp=drGqD2iDVGR?};nv~KJn81PRql9D!zMrZzp z_VI>88*1`f)>}rPUaax%HS%r^WN~6 z6f`3yZ|7Yj1P2Xb1Abk1Xn`vM51~WB%goNYfCKm4J%v$l}6a0lyqXOB;r}v96=mjKh$ltj$Yf;`J;N_yo z83t$vFXG;Whir@lROO>`YM$@hgzg9vAOB&Ip%~?SsuJmY=7{@a;WhKsJ$M_TzuSBS zGlh_lh0{X$S6Y*WxP9k)Wl7*CO3Zxc19MuqrI$(XT>FU&^E8uLFY)sRrw%BA~@Z30`Y)dyj&%9C}_5cCG^bdWp570F62I7M9K!@0}g1DEB1twQ{zkZNf zsV>Snm{fQ=ze!34z1IZ#4m@bxF*!`2BJ@-THRPx*XYv zLBBJ?>4rD_S}JPj`7Zs4gJe{=owGq6a8UtW859ZeIpvNUtrPPxW7z2FBYo8REtSB9 zaSRKO=pq_a#HSE7w8B)SbvFuROpt+1Mhu`A#-cH{2X{$;-TtNl2f16X3Ig4Bhwus{ zp+*>fUrqRWz&mN%(Vj(p18A6l&8RR*at{(O9cLP@2MN~zv>ppufaV{=zoIO_vsAhkcMf>m z7ymvcsQW*6_9(gmC_N3JmB98WlYDu&CNmGGUA3=YWl7MylTt=gSEKB<_Dk$Jy( z_cob5&OcD*(NONKa0Z6ljq<5|hd8iS1{IG0nzBmBws-Q|W!FpY^HM(yYbX@l1GbkW znxR``99DIx!uDKJPO&JIcoIr;ExH5-5(HT40pZZpr_qTMPW((9<9JkbY3)jOc0%vlfBkqJ#ioJvR(p5Lhdu`fs0!4`7F9KB6y^>{6C=T$V=JF4mBdOI9Iy) zgU>9|i}g)>BZ@;}MzS*Xd3<%O2-CRi9<{g=+WSr6+|c^Y5BDZ~*x8u(TH#}jAFK=B zA7peY;r>y$*aZzZEdZOcQJL-anZmJ~MkkDZc3U1+ImWQS7Qla}U_5p;J)vrJ{O5HD z`E_p1OG~7Wk|HslVfUM1`H60uAaek+Y0dG3;`Z*+BV@nD{3ALn7I6`J-{1>$e*n%? z``1k@>Sur;EuhAw)V%S(?}QRAB|mwN`#C=TTLl89M>r;^pDbMVo3Mt&r9Nv#00O!= z9NIW9Z2yAVV12fMfwG2E5+$9C%4cZgJ?;XskB9k_0~TS@Oqp7O{%%xvL%sGg`KX9Qx*rv&_Qr@Wbb6#v{kRT8Lj8I0Mn#6QoLf>p zscal(rw(3616TE?H~OoY;&?-P*kzjh>veZ09AU8ne*u7hVU&c%_F6j&$<0{gFS7ij zwUJ3r5K$#%-gvKWuD)({_TI(|l>8FY*nO@d(!KV}7KPh`+5-e9s02Ν*`r#%2yI z3jXwe@Ln2ICT(RkSq83cycfKKv4|*=0JJscNMUe5ZtQPZ_Z$Z~#n|DAv<_u(DOZWc z5)Y4QH#;kthz?05-a&}Nf2mt}q0mvF9SD6fCqCrgiZRZ1S~n?(h{Ogo!V&9*H)lSM z!Ap(y!M|n;bhL<~)yN&h7;YeCV46}Knga~S3^@ktHvdYuR(OD}Q+soykEp8A)Mm%$ zp{|z3nqh;b(FN-tk>H_E6}BK^VaHS4QiEhI{9Smr@L9Yuk1J4{gDd_mn6Xn zZokkXg=}=cn4id<$)W3fq&BIge#I`#kk6RP*0>G(+5Y1csnl=ioTnLt{gQLtIniuFN9P1PuMNMA7|Am4uj zTBxH9i#S;)uj4bYNF}53aprQ!+-KrX@jAU91XZH}w}u~3xHsu9`1vlr_9-#Gq&F*i zC3P=J+k1}B-oG2bZ_W5H^99;UbewJByl!Jn^p-Pg7v4V+ae>3qAp1d)&`b=>T^v2o zMmoxcwP+wBzJC%$CufVKp=_0$VX-&$g0F6duWp|wuj{eiz2H~Fp*IG;x#Fl67Z%AX zAG?T~@<(^e zx^}WH@!RhfG(Z7q8?MwDu6}gaH)*b(Q5FWxg-oX_k{IdFcHwX@b(4+_81LMupS7Re}|uq^yH{b<(ZflL_)d@1t z3={|(ZNO80&IukywjWl8gF`;Xc_dg%52WzZKB+uMtHEj}fmSu|EUSA+OboV=LZfc@ zK71EeRixEDM;r|=RWwWEfCHH`8beWdhj}usB1KY7K z?Y_ncgi2GXWr<*8Eg8i}1yHEduR-6jmuotSh;_cvpWU6peK%xPoDK&+J~4o4V$8R4thQpE+oI6yhnS@M*57&OCbRqg)0yc?_tUiUkHH1=^ga+z$$w4^fjwDeHykRe zQ#Cs1A9h$8s&3=VWp;B8*X8+%(UxJ+k`^z5tg{A*UH)-Ab_7}9e!n`&P`*X0id{An zbCu!ZV+YB4xxP97@S$?-y(_U&vX!PVZmfmbr-r#3$y_u;xJioe){4+kOo}4R3HAlC zRBHw)*q9H>yHwKim_{=i|1Rca&8ZZ)9+857?k;1ARm95Wg(5oeDq%}{ET`qFILTPjWk}namyYHg-d}5pdBHGXNDx*Lc zz4K6qImR}WYY&f>jV)6$KMPuD{}8$`51jD`+7!ovRXR{75&QtPZPs>K>ATV1wRJF~c)M^=TZA@q zY@W=w2uzI-!50Rg)%SVFLJO3|IkJN(;vE`(z?LH?$Z5%$bA8lgHWaO9CF+`1Cu3Kq zi#0?>#SyGjspAnb}SPo5yy8+_S-lJg1HR1pbAuR*-y6P=~~w z%MzZh6sM9u4gxjF*9NO#$^LfzWPaZU~#N;mz{=i1amTh zdbah&inQx^v>$K1>RRlU%ZQkR9ZI&i?F%sJHPE21LTrDpR=Bx1)o@c6&4zCIVN+5m z#dxW82>;wP=F4zOf_h{!HkwW0a5)snnCg?&>aj*4pS8;f&ripxtNLbG4ufK{aHGwo z!)fVPtH!8X7bup>m7r!ojaG+mMNkRv2i+=lOQzR^epmU9Y)ze}xM0JLp4SV5zE!I- z=oI~`W&1ENI(JSKAG;x|SpVXq2W!eQCZjsk@H%i@8WKh!_cbA5)umPUdikEs1LjMf zEI}@e8I`dL1DFDg_gCPhSPEGdtzro}`Z{{4Y|`~SeNmvaUd0|iF*JyY*{*t8<7JcM zeYVgZsPB2Owfm=%WG(AsF9jb*?>8k5j_~_a!;}8Z0dq%f1kd9Z13cVC1j%GpnDm%c z!C%nI=tI2o`G||0)KHt-Ss;)bJFEwgHmIPXg&1-pZ*0ZSC*>TC$qzU%#$72s_X zXarriuun~7g0ky=?PTi@q6jc^5fz#~`DTH`Kua?wP{nvr$?N(VXSDmI(9Ljk)aMhG zMPAsDts#H2Phd6wDLr?D3Z`@^T|B{5cER!D_xM1VlTwMo4G892?ePY9mIP7W-dcfP zvgPGrjTqK5&d1)BSGEWcI1b1h+=~nR=C*IC(>;FV2g1`2;ZXWdetGucU(L4V^87ve zTxcocb2GQTl+0SkHhgUo{#+mP??-Ib+%U|PEP!IIrRnO@wb%)~*}dI6k=qnK_p*~- zd;I8fV*jq%5bq(VgVJwR;cYnLxY@}|iq)#M?S4G3k!QbLzBji*#PC9=YH$6~(TyXwd8c2;jHhGfsS=R(kt%ZZ8fcc87YD ztMfZAhaFP?Di*qH>?E7p(T=v56{TuxWo-i=CY2u^P*e?m6@FkKss$v<4*AO zZT-kXXAs}YOM61RV@nwB>{FZn0+kkETCV%YW~Gsp>soJ5Z$^cOaSDu^+JYoViKsuu zi`4!4$!qm%opPAFbmx!UOS0$J;0wqdjhpF!KXB5Ke?H%Hly`@v_!zYEXAGi#f#s#>+t?|v{ ztJ8>iZxcAQy<0~E8j4b3&EDvegbtM2jCoxqN5fXXfHE?Z%g%D- z9in{L?IH+qjo|0kRZSP#WNejhrHXElta+Qh2`3+v;{yTBC>lJF^E(}MUy=4SbRCw6EbdA z6P!#b@J_?KQoBOpU*IBai#+mPh-htY^OzYIMUAz1@$`d^kA7uqL;wvC@lMp>ylv$P z$mz<3fsj4-;Z~>GGf?^l1ZL|c8`AFC)cB`%C$MPy3`I38@qJ$3b=*g2XtnGVQ!4aV zp+DO`bMM}NR0bbVG1PK9yaZ|gNaS%6WXkE}vip6Qopg3`_BmOw(tyPh<`hMz!Jx#w zu^t)0{_l33{dYv`_yYlrJv~~Q6Aarrrw9<3L54%4h)2?L6)W^YBQJ``l6KjCC1kx? z7ITq7=C40?%@|l zaT7Sx%(wv-X39|Kg6L}d!mMK5kuRaai`l%KW#TtxA>L>VsTySo3$nnS2Tif+|9*W4i^fB zYM4$t+GIDf6EkqM%L#WNrzG6P>Jss6N#lLR8FR~2Qr)~4Z-F2Xe?p9BO~zcS!cOxo zH}lE#hbyJhmr1_x482;YEI%GK9Tu!e-tzpZRh_^*{jFALR!~@gwcz!ICSmd;fOL(> z(pZjZV1*jchG#sDL&?T<0nRjLzzEz%v*~+krbNPab7cfu0{Fz6^O`y)2m*n}oIprU zGA#nxUye#JFXxM=B_#C~CKQiegE>-#r|bf7glh9d!{N}_Eg1ki<^!-(fs-RPF!_Z} z??>fQWIMZ*3O^?F!dyJXEe0Jq*(!Ms??ayqRug@h+!I9gZRf&aEk{qjwI82XKiLQ8 zX^%W7H2aBv#$^ME(w*e|VW>trWr*O(R=XDHbhv=B8IFcJ{p~~z3}oRJq#>4z-@f*u zd79;)oLB!6rKc}@YUhPBo+;@RY+y zmK#c9(*}A221iiHfe)B3kAI?dTO@u!q^9cki0rz{c{(vbJj?FVI}%Z}4J%iuchIag zV8JoRsiTNnOFY&6sqM+(em7Y=&|cB~dkm9)G{@lRh_)RyrrhvZ&Bv2}?lA2R?JLNj zslt|;oieC+E1|Ckam=YZL;ZeEjBPsU&XwqEOHkY)5TMg&JJdZ*9dd@wC6~hVo&x=) zi~ij4ps4dO=MH8rh9~o}STt&6c@jv6<+ZXfVDjTc-#b@|S#g2}QilxsLy-yr^!QrL zo&W(^f2>_fy?*ab`v$@fgo^h}61f)7IVm~c zGtafmK%&V}3pmBB4XkB9k5 zUE%letO>4X<#w;`dh?{B`y&q{kD;AG1ap0i2;{-{a55ZHIS<1S`Z5=L7H^I3Mg7*T zs~uITb04|Pc?zY7=PAuNKodtTYiy%jZe-DwzsxsF(O1_f*Iv> z_-vhZQ-(5N7jwMgM2<^wV%TPy<-pA@q8xZ=(OPlIk@+KgQc+RVm@M}vJ&DQ2hO3Fm z$kLa9;=cF80lahJf2e+4%)Io|%5mOFw|e^D|K~KRINHaK$2gSb1te7%{8RRz%uw3gNI9q?<)-$=l~r_b~-MPT7ICrCmk^zB zdA!`%dDf>|HyJ|4Znkzg3a(lZ^FqFnnAD~(yiyQ64(KHxke@LE!r;tD#PENY#eAI_ zZOVj(bzl8cr(Tp;DV0wqX>~*W4R-I{_M9weL#0}W^K`DAIu$uRfb>q&77vx_E0X-z zjiFdRDr3~=q}*S($RJwkrI=j5=kHMs2ux+?S}DO!(4F*v^Mx|lIfB6SlfGw-Wp0QM zRK(2Dx02A@N}`S57S#~|KXzZmkEpk6WY|zU9|dX+wVdhFPrSkYn9I=E_jixjyUpAuyH!p00`SkU{lS{^S;t>nX>?0udW3>I1HJ5=CC?tH6$Z_qpCDeKBF@!qTId0lc zmKtoBZ(@cdBbW!P;!M3aUbZ~Jeq3o+A4#{a1;aVa95fk2{35fB95MG#k47~zg7i#* zq=5XZnYk$Ax{Y$jh!~wp*37ETQ-h8 zUgcfqH5n_$f%OQ>!u)*wtN*}}$AS+6Wkz;v+8>|8u8QLf)}&V(1?NhfyZ}eI)Df<} z87L8M*$IaGT4X)#KLq*|#XwH$44OuokvG3w{@&qj>q!VcxEwBgpmqBRMM3%F^b-+E zI(!~snjvBSeFI7eUfY4aFLm)El1@>OtN@Es4AS?Z>iG^6pAV7v8YP+8K%=8Ml{+W7uNE zI?KdSls*jk^sgz=^Dh4+f#U%qIz2!;olF(lsJ7AJmws^?ojuUsk!ZOrjz>w#dQL&d z5KTe~-j^aD;>;2F}tYX ztHH0ifU5gnvp;W+EmpEm!~h2z^o45OUrc3sLck|W`N8Nt;sb1ZuLve!nLM6Zr!lRv z*jgh=5cn5KBK>NxdV)FsO34m>+mnK=Q(E@=(z1uumgXiVMJ+td|4tq6{0hRYOBED> zfMg=GXb)JJFH-Tn{L&5)shJ)F88pzxGhprt%`&e5{@EU01&6XZa%G~CdP1-hjNRS7 zz*J?~PE(FRHcVahb>{GHb6WeQ)<8t;?k{2Z%~mYAzETlT-25fk?Du7wTrCm zc}nGTpKas>%ZfW&Vzj8OJS}RP*?p!P2A=v+pEKugszK3!QLUUzm*@13RRiOiDR2~W z+Hy|*qH43a9nrrE8YmFI1^GDAiM*Z+Sc7o1<^-+><~YIzKhEkJ63mUW#;N;w{y?)5 zya2hKbpbe^1djMuh${;>)9);?AMg>_%%Xc+KEqDf94`*zp1COPCTlBv&0mS?VkkGE zqADE~Ul5FQl-P8bL$2mGAL`ZIT*yW@GwjJpS*dA49Wkxjlx{EU5{v1q+qfN`zjdT? zJu|L>q`_SyfaIcUvjTAYb4scq`!;1WQ*$Yy5By?ARc45AkuiMqlZ|lVdhb5UMx%b{ zwl*__2zrL*$%YPD`Gp|cFKe%%_FSyfT97pASfMSNAKi;~H3c?p?nM?u#VEllX5!t5 z9l$hS0BNScC#3#vWajmRvDxflmVoX9s=w>9vbuRzzjD2tujgv0D2h-sdrqO6!n|Ik}q!3AbX|BY{* zn6|DKPK)fgs#c$dTxN)2jW58`*n)B^%;V5yye>IH))_TP^#mfc&1Q&4FH4p{D}>h* z+04HmunW*22Sj+o85on}eg5UY0`U%b1zDzdX~V}`4kfb(n)4-7*=sP+tjdbue@$0d zE(HJe2=03K42aMY;`Ph}q=>MquFIDxkG<6qmD%pEt%#kU7(7I zmlHAfZnAz#m(PYbdR-_Lm~%37oxkmKo-HRWZH_&B+|;WH{y2TP>2{_eXT8>Ul~CZ-ZJ5uK!D_?AJU}0Qs;)MHmJXN}CGQ(8(QeYqep&eybEyal9tXs4-xyLVEv7e402#+A zr-)kYG_NoZu(hs-f&Mst2NZzYh%S%U{O#RwZ7+xC4Mu)A>A37nK)R7JgH~UYqcqqaQCNvN`(fh z(0wl zg(`IlwiN06`E>Bc&;SKXGm0iVt5^7>!tHuG#}kx{j?#ZyL&Oo@p}f7w><}2#36;8> zrS2EHbqI2vr0~z<)7`Te?vg8QZv0F8T={D+_xVmH1|@d7f38!1C0K)*YH_d-gb0xz z1OiME)<08QG=gcp_XAqC=B2Qt1L9yYKQ5OSRmi~+7A*lM6CCCp)kI4Pp@tr3Hz0;$ z_t~{xG@Jcr-Aq^6cqTa1O>c&P3zBhF<lpP*XG0}TWTI;coo=X+jR1S_n)8<{glee#i~;GY_G6{mIl(4Gxu08B$T2@ zmnl}yrtUoI6m=kh*>p=NnsflG6gJIo#s4pQAL ztW#6RKB7bDA6LcX!=SBtK>}F-P=5^|Ak?0p^>MhoKeOHi+v$&w6;|jc!Y5-8qV|2` zrPi0!4(P!Cer#xmr~&<|r25y`349{13RUkY4u%-r9sv-|=BMZxtCkxZPq?62J^{^+ z+9wm?$rEdP8g+s-xBNm`6CQ&sCmMek&zKV^vqi-u6v$Z;o*n*tY^6u&e_|Y$POenL zSfx7idy#zm1KIMAVHby@1s7L3#JRmGTR~pEyA>28XP;6@t(avQ*X(3`X_VyZ*=(Oxa6vK7J27Zs9#( zw?Si}h;8&f*{4l72cATtQJk55|Lm+hA zxjLaorYtQ!^gQdj*BgbJuLV?g0_lwHzmT27Q9=9VUh4_JPS7L5+n2Oo62%ph4CM&E zYJJ&L+1&Pt0)}$sOw^-qaZ`8PmMH%rs(k}-kurIMS{^k(Ei)H%tLFpe{t=gTs16;< zS<=>RjBf@I@^4=-Yr=iRo^Jv|jwb?h>k$4*`ok&aVH}41F0OE{@=l0XM9TPq)gBV0 zy(||2T1|}dpwlX=1z6I;5R@T5_&`#3?eA1|IK9GvoVVE11-tI%sXyi+3A|-{?}qgo z*hD-U!$&wEL)~}!t$gZDjQ8+|L1v|Ttx3(lU~5CjkwtuYzYl(GQWX=<%Ew2*1A}xZ zq^}LOo9g2qYWAH{S^MMhSQ{?m@o2mf!ccg!BuuE>ZDq#nEag@N&Ze+Oo))Yh-!lTf zzf)GPfA$2TW3w8g6niTqSl#&4cVpfXP)hz4pOe)L9LzQi*SPwTb3&d-e%mN&Btn$R zjd+z?z0yqX27~6#egIm*EG7BK!g*C($t@BCd~v)+6|qQy8ZW2rVbT zjRZIcA9c;)SAG<>>c36a`sA(EupLZ@WaVFTY0SW9j;DKS&n^fosD?x@HIpi|@q30f zTNqH@yPQ`L@oSO)B)$76piv0g8S6f2)r7_l-eRUl1`f>o zf7DHYfUz(AU;DF8#};9A!R6r&|6XT`?2GHHnH=K zDuiqIz0DZcG@3P8XaiSEqt^_Qg4B}M zKd_d>*{0Q~mvBv4VDgua6XH&jp8_BGu*J~sOU=E|*kG*uHdH#R7W3HQdHY7~;~N|! zLKH57g3`Y{!y+;U`)xsw?$9-AtHI9Ky^hqlDX#hR$370@x#uNJ{{Qw2KpFBFThbMn zg$KqAR0H$GI~(dYWDXj$v2Q5+?=oGtmJ%68A%%M&&xqwt>|e#3CY{ zLlo1usJZ%e8(=izIkLr~&b zqAa|;oN2qBRr{8ypH&Xn#7oLZoI%LGz%_?549Md3AeQrkI-@>5I}BiI!8EYGSXQq-QnmDX(%<~k zaUrfwr=v>H^!V5mVLby|19Wa9^r+l@|1dFZXDfayd5g{QGcN*Nc8IEa-&_@=1{`6e zR6b3GxXku}q7X&297cwn7myJvWn--u@IaJYlbr6Iqy{CKWP$LYQk;h7p2oUn0RGHn zA73EpW`DsU45*6nhh}xg=GlWmG`oNL_u8cgV{A&mF9p{DJNU)_4V6ppnyec8XdaZp~x(c zvfh>9pphmXPZX|G9))ZUeVYGeDFJE{Y*`FE#6Ncr4VbG0eyFMNCCOO7U= z9RD|c<0~Gw6$#pW$s}Gxeb&j`VeoIKwTBCaU&y1OG6_d)b;6y>D%YOo5tEd_(L@R=i-E?an|SiBNteKn~5?x-}pjU z2z%uM8;kXy=M=1|>#8{pvxJSl6@jho=LC>s?X%Pbe_%Q)uh0n2;~arAgv&&Rc<6z( zws{CIuP{=JOB~Acyn^($PnbV`7?{!BuA$lxCR}pLVU_78j)NAVnIm>4{$dLAlwkxP zT*~3Y>zGxmehmcczr9E(Cbi~+FaCIHw_C%JBY`YUfR^msyL zlO4M))`_=19dLAgH48T*B&vbU>~`aNHA(PTG`xo53KeJ*cZBVwq$1I-UxX*Wh`j>s zO&tH&chdK@pIBe@eRisqqZRDugFfdX6B*anYO>o;2C;`5E>>WBQ)GabR|I9gGliUATp!0fdlR=hZ4fwzq!CJA&|+6J$KZT z#bHVl+q6Z*7DSw*l40SB`u>GH?cfwhDbQ-X zjRT!!1*4A1w4ApFN{_1yRdoQvsN-Kqa@?|c21EkAn7FT@0k$D*FtI2cgr zCn{<3VpT3ki}b@WW?>dr5%kt`)o*W@Oa!RzgV#9J%w7N5XfE15UYK@gS*Ea=wE7OH zTn2v%fA-Nxb4j&Kj6+tfa*_d%rY`k8%I)y4a&$dLP4ux;gf$iz6TemnBELPQntQ}N zGMAJ}eSg+5E3dm_+QwGbIn_gNQt(Y z5Fii#wkmLf)6q_msC7RBUOPhz-O@AkY;M%JlnVOp>^&K$O(=QwMY54;7yq`r7)egy z<6Bc`+KH5k)0%w2e3rE;FO@8Oj;p>NTLQO}`OO7Y&JsK~FiRW}WVP<%@!$|h^%*BAJKsD+pg;7^E8jmwrhBe_x-bSB5MjS#GTZC|c2#zyB>>FIrQ*70o z2}-!D49)D*23)|!+Yi}AGpqTQE*YMM$A5ovi|OugNc6p#1_U;!Fa&<02)fQv_NLY8 z)n9ue$O48Zug%s;zLRu1cIe;sMU&|{)=<{42 zYxg6Zi1@koNuPy*%0(N_m6e3(b;&^Yq}9TpSfwyj#V61xI^s2y2+kPU4$Fk-2E8@O zMbY%~dTu*?%9a7dNS~_k2MOWNtl$Ea+^O#}7y%rKMKeHFwuE$Ih`*h)((k?$eA2>f01%ggIpIu)T6i&NJ0qYOiskZ`8~ttTt9+!TL=>tzjj4` zyvou3La!N!vx1pbB@{~>7Qb*bUUStC9GQUZ?~gUpE*}!0QQM|SI)17fnJR>Tu{z;# zgQ>U!EH;MA>Dcacu6ak{E{kuZb-ZprSTY714e9=o?XX;Vh#>T@s>v@*o~5pA4ukKZ z1VO-Ij?wohuvq^Xhz~&zk88=h@4DVniuMes>1yL`ve}A|yuu2fg`GbaCw;s4v$@yy zM!l?49bC<{6~5{lIR1dl-q}U7bY02ezJ3Jp1qr*rYw-q-VoLE6N1vQHlGz_O}S}tMHKOta_Y?mLfw|HhDe=+t)g7j zihsq4Q6*_&M+?IVKC5C){?fL`P%-bvWui@eS$(;?SI_;Ezd>FumPG z?tNtvrD@=S*MLvO#WaSNibHEIlxBy8f1gnjUBL=A{(Z6<-~D;YGIO)@D{&>AI_R>a z!QhDv(vehdxkyR^a^T-mSQtTjs+*1+%d#;h50q|&UqcMIj7x)_die@!p4jE$OFOAH zSS*UulFRb1@kb1xx_*cw><`9I`nRVXC<8W$X)W<(Q&yS6^C-8Uz`}T_?9x1ETP38)bi!qNMuS1h!^e40O zHertkOvmZ$&z7H;-w~OT3drDni2?%^?~i|M`EqBQ`bK}FHZ;TgE^Zu6Xrt9FHZ04q z+=r(aUmuc(0HOY?m(~c2*R>3KcC4!>d9TR?abHFgk=_PHmYqSpw{N6;5=l)A5v)Sp zPz1>gZ_|uYk&lv2lGjjHmZpTQna)4pHi*%`9yv+0)ylwQu+=c%SZsKAl6#AT@UUpy zB`Tc=ChbI}#FqEcLc0WuA>W|Q6smL3-!L*|vWz?O1Z(fQf-9-J<82ndZwdvEz5dxs zqNT1EsAT{!WUebiyk9EHNOYC3@g()2E2Xm4>TheU~pIvl`ZpBR#Z(yWG=GGI?Yee@hmd>J%^uZb~-9D_nq`3e{(+UYJcq3)ro8B`w7A#)@rFYo3yQ3?&WPVA1v_xmjR zfOk03v))Irx@wzG>RX=0I&?jUs;cUjC<)^^yzt}TiX;;g{XZ_i<0edE z(}8tdKw0c))Bk_?d`QL;e>HKIAzn6;_LOsJ?0a2lE-iLni6fV8c6|>xT$vXAW^?CI zYo$Q4-<)p}8?B!abscY^X>7nUQ{kZY?dF%|$O|~r=Y*!Ze+5)L0B5!M%(MCr4uue)x zOK&yOff&?^*`~dJ$i=of%PvFaegvVi`wrP+)m}&f$zvG5fY1%8H+)LYOm4fP`9C?_ zz8DNi{kG}!7uiU?>+u|Se|z5;lH5>HVwPieSG>IR;30xy!!4+1TK4H#v@qS5$PLWX zc1!kwRJ4tZX2SN!Gwt^c0nPD+V1Y7ewQg;T%PSRzyOn+i*waThNM|!h;N*L^DForD z++orbUaU6mV}|&~qYW$>rp@aiI;(gqCSEE)hj9A>?=ei%vca_qX>IX2WW(w{~vr zc21Q^So>{~4ewzYMLaGpk^lUS@9&b)#d7m^G`p4hkWJsm?>in~-iup)uhG*haf`nV zl-$l1jrgYr(zI~H2tjFy6BGW&)Oue7&u1&mD5xf(NKa4fj%a_3gB6_b&yrfQwEzkL zTlnry-p-vz=v7Jps4Jq$q~rjr3S2G3~=2a>$t31Bjn0G=b|S`nhxA8 z%6!ieq4H#PYoKwRUeY=+z}_~CeA(i;<(S6N|3DdSHWPY>dyhr}y@hipfvzGrs-RYU zGL7}Q#=(mQ2+LyV`~KkTEVx>$U+^iuV;IO?P_z0iV3w-e%p04`D+^T>PTy5pf{t_- zw@xNHCLSd!dRz0?C55F`2Ufn%xI~w&alu~S^Ww*2*ubbf1Vuoi1O;Zm=?rNZ4jm(_ zae*JxvhN;|;@$uUmgvT&(F#K*<{e6@WQQtia;A(Vu0Jr-Gg^q_ zew{?t#KIyWhqNs_pa?BKMNNz@5umIRV6M=K9>-7( z+#28&Lc>b>X}fZ6>5ISu#z%1p#L;>*1rNxQi+3GPri>asK;UQ_zGE;PUn(AA*8mu4 zaIu4_k6Xd+V8l#$BK3eYn4?esDyF8M6I4T_Im~QWj~<8Dyvuy2w5CzvY0ap~gf7U= zVp>N;(90c3xX^DY`f<`FreGR^5pPFt_bsbJM<@;5-C<1;4!Jo5HD@gnU7{81iR&y zcsk9RuWQYAg;RuU>#&njgyDj9F1Ndy+8#L$210GPhxB6I0lopD zeh7VKPHm-uA-k5)k>wf{YJijDh8!nTYq0fV86Nb^{50sRZvDA;vwF2m^-3MJ=K#s@ z(YGdnk3{)kReis2El=Bc-viXqXK=ubgKCQia+Tt%D$S_uf6B*^3lr{n5SdZIR!LVg zdY)HuB;PyET>U2$^WLg%oaWo&+4#BNG@(-?1tQQKMjQMqNkk5o<$R8EVBQM9&B0w; z^p>Oh-WB7I2bO*&$aM$Sb~Kgg;^runafd1R@MQU|CUxnOzVyJ07i*wL2D%9#D7$Yl zbv9CA?h^l7pO2^=T>0|W|IObfH$Y$ZtgFMzptaoLuIUu^NwNnRaD{hd&_HU_M4GTA z(~vlEqJbr=$0vu2jXkN!nOzVuFaU<~F75?}^M}N|&Pf`-U*c=*7xV^X6)+zDDKb}? zW}}5H$_h%Ltu@I@^Z8Azg%`2dU@_=)L@^3R{(FvLIsTS$y3iST&ldB7L_ho(FF|-z z)FSc$-uDjHjcZAl*k`=~CnCPk_lKFEy@4g-#%&KS&!jBU zA6K6r@~KO0%kH=+-=O#lY*!?%b08=B{6nq_aC?-Ygca~`QMsTO$#G0d6>|%K5CbiF zm%t&2?Z2m-!q*M%BF8^^I7`&W4+Dlam*yN7xO#M|HC(`IA1pc>8@|-yi8N?J@U++**~i#X-gcaiivTU>3s_ZN`BCHd znLLy4#HHlhm|*GXJKWWFnHn*aX1x4?&omd2zXyDFlFkmAUdLp8;|oO*acN-BjN*=l zLbLU_iy!~njJn)A&NJ9DRDW_Pktp?Xi|c~cB3hp1osH>Y3Ls7zDa~>H8X*YBTz)}G zIDPDPU_mVf>V7?g-YgUShl4VCJ%1RnHpPwOsbhm0l-X-gxP$VVhQilW@a7QFm6)T9 z*FJbo!6W5nr`{kKL8(||{E7Ay>`=?|kEDwnUzk~;<|M|UVnWQZWcPD$3Wn1dcH}^u zLpA-55j6jzq6Y>#Z2|XAL}=8gYa>f#737y2u``{s>+}zSew| zKNy(`t3id6!F^{8x=8BfiS}o-urRZ(?{ zyQd08!dKWE5+uSBm~1V!AJ%R#CvHt{+u+*PS2;a2YsFJ9&!piEhs~1ub_xwTEyf<6 z+ao77qEe4X8JUoVX;7GUZK3l;B?Qy)Plr zJLihd9D6i`MuMo8`gvO>jD);{g}af=AJ|0H7i&#sNMQ*(vy^xIA`BqKG-^e*v%;`% za44yq3Yn~$AR>D_)U;AGjK4cp2Gb?opPN$eFmL_+&gu%sldD30@BWX~E=jl^_jJsx z(^fNKG(AC!lg^mFt9c*EdeXwP?%FG~d_H%U(47yby7NU=5OQ+XChb2RK>bq{{GNRv z$1I6o--I*7R-HLVXy$>>*)ePuGf?9XJ{vG{!FUwK}U%WN* zqyo+enAM?CxnaBBmI$YzeWuqUTsSMh#P?|F-f@MZu8F5l>}7d3Ujb4V&FbfnRo7!C zter}Y3AY81>_iY(C@|&SNgKY7`H)m=boA3b2h&MnP)|UwKqIq~C}?%q5{kF&Gm=O_ z7hyJ8$jA**lp;eY5z{4SPpRU;hNJ@%!C+QV%^E+KNZ^%UC>&P$CN<>L$E0HKP@5MO zNq@fjljbpe&>8bu*ylLU!(8$WN$2alf=&q)1;q@JIlJg5xb>SVk46&uH88jz1Q=I% z;Bv@pd)p)pU0H{acU$Jrgt3I}N)AsV`!m2!4P0U8P^*!|n_AMCiMV-CSoRTI_~5ZJqHzHWiyN zf9gyNoR6F`9yJI;seZ}vtw2(Kh4K)8(auI*vktblLwGcY4U8w}fYKZU<0a{&R|09I zV`H<{%FGT41Dld(&jK`*W;r4d{Hn1X z4(JIEqVX48);HFFW&dp<1K1a*f)#K9-p(jJ@xix)Z=^^l_aB9_q5oRhs8 z#aifLz_g_7N}*E%E+m)a_ld6%5gV!Br0o8j`u;4{2d?aKFCPEkw3a~XfYw@EzR7X> zl_tW>F!18_b=79xJCj^H+ti&BbWXOBU95grC{@ZXnHG9YV05%mUb5j2c|}|*3!MCW zj8#6|Hwb6gka=J|z4>lASE3+>FTqU+2CRTvUT|Pgn(J+_)gI#?<4+4-3(#b($cww~ zI~ds%Im~XwxZ8?)WbcW|;thOQvp;}fjT$&5lt3ro86$rErt#wwC?T>f$E*w{OQe6r zqF!PGWGht&iUf=_T*^((2Xmx2l71#|J)Aa_UdXSL!^SYaS5w()q3Ia*cqERsmj5H< zX!)LmE)tSk0)Bd1cNR@(vS7>}^kb|$hbst=%T`AC?H`0&X9+?B82n&WDp(v``^j=X zqee%IjBUS2C}912dQUnKL9xD?S3c9I&EDrRO^@_=b8&MJlR+iQsHx-x?s@#rh>uQA z8lDe6A37Xcq<~yn(eYF1%UQ8&Cv-{&^qe%Cm!gxHUSPIggv-wgvg(Sw%6X1>&@Zo# zz>vt<0*90cizRt-vMa&%&;z=h4U6IEBBCX?TDM4*ht!@I!4LtkBa*yINJs;Z54W}= zDYw&&_I40%6(b&K7~vn!K;D^^-{Lq6$jt5?Mo4U-!XTkEXMgSDTO@rEfr24XR(+{OgdBok&E--v?ofT0dVE47zUFVK1LFD0g}tQOPkJ3dXhhhjaldd?dSBFQ~2OJvGq%BE#SyaDk%ieNq{;RJ4Te`qymOmW&KR-ayc^1<- zfe*O?eN44*phB9fv>~V2yhRaMYlbEtfgC?I) zI|2YPsNitn*6~s-tAz2`GcVWqU8hnq_eY7DiI-KkVyx(o@gTghwEjbC{5g*7?>mE} z-#ZKFRiYqs=(6*Qck`VVa|Uc8v8F)#t1AB;VQH$p@uxM zBLnzm3_Ma1u@zeo@(bRVt=vkB3*yt}eZkzoJPHA0gn5jQ3N`BheAZGGw2w z6NSaBJ+-A0*3BODTAYNEn`9!tdR$P1fGonJ2*ofU2}jaTgRUw{%i`GVu(bm#XJq@I zJ^-h%vODw0x;4U7NH~}O8;PlxVXU(^|3jU@gD<>j1f_cqsrN9CjHwDO_$&K z26)2oNO2y6J0c4H>*LbSUHxDjBA@{b3+1sDcN_D#!8qpz`nBJN$QWhN^3RrD_5@^~Uv}VkvW}oLs zpl$nuGUTmqSDV+-qNBb@$I2kTkkaek0Kz7jh3`awZ43;D_}4euNhuSR=Y734#CW&n zfPWl_z?4_5`w8%y`GUt25g#VtuGMMqX(xs&GpMX_!!u`&@hPwbpCSi2)L} z;V^5-z3y64&}#p6s-x(Z0iofavgfn*5(P1`5ZY6TQHWNMwU0-Fcx3`xhQFGsH>?VV zj`u?>kERz&rHXlQHjCB%m9~G$0l|cb-e$t&sE|l`dOCad471hk7mqh@oQhph!788| zwp1fxmG+8Y2P1M|^gch+6bHIVz^Rv` zDBmswB(oz=V*@bCe`hKmF0h~PG&9b9&IdMhG+7uWC8b4E$8d-Qq-+Jg`FFWe^ZKb_ z36Jm8yOxGGe)3Hnpj@3(np1@CGg)9|BOqn{*iCbA)`im18}WmYL+D7`of~_|ZDgLf zS|w^OPFdwwptLNd3^d}^RGtKk(U;YW!S}CvT5h#+12H{h#-m9Lvt%VYV;=ZE+wYRn z9kf0C;v(AC^o4(QQ+<(3YSwT#pKMRzH~XMkp{Z&fF(Ws%a{*2kSQ(K1~fdKOS-B$c9Lx)Azl@V$s_ zQrV}e2WFQad1Y9l0;8F*YBW_f#<0w7qi-iy8fa=X>VOH;RD3WpejIkMrfDw6n2yl4wL-fGGUXhC#+3#Dm(_hE79+c7_h#3e~Yvaw6QiHAm^KSoBr3@cM> z@Ld+mdV-V6BXF3umwbBR>JS#*7Ro$>WYbxP79Duu{Dvbnt}K9QfP0V991{)*2T%fu zWbpouYE~IMBtjF@Y2TBW|H;iL1fTGZqj<0dm&^uJwJhJfCfC|RoB5febRdY=&j5sP zlJcSwszL6VA{%Hr!@CJkxF}X>0Nh=zeG0g_{KqgpDJ>TvK+^@=n>dfr9ut{^T-L_J zRQLE}xT&vwmIMH3+Zi}7@#Wy^>b6Ed!qFA6j2p!j7`Pf;w%WB-{g{&TAo=6e2~5gd#ll4%HME2D+2VE50Skifi)4zi~v^TQakyGa2i+<1OjkPfXg1xbo@Mh zi%u;wNBSelmSbNS!`*1}xPuPYc&aQ(nMsE$5-ySEPw)>blCDpZ70{Bh>kE>_~cA>3pnO4nG!@=KH$hiUj9+C-}q{bu?cg^Z$=pCzT)l`ux_M5&!smKaqig zUJaK%MIMkq;W_iz^S>|nUmrr7hx}f89NQu}Y4jKA4 zLc)OJ$9~nr4&Rsf-`21313(&^?2fW#Fv$6#ux4RQAds(FL%2r1T}}P z1MQ?87qPg@pF>4Z1CP!0CFkd+4$5Y&I|0D(L?Ux^Wb&u58+Qx6yGCV87^df82n@c; zR3dB(Qu+s;p#pDhxLxCB9^(T%@#c5vctI_PKuHV~#q$3Z#k0$gx{#u{2mK$=IScbz z(>f_qzF8XYvu#T&D6LtH0eYG5=;mvb7PjiEK8hDw?k5sUp6?9cA6#gjh(H_9>Uj7cNhx{;>^*jnyC?&ys6-A}B?-k!l38pXzy6Rz zI$Etdoc^`-4hc3WgUqo&N+iX-eRPP|;Lz+_tuRHRw)amn$L$-*SoL{KL7!6iB0C57%-gr&SW;X=QQso1s2}z=xvCHW3B}Rf<0p;eTMs zO<`HBtK6aSEGOmJ3f>U3XfmBANAGQVah9qbD0qLV6xuBRcCZlj6kwz{GP_wmUzlF3 zF=}@0keJOHKP8crk;y}+5LcKHcggKY1e(rGFlLOvTr`YW;$M1Gxip*`WnpbQ%Qa$|TKr{Bw&)lld13Pu z+6Y!wfrtHJrUc4Qo7s~#d3cUf2fNa9;jBGj2R{hpVeTOI+@1rS-$>G<12_-Lr_)hc3+0jVx|#^g$0 zwu&~+6OdsK<4(}J;t5DURnh3M{&Cd+G3)yxKFMm_8ZqFr9P4t`Fz;A_g^>#qHejd= zLYiSfFGV~N*?jsy1)q?jo&>PlV!$IS^l)KBD!;N9P%nLqVqqFpEt-IWQ3uL!#zr2} zF2n@8ddt5nig&qq$Kyh+JLQ9S7tKpMU(3DQC^ zvl4T5q1mS5nz*D=z~JQns_LB6<;M6l;AL)+#zr}XS-DbWNS!`XwbIbqsIE&X+7iN; z@2yUVzeo8JI~MGR{BRx_nU|jO0o@iyKX54U4p1+#-$YdPP@zakozirCb&zjIKH%~K zoD^WX-kV_WTWK{|CRQi3=PbB%Tr4%dF^~UZ`%JWdwpxkAyNH)mGTF|>(C4_l6&~!5 zRQEC5H=kusA`1WGwVJE_msh~OOWoR44^j?h+13NThh%Y{40Zhj{5Rwf<72Oyuc0iB zC;FUlFaj6emhr%N)%~j=uPvpPgj=;vLbAB%pX%snb5ZquF|nfll>f&9s7qw+b=Xgb z{+yq>(3WEbm`lOGi8&FP@twV9 z`Rqv4(3SeabA@~fft-#*!)A*p#NF&e>(wM5D8)ax&-uI~fZZ(-p-)V~-@co}?-h^)q$c>v2^AE#88_`#9&L9YhDdE+jq* zv0uLw)8AMgk(n89m56wk)d~Ho8U!ny8nnkZ;_5_@ zQy>Nc%#}a5lkn)-MRqW$6lDDv%z)XT~^>b1vTd=@O8a0%fG=(rB>8o*#crWVAFaf-St`W>1~-9{&(l7V9E&(xRP36>|MeurWlwv%lUXv8PeCHzz|c*YTt z^}3PUFbt`h7m}<-x{L5R8oV@j@L=0=0#cv(h#AwdO`Vf~*>VS+Wp6D8)r(bB0WT8j zQZa6BUXfvW0YZRGTYx?&itrP~;e7@4^P-oL7?{n=(T*XiRz5g9_+epTZ2_IhJZ{pt z@q;np%3Ck%oVGdM=_h_c;KAUl_RVH^LTDZq4yLdJO)Prt1knEuKX3T9$@nn02aA z=ns*r+Ivd2!9|B{$w#uBAOjnkZDpF9mze(Olf9c!>vKZh+7Ne%-(GvJ#@GYmKWlKz zB{;{XndxbwRwY{tEPsqf)8kwNy~L)wcV6p&*9pemTCEA2@Vef`DXL29;lX*^i+@w% zn0l$E5qe+FmvF8v)0hj6LXxkz`tK^0ebywq%4)44|TRr%u**V9yX^C6w<=ejBf!EgB;pYQUA;|nkEpE5JOeXydwTi2tN zwmEH_s%y zTjSw3;ODh=ezNIzXv2Km)0H8;wQY1H3cIw4JuWZbz6EhNEBYfnG+x-@lgtjVnfSX6%PjRUSZxbGSGmUKxaDwC z`ii9lGtsMZL(`0$L<|NClEPpE)`ag~ZtlLNa(h==?7zeTHXw;=^M!yCVGm-_@8K`m^!$0{RrOLt~gWKJah2OvV1OKUoHmMfekik>33&pq1=NevlH?lQl2sL z+ik7(>hqv$&M`zLpYS+;_4^oIlZ&rV+Ww1O<_tNNgO5`-ch2X`5FkWkW`!F`BmY_# zJgKfVZ@$^2RSCEtg#<_8^@1keFI|s10>ssUb$!KdfOzNVJq*5gEcXQRkT~1^_TuWY z+jq^%%yUgH;m0o|dBD;3vy}pP{Z>|eACLZTodwp;*`T1dlO+r11SzTObI zd&eRoGTPfDD7cDxvo>c$=Fzm=ucSH$a;Q_`cRk@sMpZ#x{(5`h&YH`bqzr8T5P@<`srh)MYYpNo$e3g{SEaR zWxMAbKY}v?8gIL!VGqjWNo6BlEX2ws=GQDDj)cO0c&WT*vG#ufYg_cke*yC5{oy2{ zG>GgP;Vi|se~a{{YYXUlILp8BenXC;JJx0#=*3m;G*$Ss>NqD)k!y|9im}wuV!X+tx&9x^h;`*JpaN;c-H8DglIE(3YwTlS+Z4qID_AK5 z2qgdnED9iwIKfeeT%>EmpkLL`ltlH3uT~&Cy6biYvQcz*r0|co4m{~cjO=0+*QgPG z>IV+I*YXnWW4+PqSDIJ)dgd)|1CcL3xv4Rr4{A6mSGSvAN#-k1`JG9uQ2WwSupA}0 z+vo^?$}zZRxhL~RkJ4>m8Q1`N^RW2T{E=;te!|Y`c^s8==+nTT`(BarqB|wQLX=LM z{2KWfW7;=mGPgK3h@qjPWo@!dwDeW6`BpXnjB?8{k#{cFhnDXY<-MV zV+Ep@9K3#t6-Q!FU+*9GZ@w69hZ)1s3Op&P7i((Web6a!NyE9m|5pTK{^QMdz70J} z+9&$d$(=ErN%r&0He4#dlYq^$cOCh&DZVskI1TP?M zSfCNh3c07mua??D?kPgzLem57^s1P7Ye8cV(l?SjV0!jq--2z%{P=>>hCjHkilp3yf3QD(d2wW{)p(DWr@eWPGiLC z%0<;%2xEn6z~kC%gm_Ic^`G@3JNcH4o{{U_SqtaS=Re;7uc67KM8S6%fjf#Z)2M>w zIm0CK7v38xg+U;uKsvbS@dZA9j)BwW4rEigerQ4hIBQgCgEnIuR}-v}#oTN$1b% zPW*3ND#4kWyjz+!RDgRxcaA#<#28UBx@nF^Mz)sFCN~Uy-1j#JBOhN(hT0qD<&;}v z^7d?KxI)>h0IERJ-<}rZ%?|lXgJbm7?&(A&`pu=IW7pQjkPTD~vVpcO)jf7V4oFcL z{gM{I!EVsw-}QCCiH-)T3hLSWucCqLCqVsmv*D9-R|X%Fo&C$vnyLL~n3slYap=5~ zs->T(8fxXhAljP~@NEW~KBO7c54rHoA3MI{_byFqqGrk)=-wkfmYlaP1QaO;>}3Rf z@CTYP=UxHRsQk#1#DIf#4bz(g=vo=Ak-bD=StC2Udq7WHX=0-X zWlTkNGLc}%iap25n74DMWp{;C;0IwnE`lx&91Y4e^Tb_#E4|F>uc@c-PX0BYt|#+u zG&DJA0af2*lRE?*QZR~joBdl64(T1XR`OHYXufv*dyG70lkLJpPw+&1QMeBW@Gs1ryK@sNz>Q3O;BWMvqRAHw4SH{Zv zH9M%Rt3*SPatIoS*l(Niz&bR?;}Gfw@bo|WY+lTu7T_HE-zb%I;lFLRa`YM&vdzLo zb?uF(_5Znk*2sddS81TT^3*!*|9E0rh%s0?))`SDv|S8DX#ciXsq#*g+_CGdU_xoG z>OA$fDACL}XCV`}EL4;TJkmby5}U@T$x@{vV`XJMm{VKB2;;}YQ*xfMn>y3MwEMOv z=)m4Pr|EFJ5@bmI9KM9ReD*|%#0iBg-0UYQ_RypFK`H((?mFX>+`$KAynm=rG6e%v za|d_pjR+3?JT8oRfOQPru}S{qe5Zj;xTC*BpC?iZ*uZ9Ygvt?7R&;hs>%2#s)ewps zOB@c8M`Z7q^GPKiZ#mAZT1_z<6P(Z05xf8(*QYbeLtIiD4dl04k+erNy=X&N6CKu*a|HIV> z>2{~4N@)pK4`@6u;hxa8QbK*@>L;(IJ8aX3x4#&nvkPzWX~Ia@SsdB>y?r#^1sE^5 zl=`Z12tD4Oi4E$+&4jnjM8Zszx|8M;a!(OF>`?sRzU-epWRC&ILczY94vj^fnmC>h zah?6ExK;V8lH?x_^jeHDZDIT_L@)EMZ?(>+Qs)F8J{E~z;!pSdr26;{N#tYEq5(Vt zv<|eDR^zK%%YLS3ka~e_H#sOH9T9Uad(`T0H)H6OVI+u4DE=!w2q%hgAx}%4^d1DQ zW52HcJnjfi-Q;)Pos@vDxj(Xn7|VrE>>9vKf2z3L$bbv{=3G&H7PVa0`z`BIf=Lkc-g-^tvY}6)1gBn zdO8<|nSKB6aC}W#@{z>5X?ZN!t8vZx@QS&`4gRCI}9{5CntV9c#A5a&V zBFRzGJiR9(mCA@dDfAE8uwf`ZYcu&(P+F8-;6#oZ`_<}8t8b@4$vf&Fs2@9oZL~O8 z#E=%=$Bwh^3S}^sPYy(Rx|ZF&S9*$O4N+5C!&<-S3b;dvkpA1VA^Xu)GqygzuG$p* z$1yz}!Q+-#^6CCHf`wT%Cta~4moov8v>7b4Nxu}DH&NYXXk;2ogl+he__-RoG^KL{Bh=0DLea;lqdG~e;L`xK6_wHGzJm>Lte`KLfYXb)-+>!rq~qUL z@YsFuUvzx@!NVMuYj5fW~ph@&GeLV8e%5JW;Qp%p%TOpOnAw?Kd#e9I*?ol zv`UW1ak{=9EhgPiFlOhC@jSXdpl&@WLc!j`cGXn)+7%Ic=rJvlcfPj7;xMX{rwdKq zo(py@II3`!s}s_@8=w;XM`d0ooq7WRZL0eeyF^Ngrfc{5#C-?u*jw<~(?W(ygoc87 z2bF8j@X&}Pb1Pv6pMiR1OX4B~()4+c+N@dmrE?Im%VDm&8ZmufU@XG?4X+#vaq>QK zv1Bl}kFmqqB4j=Azd6aKcK(fHZW_t;6y(;#%?r6T{e8)+l7rlu2N2lJC;i~o1t%5z z-Xqk{nq5PeP&7;m)DCnb$2xB{_+GqcjZ0n7^Io1mwWq@$<2{)i7y5!|6Sd~uTGwujoqBsiFSnBP z&rJSe|Az*^ez*e8Ooky#M?wKeemDbweOnb~0x4?FE*>c3*L z$NY!%F1sxysvMaKVP-OW>`i5J@RI}{VZ6a$f{zcro#AM2@v)S+1`dc=zm0M!R zZ`WF0$KZOxDf$9RC$&!KEk93)c^XFC2wJ?Lt7@kb6>ymWUUXp2O9x>>bPuJxNg%7f z2?*(EI9zg#$YTP!`nb9hEEgk2bU5AMf>kG3Ib~GiGxV_{VK`z#DmHC@V>(O!|5(pB ze^t6YxLMEzBgq9c587zJR}-JZg3qEo?BAI|$aUfp^ePV2jZjRb-vjn^z9;j@QF;M= z41Il&wu7kwmzG)5-s({_@$ytrmK@dM-z_4hHulstk1Kx7_D6{s%n;FS2S#3DsQW!a zOxOcb4eY2i_WW09TO1QO<)%RW)fPZY_n=k!VJBldAU(TD!_4qbkbyx~@P$Pjgp=Sv zAB}(7)V#k2-qH}^mJt5kWaI9l3}CUnq{6}<2nA~t%#3jAo)eP1>c)0Vw_JYVG9Lsv zVtMV`ATmI>?P+MC;m28V504DHe=i-#=HB2=})180?D7 z`+w0q~Po6Hi<@4;Aq&eOzVF4E8b zc1IJNU=rCB9e=i9+Vg|0GvL)(c0O+sI$ZblW8{u-$ebjBEa#9rWHJ97V|t507V}r6(9O}D#mJ6|ZvMRE%g2+J z3}c0Cm{znds@}5np0CuL)UU#fbDptB4cq2xCVbUqRn-d4OEv(<*MAzJzdn2r zMjP}o(#j`x3&AM?FWho6LXJwNa`HLT1nI@Zn^lWxIojuwmagkNio=kUwJd$4&!SI2 zD2zIg9u63^d9GVYtkN!h(xFDq?gf=0S0Hb%Q#Fb1HRFnh5#MKt%zC@`xSm!P>VDQ` z5+zpT$vz^iw^@kusD-7DlU}qn3?bHs6N(~DDz)W3ipSR$#t*|eMY_b|A%SL5Nl0Aj zdU4{(*C31OTXZ%0=a+Laly|3m)cS^<4J(d-aZ#qp4hV3TLu;u(Uc>Tybke-}X)z0l zYmQcSIW8BB*X&=;C|zSGyvAOOrA3;Ij|J^Iy>0YX&acEaB+BvV{arcHb*>keJud&+hUdmfpM3>}|j4xSn*bzA%i?>{LATRpj;f zf8eRfAXQIQK&it3hUd*k@Yy!Yu^EVkj3G_wNO50t&}dEuQ*FQL`slstsOUA1;dGgw(xKZOI$k(B%zKv42XGJAW_!BSR?hi}o=_ z!3c70{zhPq<=*_QRK5vb05=Ga)d^qy0gx40=sr)i8)qSw83kEBrmY~{68Q*m=sr6& z;5)`clPvXduw25vZnY{mj=vBb=mROj-kCQ+LtPR zwy06XcT<5E=R7S-*9U(SEf+cxGCgmx!_AnD0DIw?$iq4yhDPj1R1TB@hUArFLu^tR zz?rqVD`hu_C(ri3Yb`k-5EhY)0}ZcYyJ_LKi8pBwYBgJ^uPPtKCZe5goHnatEwRQhW=ZZ-Gt z7u4$mk&yR1wenp!LtG9&w*E3syEIOkxUr-@x>{A&m3DZOoQL=DOww9f)T*5JCY9pD z(S6}up~L&MJDQ9NSX7B3C0dX*Fw+YKJEk}H_1(LI(Ck?(*4ogM_Y<=97VNT_@Bjxw zp%m$;D(wPte$Hp`Ba;<{kTuJeXj}{|0ihz`M;(R{k3+xL=fst^=OtMOIbE^w#pIL|mb6IvV`4X`IG6 z3m>4ER|jz>5^2?pUB!HIGAHIQ{@vLD5U=gpWdHoFuiwJuyIk0Af@gF`V@Q z)0Y44Bd3rf%=TQ^`vtNO79!}oF$f4`a=tva%dW6W7FQ#|GY8b+&~~*JYS)ZMxCI2| zBx%7sRFd*qee9m7j>>LMH=Ou=YA7*96Kj_-D?*72RHJCj{AqH~^XlprQ?I)eN>3C` zGaz=M>QN-WJZGso9QaCjO}K3JWW#YxGZy*S=*Md2ohR|FqvbC=a7wdIXuOGj+*d#V zQGfG}9Cy7)bwH=I%Br6|@=LCQ++(1pUhFPE(=nTuN9ODsdPLIe#r&nY7%#a?x_bCt=E-h=f z)UwV7E{v^vMcD@)W;76flm;%>y$5q6C^2duSEdbhvhlHi_~z*K|FHm3ctp!Zf3<|6 z3jafjhb|zC6@5T zM+?6ue*%EPFu}yMakdDZ1)}1}6|xW1%GJqwdJz24Dh)Hgv?~vNC-4g@jX{U$+L%DZ z5l0v*R(q2s_`Yy@J&m-D|MR}LzHF_+6PFCceO7|oU&%)xp!EwDKPMSX`0eCG>y(8B z$821;m_apw&yR(OffezTf7szZWUY<9c^RhLX?)_=I+u-NhkC#tr zcG_R_p5S)6<*}+N7>GPSAJ8jrp=I%)l@x_XIqNqeS)YodqC?41SI+v;(f?w-yz~_1 zZ#cMIb2W-=YLgF)=4u0msKO2J5?YX5vnP=8pWkN~%OWFP^#u9nJSG?#3GK`sL{CSeVRhm)FReLXNv+1)Ui_ zU&FJI4SJBqXW@N?{hp^!TBX`oGyp==!ANz1!TdimF*g)w`C#-LP2-k8uv%Lf9@i5| z<-)HyQxqWzqo%P_X0i7HiRe+OE^?$*PPvB`5&}Zx=RvU>0C`Atss0acNs4cPH|($D zew>b$uabdD!b)g{sEfRR;w=hXFt-5p-;XRdsVcd=`gXAI1j$>&#Lk(%4996Zof0HB zB~U64e0_EgC@`3#vu{+n;f`%;iVr;UHD#ID8QVCVDWdBha2(mO_y`|I*;9P@w=5on zH94zZZ~qH+sH?Jh_WJ5(dAWb|&5=A6DEg^GT8LhJ0@2OqO0iqRv=M-$$jt7(>vEBe zKW8jAbggKZ*I<1+JzipTQ44+xx zJUmbRJ>PiW_q*aYj@`;VOiyqKQGZ4I8g=_`TBRQD7&W{Aw+O@w z<`c}(O=06Guz$V|lSv=jH`PZYRT1J0p8D%m9?5$?B2UcQ{$;i0wg8EK=%BC;s%9|) zH`n4ae`1%845XPq#GgQB50$(&AjMl0A;r;Z=H#Y1-B@5pPb|Tsfx9ijqdpKv7mKZ}3QdUt( zI5YtVzkKiBT2<{hU$w4JL#?>~{r7|N7U#uOh_d$iB<^HbMy}|-u;(qmiKH=7C`F;m|nUH_yN6y!2e5wtC!d6T{+=YP}>7H|{ z?Mr+=Tw7#zCLNL`+!y$$!o;$U_-3dv^40%g8@Bzxy>a`SSLtIW0fpp^~*Zy``JABg%z?O;b{{RQ-(CDp7MVo+&w35%y~aQAx<|#2RCV z_Q!t3>z=QXZRGM&)PduQB=LPCY_+a?W!1kg(c~#`nIk|w8)TCREpKYHMfA7zl5Yl~% z>l?>vMelxT9R0d;3ro`!^U`sQ`Wu>27|=i3Hxvi^h$`X0%MSWwL(!F6SNy|xTuj)5 zWs-IJ(W6$SUC35W6&H||*iJL58d=rOJJ0Q$(ACE~{`lpuy3t_in}LbCI*2IbTPW`* zdQvQ2!yGS|D`ic%HgXzba2K!X3RWt+Nht{TQ_<}0=w^)P3nJuR--ihZJ}5KI3ab7a z_P;0h3!=sOp7z}*o;e}_8oQDnr9l=aoq!q;btPtBcnO;GF>N*ZjjlJZ{hw)%_ z5*Nqq^l`8uCmrhAjFP$xN8YUswGaUYf$j2-J+lMwI54f583kb<|jA`mTgBxWHeSTTJ07j$%_S;l1jZ$hVf6T8?$`=N(aE9OwWhr zkVvExgUj}G+dZa4P;p$+F}IPZP)tWvL!F=&@i?84_w(D9ZI9)f9e1;B%OftfQ?ty0 z%cgd%iJ!T714)%!Vp&2F_$6d8fuwmoI5DbwFtnnSq^oIcmq}kQ8?3MBJu0Js73%*4 z=T~QWs7!=BTY!1X zR7*B2o8OHt8;|uNz-+*@+zB}`>&o}|VG>CwISeBNris*;K=oUm{QyE4tw?Bf+nPW( z-+lfMwqH2{Zju8PuYor&5c$hpXo+B;t&@ zV0qf-E4G{1sO6+F&I@}`0ZAEy)-dBXT~%ApH-BpFeq0g$&wU%L0rBYE=Lhs;yi>!EqSbrwV_1F$e#UAVW&7!V$!auI0l2PegiPo^%&qsvG%TL)FUW~_ zO-6S7lFByy^UuzxOyNS3kJ$q9O)s{)B9W;Hp-B%B;iRB7D(CH1v@@6YveZ24wWG@O zcX-~uX`7MK!@hkp*0*Oh(J6 zR-pVL0<{{@Pp&g%`gw`JQf2#@6Y9WD5}A;r9COlqeiG>g@p)z(YGl*M76cO7wa31gf9a;hiTBYygCfpX(T+WGW9yqAO%%uaG>pofv3LrWA&Ndt>8&mE|Y=rRa4rTm`-hz-S%RmC;fsZB}KxNh0QKcO6o1s?#UcfKt6eueC zSlRHYv4_8#@h8M}@W%?eoCI2N2Lb6x4|k{9=V(`fepEy-Uo=XAU0sgKyAIn5PsNUe z8J%~t9l2Z$tkAtutw`*fA@im3nzn_t$z<9^Dj^K!lzyn|H zVWQK}3?I9{^{8hE;YLbqGiJ&a1wnJsFA`5*dRwd6Ao5y~Gl;Peoc3WoR8B^B% zYIotkEv${$ALfF7Io|ZEo%&5GAyAah6z;BGBgc*Ps_xx<=9!vjSUw#6bydDAwNj#F zkGQxys`h{-eyC) zt1Z9?oK`5_X`e{}2WR0XApZ;$M9j>A1fK>*WkQ`CIl2reG6nT!JeXj=2V~^w(&;_j zZwjxT(h;_D%%gMk-0CVRSq0Et4hQ;upgy7ntFe{lfoz&SEr(Z0XC^d?1Kn#+t4}Tm zlfuWk-w)aUQycngK?I*oCL|RdERd7Pp2CmVhmzsx?z~8fBqnMx4%-7?Urc)whC3X$ zVmOZQ<`8EUVZHN(JgfMxTyNOV<@Y-NJu#svX5)jUP4m`tNPQ~w$on5#aGMffkWQQG zRXFgdHqHG4YlXDmMorOaA(pDD6-pX${o`7{rCxmJ%QdJrOEvN|)d}$TI{b}ySgG;! zC-V35*hKZC1xvjSnDUB~}Fjn(ttgNU?}yMCR`RYC9E1qkH00^HZn8kP3(!f=;(D%9%#R zLFHN(Es&G7xL?Cq_QD)@l43^M7nAvBPn2u1tw~*t@b3U>@RQT;axg~-a~7@mazmNg z0Y<wZ2ecC4mwS%LF!X`XbRAy zKvyIX%rcW7vlg}(r>b&_Kj!z(jP_fm{J?OH)*)=)A)^j*TlI&RS7X4l2L~r|?oY7=^^{Cg`$;5^KVccB%qNte(sP6(wr(A5?lkge*5y%(Cvog~3YqXk5`KL+722n7cP8Gs0i zHGckMxxA@*baKKZDYznb$S(_HXBLonHj zua*gc@b0|#N+Pdq%}}?|Rtxb{Z4XH5>~)kjD^0Pb-zs`sPA!Oe;B;GYrN92n7p_P5 zJ<$(N4D$c_?v48w&b`2P-GHa*zio_}(HOQXIK*n84auO|E>KG7O61xBoVrkmC#{*GXK)BPZBSz=HqBb08(_+HjPO|54K~Sp#4~CS? zNEWZlBOilaN6%-uqq&OSM_zxKnp@k1`DM%MO(4JzI^ z7}}apcYYuC?y_9SRE>p$77wj>g877sFlx&?6$(u1jv zRsTN7rQy7XqS=|;ppWb_%si?)x{~-#jkgh!hPQpGYIP7VFEG_wi5^vd|A4lr0f4R9 zrHLav9bMy&4Hxk)V&zW#m*@Q`gYC|J>K5{XR%8GKQ{noa9fLNaQ6cTMs zt;%Y>Pf*z@Nj)9X zh%ShbLb)(9m%@M%g(Vbw0587tVG+j`6nwFS&G@UO>x97zZbPiEfMV=GqurD^iz0}b zn^Y(~|Jku#k;gEBAH>!4L4gSC^Ct-dw@|ewoUtek}o}n53?Hq_(1osggd70d^$Bq z8WsC6Gu+$ za!-!zj*O!UXGxi2`sRV3jMwJpi5SSY>U#Qf$f$Ub)i zDGuDh{2TLV|G1LN!GZ#aI#dF1qeFFNjFaEnLR=+`MyO}>T;fhq9mc$iGao~R-nOAwu?(dq^8B_FsYvCp*M$^cR)ZbyN)bT>^)XmfME>bRDT-tLM1sEr$Tdq6x zLt0Qozl{NqA$)D#T#M|JA1cYztM99gsr5~r>W5T(LO;}t2W~fms)KBk+=*`4C6-eW zx8n&i|MkCKCFm-xo=6aAY~AfFKm9Ko4 zjyxVA>2?YJq0?j^^z=l2cy51HqEiM}ApL6=UN`#<>Zi=02TGG1`?XBL)YeDmUz8SD zHY;sGpe>l0(4hfFhHt-<6AjS+KbpQWDysf#dl+B<8M?bmsi8YWX%G5y(gy1U^$KKK7!^Nqz~Sm*p=?`vOSK!fZQlPSKrv4e(BEP(mBaa2ib zaH`$omCxYRRj*WZVM^lQsTb54xKKr`hVH--dk#m!&bR;Oo4{v+HslcH-#sb<#*+nw zd$5bOJzVPV&J@T2r;V*Kj?%lymvuIe&fU*$E>H2oEg-Ib?r7sey#W23|D7!Uhbvy8 zuYb_^D(>7P{lkWmd4*f6RJ4ngP3I=!iZ%IQI=m(Kuak^A4HjTPLyLElZAL;vEjLm9uQ!bT_g z%r+?%2wkwe3Nt>REnn%DNzC~v#X~IutwPYZm`u%B2jB4`%Xs|g4@U8Qos8zprItvj zzZ7mhsQm?%wTIvpnShqnF1jvIXZid z7vuIvVyIU;K+CJQXvX*L~ z>QAMwT5BTt!450K2l0t^R59JhVC;e}3xQ8yP~e_OVT)C5G5Q_wnivOApF+ySq`xEI z_;c_H7Lga(%Iw*s0r#z-oJ_tSrrFl6JQ%VwZ!+kK07hxt2h;5YA$rhw&je0_$-|cq zeW*>}M9J0(Z98XXJuXVP1+vQ5HdWV|z+Vi1nh$C{SIYubhhM^)3co}f<}JFk69>$) zKC+q&Kl(aJV!b;=c}N~I5D~Pzm5Uk-iu~!Q$g@d$b;C?5GbADDjtEYbeS=SZ_9YoF zEZsC?u*~SsX|owi@}F6x*v)%V<0ra-TfB`iB7%2OD;N1$w=j;weF7@C4$8i7{ zDE|VOoR9wZbi2^~0K#Q0%&fNp*GS*vEYj69y=6*i>BGvSB-`6wD4$yhuex7GClQ2! z$DU1gO^L9qf}$M*&^}=%KUbRat*89kFY991Bi2Qv`U>n8X||Cs2&Sy^<&PB!*^j?p-Sk3HJ`6WU~j| zT4YBRUjnzzm%&#D?$0egva*0Ai|Lh>rch+(LLlg@3pZz5E;X8wrNJ9D*4jIZH)q&e zXbz6EEt#%Ib6u*;?mE?Lc17wfU-qz@5^ZzRXpW&V`$#`Q6evvWw(yLKiioIIW&4(K z4u{tuPW&Gl4j3;Z?DKDSk?OO5B7;*PcWarXgPLuDs`YM|y(4SiU+6e72#QACzjj-3 zAt7pBII1^u7*j}1xHCHaTnSpPI|3z^zxv%<6HZxYACpXusF}oyQW)RIUeBLGW`2#B z7;-js-d!+1D|}ViNk>D|oh<5dAk!00LSmx7XA}fYmiTui0|IU*;KBS6*8Jc7;eQO^ z7y5o=I;7F$(_GtYBnd^cukFEg$p4=UfW?>*YDdBhSw!VAcjmxy$hBgDoHX}mDibJ8 z0fo450Obcu3N*;iazZ?CV5i*&bJ8a{FD~vR|IxV%o>t?Q1Q(8+**|~4M+p}1TO#f# z*CLHPL9Rb5DWZ;~-4UtS5Kw%Nk~V_7MAg1oR^Sh10lRjlmBFa#QgM>-HX18OfNIE6 z>*QW~UYO!=BS~9T{a-RROzDprH;(3%05UK#!Tp);``fPv@lQih!U9)mARDN`ObmnE zM&pu=QDV6sM?!I_9$&-vSD{bBE+HCUTCo)E(o_)G46OibZeU_QRt&U#MOntwoALZ9@Unfp+>TM0!uq}RBgYbs6-7o z-c6ANx;vcyWm6oXcmAQHjE|7D-+L)zFe=2%`3X9Q<@aMo%T(M=>7AFI3584>M1Gij zYJ1nbU>#Y9)K%%-cbEx?D5U1g1wX-OQwSeCszX#5*H_%lOZ4yC2$h*wzCE zXBTdMj-Z=~JOyj?K}X)+y!+wp8Eo#Zq8T`G_Pb1Na!#RwB?T7ufywg+9LX=o_5d<= zyq}5n0NpeAzR7_ztpK~CLOfL0cT1rsZ6&ko@`x%fO*)Br&sP`#sweIx{d!!LTl=I9 zJekqLr>~U&Ysivk2Dy1!<^R?j&;~Hg-RF8LRzf!D0WLrs>UMFzA*C%DBgqVsU#g9iDCqY%3{DGvZCt}6l zciWW9Lq|eeT=pgW1Z?MfuN+}nfMLfEpoY1_7sS-@*EV}aK$P{zDS*40TUjc!5t6n= zuWw+qCOK>PZaTK`LDGGfMz7M5NV**_Ak}40Lbd;wJoS1`$2&MiB4l;3QC5PJ-ot6c z9~LQbN}5P(h;TqbguiI$ZTa+gU+(=-uDGEX&*bEhd5Eeb0piY?T^6j-xxcM37*4Kzcae9! zu19!5Ao_7*Oc^p6))%vO(3IB=jw`Z&Wh7DYrna$r%vRL<95X)m0Zps9 zs_#Q59?E?^tYcgMT?XisK)JHL{GYR>eINsfT!atz*q7Z^TCkU9a#p)Yt@m5bfh%Ix zKX{gM5vBo)6l2@tnjKWQXUBSB)-}k%Vk#Jur;w(~&=DKJ2ud-hcr(K%R0B5NZ$rq&=DR>TK@Mxf>~3z3|3-+lI!;0$ud@XvCrYv{6Yt zY({;^4bom3uvl!xVPZOX5mTmu$RRK(6r<0q_s^4;I2`s9W0y8(6wghx{t;V}#n38*P%fBd*@{?(7nN=}4{ zB>|I!%bb>hVqt+g_umAuC;XN`iR*-qCJtyR9xCl5rMX_$=`(;qbVoy((QyY#cuTmT z>S2A~T$#{Ecyz;-cLcZ&7wTNL}pw_vGj!L9z4GrTR|k zH_>?MUV!2GW`=V6z|R)ee12 zyY|-Rae?_cG%jtZv;8V14k#xxa+W_5ok4p#E6~ViA}5IBcS$|S`n^nK`9u+3)%LJ| zaP&{pE=ZAKF|#$EeVTjUymjD6N68%KdlGHTNB2m*PDxeWGOcngy8TD{Kb=H}+TqF% z&$QYgT`w_$fKjZ9BDGrQ9~Wrq9BD!oK0zVugFKDi({IRg{X;r(zGEtpt5M+_qiTR{ zWnl&i`&li~tW!p9DWK3>qRT2gD(91sq`}4fMvP6@e|Cvdw!N7R_q&i-aWW2IR^gZi=;|0?|JuR;T&=YPpQ|)^1 z)`(W#`hAi;$Z;^rMQUGTM@Ak`3u5WvG=qY&Kv-N`4jNUFhC{11(4N_28qd>TFvULQ zFPcAcD2>D4gTC_tgsU}z=X^AT!`RT|8}E8peKmJ{QUP3NHcj4OQQ_rMllv7pjpQiY z7ncb2h0OSHO#Oq)wNR<<83PfAUi`mM2P}%o+`XCRgZ3^BexkQ0(sDBg(_f^DwMu6> z6EBDi*tM4q`4p;HQ^YMZ%4xoF+@Wvue;Y3F^gm^;V9dgZ6OirJjzNeak--8ou9l3G ztR_not1Z1>qhVA2tl*h%y%a0GF{KiJ>^A%9yOMd{vsF!H1FgSkCwq+%nsS8tvR=RL zQ)28h!DAx7)f>$5cqU8Nw+aZlwH=kdK3qltUV-Lw@-qX}>7KSBEu|h>HOTZf`gc#f z?R#9~<-yCUlaZ`|C7$xioABnvqW`%A)1Jur&9pZEVm5m3*_v1(9RV1crsu1qGS{l( zR!>~`W|)=Y{Bt>y&%^U`MYYPz7FfxaK?53#x6Ml!u}G6znZiyfvRE`y-v$z+wwq{g z(YV*2>425RNxH^yHwdrk>kO5*4U))+JNRMHnb;4iUYtCUMTmu$@Mu9W{&?UNjba6!+B~}LE$3!<$YIYe|DFym z4{9LwxCSSx|Ii@RFAH&qdc_hSk*AcH5Xu#8-1UN#O0w7dSE?+^t#!GCAuCHXl^;F9 zlOPZqdLg*8zP;kIH$|BB_YFkwAEPAF!;+Hf{*0>uo1bL$h&A^%u^cG^>KV9U1=vvj zaOi5BEZ6qzyJHnr7`}@6f}|kmssi~sq{OWaM^GmUNpz532YEaOUpV`Fi~%b;dQH|p??M5Dh8j;!hi6mE()-X*h|&1o!@jxK=jE25&`y_$-+i1Z zTXMcTsQYc~OO-<&ee)@JJQFD-`}ulnJdMVc5XLVtLXV5`nNu0wLz0s!t8O(n`%^1Nx| zIiFdp?oUn1IKZ9_sj!n+#QM;{(WpAoiWbyWl%2hwEv{GQI2L=H`TpJz#I=}YV$?{A zA|~px*JrXpJXeogPg#xyg|e?zCRq}v{Lk9{=?D5TbB14?Ns))i`yf=f$v8G{mqg6E z+^>qeCRWy_|NR<57%UG~^Nga>@I~7 z*8HWrg{&0Ux=0ne1E#&tb4sOmfysX+JEZnU9I9x5`++#Pf+2_w;BYihlF-%0zyL6z zE(RcRzkLMXeE78rOpq#sVv^hnUz2o=wjNhmhlf`*3U_nEY~W!+B!w5(aeP0FxsaKd zx3~;)XtbW>|E2I9EVra8CUU->t0reB6!>5&I%Tf;U6II87Qd)^8GMvm^1kN_k!G$3 zzowIdsOuVGsqs^Fxv!YsA)aC?v!bG0{2}V1w3R#ap@~d zh0s0o*qvl!D|a;G+ZVOh38Sxw%(x%7?|U0`TmhJ^=xN|*m?0MGiM^`L zn4z9iY9genxa%UwbA1he8RRZ)qEO(!6R0#R^~A|A0k|xNabuH8zb%Oc7J27twNi<7 zMEvG^slJa(eB3Irl#3e|4C8??pqe|a47vxq!V@7sQ7ksPER%VNsJn9MJ<0jZuA;@{5b|Diy8P}9>liN}TWg5p@uE@J|Rfv zPDM$Jg0bNBDzu?EG@J7qHVHJ5@+{=#3Qk_Cd@)9%0aPoQk)wC6O+MwL44QIH-_4*@NkhnD?QO{uHv7;hG60WLPW$sX zS7#>d;^a{SAK4kR#M{)5q!*@@wLW=55Fe|=0tVCprcDo*Vr6Tg^<_Vs^=)c3d&H62 z>%09r>aSRSagd*aARl6)U#q3oef}aFNy$Y{`-n1@ODr34o$bFxdIfiIJnrcYD}y~o z(l~%P<+;a5hMIok+8DILiH1}A`Y8)z8XpQ6{O}in1P=A7=ik`D6|?t9sX(TAyI->5 z-@UC<;1HWnYp4pp8?F5`)=*I!61iKk_p9sNB9m^2x=|jBTtfA`Vq#w1Esj~jOTB=? zEiwyvkd*H66nwtLn(Mo2+?T_aI^0k5^;0vW!?c;E4Iax=DTFySXgH5dW^`WxFLm2h zEjR~BrN~!Oso*x}?pwElUzYe8eUoVfW#&a+NCD6q2W%aT(j0c=C_RH@Iyo=2JYj9) zD}PRYH=U_?LB8-5(c<^aDC(r#u;hWI3Tu2ekhK1biS>R`W7pSoaaE~^wx>sZ*O4KP z2}G~;1Z8HwSKf>*yU1D;-kNLcb+g^oQJl7n#KKqc17Z=WHx*Bj7{qP}!@k7^CsB{1 zVK8hmII9`OL^kl&<>TZ+3&V3*M}r#pb4Uj?;+PR8f@9krL@;L0#iR}tG^Vo)e}6cA zSY3^w$0Z%o;CJI(uY1MBgX7pDv3nQV@=&%s$lGi%X6FMI z^LW2PCi-f@_JKM*+&Y?)_6zB%v3y@H4<-N43ETza_Ca3^{OyHyKKSO8C$9a-B=E6R zM{e`x)olw5WH6v$V*;VkEjRk)@$Yaof0i<$Koq4nRi?#6ni67ejYver$fOGBHD` zGI$3KH=zyb;UuTU^_A&`?&RHb#fD78sER`-(i+abJL7CH2$rIPVCTU5cm=$g{EHEa z%N~!&1DqNXzs^CJP;TOSGbKUd{+X2ZekugMKUW>P=Tpo>@xJ_f7ciIgf4n~fnGYqY z$1ej!qds%4vun9~d?GfDpb#uieVg72so?|;ii5do{it+FUkRGK1oZqr7XqJ*a)2qI za66b%(4-wCarl+;3P_HgC@yb(KBHEmN%+gp+B@P{~QZ+5+pX2!(v?M7;yUioOu_OOy59NX%>R-gy?j zuK}JVZ?`Z2MSb8#(^2D|?R>=_k~y-M0lZ$<=z0|<{_&W=c^duNYyoo^zf>hPaR9hEs?K&P zB}L$qA~57HSZ=xdb(P|#KKRWuUgFwB>?)D|r|ps+;x*utsGGF^UU@D|x`WH$n)=2D zp!ozdLqoyJpfIA_^FsBb3L#U~!-cLNvXSJ?4El=>Ps_~Et-l0h9=o6LG5O}Qxx8+7 z3aZW`bgm8-68k*N8wz5XXtG8nGoPC&8|njZrs47yHG67nBt7)UMO%N8&vtewmDzrz z;PR>v7QrpgnC`v0s8zMaFdWt>_t$g(ss)%&P&bu+AI&jkX#))LPKO?^+M?Z6*<|~o zY3jTVAMcK~Q18Ld-)`dVj_0BQIhvDK2Fssw6Acy$GJWXFnKW^cXY$W^xC@+ZR{oLS z({p{@-8%{rJI);OGs0s}Ig92Z8RH2MH?!-Z(Q5h75ZdepI(1gv{E&G11a_mL*r6Zm zYAG?_+&;jfCMiRz+u>9#_`1;K`n-6n@#pR0tUA= z9~6HzoZ%fiM=G;(jUZUdIy>jZdWDS4O?fZK9BfoO)TkHE%p#m3BPR_18k>wJ>n}Io%uanwE#c^RMImzj$w~!pJh@Ke(NzZKUR;6JR+`uhn!DUdvw(S91*Nh=kngRxA+^XO;rz&-1 z^`vh4w4gOoNge(@qEi9r%H5x&$NBbiwB%tndMy!fYT-zKWx1d754R>cHALV2w(;biqc#(jJQ-I zv(L7AH?c1RM-S(U+%Rn~V7j)2%>6aOZF?+++Upp}YCI?Ss8810eyP!Aan5+vu$c%S z2O2hAnrUWlf-slfH`j1Y9cxjp;Lxv)&8r3y&UmtXZZ=4e&>`6G7vzYuo=1KXOFKC9Vg3 z<`uOc#tlHUlT>DE!TCeIp9 z*zkr}?P}2}di@5>ZZq+hEIBPkepPO-pCuE1(vtaiE}Q8+uFMjyk8>qxrP-Y~k{s6V za`oHcjFT&C12Uui<(5f*pv@9BNg>Evk zyWG-b-PZOQrl(T^T0a1VJWteUTiMhg@FT^d5bqEn?s`?Q|A*)M_T1*1@%B1ddtkT{4M(KXMDrWTt$gWN#?76CjcWNhVJ;B}%GA>*J7eY9+ zkm)9!-<&$fL{EnadB|wkVY83z{>VSHO7%0!^1Hw?+%d%9$n;aQPqRj4H42fUrD9sXLHZh2*E8!p=3-){tCe4>X1>q|^!THjkJ$OVl#vU?YP#ee>G=k`RWLu+=(3essi;eF4O8-g*ayDgI0>vKu^*%S3oe>#KHXnj}_+1j|snW#dQ?q|#%S4(ajGsd~HDk< zyzZMI*qCIyhi;A4clM}bJ1>jj6q=9!Ml^-VoH_2m|DUlT1}dot#FP!8>aOth^$H}F z`sjeQo%?L5yN!b1s=Gg;1Fp_d$qfTGCnkho>$hd5_j7pS2Vm9UN&S%xASFcu)lYK9 zfnn`Q9rWm{$nBl)_gnpmq1{sZqHc%u&{Pb9$G)>Ss5f*xydn6=VcEC%u}o^&Kz7xe zI0+9HxRMqK%O1ZyT3%6=kCyKP-u?MUb0Lm*)#ih1^6VyWb+WCzlg|KGrGNn2iaIDW z*`x8P|C)i~#MefboxK-a>ivrZF4iYe=UvUYV)01f;pbpc&UVGq;+yafcjcmNR4nq} z$j0iMR@3=z(@%!rqWdD3@1Y{ju#%>+=Lp_#%A%R5Y6!X%sbF7-uos68;S#PT^5D{r zFJnCV>W!JxcWJ|?-tb0&aDwRZol=vKBmSH4BXQ?B>T);6co*fAvAHy?m$+LGa}llvmzmmHcLLme-%hE zHR`TZ%P@JOEEJz@;CQzyjU@9g=*4Z(A=C>^&DsyiqKJ$A^ebOegRjo$|K|dHi_3ac zW7E&2rru7uZ8cGjkfN16+Z-0&@iC4)Vac@FZ?f|vWeq%eqBY*itB7a3_)stFCxjz* z?8msxAQxqi(B7WFs}nK{@ID_u4WLh9!aqw&B9o*K)>(` z)4GR(+Hd@SWo!OTwQIffrh?y`4wjFt^@RWB7sCN*0Cl!SuL?4oJ{i9iA4|>^&)S@l z6ci+CB0if;z-pY#ZA!0_dKvs8%=FPmG|Zny?<@!X{7Ce$eo0*wtTwzDs@ad9L>f-Q zm4JbTL5okU#*ZY@@f_y>s3S-U!0}?q`fwze6ix4$QJYUoM3)?mx8@;UAulbK%Az`4<&!)$yxq9Mbufi}LIcPh? z?NE05fzjS@NoADdCL5J2dAV;cAT6;w|GoZ7uiip+F261gtnh3p?Gd@RJ*z^#>y{uwN26WUe0shz!p5#ZF-if^a%>G66O}zjcYAL9JAnO)T>m^dDmBj7N zl(THK7NvDRriRuqDoQU6C_LWoajkd=zR3`)`WP1CglYyy0mDFfx%X~>&Q3z03=C6~ z_+(^l$`KmL#&=I_#(-q)UEP+`dvK4X)T1ZCu{9<>F#Qkws)i_lu|D_5t>}wL3X}Qfe z(=MYU52OO!76xVa96nlRk|8{R1E4Q${kH$8P0-5y*qxg|DwS6-4K0q=^~8a_Jr>9+ z>vuRYRGk0_OxXl<<6SRl;+%`MIE4QkzBYjqvg@ch^8%I*j0hn=JT7JEBF%?;`B?wk z4j&FqmRXY&((6jyCf9U7E(=^_P1z3^L74E>28PBqlxkQDHodZ)peu8S8tK(O)DkL2MBj(t^oh$ z+V2~!&5y_!sGG*<5LpLsOv>QX7*0F`BL1yGi!4htwNs5|@Y+*#X~gX)FeT?ETI8}R z-1IE~{0R~MZQo3b?&ID}80GhbCpg`-XD3~i z|32g5OQfnawTu2%6=A7Eldn^G_hELdvZ^@J=Q)Um7uH*K%mEPA+r*193*?j2ijExs z5M!+}T{+2y^zLlaN2b_U$NEL}X|%suLNO*u`B&=)o72xlnyo)KmcMOSB~Z@2PLx@y z1H(8^4SW&)lYAdF1}!i*)8yxq9K_IC`Q!C!ZP=XP0T!>_QDC@eHbSPQ06f2PvN_CW zTJUm)qcxdSr;q+4l3(~^@C7G6<=AqizgnRh-T3f_nX(pcE2N0ertsCIU`!H(EV&M| z?VcgO#QpA%Adf-Z8No^>~_C-pPxQw6t`KgQFA;w}B+2nCyB}}Y=IX2x@c{1GHp5I75qhpL5@5hX`smu*i zi(P8*6r4W$@WLi$!A_7b<0TAcugv&=kekU#8ej*il_j~GJ5PJUrnybM{6n1WJjr4> zgUFu{MNvg!th?}CG4pTV;_CqgHMh3Rsin&GQt|LAEC#u`Pp z+6-|Rq7vTY=(Ac^ozMsR(S$~Y7Ux^&h@a-RQ2Qw@tEC&+q{hzQETf$vy;(+m$xk-N zX?{?FnEhIBmTW8&y&&!H!&M)~AQ)U$B)twEoiOpdmWGZ!lV(9F#chX-DR66o;H&Po z^FQa*RVNDG7|$ulMW#>ym)+wv3e27cq*0+%<#od|XDHLvqM9azh#TlnSXt=?!%Zwv zv!Gw!Pc^z8FoPhk#$T#bRHDKr-5O!Atk+;XI<ya3qB^3JL z&Zvbe(}THADr!dR87D!#C(p>94*MmEs~?|4`$w@a0)yRvh!;7bs8HQ)fr&#mKYxtw ztQyN|H(nMI-GJ0CKe``zo|ZT3mQAz=?(34RQBChFG|6uITW{=c=`oP^vH7>B{}&>T zmt3_U70RzZhd*{4mX$8KdfM*Jmr^weLN|k-giXz*Bu&H?YBDVCW$$IdU^0JQQk^6d zmU#o)f>v^^xbgAC*Y&zU(()^i32-0@gQJkSW7-$1qXTQpCFF!}oN&v6FW3~n6LaXv zdOitB=~h|fEPFR1n1`aRePT5hqSB2v*Q zm4Wu=n|S!Axn@Jf+#*<(I-q~Ob=(w#@J#m%MQWv!rmfRJgkgu^NMvsLkxa=x`b^0B z#A5qp0OXB@MGh%@gm3Wh=cqoS#W!jqYY<$I9d(czplviFea1@FpDEdv7`?P;Cgw-F z;#IA-d6sBwyWXT_Gw*%7W0^xkvO*hjJ0YbEW&Aw*G2|;tQcM!^_?wsC;?ULl_6$F? zNhdzzn7H_4BjK4V@a%#-mD0wtywM3LHA6zErmLG=9}WjiqfeQKWpKVFOsJKR#KifF z+hnAweSzvC$49)tMJ{3fAT058f7V+0<;1TFYBQ2TA+T!C?uR_p9)>1`7`{`p-mjnN zM(^&Hl8CyHkYf8KA~i{1EyYDE``;d-y`KGnh6VYs4`_LVV*EmLUH<^dfjy$oD_G}m zWBfPH@+c4jZJ-nNqJ``dXX9gLtL%@M$>ElSin-gGi7e5s1cqc$p-5)KBT^V?Cqb{J zgsA~PS`{={yeNiGS~e2WF3s3x5EL%uPm)gXQ$wgf>+%GEEb#>}P;`sm74MRD18D}C z8#-!5L)cW;bg~FA1UUr`2i*XA7ZJ^c+H&rScXMd)RgbT~I@Q6VFOpt?bRtP%Fa3zJ z9$j&}9v@Dy;3jks7<;^gbTBDU3bx^T<8)6f;$w!L{0XJO2!MWJan+NO3)Eq22XnDH zcm z=PCqsilV6R=#J1c|0##yy}d+(bn+<`d(R+|dd_VzPvF=1i0KzWrlY%Chaa>$plS=e2ys9L+~I`^XQq^BvR@-!{?s&h6hsXVy<%d z-4?_P@4ywRgowB8g*$?4JYYqNT)af_he7h^n-+{m+IbmzpAHKvzrJu&h5RwfMG#1s z#ccb2ZY_Oz1(Pw`8ZrENoN8Wz?1WPutynEEw9pCZA$8B&m)XaSQSpn;oUx0KC92bE zbXG9+VArkEK(T+?fWbK{t;UWWYV9~=WFV0_aRxjVbtGEr;Caga&(hXtl(9^2q?Hm% z*DhqVT-B`pCpa3Ady1SJ?>m%$$NB3P;3kIWNdu}PLDek5Pk6Vyueb261j3Cj#KqINm(t>T1%51S9aM~U+eolB-thHX_F4Ni?1+esXf-KOaT6$|mKpv>D zHP6UM${LGd@-=7xKepl@bp^jzc0N)$Le2=DtBg))@8dMd>TtVZ+B{-2L>pe(%)oCF9jRA*NHo`xJ z{%2}WHz>@%15@Q$H*r&x&euBYtCW4`TvITlOG^Ffggl7|_e7JpxZ-y}D+;^TfmO2* zbrv=$FK#R>kkn*G3JqB@48%!DfK0D$atWmtd&R1)vn`!Xv5)mV_EW8n%iW{AG_#M`X^r52;W~zr!(SP;gsrb7B=pSAi6TNx%(|e zCb!bM^p}!=MVbG$9`P+cO*%~Q&Sh(<&-foZ2)POtFAza-4EmJBZ;ZpT0Y!-;$z`m*GB#fcRmKC1u_}1naxn0e}eX{|puM-uwZ_S%h^uw4G*-ZBItV2(? z{h$Ky3c0lljatYP5njVL%TFlXl}(zaQ2~Ih;=kj6pxZumvAH#$xOfw7FIZ!9gY;+y zH(4it=B#hCzCNeXy#-P}+BHbub&y2HYr#|KGLREQvD08Xxs?`Zz$E_of|~|;47&vN z-f!Vw=WV~_;8J?xTednXBaX~<6$en17kg1|8HfSO)^P5B26PT>Z|CgBbe;j6T5ZTZ z0NJQH#h{jO8}a#*`1?mJx;w(Yw_--Z(P9nTjw%;0^7)l|-(8q=bc&zP74W*7 z0(rspLnw&#eu4s4yViw|>meLAGQx>&KXseBx`()tNe48DFj8A^zK1EQ@LG(FM==Uo z@u+C zqi9(nWflDlzMR7!lFELrSAt&Sec^7(3`AZ@q;5P{Kj@<|Q#+J~U^EbF_67~DN|?Nf z^f%!YZ#%q}8PEd*d6<_l)#L%?YEE(UvuCuQ0;XHgU8||3q2+smb?eP#J8Mp*WQlth zv)!HI64MvHUjLXkcsr!y);0wRQHeE~52Rd~h~aqwfy~H3>oeD~YhyEOT$$tC-`6Q7m4Q*W#p$AM*L)O{C?8whXd^Sd;9~_~ezi-v($U8C z#}p2`QV$k|A*lVLNA+*JJHWcNHpzhT)Dnh^L_DYX&EL13*U|{};Ai{qMnz4sTi-5W zDq5_n1>D(<=QOPIz<$xmf2jfntVZ|)B-7Nmf2HS8br|a*V;*$7DN*mHL|t|nIe9NP zKXuxJ(LDk#`IMOBxwkU2kPYn5}D(Ik{vM(s@wi&bA=+ zWwo|hlv+(jf4pK9_WEf+Ry30(fSHL+MDA0&ulwWmAaf4Z@p98scmu?;$`yc$*;Ig- zt|h?A0k1Ux8v)SQZ1Magx&S3!A$pVFtUkAW`O6-;yi6P~Ym|TJ9&!ho#ov+iKn-sB z3cD2~0;T>oh~n^C62LQfIs5G`vv)@sgH~d^>wz($5*$5X00Z9sEaJ}^(-)1strU%| zsFsL9EYM+x#r5$YhQoy79}{EeWYrrUf=|snYmNe*%~_t~fbyC6{RrbKDiF`(@|!kf zy{_|7Y~9nF8v8Rc6$*FJ0hYC7yh)chB;Iqost`iLU*X&#;R{Tky`{vL`|NOD?Pfoq z$%-an2;n5njVV?vIOYT)onbg%4XtFiVnSWF2a$wODIm9w+0z}@`@=?_S9_r~ZkTU% z9u#;F>wKT;UJ*c`Hhl5=Qb*5*FwW+i)N^GuJZ!mc&Z{ne1FV#5yIykrK+4VJx0``e;-kpzo)_=Hm0r066OF7EiM8AQ;%;< zT0ju6(r?xRF~PdDN>e63-QV%R zAKEA|Wm+~fx0HY|T$jC>{C%iwRyNV-$#gKszT)9RQ@q4)HNTIm31)hrD?im{&KJ@a2&FK5lQDh!5)m~5Q#eF=-P!C60_vc`WpPPy^8 zE%9V!1Euf-{RF?5D*lco13(oW2{^@_QuD!b3kPB_;ll+6`$@IGEahm>fnIyTy1a&f z1oK0aG#ak$M>OnvHuHWEhB{Bs1l?3~04Yc+s|V!ASXt6S7jb0lN#TSwy$J*kZ`8P1 zEQcAgSAl26P;@HIfcz6|)?VwQmsOXK8zg22hD`#~%j+C_23&jcExngGuK^`NcjsW< z+BZF-kymCJL@kCg@1aq%%4tTD6eL$voM9(RZYy7!zF7Ik3ZlaOderiMwPcX6RZIl{ zJi!mjvPM9c>@RX*nep*CIE6tLO2VfLz~^3f2hRsvP;SdcB~qU&L&G$%XlzSsjwVnO z8l8gu;q@+zF^$}x>vDZc0Ux7Q41x?Dy>x#hvPbqkiZ z)7CM|xrukKZ7hIxm`rBVtirETl^GN{&5;VU1lfQQxAW&JJW=Y|Zm~cNQbl0|3{Q`b z+e>uhG$A|mkJ6%z6#p%`6!iY-SBzP!K1$cxVSw8y=cT=a4icLLQDWRV95MiN)t1%> zHME}_$Tbf>~j(_WP$&eaAN z69n;xJ$YL<}GEtVd7~qJ_2d{wQzX5IBsXrC4?#%N8(z| z;4FR+PK%2yaAZQ_21HU16c5uk*b~@H71e|-F*KlY2M}|HnYOhCHDB6JqFW#RfhF3M z>|{xX)?5L@vH=gw=mAfFH(j~iC54Qq>QZESfaNXL?b#Xhq&vNAG@S=~0 znP|=LE)QxV63=&dxrev>vSI*+4GA9M^#R-xGlx|kxC}p$Tmqm_t6C^`7#$EUCgFNE zOfU@SRyb;vvy=twmeb~tcaoQ%{Lyn}dmf|)1E}8JoNmm${vJNosJXXrrJ|nGv#Q21 zfpKD?3V6NYQZUQHK`_5&fGGM!ms%3@>sX!wfzlHuNq0LO`cfD-&!1=l7__r)-R%@y zK;y-_Ou}6PUT31rx0>}~-<-g3Jh)W`63g4YPj$6~sXsJu0;^7sF-5YFWj0l`V_8ud z>eLnx2*yVik^m;{e*gGsI!UOW*;0Sx7=P4nWdxLI#U`bmP^?-o0a}@JOgFu5F*8M# zp_iH2oZSEHYve|;hsu(M*4;&`3!hKeEx2)CJdhrJ-pF&Mnm=BNp6I)m@Pi78w)f(% z8Cs?NdCD$fdaRq<`-e(m@g!hW5C9$kR zZMzY$mo#@}?l|%-7%30qKZ)&m@x$@k>Ev~P<4=o=H#Vapa<1;b^Hex&m_QVR3EqP_ zj{NTI@%cUBS{0ZB8m&x>_&$EKq!g+G5ZCO{3aaYVZH|&q^;3A5*W)&ma;w=Ur;coT zoFAyOedU1^5a?>~kQ4#Uf|whL<|w?1NAGs3vSwsD5XX*>v+Av=%f^k`7qktBA{ zQ`oxvLW?0O+%#WG$DNt=ygD?u=wDB>ytg1@5qA8Wx76g;KmTlq@GsffmM_yr;MKAx zS9mP;B_e8bC^=lv!)>5))?SuI9v}%vA?bd8#F7Hj%}#wTey#k@veSSt&!64NNRb3>q}{y)r$^YRoAN=eP?C6n0o`N7^yI)F1|y ztyiE0oHVAkr{jTtxZ57;$8FrM3Tua+pQv};sw3dRG8v}lcX1z2S$=nG)L1dee4AfZ z3&+{BZi;+QOB@1gYiNl5Ou}i?b8(-w(JC6kwx8w}NzEG+EMCyZ%@M0+3*j-c{(o(~ zbyQSQ+crMHP%@+lLrMwKDI(?2ji`V$I7mphbSexf(jXwEh;*0000SsUN{Mt!cgMGR zpZELy{&>E%&SEWK&7OVsxzFBrT-S9Uvs`v~B-|BX#YxSk`Hr3$A#v5#Rt2Zx2cZZm ze&dc7nwjaeaGf6;K#h|+I>6CZ1_4U=`&%U?jYwmbWiuzYDhS0uP z-EN5~i=2==+lRpKT0&SY{fW_?koZM`5Xyq_;6KH@rqu>KFaB3h>yD7y|FV(Ei}YHl z3PCr(AN_0-IDoDV$3L>7`I+`2qrJyUuDITr&t3gKd*{{Vxqf_cj-9v6d+c6f3|f(E zl76T0lv zp4RgTVCM_N6P}oeeVD`3@%`wiA_i8y+*#}S=!p^I3NFTaAd7jW;SEu|BtV>rfK?bJ z`NzpbCYl07M2+g*{)NeND=dxO4_ES!-g`6hiwRG9f1|Q@N%F3*fXS${Lc}D;3c9l5 zVS-{S&=mu=WtIHQFyVZ`K-)iK6#>(_B!?0RA-fDT@PsXYk?G2p7}fhR;oa{ub4Od= zo)@(qfGhuu>^$G%o{vlh1v`02ue?)d48y{@St|mT4)rJnmEeSi0-KR<`#9Tkzn>9U z?Fm0|SPuJVF@JFO$BBI$G3LY_1PA@MGy;jryqVgpfp_exYlD5o+$s)qWl+`s8N<-XP<;hpzjMa>ku0OOj)3VM9P{}x z3ps&heFQG+L6T5;=)1G2+9+!CK{V0NSK0+Gk7~F}Wdk;*p14~2b*K-qCP*oXdS}om zoA#Qjb0-CK{S0_i&cb+n1+_sN2pm^RtqbAJ03Hh`cHR94r}pRD^V${umw0Dheo-}% zKV3$my zteqmG&PbxGi&g@T3bGB;;1I1T^Y>jV$X}eEM8Mc)AkZ=|+EwwXhTdMN;JoW*^o)g_ ziyR_gT!7Ef{EPccv!BF>kMM-FC7#az>}8N29{ca|I|- z?6c`e;+)39~b7SfR-0=3LrJRL^26oaSW7W8OY1O@m+|)5YDppLM~+b(8rrmS_@3SVTk$>#%zp;b{m-37<#}V@6ep8_ZAY zfD;1|mG3>|<0CL>6icdtYHwHSwn9@(^UGB|Hu7#>>u2%o8dVw7%4uVzrv26Ln^H!r z{~r6#wH>3LobC4;zWX$cRXYTwTg_x?Qraig@!SOhL4SiehQ<<1@TkZb{?>keI8!!6 z{J~DU`tl9f0#-5vM_RQH3cpod#)GnHUgE$%&xZzppRHW~8kFBTSz zn@$dk26D?;Qy^)hL2wxjxc2k!08&0TG15{DJ$Mx|^Lfy`D?D?UHy_w&nDvc~0-u1y zDpxBAuJKXYT%T2Lm7y(8xvVFFvmMcCB^^y9fx^n?-azKsAt$Q%7q6PGnmNf>hx2mZ zO5N_6pmQZ1ogUZjj76k!>`ClT{QX`cpZd^EsmOM_ts?uRjfnq;LHp$QB9#SK;XZr& z^`&YpAR|THlf;{RMYYP*FAjm9w{G5W-M!JU%vDKL@ z3OE>u^2^L^kO=v)7`Wv^>=|R`D|s*=*9N_q4I$;}XK4+B6S#ClBrbNTJb)=%BN0~E zQA7h*GS|*@MIHbe04cu)C?fsrW1mw=Ju1rvq7*oUSwL$y5b;p9Oh-!&R6qS7kAV^{ zl&CTM$U~U@`SHo5CmHKFl<*d{k-~tievzypcE~+Gj%VrXf2=p+h9@-N>;B;3w=L0eN0LKm*TI4steCc>JHRZXw`jhIffJBM6Wy)M9qp)~pDu)T{K z>UL3tzOM=3MVc4Ni>WT!_{`84k+;JW!S?l79~ z@UNYqSMWP&;+=M~-?;DY%tkg%Q*B=!^yrpUGq4T60HW_K;gE4nvNE65)|{C43$-}w za4qM-sNI(o=%ulWO1#c>N4GqE;g!msv4#{V=(_vP@nGv$)}*+lIZuvys_@V(v!C@v zU3itnereLStZDxT*2X~hwd2m!D~Hdlx(u))OMcUawwls>uXH17URbTy#Kk+6IK{!c z=SM_=IA6?@`!@BVCtMkp3~BZI%}MV>=8@M;QEbiOYr;1!Ysrnv3dK0Bo9nFymlKu$ zT)dDdNMpd%c^}f=;WN_fYy*3h?*e^*vteyc0+g24`W6O#T(`ta))>aB;u{D*xjHfM zDLlm~mo>p#W}j64HDBQ1`itEIUrr^a{AhaC(8v7uq-3(EzEbCkxNdLxk^k+rhO(n? zPjkNrwCKnMykqa2ZVD)~YvXCYcJ$gxUnIn!AEDFb{G%U(V>;mil#eHx_koE<;(VL| zQsk5rZ2+3(=O+%T3LJpAffYGYL#{=tZse-w#DwQTwYS2LCThuTR=6vle(O$ylB($J z0#Pra)(3545eI@aIHH&9MaeujN03R!)g`{~w`MVttDjj`y_r%y)cApLF%F(+t@ngY zQ9%4R@-tZ)HJSPPs67vf4T0QrRQT<&e@i~?sb;+l9T)XZsc=I5@k;+oZ=OA2**I8& zt641Moi;imLMCsCZEb(GWvM&Sf^FR1g&h!o>3e@Hkjta$^+~CYUyZlk70YEUZf& zTXo`hk}Th@6Eds3MI6Yq9Dn@^qzISFee`cH;5d63iP_ruJR(FW*_knaYIS5y!Fe#=+>7BkRra89oImGOK=Ez`>yUt82ad z49m=z2OCm^EGj-bzBQ1bv)v}Oo~+xg@W3~h7@!@ow@(G3(vMOsS~Q!S{Wp3kZ*7;! z_OR>adbdhDks#ie9<@R2fGYDqFEhKMG##qjIItF?A8G@U`J#E5eyDGGZi0itVsiLf zQygcS3;nE`$kp77^P`R}K_Tbg@acLNCMpb|4D zzygZmFN&c^GcB`cN&vm_k)TCZjO;Pxw=Kr)4i1#_JVxbDbO$uMN@xS;P9Nvvi=B|K z*dO1x$!TDM*r(o#wR$({*4~AcmU=}d13g4V?14IG^X{a3ti}=2cSpy}=fc?TyHAKD z#Jn*|;Hv(eh+z$Eo#DG=!~0RDHIKvo>MBi7n20sy^BPdAU?V*5XE%B&W#Q*kM!@s| zKXwpR&9#wK2)SiOv|(BQO^>Fa&NuhPrxIA(X55U_I3d4b!?W&Of#xWiqV?g0Lz0c} zl_AUhhLn3jP&zq;eBUm~bjLom*s1DP_p@6^xK9g)hIZqv1bB2}cC+qfKd`)^TpX>645|y8>QNuDkeHQ; zzuY%#L+Ct@cotn<`}d5@*0Bucv3WN2@QIhc68rE2QPHzG51jLH?iYM&4z4@1%s<}@ z0>}?{%%=e|83z%+Gq=&bb&lmbW(Nf>6au!)i>H8u>zrwnw7(u8*0RNJM_rft)$$F8 zjDK`Deu{;e`B4&75bR6$+@l5v5OM?A!oVXTIej?5hI-vLhjrLFKm!+dBe=tFV&p+I zJ6~qi@8Aq?jhPw9b|lI{;bR|=iqlw5;Q+Mgc8ZvDTmm(K;T`9Y*wyNF2m(qb=U51# zoUmXNpKYcjGx8L$9J=4W=F27!Y5nFxF@8kJ=~B80OgcD*9Cmrf>UfYf?jE?U<&+OR0!C1+gAZMb9lAXIdJVsWh|g=M zV=kyw{+65{@iHZw;a5`49y3KQNW3&LtWZMbtE<EkI|%6MlvT@l5yWL9?4pF;Cs5&2jN?4{B>HhZ;mHE^RL+ONoDpFoKKEzc zYO*yDyDzJe)LuqLWG^2=_Oex#CYzNa=kQR?VDAgs#TFkQD_(77h&~Mj$mXM?TgX68uj|Xs3A&|O2UqgZ>H9eNsO+2c z+Xq7T=x8JOsc@i>h?r3{{iC)x(-5&T-&2=A^bOn1=NJ>JG^#p|N_IRWYUcC?tNy!j zrgE-(o3&wQqM^<=Fy1kC^_2UtlWN<5S4_F-w*GzxtK>8L%5LgWMOiLV9uw3U1uyWUn@;wgE-+&v(f}6e6FH;Sg$pq#uSESN7HB zM3d#8R9Qch_0j%aO+y9pLBWUo@tiTF53&`#8Eaj;4sHL3rv6zbDwa@HlHM$VVmUt) zCK5K(L2z&wx|5%c6B`;|Lz&K&8ZXM9Y%jo>M@@H4crF{w{E;cU$45*$;qzJ){|dQ> zP*qBPGDpt)T?(uR{+U4QEO+T!5v?yR&FX@2LzCilx)etP_44s6*ls|1Wm>*Ibyb=(X#m8$4D(ImT9UF!w3t?JkGRlqnncOi&+3q(_62>6>xo73*&K(blV$b3VpDb%|5I=UxbKa*T|&u5%melKg1!G zWb(){Lk4EP@;E3f4LCd6WNl0&3DmYjW0yr7ODpF{8Zwu@%N?&DUx zG$J{Ty4thztPXRfN1z6zy;I^F^Xk|7W$qD$nWBqk(vV;Zv-R6BOU;HhcU=KtA;h0| z3_NiUeEx#U9+s+L{wgTHB$FdP1@|JaB#PEKeepYSj2@dgTh-hXmAF6@)%b;pBJX^+ z|Lgc=A;DY)bUr;L z{JoEnbHlyrEfnCG=500^NKnpuY@^fB_O{z17u!-fmDQ-X6A3-7R$jau&y#eVSJ_Y<}tHc+W2y~`dSj4de3s||F0SlsIf zaWUw_Hiy?|2Q)baLP(6$i$ts1^JmA%0Dh49sm9m#=TJ{!T5B>34!nbHx(xWW6>WQk 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 literal 0 HcmV?d00001 diff --git a/keyboards/ergodox/keymaps/familiar/img/HNTR.svg b/keyboards/ergodox/keymaps/familiar/img/HNTR.svg deleted file mode 100644 index a419e7ab..00000000 --- a/keyboards/ergodox/keymaps/familiar/img/HNTR.svg +++ /dev/null @@ -1,7253 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PanningHold down Scroll Wheel to pan with mouseUp/Down - Scroll WheelLeft/Right - Shift + Scroll WheelZooming- Ctrl + Scroll View to zoom in/out- Press 1, 2, 4, or 5 for preset zoom views.Zoom Tool (F3) :- Left click to zoom in- Right click to zoom out - - - Keyboards - - - - - - - - - To avoid delays and errors in your order you must convert all of your fonts and text to vector data - This layout is used for your legends only. Keycap colors need to be defined with the online designer tool.Please check out our online tutorials at support.wasdkeyboards.comfor help and instructions regarding layout creation. - - - Quick Start:1. Enable Layers by going to: Layer > Layers (Ctrl + Shift + L) *The layers window can be expanded by dragging the area under the opacity slider.2. Use the Eyeball Icons to toggle visibility for preset layers3. Use the Select tool to move and scale objects (F1)4. Use the Text Tool to add and edit text (F8) - - Managing Layers1. Enable Layers by pressing Ctrl + Shift + L2. The Layer window can be enlarged by dragging thearea under the Opacity slider.3. Use the Eyeball Icon to toggle layer visibility.4. Use the Lock Icon to toggle the ability to edit layer.5. To add a layer, use the button from Layers panel. - - - Manipulating ObjectsThe Select Tool (F1) allows you to select and move,scale, and delete objects. Select an object, then drag the object to move it. You can drag the arrows around the object to scale it.Holding Ctrl while moving will keep the object locked onthe same X or Y axis. Holding Ctrl while scaling will keep the size ratio locked. - Inkscape Tutorial - FAQ (Frequently Asked Questions)I can't see any layers, I just see one layer or no layers when I open the layers panel.This happens when you drag and drop the layout file into Inkscape which "imports" it instead of opening it. Please close your Inkscape window, go back to the original file, right click it and choose "edit with Inkscape". What are the grids for on the layout? Can I place objects outside the grid?Yes. The grids are for reference only. You can snap the grids to use our standard margins. You can print all the way to the edge of the frame. There is a +/-0.01" tolerance, so we suggest that you stay within the grids when possible.Can I put a graphic that spans over multiple keys? Yes. Large images will be cropped to the top face of the keys. The areas in between the keys will not be printed.Advanced users can use a clipping mask to get a better idea of what the final image will look like.How can I change the color of the printing?We have tutorials in our support center that can show you how to add colors to your text and images.Go to support.wasdkeyboards.comI want to edit the Mac-style layouts, but the text is not editable.The Mac layout text is not editable since the font is not common. The font used is VAG Rounded-Light. - Adding text1. Click on the Text Tool (F8)2. Click on the area where you want add text3. Type your text4. Font and size and can changed in the text toolbar5. Use the Select Tool (F1) to reposition thetext if necessary. - - - - Editing font type and size1. Use the Select Tool (F1) select the objects youwant to edit.2. Click on the Text Tool (F8)3. Use the text toolbar to change font type and text size - - - - - Editing textUse the Select Tool (F1) and double click a singletext object.-or-Use the Text Tool (F8) and click on a single text object. - - - - Adding stock artworkCommonly used icons and symbols are available within the file.1. Turn on the visibility of the layer titled: "Stock Artwork"2. Use the Select Tool (F1) to select the object you want to use.3. Press Ctrl + C to copy4. Select the layer you want to paste the object to, then press Ctrl + V5. You can then use the Select Tool (F1) to move and/or scale the object to proper size. See "Snapping" for tips on aligning objects. - Adding custom artNormal graphics can be added into the file, but you must convert thegraphic to a path.1. Copy the graphic from another program. (Usually Right Click > Copy)2. Select the layer you want to paste the graphic to, then press Ctrl + V-or-1. File > Import (Ctrl + I) and select the file you want to import.2. Select the Embed option and click OK.3. Select the graphic, and goto Path > Trace Bitmap (Shift + Alt + B)4. Make sure your graphic is selected, then select a Scan option andclick OK. The graphic will be traced, and will overlay the original object.5. Move the new object into position and delete the original image. - - - SnappingEnabling snapping allows you to snap objects at various reference points of other objects which will allow you to quickly and accurately align objects to each other.Make sure Snap Controls Toolbar is displayed on the right hand side. (View > Show/Hide > Snap Controls Bar)Make sure Snapping is enabled (Toggle with "%")Hover over the various points to see what snappingare available. You can turn each one on/off.Drag objects over other objects to snap. You may need to zoom in or out to snap to certain objects. Turning off irrelevant points will also make it easier to snap. - - Copy and PasteCtrl + C: Copy objectCtrl + V: Paste objectCtrl + Alt + V: Paste in placeShift + Ctrl + V: Paste style - Guide LinesYou can use Guides to help align objects. Click and drag from the rulerson the edge of the document.Enable snapping to guides in the Snap Control Bar You can Show/Hide Guides by going to View > Guides - - - WASD Keyboards 104/87-Key Design Template - IMPORTANT: - Before saving and uploading your file: select all of your text; go to Path > Object to Path (Ctrl+Shift+C) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 😎 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/keyboards/ergodox/keymaps/familiar/img/familiar.json b/keyboards/ergodox/keymaps/familiar/img/familiar.json deleted file mode 100644 index e80f99e5..00000000 --- a/keyboards/ergodox/keymaps/familiar/img/familiar.json +++ /dev/null @@ -1,865 +0,0 @@ -[ - { - "name": "ErgoDox Familiar (CosmicStick Colors)", - "author": "Stick" - }, - [ - { - "x": 3.5, - "c": "#FFF8E7", - "t": "#403e3a", - "fa": [ - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 0, - 7, - 0 - ] - }, - "\n\n#\nF3\n\n\n³\n\n\n3", - { - "x": 10.5, - "fa": [ - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - "*\nF8\n\n\n\n\n\n¾\n\n8" - ], - [ - { - "y": -0.87, - "x": 2.5 - }, - "\n\n@\nF2\n\n\n²\n\n\n2", - { - "x": 1, - "fa": [ - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - "¤\n\n$\nF4\n\n\n£\n\n\n4", - { - "x": 8.5, - "fa": [ - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - "&\nF7\n\n\n\n\n\n½\n\n7", - { - "x": 1 - }, - "(\nF9\n\n\n\n\n\n‘\n\n9" - ], - [ - { - "y": -0.8699999999999999, - "x": 5.5 - }, - "\n\n%\nF5\n\n\n€\n\n\n5", - "\n\n_\nF11\n\n\n¥\n\n\n-", - { - "x": 4.5, - "fa": [ - 0, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - "+\nF12\n÷\n\n\n\n\n×\n\n=", - "^\nF6\n\n\n\n\n\n¼\n\n6" - ], - [ - { - "y": -0.88, - "c": "#605d57", - "t": "#FFF8E7", - "a": 7, - "w": 1.5 - }, - "ESCAPE", - { - "c": "#FFF8E7", - "t": "#403e3a", - "a": 4, - "fa": [ - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - "¡\n\n!\nF1\n\n\n¹\n\n\n1", - { - "x": 14.5, - "fa": [ - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - ")\nF10\n\n/\n\n\n\n’\n\n0", - { - "c": "#605d57", - "t": "#FFF8E7", - "a": 7, - "w": 1.5 - }, - "SYSREQ" - ], - [ - { - "y": -0.3799999999999999, - "x": 3.5, - "c": "#993300", - "a": 4 - }, - "\n\n\n↑\n\n\né\n\n\nE", - { - "x": 10.5, - "c": "#FFF8E7", - "t": "#403e3a" - }, - "\n\n\n5\n\n\n\ní\n\nI" - ], - [ - { - "y": -0.8700000000000001, - "x": 2.5, - "a": 6, - "fa": [ - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 7 - ] - }, - "å\n\n\n\n\n\n\n\nW", - { - "x": 1 - }, - "®\n\n\n\n\n\n\n\nR", - { - "x": 8.5, - "a": 4, - "fa": [ - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 7, - 7, - 0 - ] - }, - "\n\n\n4\n\n\n\nú\n\nU", - { - "x": 1 - }, - "\n\n\n6\n\n\n\nó\n\nO" - ], - [ - { - "y": -0.8699999999999999, - "x": 5.5, - "a": 6 - }, - "þ\n\n\n\n\n\n\n\nT", - { - "c": "#605d57", - "t": "#FFF8E7", - "a": 7, - "f": 3, - "h": 1.5 - }, - "HOME", - { - "x": 4.5, - "f": 3, - "h": 1.5 - }, - "PAGE UP", - { - "c": "#FFF8E7", - "t": "#403e3a", - "a": 6, - "fa": [ - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 7 - ] - }, - "\n\nü\n\n\n\n\n\nY" - ], - [ - { - "y": -0.8799999999999999, - "c": "#605d57", - "t": "#FFF8E7", - "a": 4, - "w": 1.5 - }, - "\n\n\nBREAK\n\n\n\n\n\nDELETE", - { - "c": "#FFF8E7", - "t": "#403e3a", - "a": 6 - }, - "ä\n\n\n\n\n\n\n\nQ", - { - "x": 14.5, - "a": 4, - "fa": [ - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 7, - 7, - 0 - ] - }, - "\n\n\n×\n\n\n\nö\n\nP", - { - "c": "#605d57", - "t": "#FFF8E7", - "fa": [ - 1, - 1 - ], - "w": 1.5 - }, - "\nINSERT\n\n\n\n\n\n\n\nBCKSPC" - ], - [ - { - "y": -0.3799999999999999, - "x": 3.5, - "c": "#993300", - "fa": [ - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 0, - 0, - 7, - 0 - ] - }, - "Ð\n\n\n↓\n\n\nð\n\n\nD", - { - "x": 10.5, - "c": "#FFF8E7", - "t": "#403e3a" - }, - "\n\n\n2\n\n\n\n\n\nK" - ], - [ - { - "y": -0.8700000000000001, - "x": 2.5, - "c": "#993300", - "t": "#FFF8E7" - }, - "§\n\n\n←\n\n\nß\n\n\nS", - { - "x": 1 - }, - "\n\n\n→\n\n\n\n\n\nF", - { - "x": 8.5, - "c": "#FFF8E7", - "t": "#403e3a" - }, - "\n\n\n1\n\n\n\n\n\nJ", - { - "x": 1, - "fa": [ - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - "\n\n\n3\n\n\n\nø\n\nL" - ], - [ - { - "y": -0.8799999999999999, - "x": 5.5, - "a": 7, - "fa": [ - 7 - ] - }, - "G", - { - "x": 6.5 - }, - "H" - ], - [ - { - "y": -0.8700000000000001, - "c": "#605d57", - "t": "#FFF8E7", - "f": 3, - "w": 1.5 - }, - "TAB", - { - "c": "#FFF8E7", - "t": "#403e3a", - "a": 6, - "fa": [ - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 7 - ] - }, - "á\n\n\n\n\n\n\n\nA", - { - "x": 14.5, - "a": 4, - "fa": [ - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 1, - 7, - 7, - 0 - ] - }, - ":\n\n°\n-\n\n\n\n¶\n\n;", - { - "c": "#605d57", - "t": "#FFF8E7", - "a": 7, - "w": 1.5 - }, - "ENTER" - ], - [ - { - "y": -0.6299999999999999, - "x": 6.5, - "h": 1.5 - }, - "END", - { - "x": 4.5, - "h": 1.5 - }, - "PAGE DOWN" - ], - [ - { - "y": -0.75, - "x": 3.5, - "c": "#FFF8E7", - "t": "#403e3a", - "a": 4, - "fa": [ - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 7, - 7, - 0 - ] - }, - "¢\n\n\n\n\n\n©\n\n\nC", - { - "x": 10.5, - "fa": [ - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 7, - 7, - 0 - ] - }, - "<\n\n\n0\n\n\n\nç\n\n," - ], - [ - { - "y": -0.8700000000000001, - "x": 2.5, - "a": 7, - "fa": [ - 7 - ] - }, - "X", - { - "x": 1 - }, - "V", - { - "x": 8.5, - "a": 6, - "fa": [ - 7, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 7 - ] - }, - "\n\nµ\n\n\n\n\n\nM", - { - "x": 1, - "a": 4, - "fa": [ - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 7, - 7, - 0 - ] - }, - ">\n\n\n\n\n\n\n\n\n." - ], - [ - { - "y": -0.8799999999999999, - "x": 5.5, - "a": 7, - "fa": [ - 7 - ] - }, - "B", - { - "x": 6.5, - "a": 6, - "fa": [ - 7, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 7 - ] - }, - "\n\nñ\n\n\n\n\n\nN" - ], - [ - { - "y": -0.8700000000000001, - "c": "#403e3a", - "t": "#FFF8E7", - "a": 5, - "fa": [ - 1, - 0, - 1, - 0, - 0, - 0, - 7 - ], - "w": 1.5 - }, - "SHIFT\n\n\n\n\n\n(", - { - "c": "#FFF8E7", - "t": "#403e3a", - "a": 6, - "fa": [ - 1, - 0, - 1, - 0, - 0, - 0, - 7, - 0, - 7 - ] - }, - "æ\n\n\n\n\n\n\n\nZ", - { - "x": 14.5, - "a": 4, - "fa": [ - 0, - 0, - 1, - 1, - 0, - 0, - 7, - 1, - 7, - 7, - 0 - ] - }, - "?\n\n\n+\n\n\n\n¿\n\n/", - { - "c": "#403e3a", - "t": "#FFF8E7", - "a": 5, - "fa": [ - 1, - 0, - 1, - 1, - 0, - 0, - 7 - ], - "w": 1.5 - }, - "SHIFT\n\n\n\n\n\n)" - ], - [ - { - "y": -0.3799999999999999, - "x": 3.5, - "c": "#FFF8E7", - "t": "#403e3a", - "a": 4, - "fa": [ - 1, - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 0, - 7, - 0 - ] - }, - "¨\n\n\"\n\n\n\n´\n\n\n'", - { - "x": 10.5, - "fa": [ - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - "}\n\n\n\n\n\n\n»\n\n]" - ], - [ - { - "y": -0.8700000000000001, - "x": 2.5 - }, - "\n\n~\n\n\n\n\n\n\n`", - { - "x": 1, - "fa": [ - 1, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - "¦\n\n|\n\n\n\n¬\n\n\n\\", - { - "x": 8.5, - "fa": [ - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - "{\n\n\n\n\n\n\n«\n\n[", - { - "x": 1, - "c": "#605d57", - "t": "#FFF8E7", - "a": 7 - }, - "PRNT SCRN" - ], - [ - { - "y": -0.75, - "x": 0.5, - "c": "#006699", - "a": 4, - "fa": [ - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ] - }, - "\n\n\nFLASH\n\n\n\n\nCTRL\nGUI", - { - "c": "#403e3a", - "a": 5, - "fa": [ - 1 - ] - }, - "CTL+SFT\n\n\n\n\n\nMENU", - { - "x": 14.5 - }, - "CTL+SFT\n\n\n\n\n\nMENU", - { - "c": "#006699", - "a": 4, - "fa": [ - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 1 - ] - }, - "\nFLASH\n\n\n\n\n\n\nCTRL\nGUI" - ], - [ - { - "r": 30, - "rx": 6.5, - "ry": 4.25, - "y": -1, - "x": 1, - "c": "#605d57", - "fa": [ - 1, - 1, - 0, - 1 - ] - }, - "\n\n\nKBDBRT-\n\n\n\n\n\nVOL-", - "\n\n\nKBDBRT+\n\n\n\n\n\nVOL+" - ], - [ - { - "c": "#FFF8E7", - "t": "#403e3a", - "a": 5, - "h": 2 - }, - "ALT", - { - "c": "#403e3a", - "t": "#FFF8E7", - "a": 7, - "f": 3, - "h": 2 - }, - "FN", - { - "c": "#605d57", - "f": 3 - }, - "MUTE" - ], - [ - { - "x": 2, - "c": "#403e3a", - "a": 5 - }, - "ALTGR\n\n\n\n\n\nLDR" - ], - [ - { - "r": -30, - "rx": 13, - "y": -1, - "x": -3, - "c": "#605d57", - "a": 4 - }, - "\n\n\nKBDBRT-\n\n\n\n\n\nBRT-", - "\n\n\nKBDBRT+\n\n\n\n\n\nBRT+" - ], - [ - { - "x": -3, - "a": 7, - "f": 3 - }, - "NUM LOCK", - { - "c": "#403e3a", - "f": 3, - "h": 2 - }, - "FN", - { - "c": "#FFF8E7", - "t": "#403e3a", - "a": 5, - "h": 2 - }, - "ALT" - ], - [ - { - "x": -3, - "c": "#403e3a", - "t": "#FFF8E7" - }, - "ALTGR\n\n\n\n\n\nLDR" - ] -] \ No newline at end of file diff --git a/keyboards/ergodox/keymaps/familiar/img/familiar.png b/keyboards/ergodox/keymaps/familiar/img/familiar.png deleted file mode 100644 index 4d61846eb89d9a8f0a0cfde1359de0338e2735db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102059 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 - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PanningHold down Scroll Wheel to pan with mouseUp/Down - Scroll WheelLeft/Right - Shift + Scroll WheelZooming- Ctrl + Scroll View to zoom in/out- Press 1, 2, 4, or 5 for preset zoom views.Zoom Tool (F3) :- Left click to zoom in- Right click to zoom out - - - Keyboards - - - - - - - - - To avoid delays and errors in your order you must convert all of your fonts and text to vector data - This layout is used for your legends only. Keycap colors need to be defined with the online designer tool.Please check out our online tutorials at support.wasdkeyboards.comfor help and instructions regarding layout creation. - - - Quick Start:1. Enable Layers by going to: Layer > Layers (Ctrl + Shift + L) *The layers window can be expanded by dragging the area under the opacity slider.2. Use the Eyeball Icons to toggle visibility for preset layers3. Use the Select tool to move and scale objects (F1)4. Use the Text Tool to add and edit text (F8) - - Managing Layers1. Enable Layers by pressing Ctrl + Shift + L2. The Layer window can be enlarged by dragging thearea under the Opacity slider.3. Use the Eyeball Icon to toggle layer visibility.4. Use the Lock Icon to toggle the ability to edit layer.5. To add a layer, use the button from Layers panel. - - - Manipulating ObjectsThe Select Tool (F1) allows you to select and move,scale, and delete objects. Select an object, then drag the object to move it. You can drag the arrows around the object to scale it.Holding Ctrl while moving will keep the object locked onthe same X or Y axis. Holding Ctrl while scaling will keep the size ratio locked. - Inkscape Tutorial - FAQ (Frequently Asked Questions)I can't see any layers, I just see one layer or no layers when I open the layers panel.This happens when you drag and drop the layout file into Inkscape which "imports" it instead of opening it. Please close your Inkscape window, go back to the original file, right click it and choose "edit with Inkscape". What are the grids for on the layout? Can I place objects outside the grid?Yes. The grids are for reference only. You can snap the grids to use our standard margins. You can print all the way to the edge of the frame. There is a +/-0.01" tolerance, so we suggest that you stay within the grids when possible.Can I put a graphic that spans over multiple keys? Yes. Large images will be cropped to the top face of the keys. The areas in between the keys will not be printed.Advanced users can use a clipping mask to get a better idea of what the final image will look like.How can I change the color of the printing?We have tutorials in our support center that can show you how to add colors to your text and images.Go to support.wasdkeyboards.comI want to edit the Mac-style layouts, but the text is not editable.The Mac layout text is not editable since the font is not common. The font used is VAG Rounded-Light. - Adding text1. Click on the Text Tool (F8)2. Click on the area where you want add text3. Type your text4. Font and size and can changed in the text toolbar5. Use the Select Tool (F1) to reposition thetext if necessary. - - - - Editing font type and size1. Use the Select Tool (F1) select the objects youwant to edit.2. Click on the Text Tool (F8)3. Use the text toolbar to change font type and text size - - - - - Editing textUse the Select Tool (F1) and double click a singletext object.-or-Use the Text Tool (F8) and click on a single text object. - - - - Adding stock artworkCommonly used icons and symbols are available within the file.1. Turn on the visibility of the layer titled: "Stock Artwork"2. Use the Select Tool (F1) to select the object you want to use.3. Press Ctrl + C to copy4. Select the layer you want to paste the object to, then press Ctrl + V5. You can then use the Select Tool (F1) to move and/or scale the object to proper size. See "Snapping" for tips on aligning objects. - Adding custom artNormal graphics can be added into the file, but you must convert thegraphic to a path.1. Copy the graphic from another program. (Usually Right Click > Copy)2. Select the layer you want to paste the graphic to, then press Ctrl + V-or-1. File > Import (Ctrl + I) and select the file you want to import.2. Select the Embed option and click OK.3. Select the graphic, and goto Path > Trace Bitmap (Shift + Alt + B)4. Make sure your graphic is selected, then select a Scan option andclick OK. The graphic will be traced, and will overlay the original object.5. Move the new object into position and delete the original image. - - - SnappingEnabling snapping allows you to snap objects at various reference points of other objects which will allow you to quickly and accurately align objects to each other.Make sure Snap Controls Toolbar is displayed on the right hand side. (View > Show/Hide > Snap Controls Bar)Make sure Snapping is enabled (Toggle with "%")Hover over the various points to see what snappingare available. You can turn each one on/off.Drag objects over other objects to snap. You may need to zoom in or out to snap to certain objects. Turning off irrelevant points will also make it easier to snap. - - Copy and PasteCtrl + C: Copy objectCtrl + V: Paste objectCtrl + Alt + V: Paste in placeShift + Ctrl + V: Paste style - Guide LinesYou can use Guides to help align objects. Click and drag from the rulerson the edge of the document.Enable snapping to guides in the Snap Control Bar You can Show/Hide Guides by going to View > Guides - - - WASD Keyboards 104/87-Key Design Template - IMPORTANT: - Before saving and uploading your file: select all of your text; go to Path > Object to Path (Ctrl+Shift+C) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/keyboards/ergodox/keymaps/familiar/img/familiar_stick.svg b/keyboards/ergodox/keymaps/familiar/img/familiar_stick.svg deleted file mode 100644 index 18ec937e..00000000 --- a/keyboards/ergodox/keymaps/familiar/img/familiar_stick.svg +++ /dev/null @@ -1,7592 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PanningHold down Scroll Wheel to pan with mouseUp/Down - Scroll WheelLeft/Right - Shift + Scroll WheelZooming- Ctrl + Scroll View to zoom in/out- Press 1, 2, 4, or 5 for preset zoom views.Zoom Tool (F3) :- Left click to zoom in- Right click to zoom out - - - Keyboards - - - - - - - - - To avoid delays and errors in your order you must convert all of your fonts and text to vector data - This layout is used for your legends only. Keycap colors need to be defined with the online designer tool.Please check out our online tutorials at support.wasdkeyboards.comfor help and instructions regarding layout creation. - - - Quick Start:1. Enable Layers by going to: Layer > Layers (Ctrl + Shift + L) *The layers window can be expanded by dragging the area under the opacity slider.2. Use the Eyeball Icons to toggle visibility for preset layers3. Use the Select tool to move and scale objects (F1)4. Use the Text Tool to add and edit text (F8) - - Managing Layers1. Enable Layers by pressing Ctrl + Shift + L2. The Layer window can be enlarged by dragging thearea under the Opacity slider.3. Use the Eyeball Icon to toggle layer visibility.4. Use the Lock Icon to toggle the ability to edit layer.5. To add a layer, use the button from Layers panel. - - - Manipulating ObjectsThe Select Tool (F1) allows you to select and move,scale, and delete objects. Select an object, then drag the object to move it. You can drag the arrows around the object to scale it.Holding Ctrl while moving will keep the object locked onthe same X or Y axis. Holding Ctrl while scaling will keep the size ratio locked. - Inkscape Tutorial - FAQ (Frequently Asked Questions)I can't see any layers, I just see one layer or no layers when I open the layers panel.This happens when you drag and drop the layout file into Inkscape which "imports" it instead of opening it. Please close your Inkscape window, go back to the original file, right click it and choose "edit with Inkscape". What are the grids for on the layout? Can I place objects outside the grid?Yes. The grids are for reference only. You can snap the grids to use our standard margins. You can print all the way to the edge of the frame. There is a +/-0.01" tolerance, so we suggest that you stay within the grids when possible.Can I put a graphic that spans over multiple keys? Yes. Large images will be cropped to the top face of the keys. The areas in between the keys will not be printed.Advanced users can use a clipping mask to get a better idea of what the final image will look like.How can I change the color of the printing?We have tutorials in our support center that can show you how to add colors to your text and images.Go to support.wasdkeyboards.comI want to edit the Mac-style layouts, but the text is not editable.The Mac layout text is not editable since the font is not common. The font used is VAG Rounded-Light. - Adding text1. Click on the Text Tool (F8)2. Click on the area where you want add text3. Type your text4. Font and size and can changed in the text toolbar5. Use the Select Tool (F1) to reposition thetext if necessary. - - - - Editing font type and size1. Use the Select Tool (F1) select the objects youwant to edit.2. Click on the Text Tool (F8)3. Use the text toolbar to change font type and text size - - - - - Editing textUse the Select Tool (F1) and double click a singletext object.-or-Use the Text Tool (F8) and click on a single text object. - - - - Adding stock artworkCommonly used icons and symbols are available within the file.1. Turn on the visibility of the layer titled: "Stock Artwork"2. Use the Select Tool (F1) to select the object you want to use.3. Press Ctrl + C to copy4. Select the layer you want to paste the object to, then press Ctrl + V5. You can then use the Select Tool (F1) to move and/or scale the object to proper size. See "Snapping" for tips on aligning objects. - Adding custom artNormal graphics can be added into the file, but you must convert thegraphic to a path.1. Copy the graphic from another program. (Usually Right Click > Copy)2. Select the layer you want to paste the graphic to, then press Ctrl + V-or-1. File > Import (Ctrl + I) and select the file you want to import.2. Select the Embed option and click OK.3. Select the graphic, and goto Path > Trace Bitmap (Shift + Alt + B)4. Make sure your graphic is selected, then select a Scan option andclick OK. The graphic will be traced, and will overlay the original object.5. Move the new object into position and delete the original image. - - - SnappingEnabling snapping allows you to snap objects at various reference points of other objects which will allow you to quickly and accurately align objects to each other.Make sure Snap Controls Toolbar is displayed on the right hand side. (View > Show/Hide > Snap Controls Bar)Make sure Snapping is enabled (Toggle with "%")Hover over the various points to see what snappingare available. You can turn each one on/off.Drag objects over other objects to snap. You may need to zoom in or out to snap to certain objects. Turning off irrelevant points will also make it easier to snap. - - Copy and PasteCtrl + C: Copy objectCtrl + V: Paste objectCtrl + Alt + V: Paste in placeShift + Ctrl + V: Paste style - Guide LinesYou can use Guides to help align objects. Click and drag from the rulerson the edge of the document.Enable snapping to guides in the Snap Control Bar You can Show/Hide Guides by going to View > Guides - - - WASD Keyboards 104/87-Key Design Template - IMPORTANT: - Before saving and uploading your file: select all of your text; go to Path > Object to Path (Ctrl+Shift+C) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/keyboards/ergodox/keymaps/familiar/img/hntr.json b/keyboards/ergodox/keymaps/familiar/img/hntr.json deleted file mode 100644 index c1aae552..00000000 --- a/keyboards/ergodox/keymaps/familiar/img/hntr.json +++ /dev/null @@ -1,634 +0,0 @@ -[ - { - "name": "Infinity ErgoDox - H.NT.R" - }, - [ - { - "x": 3.5, - "c": "#e3e2dd", - "t": "#525554", - "fa": [ - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 5 - ] - }, - "\n\n#\nF3\n\n\n\n\n\n3", - { - "x": 10.5, - "fa": [ - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 5 - ] - }, - "*\nF8\n\n\n\n\n\n\n\n8" - ], - [ - { - "y": -0.875, - "x": 2.5 - }, - "\n\n@\nF2\n\n\n\n\n\n2", - { - "x": 1 - }, - "\n\n$\nF4\n\n\n\n\n\n4", - { - "x": 8.5 - }, - "&\nF7\n\n\n\n\n\n\n\n7", - { - "x": 1 - }, - "(\nF9\n\n\n\n\n\n\n\n9" - ], - [ - { - "y": -0.875, - "x": 5.5 - }, - "\n\n%\nF5\n\n\n\n\n\n5", - "\n\n\nF11", - { - "x": 4.5 - }, - "\nF12", - "^\nF6\n\n\n\n\n\n\n\n6" - ], - [ - { - "y": -0.875, - "c": "#525554", - "t": "#e3e2dd", - "a": 7, - "f": 3, - "w": 1.5 - }, - "CYCLE LAYER", - { - "c": "#e3e2dd", - "t": "#525554", - "a": 4, - "f": 3 - }, - "\n\n!\nF1\n\n\n\n\n\n1", - { - "x": 14.5, - "f": 3 - }, - ")\nF10\n\n\n/\n\n\n\n\n0", - { - "c": "#525554", - "t": "#e3e2dd", - "a": 7, - "f": 3, - "w": 1.5 - }, - "CYCLE LAYER" - ], - [ - { - "y": -0.375, - "x": 3.5, - "c": "#c0472c", - "a": 4, - "fa": [ - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 5 - ] - }, - "\n\n\nPG UP\n▲\n\n\n\ne\nO", - { - "x": 10.5, - "c": "#e3e2dd", - "t": "#525554" - }, - "\n]\n\n\n5\n\n\n\ni\nL" - ], - [ - { - "y": -0.875, - "x": 2.5, - "a": 7, - "fa": [ - 5 - ] - }, - "W", - { - "x": 1, - "a": 5, - "fa": [ - 1, - 0, - 0, - 0, - 0, - 0, - 5 - ] - }, - "r\n\n\n\n\n\nU", - { - "x": 8.5, - "a": 4, - "fa": [ - 1, - 1, - 0, - 0, - 0, - 0, - 5, - 0, - 1, - 5 - ] - }, - "\n[\n\n\n4\n\n\n\nu\nD", - { - "x": 1 - }, - "\n?\n\n\n6\n\n\n\no\nG" - ], - [ - { - "y": -0.875, - "x": 5.5, - "a": 5 - }, - "t\n\n\n\n\n\nJ", - { - "a": 7, - "h": 1.5 - }, - "", - { - "x": 4.5, - "h": 1.5 - }, - "", - { - "a": 5 - }, - "y\n\n\n\n\n\nK" - ], - [ - { - "y": -0.875, - "c": "#525554", - "t": "#e3e2dd", - "a": 7, - "f": 3, - "w": 1.5 - }, - "DELETE", - { - "c": "#e3e2dd", - "t": "#525554", - "fa": [ - 5 - ] - }, - "Q", - { - "x": 14.5, - "a": 4, - "fa": [ - 5, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 5 - ] - }, - "\n|\n\n\n×\n\n\n\n\nP", - { - "c": "#525554", - "t": "#e3e2dd", - "a": 7, - "f": 3, - "w": 1.5 - }, - "⌫" - ], - [ - { - "y": -0.375, - "x": 3.5, - "c": "#c0472c", - "a": 4, - "fa": [ - 5, - 1, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 5 - ] - }, - "\n\n\nPG DN\n▼\n\n\n\nd\nE", - { - "x": 10.5, - "c": "#e3e2dd", - "t": "#525554" - }, - "\n)\n\n\n2\n\n\n\nk\nN" - ], - [ - { - "y": -0.875, - "x": 2.5, - "c": "#c0472c", - "t": "#e3e2dd" - }, - "\n\n\nHOME\n◀\n\n\n\ns\nI", - { - "x": 1 - }, - "\n\n\nEND\n▶\n\n\n\nf\nA", - { - "x": 8.5, - "c": "#e3e2dd", - "t": "#525554" - }, - "\n(\n\n\n1\n\n\n\nj\nH", - { - "x": 1 - }, - "\n/\n\n\n3\n\n\n\nl\nT" - ], - [ - { - "y": -0.875, - "x": 5.5, - "fa": [ - 5, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 5 - ] - }, - "\n\n:\n\n\n\n\n\ng\n;", - { - "x": 6.5, - "a": 5, - "fa": [ - 1, - 1, - 1, - 1, - 0, - 0, - 5 - ] - }, - "h\n\n\n\n\n\nF" - ], - [ - { - "y": -0.875, - "c": "#525554", - "t": "#e3e2dd", - "a": 7, - "f": 3, - "w": 1.5 - }, - "TAB", - { - "c": "#e3e2dd", - "t": "#525554", - "a": 5 - }, - "a\n\n\n\n\n\nS", - { - "x": 14.5, - "a": 4, - "fa": [ - 1, - 1, - 1, - 1, - 0, - 0, - 5, - 0, - 1, - 5 - ] - }, - "\n\\\n\n\n-\n\n\n\n;\nR", - { - "c": "#525554", - "t": "#e3e2dd", - "a": 7, - "f": 3, - "w": 1.5 - }, - "ENTER" - ], - [ - { - "y": -0.625, - "x": 6.5, - "c": "#e3e2dd", - "t": "#525554", - "h": 1.5 - }, - "", - { - "x": 4.5, - "h": 1.5 - }, - "" - ], - [ - { - "y": -0.75, - "x": 3.5, - "a": 4 - }, - "\n\n\n-\n\n\n\n\n\nC", - { - "x": 10.5 - }, - "<\n}\n\n\n.\n\n\n\n\n," - ], - [ - { - "y": -0.875, - "x": 2.5 - }, - "\n\n\n=\n\n\n\n\n\nX", - { - "x": 1 - }, - "\n\n\n—\n\n\n\n\n\nV", - { - "x": 8.5 - }, - "\n{\n\n\n0\n\n\n\n\nM", - { - "x": 1 - }, - ">\n~\n\n\nENTER\n\n\n\n\n." - ], - [ - { - "y": -0.875, - "x": 5.5 - }, - "\n\n\n_\n\n\n\n\nb\nY", - { - "x": 6.5, - "a": 5 - }, - "n\n\n\n\n\n\nB" - ], - [ - { - "y": -0.875, - "c": "#525554", - "t": "#e3e2dd", - "a": 7, - "f": 3, - "w": 1.5 - }, - "ALT", - { - "c": "#e3e2dd", - "t": "#525554", - "a": 4 - }, - "\n\n\n+\n\n\n\n\n\nZ", - { - "x": 14.5 - }, - "\"\n`\n\n\n+\n\n\n\n/\n'", - { - "c": "#525554", - "t": "#e3e2dd", - "a": 7, - "f": 3, - "w": 1.5 - }, - "ALT" - ], - [ - { - "y": -0.375, - "x": 3.5, - "f": 3 - }, - "END", - { - "x": 10.5, - "f": 3 - }, - "PAGE UP" - ], - [ - { - "y": -0.875, - "x": 2.5, - "f": 3 - }, - "HOME", - { - "x": 1, - "f": 3 - }, - "🔒2", - { - "x": 8.5, - "f": 3 - }, - "🔒3", - { - "x": 1, - "f": 3 - }, - "PAGE DOWN" - ], - [ - { - "y": -0.75, - "x": 0.5, - "c": "#0075ad", - "a": 4, - "fa": [ - 1, - 1, - 1, - 1, - 0, - 0, - 5, - 0, - 1, - 9 - ] - }, - "\n\n\nFLASH\n\n\n\n\n\nΑ", - { - "c": "#525554", - "a": 7, - "f": 3 - }, - "MENU", - { - "x": 14.5, - "f": 3 - }, - "MENU", - { - "c": "#0075ad", - "a": 4, - "f": 3 - }, - "\nFLASH\n\n\n\n\n\n\n\nΩ" - ], - [ - { - "y": 1.125, - "c": "#c0472c", - "fa": [ - 1, - 1, - 1, - 1, - 0, - 0, - 5, - 0, - 1, - 5 - ], - "w": 6 - }, - "SHIFTED\nLAYER 4\nSHIFTED\nLAYER 4\nLAYER 2 (LEFT) / LAYER 3 (RIGHT)\n\n\n\nqwerty (layer 1)\nMAIN LAYER" - ], - [ - { - "r": 30, - "rx": 6.5, - "ry": 4.25, - "y": -1, - "x": 1, - "c": "#525554", - "fa": [ - 1, - 1, - 1, - 1 - ] - }, - "\n\n\n🔅-\n\n\n\n\n\n🔉", - "\n\n\n🔆+\n\n\n\n\n\n🔊" - ], - [ - { - "a": 7, - "f": 3, - "h": 2 - }, - "SHIFT", - { - "f": 3, - "h": 2 - }, - "ƒ4", - { - "f": 3 - }, - "🔒1" - ], - [ - { - "x": 2, - "f": 3 - }, - "CTRL" - ], - [ - { - "r": -30, - "rx": 13, - "y": -1, - "x": -3, - "a": 4, - "f": 3 - }, - "\n🔅-\n\n\n\n\n\n\n\n🔅-", - { - "f": 3 - }, - "\n🔆+\n\n\n\n\n\n\n\n🔆+" - ], - [ - { - "x": -3, - "a": 7, - "f": 3 - }, - "🔒1", - { - "f": 3, - "h": 2 - }, - "ƒ4", - { - "c": "#e3e2dd", - "t": "#525554", - "h": 2 - }, - "" - ], - [ - { - "x": -3, - "c": "#525554", - "t": "#e3e2dd", - "f": 3 - }, - "CTRL" - ] -] \ No newline at end of file diff --git a/keyboards/ergodox/keymaps/familiar/img/hntr.png b/keyboards/ergodox/keymaps/familiar/img/hntr.png deleted file mode 100644 index 519d152df5817293c100034d04ab31a6d6fd9cd5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77473 zcmb@ubzD{37d>i&fV6O=ML|&Npa@DRt(0OA$^ks2bayD-2qGN<0wNtE9nvDDba!_* zZyvqI{odbu?~nIBpZoc2@7Oo*U>uWU+w^47y4qZ3 zx5qRu;mOmdpYnPvKJi|B%hV)GC1`w#=&bAsQ9`QwL9)gtL^QEotnY*pwa}R!8Qwim zttY!ncfQ$ba^^|QM~c8Zr3KNu6s3I4`#d*F)>R}WCG(XtXmzx;j|dW;`1PNQ!qoas zY;bU}QIh4MuA$+ficN{b`+|aVC=`kVf%p4!@Izc{d%J65A|vJxHa0d6H8_!LHv9Lr zw34Q1U(sPZ{rYc2zo)l1wsY2<{52s;Na(M@ zJer=Fu`#_aCM@hcMeFwK3*np5j1&|Uw;50U8a8}ipt}^_?|VAYsUHnP{B@VQW1Pr8 zLvng`QXNg`a#loKT&=?Cq>+h9AOkKL%WX6|Zffwt&o7O+-z-KrCk*%a>g4ZFproWk zc=Q$*FjZZm%uA{y8{;_gWXQYhS=fLSIfzY3JwXzl~G6 zVDl^|#3bz$8ynl$0tseN6;y3GL@uM42l)CTB7&0sLS-Xa=!Y*4f`Z24Gl#<7F)`PR zKh_BAZl;2paC39FmdXEoHn!MkUpgu*co_7l$jHdAH+SBgrD%H;QmH+M#c`S0r^W&P z@s!0&Mn)#iG2`b1C<*aX3i9B?6IbE!+_(|OdbwJ(Adtn)ki0r@gzvJ)k5BQO_%);o z+`D)0W{;t$gK^N$Dz3JA5A?Qiw+&S{Ox88-PEKBCvC=dbB;B>0ysZ4=FT32jJ}T8k zrzI=8>vE^ZWhE=G4b1CfCZd;)#CZs>M45n{ogHpmQC)p(2wd zJ&7DwZ=O1(Jp7*!n&UF_FGA{Bhd1-p*J ztJPw8l8fCC%qm?eYN5PG9)ONb{=*5%HM zkd2CBmR8kVX4i3r?>T4AtfN(j&hB8@h%65N{mqx&x9fb3xiyF$(P`@x>b%d&OtJov z?AGGm_9_t}AssHsaYS`O1G#J>tDvlL>En|D?N**8_?STp&1Ci*uS?L%X|Gb{QbuPS z7aDlwDQM)Bl5%BaG(%eQk+iRQOAzVpr*b~wI%)4(g3rdM=3>JyzYAFIlsw8WEc_Bj zr(9%w*4>|`=B4mak5ZF!@$t?%WFm5-3>!CpEV1ND9RfP{Xni)uQz^^Dw$y|xZm`-& zSkB_>D-wlAP>QhQ2g4@2Eo$vq{rSARlL8F$nJf*PD5|Qe%HzMIjn&FIv95RG86_-_ zNREfY2uey~{(vWFJw0q#C65RhC^9@f1DHG0n#kC*I*(%Z#vST{wIgjg^(k68e?R3T z+}f@#!i9_dVpY}Hk!40S!$iYVGX|6Ij66_OTbDi1jth6)+;(3D* zFuo29d@GltQ7`q0UhOftAfaBljvxAN$VdM2{|SCQc^ zx}6!}Y;VHS=rq;URR@Z#jm*ufz0NvT2D3(}V}5Xk*F?smaKu+k?TK3I3@pPl3XQTX zGue4qJmfTP6&1=NqT-$dB$?lOmlAaK^bpJ38Q$rYWH1z#-$N0Hxi(qNZXIa#S@Kx* z@bndw(!;x!Aew(TL~~ZebN0(u8=rjLtULLp4LT^B5*k{Et@HS_0@@o~CZ7i#X)*UN zQEpCU%UUH9B<#aX#bcO?+a@~1_|*J9A#O6Qw#VdbC`-+_uD6fgow(3y-W4Y~S1ejb z2_Zq|6?)jitMo*?@sW!26$pft>r6OKU!gsTuk?EU8$xzZCmy~&cewri-G%aS^MR#X zL;icm3}kwPY-3|W5rWpD%o{t4!rBT54OF?rvpzJ0)4a`o;5~IEgow!cC;{zY$k!Jvnue=8 z>l_ch1r8VKUg}6)b&GMa$?QECY?YnV9 z(a6~N+5bMqkk}sAHSSr}Yxt_O8~WNU?H&W<9{s%+`$|tYe^kD6S6b+~A~H^mO*r;J zTyCm@87e`en(1;AIln;O6fv(M(a&A^j)#uTg>Wm%wT1 zZ)f`u9X7R~*(BucSp}IN`Hgv^yKHt#J(C7OVyly zo?fq4SBkup|0PB-qoJXrE^e+~=?$t=LMA$aQ_ESRm{<6U8xsKN+GF$6ODV|dD~*|F z=+S7k`wBsq!ko7DtgrZ;qKPn(!{+e1Q0qrGXBRqkQWj^ect&h5jq)MIB{H)t3ihYw zn0NVOM5NP!H0bH@P(+2BG-W`joz|CTXJIEIlba&Mg~SGfK`yQ8X_!TR-f%)4t$mFG zVlIn9=8MpiAD`%39Oo@?bYGl_bJD&gEL_6G#_TfL!&TSVpeYu@FD2z8b*0XvZGGl3 z_qWACQE_qH7qXA!p0{?lGuomyXx!1{x1H$nU$#?eG^DXcgqz3d8n1gvjA50eq03di``27r55dLUl|o*&G;P$ zyqrEODHS=Km0-X3E|KACtarOrw}gWrzCo2rrL+6ARq$)qjyy3&vu;ZEEG+ha=F~Tx zSo%C<twm$0Yg9opN3M|fiTS%;v3kh9D zn={5)cOO`HhZm~7_8eYV@LLRF=ic=WVcR8>ELHTXmMpVS2)4^19kl!Ob#8NYe`Var z($c-Ch<9&)GYoZP-TcjaCU!x^=K=5F`Z7JXXHIKla}dkY(z1ehZfc6|$y3VKLBm(} zg1ML(PgR`M@2LwsiISE+^FAd*lT$g5gOl?`)w|xQg@y8xwQI#ztrafm1vQd$75{`T z#dyh#j7r#qHnu7w;|(&c>mI0wHa3N?!q%(k4LkX7On>;m#%;TqUp2JLkO!Edf7K{DP=9G3ud{aDTJ2waXh2^y9!$am{Lei3XuZJO;nwk^}X2e&ID(-MO z>^BAfNssC+BKpR8+w0*Ie`E8EMS0#S#7e)Kjyz z=a~zOc<-mPirJ&abDL4J=`Z1LE478ztB`Hm)pBu$f+zWRP1K3cEqH2yFoF&Dcc z$th`m8-{-Z=MAxNrG0kWIvYPfYN;lO(nH&t`{WGiWriN!@cEt1YCinY^y<$I zwyf~F--i}PEv8Gkyl|y?(#PV zc}RGzw)FP0KFNyk9T+gsmcS8_%uH&E{Ji5Uz{Gl`rsY2Smn#xk#toX0H%+}dPc$U4 zm6YPch{AiR&)T1U+SaR{GOG`%i-*RH3g^wYVQHUIf#VB_Nk^^J9`$>axuqtZ%kI>; zS6oF?{3}Y0_yy&v&#i7&c6DX4m~&0(d=2L~ZD}C*u|_hlP?_T9@Nn|yO7TtUTM?m% zmxB(ss%lU~<2>rmFbldAv!E+IJ%>xTuC$inF=MU~(s;~dRW7~UutAt?oT#bhT!j*< zN(QmY@6z0|K0}dXscp2 zP?7DWjjefeD-vh308c@})XzG8^r*g;*4AT&G3(j}tqpRWuwY>YygUS-OR6N5N32M z7YukP806)-{H?{aC9~yuHT#8CBO;F zO=1kQC=pTVWXc1&v4*MQ<-^YE=vQo*LQ58q)4K)-M#wi)Q_n8;6)@PM#MEw$81}zd zOpjVxQT8r5*j>6f8qjYW>Y03n{qP*DCp@?060@F?M^;uJL3Q;8PNT`Hp^r@XG8Ya7F!JdI{hPSf{=8LD##e!kNUbLmIL zd(2hBb3l1_BYIS*v)?v3GBTD$y;xg0&rmrpap9Hcd87MdL8=MbXh=hEb5jvB)V*2O zy>e!JhQs_s^$f}nzMZ8Z@*5Sbl|DrhhIr=<&|H;V&XjaI+rKlz9RN_$^IJ@EW?5tz z54B{TMK#;-+1b$obO3;Pihc1T=5?)qDJ@~nZ+Wbu;@gsWzg11$n+<|V1SXiMqp_(- zZ!mPd8{^I2-BtNkEt6Ru(IDY;@1*ebxMu@WHnQIzrH4W@D3qFwlaG~aeRpFH+0I0x zNzYD3pjJcJRDwRTW%&vJ4(ALm=^Y(nu$yoMBCf0MHc{t?MAuX?B$P);o-Ho!L>sk~ zmNdLe^!_;7qCF=LNH*{Nr)QND()onv{A{P62j)kfK!`e)9W5=g@S?f!)U35wZ?ITT zy8k?h@X*^j<_b+selZz?yo<@ov~V4pB;9SD_v4xrVmaBEP6HFe@55M}?UJc?X@gF)F9hxKDVLSyT7sr7*>x* zTSHp<;%e*ajzDB3beuiK$M+Zm&l*{6m`eDPip3v3ahcN!yILwA`v5(^V}3*|%OT#s zd$9jji?gREk&i!R(%X&x;Uz|~u)GtG+sETBb-}N<76v>a_!VE|NIr{SFgs&4;Pgde zo)m-YU`5C(CX1@XY<0>vy$S8orXsl6^ypvDM><%@CMNp%@Wn0VvI8wc5|f)JcK7zx z({QbFjJMUxnk0%9`0&NWP7xY09Z~E)EFRy5#FwWpe_?n-`tB6PxpU=-X%V9S0j!1E z$`*tqqdmSU+PbX|D_t+uJyRV=)sRdsc)3{qX{%%HzITYpVV?3Bp8%m*S8g$f0cV^#Ge z9$tQE0cD|SV%sICmndP^+s#l=QaXKVw&`;;@@Gc9R@dam%(%02pVH2iv#3;R_j0Bt z*O*F(>9E+`;zsPKaQRNH`^{Um?+OtYLaC08hfm5cmNx~_>8O-XJ+-&xV*l0gNx-v! z+OS}M!nRl=ScBDl3SL%gPmc#cyHuNuHYfU|6Ib5&^2ewPgfH*rao2xIrqgNQTIyYN zHywV4so`qx(ZnS@_8)qs>LTtk`rIP%qInh?jd^b*m+qCr)I)hvBj9*TU0pzPVn;&& z_zSu&_jao4r1bQ33#c_7bv{ysxCFSUXz|4Plc?7&QMWLm>>@e4sr@4@Ey~Xqnl8|< z9OKN1=4ms=_CZ_a6ST^+sf`9Vb`|Sifd|jA6~4!2K0c;7DkoITWE_?PyPLYa3L6Js zNLP2%Cu4c(QLNNcCwKqF3pXb?pFA0iWK(OjO&}w^y!K64rZ9Ir{CSbxCB{KPxEUtA zvMhzNnAe|I9vu~X-(gh&lfq{e>IXYYsnCuH=S|@2s7`96GMWIm8l&SWH@xnl&J zle~M!SkbFhlI+fByyBvMaEwhfp949N*8SY_;r%#f;0mzuX?f`-Q4d^kQI}+*hrT`{ zl7JYDuZmXk^Axfcolec@&H7FbK^?>0EG=%b*zA; z6*tJ86KPNHE6aKf4-2%lJyLDROT)fFP5%`2z(1rw;6qW-@q?qg#w%@i`$m^6GD+EY z&7m;9aL{oE3gZvn6B<|?NGD;Z#zJAJ{)N}xG%P92YV36HV{N`|*U^JD6UiVhBl190 zrts_j$)i>|)3O?G$OJ0{v)dRZt)vGmKIWwOGNXj5{vgHWv#{Mvoh>iN{Q`S1_-nFEX_$$&o4|FN3Y>A$eoL3kD9^t|(-?ruoIi0%B&?jKjD%?sdXbmD0j5SFuQOy6wurUNo7k6fOyh|6!=zLN6QNx*H zn90@2GkLd;cGc6P z{e&*=gqNXn`YGTecuY6ef>2H4?l7WDjCuf<^(Ta2>c({b zBIDJlGq{F*#eN@WOQwlMqs?IC;o%fUBV(r{@%epoi8G~!SRX?k=-s&RK8^}8wrg#q)5TWfl z4rC4{mM^c<*pNWc{hIf!jyJC(&Lo6fGGMF{PH7*K6XFX}j=odoDBn@2;7dLo7?S>B z#$>LisCO;DFcJMlO~Aahc#e+ol&*(9S}Obbtfo5`@@v14F2ov4Bv^RD0?)0U+z>Fr zwH*oY{-%A@MKfO?JUaM47W3V{A7?v+eMW#hUh4lyQqAC+&4;gFL1g}CgyJ0<$!y0B7dp<;7!NE+D!Y6e$L5bH zuo4wj5dzdeLUIA%yi#y&EdRTH>57E+-ifstDg?m0pdr#&qOP&`aDk|w#Giu^E%ld>sHs(Edyvb| z&H@V;iA!*mp9W!d5?=YG3Cb|UUK0kYwo3bSUniD*KcH0my}jSBv@|49*YX=}pQx#~ zLy!6G@Ne|$w;Ei8G!CNkFyY(Y@;0zZ@Iu!1Ap8QAulZstI_i%d; zzXFykD8H7RFmHL&9DMQP{=;(xIbC_e^G1wfq8jHQ|3}bta<{40vZ)9Hnv-HY1-Kla z3g(6#b*4*+f(d^lVT=p11LUO8?%`nE3WD{@r?blrrJupy9Nn+dPnDMXC)@Pe$c(l zAz)Bdu*A`KSBel5ywuURV{Jz16Z)kEp{@WZg52l3#zKl&(ohHk@sXQ%oql8H?Dy5Y z6B>b2p$+d-zXf`p&k|9;5}bYp4-fyE{vEFAJ5U*E7Bj|PMRv9S+2d4-Aqj<4CO6f4 zXr14s!>~v)AnLnB5mXi|nF6=@g;7~4ogE5Phu!^5{UQp`B6xZ!MZFkLN&Y~hD?gAZ z)Z|?`h6FJ2Y9L1Nb=rhQU-=$91l1h8E1%$wOK1%J%KkoFLAYTZ1M4hofu`iGa2 z>;irz?yL(B2Xq%GVq%9&nFY5e`3(p69+zf6z$LhMHVhHu@t#hC^ai#2gn@NOTiXkM z2V0=*M)d={+rK#oP-)9Hx`6AeUmK7B}Wu(o);w=3*s4raAk?DmyI#tRg zPUP%22`R`VK0Z+YG4^UFz&-U<<$(1e(+C~jCIBI333%e@adm0y#-9l~v7}Q@>p5U2 zZGGJ;*!k*cqaP#z2hWzoTC;)YzyLYODPP~GU^F%&k`Hv*gzU^|?50VUWMt#9Z;f{L zdlHnU8mFhM+kF9;C(h~(+UxoLGtOt}NkwH5+%V3ldt3Q)BM_ru0f{8@ZcL$LvED{Y z->gg18a1(pz&yn0rsGS#vwH@ls87>c0LwY}`mms0ON?RYD{$>A)+=(3gXA3;?y^g; zfYe3nb>$L4+5vbfy`|T~G0wGpvS4bFyQ^5WkzZa#{gxGZqCQtZ5geYFsL?B~QdU_+F9d5n-+W-a(We;6V~v&=y<$#M`7Lcj zNXA{tdcMfNzKRZeBg>*IhSgu8@N8jdWu20lsIpg8^3^0lyUPgX*?LJe;DTR{32mb4g(7odBZk5xC3C*bPNdTQtJGqB!KFOhUYFZ~1KnZhQ{vvr_?#V@FxW3hWpSM*I6&XoLO??LV zcgD#5pVH?YDJk{qAc|#JA~(qk8@HVdapH_s1?yL$NAsHulzxE76Y<4ku^1p z86T}HA+JM}{oKEn`+U)QYfAu7XBy6zTN%UKm!3^lvYZ-k3wt;DPr{UVue|@1rx}Ud;a6$|~2`d0%)|(3@}}8MDlE<-}P%PB|a-^z=-8xHIMf z+A%Q+iIzUkxDRPZXHlrGf%(o&mq`2yc=bycR|8P97z%>!-4S`1;HR;xr)e3*03yLE zI(9xuI8on%g|sb4wwX~QpA*SwZD~<&6aF%DRZH4`7t3a-paU0jol`3NzxanNcOuiy zH{%l;&7s)u=_uee`<}!l^HA=Z_~LXD_dT6gi^xj9(HGQT>E{~C#Lecq^|KVuXR~vG z7ThO8;@HAz${hIdpqh&v77*-!DD@Y+({(bSsVcLCZf9$&eB61HXlH}1=GDSoSP631K z;pbQ5zF6j;TYbn@c&cxA5#tj1r*`HExwe(J1xlQcEVVMRXk+Ehdb-z9;Zf zEdJ%|*RQ*CI3AEWIIW2~inY%iIxTd%2FB^EI}Q)T-FkYBQ^7wZp_7ZdJw83}*yA@E zfpKtclwK#hwW*hM@I~=oBW>V+QINxN`O3BT$!zYeUF>%<^l>4B>3nFAef)f&PL*GI zLb=k_^QezdMus!cw0gbiVq*!|fb9c3&!4ZWdPVo(I&$ktCTtyYHYE(z9wb4~=TpWg z30EFo-V1DOO=e#st{yY6-^jXn#^;l-k4y8dJZ*F)6?+!$wa!e3eNI8b6$};dfz7!h z%jU&MoYGwigdycQhH7iljKP3iDUsFeeN1KtAIeMT&ofR@d}3=h{B1g1N+^_u=aV!y z<%}2;%sobK?JAhXqpy$Lis=4f6yWx-yB3)`^QQtzoeB4eh+jLRwAtk!!zW@Zes#Tz z(~~?5@y!LMe&jtPe3yGj2st=FhDJu5wpS+`a3I!#$3ieo?%s`w?d!-%S%6S@&B zUv68D5miXxfrY@rxlX*Y{=+{B5G1mH9_C28?Oa>#m?FF3Tbidgm+47_!-48VIy__= zDpg0CGS)yv*p$Pr5Fv>(m?QSX^4-?O!s)QLD}U(O6+;UAM{pTWRZHIddYuF~!$S;bI9yew zu+sQ|MWsM!ja>u>uE#(d(#i3Zl~s0{m^jr+p2!gHc<2*Mmii>E2Fw_&jOk+btY&B0 z1LI^>beC6~Vs6nMJ$lqB6mfi;pvCqUO~yjaaC<+`)MJ$u19T<@`%g9aY{`97Q5hLB zF!Y4}1?Lpnt91y0ZG>%S#zO%xeY2Qx^9pqIa8EYEKa zcI%<9adpI|<`VW~qrrJ2i37R(i-dPen}U{cMPXqfy}&`ZA}T!4Y0&&RL$y>PY>?0G z?T-mb;xFBx(8nr{-JQopj5On#+&G=G{Ey&HSRy-yLqKqnkDov6|2)DGHO3F=-{@yn zM2ilobv1vhO_8ApL#)Y&#o!w(!A{S7J&~S$eQlq}Qwt_@HAJ&5AD-+ciN8p)-~D{* zrseG)FK2q)#%`$si^p#3)l_3#$=u+gJ4Ex_8J$;C{x^6%CaG*4;W{01wKYd8EZ=6{ zOZ6(zudpp6jfd7$C@nQf{9G|^A68HkKHH;E%nQ%NiNFJy5@T|jXf&Ebmb5}(7>4g`vPz92hGik<>k3W^Sw8X-2)!<_oRa|%|Yi=xU{)UX4 zz6tjxi6_75mvc}OVgKCD2P5XddrxmJ;*hbIDEkxK+9Px)pe40Ob$OQ^mNIv0YBj7yJCgEiByV%HRVA6B@cRe$tF?;AnABDv>ZV zHW_noPZ^q-(J^*^RzSbz*McU+7m)Vx8-0qrzlE)aYDCb^R2WGkZ35ZiTTPKy8O5aa z6I7SOpI_RBJvO6r<^E$uMrOFS^gS}%xcW3lxHR&w8eY!)v_9G;N~^L8n~%t&Qk=m1 zoA(NJ#`oAHCP+w{NV3lfkY1soh+$L+;Z@m(YSc1Or-#=q zr8sZ=j$m2!RbY`+$kiqyV^i`NzasC!_6Q#n#|#V%z?s$_v}n|wt-;i}QYHyXj4qdv z<>5DsMASQVllF)zDLeX};ASuR!)V=sJe+vyn?Bbb3vc=#GLkqu3uQ1f-?o%5nyL-| z2VR)){2Bh2Rx{)7$bO&!UAaY+C5z_a|G^qrN#y;aQAmaAe*fDM^u>Q+$LU zx{I$>sYz0)%5gis^>&(^8tkts7Vv!JP@3>0TweQuuC(y2+)HvBnjbd}+XT zaahvQGIj461FZk>%a>z7`kjOtkJBR%6@@F*va)kNSz1jEnxrag4kmJ;`&@#%wcwYeDL0u z4ZZ-=ð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 From 6b0842760b4ac0a4be6d9a60f12cc9bdbfea8613 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Fri, 7 Apr 2017 19:23:27 -0700 Subject: [PATCH 078/117] Corrected a missed typo in the readme. --- keyboards/atreus/keymaps/xyverz/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/atreus/keymaps/xyverz/readme.md b/keyboards/atreus/keymaps/xyverz/readme.md index 5187e5d3..98df9d77 100644 --- a/keyboards/atreus/keymaps/xyverz/readme.md +++ b/keyboards/atreus/keymaps/xyverz/readme.md @@ -46,7 +46,7 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t |------+------+------+------+------|------.,------|------+------+------+------+------| |Shft Z| X | C | V | B | CTRL ||Alt / | K | M | , | . |Shft /| |------+------+------+------+------| ||Enter |------+------+------+------+------| - | Esc | Tab | GUI | LOWER| BkSp |------'`------| Spc | RAISE| - | ' | RGUI | + | Esc | Tab | GUI | LOWER| BkSp |------'`------| Spc | RAISE| - | ' | \ | `----------------------------------' `----------------------------------' ### layer 3 : LOWER layer From 9237b95ebe9bbcab92ecc9138135d4d8f6d0a23f Mon Sep 17 00:00:00 2001 From: Xyverz Date: Fri, 7 Apr 2017 19:42:05 -0700 Subject: [PATCH 079/117] More missed keycodes; added PSCR, SLCK, and PAUS to ADJUST layer. --- keyboards/atreus/keymaps/xyverz/keymap.c | 4 ++-- keyboards/atreus/keymaps/xyverz/readme.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/atreus/keymaps/xyverz/keymap.c b/keyboards/atreus/keymaps/xyverz/keymap.c index 3c61d66d..560a9d30 100644 --- a/keyboards/atreus/keymaps/xyverz/keymap.c +++ b/keyboards/atreus/keymaps/xyverz/keymap.c @@ -128,7 +128,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ,----------------------------------. ,----------------------------------. | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | |------+------+------+------+------| |------+------+------+------+------| - | F11 | | | | | | | | | | F12 | + | F11 | | | | | | | PrSc | ScLk | Paus | F12 | |------+------+------+------+------|------.,------|------+------+------+------+------| | |QWERTY|COLEMK|DVORAK| | || | | | | | | |------+------+------+------+------| || |------+------+------+------+------| @@ -136,7 +136,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { `----------------------------------' `----------------------------------'*/ [_ADJUST] = { {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, XXXXXXX, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 }, - {KC_F11, _______, _______, _______, _______, XXXXXXX, _______, _______, _______, _______, KC_F12 }, + {KC_F11, _______, _______, _______, _______, XXXXXXX, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_F12 }, {_______, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, _______, _______, _______}, {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET } } diff --git a/keyboards/atreus/keymaps/xyverz/readme.md b/keyboards/atreus/keymaps/xyverz/readme.md index 98df9d77..e7e21780 100644 --- a/keyboards/atreus/keymaps/xyverz/readme.md +++ b/keyboards/atreus/keymaps/xyverz/readme.md @@ -79,7 +79,7 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t ,----------------------------------. ,----------------------------------. | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | |------+------+------+------+------| |------+------+------+------+------| - | F11 | | | | | | | | | | F12 | + | F11 | | | | | | | PScr | SLck | Paus | F12 | |------+------+------+------+------|------.,------|------+------+------+------+------| | |QWERTY|COLEMK|DVORAK| | || | | | | | | |------+------+------+------+------| || |------+------+------+------+------| From a11053bda8f6263cf85c6127975cf3364f25083c Mon Sep 17 00:00:00 2001 From: Xyverz Date: Sat, 8 Apr 2017 22:53:46 -0700 Subject: [PATCH 080/117] Cleaned up the keymap: Added MOD_TAP aliases for keymap.c readability. Updated README to document said changes. Added additional Dvorak layer to make using the CMD key easier on Macs. --- keyboards/atreus/keymaps/xyverz/keymap.c | 41 +++++++++++++++++++---- keyboards/atreus/keymaps/xyverz/readme.md | 27 ++++++++++++--- 2 files changed, 57 insertions(+), 11 deletions(-) diff --git a/keyboards/atreus/keymaps/xyverz/keymap.c b/keyboards/atreus/keymaps/xyverz/keymap.c index 560a9d30..ed943eb6 100644 --- a/keyboards/atreus/keymaps/xyverz/keymap.c +++ b/keyboards/atreus/keymaps/xyverz/keymap.c @@ -15,14 +15,16 @@ extern keymap_config_t keymap_config; #define _DVORAK 0 #define _QWERTY 1 #define _COLEMAK 2 -#define _LOWER 3 -#define _RAISE 4 +#define _DVORMAC 3 +#define _LOWER 4 +#define _RAISE 5 #define _ADJUST 16 enum planck_keycodes { DVORAK = SAFE_RANGE, QWERTY, COLEMAK, + DVORMAC, LOWER, RAISE, BACKLIT @@ -33,6 +35,8 @@ enum planck_keycodes { #define SFTSLSH SFT_T(KC_SLSH) #define SFTZED SFT_T(KC_Z) #define ALTENT ALT_T(KC_ENT) +#define ESCTRL CTL_T(KC_ESC) +#define TABALT ALT_T(KC_TAB) // Fillers to make layering more clear #define _______ KC_TRNS @@ -53,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { {KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, XXXXXXX, KC_F, KC_G, KC_C, KC_R, KC_L }, {KC_A, KC_O, KC_E, KC_U, KC_I, XXXXXXX, KC_D, KC_H, KC_T, KC_N, KC_S }, {SFTSCLN, KC_Q, KC_J, KC_K, KC_X, KC_LCTL, KC_B, KC_M, KC_W, KC_V, SFTZED }, - {KC_ESC, KC_TAB, KC_LGUI, LOWER, KC_BSPC, ALTENT, KC_SPC, RAISE, KC_MINS, KC_SLSH, KC_BSLS} + {ESCTRL, TABALT, KC_LGUI, LOWER, KC_BSPC, ALTENT, KC_SPC, RAISE, KC_MINS, KC_SLSH, KC_BSLS} }, /* QWERTY Layer @@ -70,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { {KC_Q, KC_W, KC_E, KC_R, KC_T, XXXXXXX, KC_Y, KC_U, KC_I, KC_O, KC_P }, {KC_A, KC_S, KC_D, KC_F, KC_G, XXXXXXX, KC_H, KC_J, KC_K, KC_L, KC_SCLN}, {SFTZED, KC_X, KC_C, KC_V, KC_B, KC_LCTL, KC_N, KC_M, KC_COMM, KC_DOT, SFTSLSH}, - {KC_ESC, KC_TAB, KC_LGUI, LOWER, KC_BSPC, ALTENT, KC_SPC, RAISE, KC_MINS, KC_QUOT, KC_BSLS} + {ESCTRL, TABALT, KC_LGUI, LOWER, KC_BSPC, ALTENT, KC_SPC, RAISE, KC_MINS, KC_QUOT, KC_BSLS} }, /* Colemak Layer @@ -87,7 +91,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { {KC_Q, KC_W, KC_F, KC_P, KC_G, XXXXXXX, KC_J, KC_L, KC_U, KC_Y, KC_SCLN}, {KC_A, KC_R, KC_S, KC_T, KC_D, XXXXXXX, KC_H, KC_N, KC_E, KC_I, KC_O }, {SFTZED, KC_X, KC_C, KC_V, KC_B, KC_LCTL, KC_K, KC_M, KC_COMM, KC_DOT, SFTSLSH}, - {KC_ESC, KC_TAB, KC_LGUI, LOWER, KC_BSPC, ALTENT, KC_SPC, RAISE, KC_MINS, KC_QUOT, KC_BSLS} + {ESCTRL, TABALT, KC_LGUI, LOWER, KC_BSPC, ALTENT, KC_SPC, RAISE, KC_MINS, KC_QUOT, KC_BSLS} + }, + +/* Dvorak Layer with Command key on left thumb instead of Control + ,----------------------------------. ,----------------------------------. + | ' | , | . | P | Y | | F | G | C | R | L | + |------+------+------+------+------| |------+------+------+------+------| + | A | O | E | U | I | | D | H | T | N | S | + |------+------+------+------+------|------.,------|------+------+------+------+------| + |SFT/ ;| Q | J | K | X | CMD ||Alt / | B | M | W | V |SFT/ Z| + |------+------+------+------+------| ||Enter |------+------+------+------+------| + | Esc | Tab | GUI | LOWER| BkSp |------'`------| Spc | RAISE| - | / | \ | + `----------------------------------' `----------------------------------' */ + [_DVORMAC] = { + {KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, XXXXXXX, KC_F, KC_G, KC_C, KC_R, KC_L }, + {KC_A, KC_O, KC_E, KC_U, KC_I, XXXXXXX, KC_D, KC_H, KC_T, KC_N, KC_S }, + {SFTSCLN, KC_Q, KC_J, KC_K, KC_X, KC_LGUI, KC_B, KC_M, KC_W, KC_V, SFTZED }, + {ESCTRL, TABALT, KC_LGUI, LOWER, KC_BSPC, ALTENT, KC_SPC, RAISE, KC_MINS, KC_SLSH, KC_BSLS} }, /* LOWER Layer @@ -130,14 +151,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |------+------+------+------+------| |------+------+------+------+------| | F11 | | | | | | | PrSc | ScLk | Paus | F12 | |------+------+------+------+------|------.,------|------+------+------+------+------| - | |QWERTY|COLEMK|DVORAK| | || | | | | | | + | |QWERTY|COLEMK|DVORAK|DVORMC| || | | | | | | |------+------+------+------+------| || |------+------+------+------+------| | | | | | |------'`------| | | | | RESET| `----------------------------------' `----------------------------------'*/ [_ADJUST] = { {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, XXXXXXX, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 }, {KC_F11, _______, _______, _______, _______, XXXXXXX, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_F12 }, - {_______, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, _______, _______, _______}, + {_______, QWERTY, COLEMAK, DVORAK, DVORMAC, _______, _______, _______, _______, _______, _______}, {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET } } @@ -172,6 +193,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; break; + case DVORMAC: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_DVORMAC); + } + return false; + break; case LOWER: if (record->event.pressed) { layer_on(_LOWER); diff --git a/keyboards/atreus/keymaps/xyverz/readme.md b/keyboards/atreus/keymaps/xyverz/readme.md index e7e21780..ec7d836c 100644 --- a/keyboards/atreus/keymaps/xyverz/readme.md +++ b/keyboards/atreus/keymaps/xyverz/readme.md @@ -7,8 +7,15 @@ time, but still very much like the original Atreus keymap. I've managed to get t implemented (more like copied) the RAISE/LOWER/ADJUST layers. This is a work in progress, but I think I'm closer to a final go with this. +I'm using MOD_TAP quite a bit in this keymap. On all layers, R4 pinky keys use mod-tap and are SHIFT when held +and their normal keys when tapped. In addition, ESC and TAB are also set as Ctrl and ALT respectively when held, +and Enter/ALT on the right thumb key for all layers. + I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar to the default Planck layouts. +Recently added: Documentation, Formatting, and another Dvorak layer that has Command on the left thumb, instead of +Control. + ## Still to do: * Enjoy this revision; figure out new things later. @@ -49,7 +56,19 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t | Esc | Tab | GUI | LOWER| BkSp |------'`------| Spc | RAISE| - | ' | \ | `----------------------------------' `----------------------------------' -### layer 3 : LOWER layer +### Keymap 3: Dvorak for Mac layout + + ,----------------------------------. ,----------------------------------. + | ' | , | . | P | Y | | F | G | C | R | L | + |------+------+------+------+------| |------+------+------+------+------| + | A | O | E | U | I | | D | H | T | N | S | + |------+------+------+------+------|------.,------|------+------+------+------+------| + |SFT/ ;| Q | J | K | X | CMD ||Alt / | B | M | W | V |SFT/ Z| + |------+------+------+------+------| ||Enter |------+------+------+------+------| + | Esc | Tab | GUI | LOWER| BkSp |------'`------| Spc | RAISE| - | / | \ | + `----------------------------------' `----------------------------------' + +### Keymap 4: LOWER layer ,----------------------------------. ,----------------------------------. | ! | @ | # | $ | % | | ^ | & | * | ( | ) | @@ -62,7 +81,7 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t `----------------------------------' `----------------------------------' -### Keymap 4: RAISE layer +### Keymap 5: RAISE layer ,----------------------------------. ,----------------------------------. | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | @@ -74,14 +93,14 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t | ` | | | | Del |------'`------| Ins | | | | | `----------------------------------' `----------------------------------' -### Keymap 5: ADJUST layer +### Keymap 6: ADJUST layer ,----------------------------------. ,----------------------------------. | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | |------+------+------+------+------| |------+------+------+------+------| | F11 | | | | | | | PScr | SLck | Paus | F12 | |------+------+------+------+------|------.,------|------+------+------+------+------| - | |QWERTY|COLEMK|DVORAK| | || | | | | | | + | |QWERTY|COLEMK|DVORAK|DVORMC| || | | | | | | |------+------+------+------+------| || |------+------+------+------+------| | | | | | |------'`------| | | | | RESET| `----------------------------------' `----------------------------------' From a875299d9aa9f0f1d2e01bedfaae0cb15c182e27 Mon Sep 17 00:00:00 2001 From: Dylan Khor Date: Sun, 9 Apr 2017 02:02:40 -0400 Subject: [PATCH 081/117] Added breathing macros and removed mappings to unused layouts --- keyboards/planck/keymaps/khord/config.h | 1 + keyboards/planck/keymaps/khord/keymap.c | 42 ++++++++++++++++++++++--- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/keyboards/planck/keymaps/khord/config.h b/keyboards/planck/keymaps/khord/config.h index 008f3a5c..83dece50 100644 --- a/keyboards/planck/keymaps/khord/config.h +++ b/keyboards/planck/keymaps/khord/config.h @@ -48,6 +48,7 @@ along with this program. If not, see . /* number of backlight levels */ #define BACKLIGHT_LEVELS 3 +#define BACKLIGHT_BREATHING /* Set 0 if debouncing isn't needed */ #define DEBOUNCING_DELAY 5 diff --git a/keyboards/planck/keymaps/khord/keymap.c b/keyboards/planck/keymaps/khord/keymap.c index 8001a098..e371e5b7 100644 --- a/keyboards/planck/keymaps/khord/keymap.c +++ b/keyboards/planck/keymaps/khord/keymap.c @@ -37,6 +37,14 @@ enum planck_keycodes { #define _______ KC_TRNS #define XXXXXXX KC_NO +#define MACRO_BREATH_TOGGLE 21 +#define MACRO_BREATH_SPEED_INC 23 +#define MACRO_BREATH_SPEED_DEC 24 +#define MACRO_BREATH_DEFAULT 25 +#define M_BRTOG M(MACRO_BREATH_TOGGLE) +#define M_BRINC M(MACRO_BREATH_SPEED_INC) +#define M_BRDEC M(MACRO_BREATH_SPEED_DEC) +#define M_BRDFT M(MACRO_BREATH_DEFAULT) // Tap Dance Declarations enum { ESC_CAP = 0, @@ -173,10 +181,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = { - {_______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL}, - {_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______}, - {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______}, - {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C_A_INS, C_A_DEL} + {_______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, M_BRDFT, KC_DEL }, + {_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, _______, _______, M_BRINC, _______}, + {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, M_BRDEC, C_A_INS}, + {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, M_BRTOG, C_A_DEL} } @@ -210,6 +218,32 @@ void persistant_default_layer_set(uint16_t default_layer) { default_layer_set(default_layer); } +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { + switch(id) { + case MACRO_BREATH_TOGGLE: + if (record->event.pressed) { + breathing_toggle(); + } + break; + case MACRO_BREATH_SPEED_INC: + if (record->event.pressed) { + breathing_speed_inc(1); + } + break; + case MACRO_BREATH_SPEED_DEC: + if (record->event.pressed) { + breathing_speed_dec(1); + } + break; + case MACRO_BREATH_DEFAULT: + if (record->event.pressed) { + breathing_defaults(); + } + break; + } + return MACRO_NONE; +} + bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: From aee9b10e92a597984ba9693b2dfcf597ca380a70 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 10 Jul 2016 23:45:39 +0300 Subject: [PATCH 082/117] Add a keyboard specific visualizer --- keyboards/ergodox/infinity/Makefile | 2 +- keyboards/ergodox/infinity/rules.mk | 2 +- keyboards/ergodox/infinity/visualizer.c | 168 ++++++++++++++++++++++++ quantum/visualizer/visualizer.mk | 4 + 4 files changed, 174 insertions(+), 2 deletions(-) create mode 100644 keyboards/ergodox/infinity/visualizer.c diff --git a/keyboards/ergodox/infinity/Makefile b/keyboards/ergodox/infinity/Makefile index 191c6bb6..bd09e588 100644 --- a/keyboards/ergodox/infinity/Makefile +++ b/keyboards/ergodox/infinity/Makefile @@ -1,3 +1,3 @@ ifndef MAKEFILE_INCLUDED include ../../../Makefile -endif \ No newline at end of file +endif diff --git a/keyboards/ergodox/infinity/rules.mk b/keyboards/ergodox/infinity/rules.mk index 473a6dfe..1b011cd5 100644 --- a/keyboards/ergodox/infinity/rules.mk +++ b/keyboards/ergodox/infinity/rules.mk @@ -59,7 +59,7 @@ OPT_DEFS += -DCORTEX_VTOR_INIT=0x00002000 # CUSTOM_MATRIX ?= yes # Custom matrix file SERIAL_LINK_ENABLE = yes -VISUALIZER_ENABLE ?= no #temporarily disabled to make everything compile +VISUALIZER_ENABLE ?= yes LCD_ENABLE ?= yes LED_ENABLE ?= yes LCD_BACKLIGHT_ENABLE ?= yes diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c new file mode 100644 index 00000000..c0d335ce --- /dev/null +++ b/keyboards/ergodox/infinity/visualizer.c @@ -0,0 +1,168 @@ +/* +Copyright 2016 Fred Sundvik + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +// Currently we are assuming that both the backlight and LCD are enabled +// But it's entirely possible to write a custom visualizer that use only +// one of them +#ifndef LCD_BACKLIGHT_ENABLE +#error This visualizer needs that LCD backlight is enabled +#endif + +#ifndef LCD_ENABLE +#error This visualizer needs that LCD is enabled +#endif + +#include "visualizer.h" +#include "led_test.h" + +static const char* welcome_text[] = {"TMK", "Infinity Ergodox"}; + +// Just an example how to write custom keyframe functions, we could have moved +// all this into the init function +bool display_welcome(keyframe_animation_t* animation, visualizer_state_t* state) { + (void)animation; + // Read the uGFX documentation for information how to use the displays + // http://wiki.ugfx.org/index.php/Main_Page + gdispClear(White); + // You can use static variables for things that can't be found in the animation + // or state structs + gdispDrawString(0, 3, welcome_text[0], state->font_dejavusansbold12, Black); + gdispDrawString(0, 15, welcome_text[1], state->font_dejavusansbold12, Black); + // Always remember to flush the display + gdispFlush(); + // you could set the backlight color as well, but we won't do it here, since + // it's part of the following animation + // lcd_backlight_color(hue, saturation, intensity); + // We don't need constant updates, just drawing the screen once is enough + return false; +} + +// Feel free to modify the animations below, or even add new ones if needed + +// Don't worry, if the startup animation is long, you can use the keyboard like normal +// during that time +static keyframe_animation_t startup_animation = { + .num_frames = 4, + .loop = false, + .frame_lengths = {0, gfxMillisecondsToTicks(1000), gfxMillisecondsToTicks(5000), 0}, + .frame_functions = { + display_welcome, + keyframe_animate_backlight_color, + keyframe_no_operation, + enable_visualization + }, +}; + +// The color animation animates the LCD color when you change layers +static keyframe_animation_t color_animation = { + .num_frames = 2, + .loop = false, + // Note that there's a 200 ms no-operation frame, + // this prevents the color from changing when activating the layer + // momentarily + .frame_lengths = {gfxMillisecondsToTicks(200), gfxMillisecondsToTicks(500)}, + .frame_functions = {keyframe_no_operation, keyframe_animate_backlight_color}, +}; + +// The LCD animation alternates between the layer name display and a +// bitmap that displays all active layers +static keyframe_animation_t lcd_animation = { + .num_frames = 2, + .loop = true, + .frame_lengths = {gfxMillisecondsToTicks(2000), gfxMillisecondsToTicks(2000)}, + .frame_functions = {keyframe_display_layer_text, keyframe_display_layer_bitmap}, +}; + +static keyframe_animation_t suspend_animation = { + .num_frames = 3, + .loop = false, + .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0}, + .frame_functions = { + keyframe_display_layer_text, + keyframe_animate_backlight_color, + keyframe_disable_lcd_and_backlight, + }, +}; + +static keyframe_animation_t resume_animation = { + .num_frames = 5, + .loop = false, + .frame_lengths = {0, 0, gfxMillisecondsToTicks(1000), gfxMillisecondsToTicks(5000), 0}, + .frame_functions = { + keyframe_enable_lcd_and_backlight, + display_welcome, + keyframe_animate_backlight_color, + keyframe_no_operation, + enable_visualization, + }, +}; + +void initialize_user_visualizer(visualizer_state_t* state) { + // The brightness will be dynamically adjustable in the future + // But for now, change it here. + lcd_backlight_brightness(0x50); + state->current_lcd_color = LCD_COLOR(0x00, 0x00, 0xFF); + state->target_lcd_color = LCD_COLOR(0x10, 0xFF, 0xFF); + start_keyframe_animation(&startup_animation); + start_keyframe_animation(&led_test_animation); +} + +void update_user_visualizer_state(visualizer_state_t* state) { + // Add more tests, change the colors and layer texts here + // Usually you want to check the high bits (higher layers first) + // because that's the order layers are processed for keypresses + // You can for check for example: + // state->status.layer + // state->status.default_layer + // state->status.leds (see led.h for available statuses) + if (state->status.layer & 0x8) { + state->target_lcd_color = LCD_COLOR(0xC0, 0xB0, 0xFF); + state->layer_text = "Numpad"; + } + else if (state->status.layer & 0x4) { + state->target_lcd_color = LCD_COLOR(0, 0xB0, 0xFF); + state->layer_text = "KBD functions"; + } + else if (state->status.layer & 0x2) { + state->target_lcd_color = LCD_COLOR(0x80, 0xB0, 0xFF); + state->layer_text = "Function keys"; + } + else { + state->target_lcd_color = LCD_COLOR(0x40, 0xB0, 0xFF); + state->layer_text = "Default"; + } + // You can also stop existing animations, and start your custom ones here + // remember that you should normally have only one animation for the LCD + // and one for the background. But you can also combine them if you want. + start_keyframe_animation(&lcd_animation); + start_keyframe_animation(&color_animation); +} + +void user_visualizer_suspend(visualizer_state_t* state) { + state->layer_text = "Suspending..."; + uint8_t hue = LCD_HUE(state->current_lcd_color); + uint8_t sat = LCD_SAT(state->current_lcd_color); + state->target_lcd_color = LCD_COLOR(hue, sat, 0); + start_keyframe_animation(&suspend_animation); +} + +void user_visualizer_resume(visualizer_state_t* state) { + state->current_lcd_color = LCD_COLOR(0x00, 0x00, 0x00); + state->target_lcd_color = LCD_COLOR(0x10, 0xFF, 0xFF); + start_keyframe_animation(&resume_animation); + start_keyframe_animation(&led_test_animation); +} diff --git a/quantum/visualizer/visualizer.mk b/quantum/visualizer/visualizer.mk index 2f4a41d6..ecdeba1e 100644 --- a/quantum/visualizer/visualizer.mk +++ b/quantum/visualizer/visualizer.mk @@ -50,7 +50,11 @@ ifneq ("$(wildcard $(KEYMAP_PATH)/visualizer.c)","") SRC += keyboards/$(KEYBOARD)/keymaps/$(KEYMAP)/visualizer.c else ifeq ("$(wildcard $(SUBPROJECT_PATH)/keymaps/$(KEYMAP)/visualizer.c)","") + ifeq ("$(wildcard $(SUBPROJECT_PATH)/visualizer.c)","") $(error "$(KEYMAP_PATH)/visualizer.c" does not exist) + else + SRC += keyboards/$(KEYBOARD)/$(SUBPROJECT)/visualizer.c + endif else SRC += keyboards/$(KEYBOARD)/$(SUBPROJECT)/keymaps/$(KEYMAP)/visualizer.c endif From bb86be1f1f3927a7ce339cb9439c97914af24754 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 28 Aug 2016 23:08:34 +0300 Subject: [PATCH 083/117] Remove unneeded makefile include --- keyboards/ergodox/ez/rules.mk | 4 ---- keyboards/ergodox/infinity/rules.mk | 4 ---- 2 files changed, 8 deletions(-) diff --git a/keyboards/ergodox/ez/rules.mk b/keyboards/ergodox/ez/rules.mk index 64b2db81..6cd1c0c4 100644 --- a/keyboards/ergodox/ez/rules.mk +++ b/keyboards/ergodox/ez/rules.mk @@ -74,7 +74,3 @@ OPT_DEFS += -DBOOTLOADER_SIZE=512 SLEEP_LED_ENABLE = no API_SYSEX_ENABLE ?= no RGBLIGHT_ENABLE ?= yes - -ifndef QUANTUM_DIR - include ../../../Makefile -endif diff --git a/keyboards/ergodox/infinity/rules.mk b/keyboards/ergodox/infinity/rules.mk index 1b011cd5..d51574ac 100644 --- a/keyboards/ergodox/infinity/rules.mk +++ b/keyboards/ergodox/infinity/rules.mk @@ -66,10 +66,6 @@ LCD_BACKLIGHT_ENABLE ?= yes MIDI_ENABLE = no RGBLIGHT_ENABLE = no -ifndef QUANTUM_DIR - include ../../../Makefile -endif - ifdef LCD_ENABLE include $(SUBPROJECT_PATH)/drivers/gdisp/st7565ergodox/driver.mk endif From f5c89416527a3ec435ed49137fd2bf4af216024c Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 28 Aug 2016 23:25:39 +0300 Subject: [PATCH 084/117] UGFX is compiled once per keyboard instead of keymap --- build_keyboard.mk | 8 ++++---- .../infinity/drivers/gdisp/st7565ergodox/board_ST7565.h | 2 -- quantum/visualizer/visualizer.mk | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/build_keyboard.mk b/build_keyboard.mk index 82464d58..ad92892e 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk @@ -258,12 +258,12 @@ endif OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT) $(KEYMAP_OUTPUT)_SRC := $(SRC) -$(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYMAP=\"$(KEYMAP)\" +$(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) $(GFXDEFS) -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYMAP=\"$(KEYMAP)\" $(KEYMAP_OUTPUT)_INC := $(VPATH) $(EXTRAINCDIRS) $(KEYMAP_OUTPUT)_CONFIG := $(CONFIG_H) -$(KEYBOARD_OUTPUT)_SRC := $(CHIBISRC) -$(KEYBOARD_OUTPUT)_DEFS := $(PROJECT_DEFS) -$(KEYBOARD_OUTPUT)_INC := $(PROJECT_INC) +$(KEYBOARD_OUTPUT)_SRC := $(CHIBISRC) $(GFXSRC) +$(KEYBOARD_OUTPUT)_DEFS := $(PROJECT_DEFS) $(GFXDEFS) +$(KEYBOARD_OUTPUT)_INC := $(PROJECT_INC) $(GFXINC) $(KEYBOARD_OUTPUT)_CONFIG := $(PROJECT_CONFIG) # Default target. diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h index 290571ce..abda0bd8 100644 --- a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h +++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h @@ -8,8 +8,6 @@ #ifndef _GDISP_LLD_BOARD_H #define _GDISP_LLD_BOARD_H -#include "print.h" - #define ST7565_LCD_BIAS ST7565_LCD_BIAS_9 // actually 6 #define ST7565_ADC ST7565_ADC_NORMAL #define ST7565_COM_SCAN ST7565_COM_SCAN_DEC diff --git a/quantum/visualizer/visualizer.mk b/quantum/visualizer/visualizer.mk index ecdeba1e..8f5fb893 100644 --- a/quantum/visualizer/visualizer.mk +++ b/quantum/visualizer/visualizer.mk @@ -43,8 +43,8 @@ OPT_DEFS += -DLED_ENABLE endif include $(GFXLIB)/gfx.mk -SRC += $(patsubst $(TOP_DIR)/%,%,$(GFXSRC)) -OPT_DEFS += $(patsubst %,-D%,$(patsubst -D%,%,$(GFXDEFS))) +GFXSRC := $(patsubst $(TOP_DIR)/%,%,$(GFXSRC)) +GFXDEFS := $(patsubst %,-D%,$(patsubst -D%,%,$(GFXDEFS))) ifneq ("$(wildcard $(KEYMAP_PATH)/visualizer.c)","") SRC += keyboards/$(KEYBOARD)/keymaps/$(KEYMAP)/visualizer.c From 6039a4f6edefbad7604a9533d445091cd646f240 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Tue, 28 Mar 2017 09:59:29 +0300 Subject: [PATCH 085/117] Empty implementation of has_onshot_mods_timed_out When the timeout is zero or not defined, the function now returns false. Fixes a linker error when the visualizer is enabled --- tmk_core/common/action_util.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tmk_core/common/action_util.c b/tmk_core/common/action_util.c index cb4b2526..77848c09 100644 --- a/tmk_core/common/action_util.c +++ b/tmk_core/common/action_util.c @@ -58,9 +58,13 @@ void set_oneshot_locked_mods(int8_t mods) { oneshot_locked_mods = mods; } void clear_oneshot_locked_mods(void) { oneshot_locked_mods = 0; } #if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) static int16_t oneshot_time = 0; -inline bool has_oneshot_mods_timed_out() { +bool has_oneshot_mods_timed_out(void) { return TIMER_DIFF_16(timer_read(), oneshot_time) >= ONESHOT_TIMEOUT; } +#else +bool has_oneshot_mods_timed_out(void) { + return false; +} #endif #endif From 503565d1742ed458c992192a05f6ffe1db053135 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Fri, 31 Mar 2017 22:51:00 +0300 Subject: [PATCH 086/117] Only re-send matrix every 5ms The previous 1ms value was too often, and wouldn't always leave time for the visualizer --- quantum/serial_link/system/serial_link.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quantum/serial_link/system/serial_link.c b/quantum/serial_link/system/serial_link.c index 75c7e77a..b3bee62a 100644 --- a/quantum/serial_link/system/serial_link.c +++ b/quantum/serial_link/system/serial_link.c @@ -212,7 +212,7 @@ void serial_link_update(void) { systime_t current_time = chVTGetSystemTimeX(); systime_t delta = current_time - last_update; - if (changed || delta > US2ST(1000)) { + if (changed || delta > US2ST(5000)) { last_update = current_time; last_matrix = matrix; matrix_object_t* m = begin_write_keyboard_matrix(); From 2b24d35846693a3365a35b6ee9bc31b70659cfcf Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Fri, 31 Mar 2017 23:58:10 +0300 Subject: [PATCH 087/117] Hopefully finally fix the corrupt LCD The SPI bus is now selected and deselected before each set of commands. Also speed up things by buffering many commands into a single batch. --- .../gdisp/st7565ergodox/board_ST7565.h | 46 +- .../gdisp/st7565ergodox/gdisp_lld_ST7565.c | 393 ++++++++++-------- 2 files changed, 228 insertions(+), 211 deletions(-) diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h index abda0bd8..c2092b5e 100644 --- a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h +++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h @@ -37,10 +37,14 @@ // MSB First // CLK Low by default static const SPIConfig spi1config = { - NULL, - /* HW dependent part.*/ - ST7565_GPIOPORT, - ST7565_SS_PIN, + // Operation complete callback or @p NULL. + .end_cb = NULL, + //The chip select line port - when not using pcs. + .ssport = ST7565_GPIOPORT, + // brief The chip select line pad number - when not using pcs. + .sspad=ST7565_SS_PIN, + // SPI initialization data. + .tar0 = SPIx_CTARn_FMSZ(7) | SPIx_CTARn_ASC(7) | SPIx_CTARn_DT(7) @@ -50,13 +54,10 @@ static const SPIConfig spi1config = { //SPI_CR1_BR_0 }; -static bool_t st7565_is_data_mode = 1; - static GFXINLINE void init_board(GDisplay *g) { (void) g; palSetPadModeNamed(A0, PAL_MODE_OUTPUT_PUSHPULL); palSetPad(ST7565_GPIOPORT, ST7565_A0_PIN); - st7565_is_data_mode = 1; palSetPadModeNamed(RST, PAL_MODE_OUTPUT_PUSHPULL); palSetPad(ST7565_GPIOPORT, ST7565_RST_PIN); palSetPadModeRaw(MOSI, ST7565_SPI_MODE); @@ -65,7 +66,6 @@ static GFXINLINE void init_board(GDisplay *g) { spiInit(); spiStart(&SPID1, &spi1config); - spiSelect(&SPID1); } static GFXINLINE void post_init_board(GDisplay *g) { @@ -86,39 +86,27 @@ static GFXINLINE void acquire_bus(GDisplay *g) { (void) g; // Only the LCD is using the SPI bus, so no need to acquire // spiAcquireBus(&SPID1); + spiSelect(&SPID1); } static GFXINLINE void release_bus(GDisplay *g) { (void) g; // Only the LCD is using the SPI bus, so no need to release //spiReleaseBus(&SPID1); + spiUnselect(&SPID1); } -static GFXINLINE void write_cmd(GDisplay *g, uint8_t cmd) { - (void) g; - if (st7565_is_data_mode) { - // The sleeps need to be at lest 10 vs 25 ns respectively - // So let's sleep two ticks, one tick might not be enough - // if we are at the end of the tick - chThdSleep(2); - palClearPad(ST7565_GPIOPORT, ST7565_A0_PIN); - chThdSleep(2); - st7565_is_data_mode = 0; - } - spiSend(&SPID1, 1, &cmd); +static GFXINLINE void enter_data_mode(GDisplay *g) { + palSetPad(ST7565_GPIOPORT, ST7565_A0_PIN); +} + +static GFXINLINE void enter_cmd_mode(GDisplay *g) { + palClearPad(ST7565_GPIOPORT, ST7565_A0_PIN); } + static GFXINLINE void write_data(GDisplay *g, uint8_t* data, uint16_t length) { (void) g; - if (!st7565_is_data_mode) { - // The sleeps need to be at lest 10 vs 25 ns respectively - // So let's sleep two ticks, one tick might not be enough - // if we are at the end of the tick - chThdSleep(2); - palSetPad(ST7565_GPIOPORT, ST7565_A0_PIN); - chThdSleep(2); - st7565_is_data_mode = 1; - } spiSend(&SPID1, length, data); } diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c index c33aea81..4547f141 100644 --- a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c +++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c @@ -20,16 +20,16 @@ /*===========================================================================*/ #ifndef GDISP_SCREEN_HEIGHT - #define GDISP_SCREEN_HEIGHT 32 +#define GDISP_SCREEN_HEIGHT 32 #endif #ifndef GDISP_SCREEN_WIDTH - #define GDISP_SCREEN_WIDTH 128 +#define GDISP_SCREEN_WIDTH 128 #endif #ifndef GDISP_INITIAL_CONTRAST - #define GDISP_INITIAL_CONTRAST 0 +#define GDISP_INITIAL_CONTRAST 0 #endif #ifndef GDISP_INITIAL_BACKLIGHT - #define GDISP_INITIAL_BACKLIGHT 100 +#define GDISP_INITIAL_BACKLIGHT 100 #endif #define GDISP_FLG_NEEDFLUSH (GDISP_FLG_DRIVER<<0) @@ -40,16 +40,16 @@ /* Driver config defaults for backward compatibility. */ /*===========================================================================*/ #ifndef ST7565_LCD_BIAS - #define ST7565_LCD_BIAS ST7565_LCD_BIAS_7 +#define ST7565_LCD_BIAS ST7565_LCD_BIAS_7 #endif #ifndef ST7565_ADC - #define ST7565_ADC ST7565_ADC_NORMAL +#define ST7565_ADC ST7565_ADC_NORMAL #endif #ifndef ST7565_COM_SCAN - #define ST7565_COM_SCAN ST7565_COM_SCAN_INC +#define ST7565_COM_SCAN ST7565_COM_SCAN_INC #endif #ifndef ST7565_PAGE_ORDER - #define ST7565_PAGE_ORDER 0,1,2,3 +#define ST7565_PAGE_ORDER 0,1,2,3 #endif /*===========================================================================*/ @@ -58,12 +58,24 @@ typedef struct{ bool_t buffer2; + uint8_t data_pos; + uint8_t data[16]; uint8_t ram[GDISP_SCREEN_HEIGHT * GDISP_SCREEN_WIDTH / 8]; }PrivData; // Some common routines and macros #define PRIV(g) ((PrivData*)g->priv) #define RAM(g) (PRIV(g)->ram) + +static GFXINLINE void write_cmd(GDisplay* g, uint8_t cmd) { + PRIV(g)->data[PRIV(g)->data_pos++] = cmd; +} + +static GFXINLINE void flush_cmd(GDisplay* g) { + write_data(g, PRIV(g)->data, PRIV(g)->data_pos); + PRIV(g)->data_pos = 0; +} + #define write_cmd2(g, cmd1, cmd2) { write_cmd(g, cmd1); write_cmd(g, cmd2); } #define write_cmd3(g, cmd1, cmd2, cmd3) { write_cmd(g, cmd1); write_cmd(g, cmd2); write_cmd(g, cmd3); } @@ -86,207 +98,224 @@ typedef struct{ */ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { - // The private area is the display surface. - g->priv = gfxAlloc(sizeof(PrivData)); - PRIV(g)->buffer2 = false; - - // Initialise the board interface - init_board(g); - - // Hardware reset - setpin_reset(g, TRUE); - gfxSleepMilliseconds(20); - setpin_reset(g, FALSE); - gfxSleepMilliseconds(20); - - acquire_bus(g); + // The private area is the display surface. + g->priv = gfxAlloc(sizeof(PrivData)); + PRIV(g)->buffer2 = false; + PRIV(g)->data_pos = 0; + + // Initialise the board interface + init_board(g); + + // Hardware reset + setpin_reset(g, TRUE); + gfxSleepMilliseconds(20); + setpin_reset(g, FALSE); + gfxSleepMilliseconds(20); + + acquire_bus(g); + enter_cmd_mode(g); write_cmd(g, ST7565_DISPLAY_OFF); - write_cmd(g, ST7565_LCD_BIAS); + write_cmd(g, ST7565_LCD_BIAS); write_cmd(g, ST7565_ADC); write_cmd(g, ST7565_COM_SCAN); - + write_cmd(g, ST7565_START_LINE | 0); - write_cmd(g, ST7565_RESISTOR_RATIO | 0x6); + write_cmd(g, ST7565_RESISTOR_RATIO | 0x6); - // turn on voltage converter (VC=1, VR=0, VF=0) - write_cmd(g, ST7565_POWER_CONTROL | 0x04); - delay_ms(50); + // turn on voltage converter (VC=1, VR=0, VF=0) + write_cmd(g, ST7565_POWER_CONTROL | 0x04); + flush_cmd(g); + delay_ms(50); - // turn on voltage regulator (VC=1, VR=1, VF=0) - write_cmd(g, ST7565_POWER_CONTROL | 0x06); - delay_ms(50); + // turn on voltage regulator (VC=1, VR=1, VF=0) + write_cmd(g, ST7565_POWER_CONTROL | 0x06); + flush_cmd(g); + delay_ms(50); - // turn on voltage follower (VC=1, VR=1, VF=1) - write_cmd(g, ST7565_POWER_CONTROL | 0x07); - delay_ms(50); + // turn on voltage follower (VC=1, VR=1, VF=1) + write_cmd(g, ST7565_POWER_CONTROL | 0x07); + flush_cmd(g); + delay_ms(50); - write_cmd(g, 0xE2); + write_cmd(g, 0xE2); write_cmd(g, ST7565_COM_SCAN); - write_cmd2(g, ST7565_CONTRAST, GDISP_INITIAL_CONTRAST*64/101); - //write_cmd2(g, ST7565_CONTRAST, 0); - write_cmd(g, ST7565_DISPLAY_ON); - write_cmd(g, ST7565_ALLON_NORMAL); - write_cmd(g, ST7565_INVERT_DISPLAY); + write_cmd2(g, ST7565_CONTRAST, GDISP_INITIAL_CONTRAST*64/101); + //write_cmd2(g, ST7565_CONTRAST, 0); + write_cmd(g, ST7565_DISPLAY_ON); + write_cmd(g, ST7565_ALLON_NORMAL); + write_cmd(g, ST7565_INVERT_DISPLAY); - write_cmd(g, ST7565_RMW); + write_cmd(g, ST7565_RMW); + flush_cmd(g); // Finish Init post_init_board(g); - // Release the bus - release_bus(g); - - /* Initialise the GDISP structure */ - g->g.Width = GDISP_SCREEN_WIDTH; - g->g.Height = GDISP_SCREEN_HEIGHT; - g->g.Orientation = GDISP_ROTATE_0; - g->g.Powermode = powerOn; - g->g.Backlight = GDISP_INITIAL_BACKLIGHT; - g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + // Release the bus + release_bus(g); + + /* Initialise the GDISP structure */ + g->g.Width = GDISP_SCREEN_WIDTH; + g->g.Height = GDISP_SCREEN_HEIGHT; + g->g.Orientation = GDISP_ROTATE_0; + g->g.Powermode = powerOn; + g->g.Backlight = GDISP_INITIAL_BACKLIGHT; + g->g.Contrast = GDISP_INITIAL_CONTRAST; + return TRUE; } #if GDISP_HARDWARE_FLUSH - LLDSPEC void gdisp_lld_flush(GDisplay *g) { - unsigned p; - - // Don't flush if we don't need it. - if (!(g->flags & GDISP_FLG_NEEDFLUSH)) - return; - - acquire_bus(g); - unsigned dstOffset = (PRIV(g)->buffer2 ? 4 : 0); - for (p = 0; p < 4; p++) { - write_cmd(g, ST7565_PAGE | (p + dstOffset)); - write_cmd(g, ST7565_COLUMN_MSB | 0); - write_cmd(g, ST7565_COLUMN_LSB | 0); - write_cmd(g, ST7565_RMW); - write_data(g, RAM(g) + (p*GDISP_SCREEN_WIDTH), GDISP_SCREEN_WIDTH); - } - unsigned line = (PRIV(g)->buffer2 ? 32 : 0); - write_cmd(g, ST7565_START_LINE | line); - PRIV(g)->buffer2 = !PRIV(g)->buffer2; - release_bus(g); - - g->flags &= ~GDISP_FLG_NEEDFLUSH; - } +LLDSPEC void gdisp_lld_flush(GDisplay *g) { + unsigned p; + + // Don't flush if we don't need it. + if (!(g->flags & GDISP_FLG_NEEDFLUSH)) + return; + + acquire_bus(g); + enter_cmd_mode(g); + unsigned dstOffset = (PRIV(g)->buffer2 ? 4 : 0); + for (p = 0; p < 4; p++) { + write_cmd(g, ST7565_PAGE | (p + dstOffset)); + write_cmd(g, ST7565_COLUMN_MSB | 0); + write_cmd(g, ST7565_COLUMN_LSB | 0); + write_cmd(g, ST7565_RMW); + flush_cmd(g); + enter_data_mode(g); + write_data(g, RAM(g) + (p*GDISP_SCREEN_WIDTH), GDISP_SCREEN_WIDTH); + enter_cmd_mode(g); + } + unsigned line = (PRIV(g)->buffer2 ? 32 : 0); + write_cmd(g, ST7565_START_LINE | line); + flush_cmd(g); + PRIV(g)->buffer2 = !PRIV(g)->buffer2; + release_bus(g); + + g->flags &= ~GDISP_FLG_NEEDFLUSH; +} #endif #if GDISP_HARDWARE_DRAWPIXEL - LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) { - coord_t x, y; - - switch(g->g.Orientation) { - default: - case GDISP_ROTATE_0: - x = g->p.x; - y = g->p.y; - break; - case GDISP_ROTATE_90: - x = g->p.y; - y = GDISP_SCREEN_HEIGHT-1 - g->p.x; - break; - case GDISP_ROTATE_180: - x = GDISP_SCREEN_WIDTH-1 - g->p.x; - y = GDISP_SCREEN_HEIGHT-1 - g->p.y; - break; - case GDISP_ROTATE_270: - x = GDISP_SCREEN_HEIGHT-1 - g->p.y; - y = g->p.x; - break; - } - if (gdispColor2Native(g->p.color) != Black) - RAM(g)[xyaddr(x, y)] |= xybit(y); - else - RAM(g)[xyaddr(x, y)] &= ~xybit(y); - g->flags |= GDISP_FLG_NEEDFLUSH; - } +LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) { + coord_t x, y; + + switch(g->g.Orientation) { + default: + case GDISP_ROTATE_0: + x = g->p.x; + y = g->p.y; + break; + case GDISP_ROTATE_90: + x = g->p.y; + y = GDISP_SCREEN_HEIGHT-1 - g->p.x; + break; + case GDISP_ROTATE_180: + x = GDISP_SCREEN_WIDTH-1 - g->p.x; + y = GDISP_SCREEN_HEIGHT-1 - g->p.y; + break; + case GDISP_ROTATE_270: + x = GDISP_SCREEN_HEIGHT-1 - g->p.y; + y = g->p.x; + break; + } + if (gdispColor2Native(g->p.color) != Black) + RAM(g)[xyaddr(x, y)] |= xybit(y); + else + RAM(g)[xyaddr(x, y)] &= ~xybit(y); + g->flags |= GDISP_FLG_NEEDFLUSH; +} #endif #if GDISP_HARDWARE_PIXELREAD - LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { - coord_t x, y; - - switch(g->g.Orientation) { - default: - case GDISP_ROTATE_0: - x = g->p.x; - y = g->p.y; - break; - case GDISP_ROTATE_90: - x = g->p.y; - y = GDISP_SCREEN_HEIGHT-1 - g->p.x; - break; - case GDISP_ROTATE_180: - x = GDISP_SCREEN_WIDTH-1 - g->p.x; - y = GDISP_SCREEN_HEIGHT-1 - g->p.y; - break; - case GDISP_ROTATE_270: - x = GDISP_SCREEN_HEIGHT-1 - g->p.y; - y = g->p.x; - break; - } - return (RAM(g)[xyaddr(x, y)] & xybit(y)) ? White : Black; - } +LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { + coord_t x, y; + + switch(g->g.Orientation) { + default: + case GDISP_ROTATE_0: + x = g->p.x; + y = g->p.y; + break; + case GDISP_ROTATE_90: + x = g->p.y; + y = GDISP_SCREEN_HEIGHT-1 - g->p.x; + break; + case GDISP_ROTATE_180: + x = GDISP_SCREEN_WIDTH-1 - g->p.x; + y = GDISP_SCREEN_HEIGHT-1 - g->p.y; + break; + case GDISP_ROTATE_270: + x = GDISP_SCREEN_HEIGHT-1 - g->p.y; + y = g->p.x; + break; + } + return (RAM(g)[xyaddr(x, y)] & xybit(y)) ? White : Black; +} #endif #if GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL - LLDSPEC void gdisp_lld_control(GDisplay *g) { - switch(g->p.x) { - case GDISP_CONTROL_POWER: - if (g->g.Powermode == (powermode_t)g->p.ptr) - return; - switch((powermode_t)g->p.ptr) { - case powerOff: - case powerSleep: - case powerDeepSleep: - acquire_bus(g); - write_cmd(g, ST7565_DISPLAY_OFF); - release_bus(g); - break; - case powerOn: - acquire_bus(g); - write_cmd(g, ST7565_DISPLAY_ON); - release_bus(g); - break; - default: - return; - } - g->g.Powermode = (powermode_t)g->p.ptr; - return; - - case GDISP_CONTROL_ORIENTATION: - if (g->g.Orientation == (orientation_t)g->p.ptr) - return; - switch((orientation_t)g->p.ptr) { - /* Rotation is handled by the drawing routines */ - case GDISP_ROTATE_0: - case GDISP_ROTATE_180: - g->g.Height = GDISP_SCREEN_HEIGHT; - g->g.Width = GDISP_SCREEN_WIDTH; - break; - case GDISP_ROTATE_90: - case GDISP_ROTATE_270: - g->g.Height = GDISP_SCREEN_WIDTH; - g->g.Width = GDISP_SCREEN_HEIGHT; - break; - default: - return; - } - g->g.Orientation = (orientation_t)g->p.ptr; - return; - - case GDISP_CONTROL_CONTRAST: - if ((unsigned)g->p.ptr > 100) - g->p.ptr = (void *)100; - acquire_bus(g); - write_cmd2(g, ST7565_CONTRAST, ((((unsigned)g->p.ptr)<<6)/101) & 0x3F); - release_bus(g); - g->g.Contrast = (unsigned)g->p.ptr; - return; - } - } +LLDSPEC void gdisp_lld_control(GDisplay *g) { + switch(g->p.x) { + case GDISP_CONTROL_POWER: + if (g->g.Powermode == (powermode_t)g->p.ptr) + return; + switch((powermode_t)g->p.ptr) { + case powerOff: + case powerSleep: + case powerDeepSleep: + acquire_bus(g); + enter_cmd_mode(g); + write_cmd(g, ST7565_DISPLAY_OFF); + flush_cmd(g); + release_bus(g); + break; + case powerOn: + acquire_bus(g); + enter_cmd_mode(g); + write_cmd(g, ST7565_DISPLAY_ON); + flush_cmd(g); + release_bus(g); + break; + default: + return; + } + g->g.Powermode = (powermode_t)g->p.ptr; + return; + + case GDISP_CONTROL_ORIENTATION: + if (g->g.Orientation == (orientation_t)g->p.ptr) + return; + switch((orientation_t)g->p.ptr) { + /* Rotation is handled by the drawing routines */ + case GDISP_ROTATE_0: + case GDISP_ROTATE_180: + g->g.Height = GDISP_SCREEN_HEIGHT; + g->g.Width = GDISP_SCREEN_WIDTH; + break; + case GDISP_ROTATE_90: + case GDISP_ROTATE_270: + g->g.Height = GDISP_SCREEN_WIDTH; + g->g.Width = GDISP_SCREEN_HEIGHT; + break; + default: + return; + } + g->g.Orientation = (orientation_t)g->p.ptr; + return; + + case GDISP_CONTROL_CONTRAST: + if ((unsigned)g->p.ptr > 100) + g->p.ptr = (void *)100; + acquire_bus(g); + enter_cmd_mode(g); + write_cmd2(g, ST7565_CONTRAST, ((((unsigned)g->p.ptr)<<6)/101) & 0x3F); + flush_cmd(g); + release_bus(g); + g->g.Contrast = (unsigned)g->p.ptr; + return; + } +} #endif // GDISP_NEED_CONTROL #endif // GFX_USE_GDISP From a8f5897b976ee9f16b1798db38fb0ee4b8981c9e Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 1 Apr 2017 16:36:34 +0300 Subject: [PATCH 088/117] Add support for blitting to the Infinity LCD --- .../gdisp/st7565ergodox/gdisp_lld_ST7565.c | 26 +++++++++++++++++++ .../gdisp/st7565ergodox/gdisp_lld_config.h | 11 ++++---- keyboards/ergodox/infinity/gfxconf.h | 2 +- 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c index 4547f141..2c8a168e 100644 --- a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c +++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c @@ -254,6 +254,32 @@ LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { } #endif +LLDSPEC void gdisp_lld_blit_area(GDisplay *g) { + uint8_t* buffer = (uint8_t*)g->p.ptr; + int linelength = g->p.cx; + for (int i = 0; i < g->p.cy; i++) { + unsigned dstx = g->p.x; + unsigned dsty = g->p.y + i; + unsigned srcx = g->p.x1; + unsigned srcy = g->p.y1 + i; + unsigned srcbit = srcy * g->p.x2 + srcx; + for(int j=0; j < linelength; j++) { + uint8_t src = buffer[srcbit / 8]; + uint8_t bit = 7-(srcbit % 8); + uint8_t bitset = (src >> bit) & 1; + uint8_t* dst = &(RAM(g)[xyaddr(dstx, dsty)]); + if (bitset) { + *dst |= xybit(dsty); + } + else { + *dst &= ~xybit(dsty); + } + dstx++; + srcbit++; + } + } +} + #if GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL LLDSPEC void gdisp_lld_control(GDisplay *g) { switch(g->p.x) { diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_config.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_config.h index 48587b9e..2b66a877 100644 --- a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_config.h +++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_config.h @@ -14,12 +14,13 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_FLUSH TRUE // This controller requires flushing -#define GDISP_HARDWARE_DRAWPIXEL TRUE -#define GDISP_HARDWARE_PIXELREAD TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_FLUSH TRUE // This controller requires flushing +#define GDISP_HARDWARE_DRAWPIXEL TRUE +#define GDISP_HARDWARE_PIXELREAD TRUE +#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_BITFILLS TRUE -#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_MONO +#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_MONO #endif /* GFX_USE_GDISP */ diff --git a/keyboards/ergodox/infinity/gfxconf.h b/keyboards/ergodox/infinity/gfxconf.h index 8caa577b..45b9f585 100644 --- a/keyboards/ergodox/infinity/gfxconf.h +++ b/keyboards/ergodox/infinity/gfxconf.h @@ -143,7 +143,7 @@ #define GDISP_HARDWARE_DRAWPIXEL TRUE #define GDISP_HARDWARE_CLEARS FALSE #define GDISP_HARDWARE_FILLS FALSE - #define GDISP_HARDWARE_BITFILLS FALSE + //#define GDISP_HARDWARE_BITFILLS FALSE #define GDISP_HARDWARE_SCROLL FALSE #define GDISP_HARDWARE_PIXELREAD TRUE #define GDISP_HARDWARE_CONTROL TRUE From e6f7a8a47a82258725683980b83e215c8323aef2 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 1 Apr 2017 16:37:31 +0300 Subject: [PATCH 089/117] Display QMK logo at startup of Infinity Ergodox --- keyboards/ergodox/infinity/lcd_logo.png | Bin 0 -> 490 bytes keyboards/ergodox/infinity/visualizer.c | 89 +++++++++++++++++------- 2 files changed, 65 insertions(+), 24 deletions(-) create mode 100644 keyboards/ergodox/infinity/lcd_logo.png diff --git a/keyboards/ergodox/infinity/lcd_logo.png b/keyboards/ergodox/infinity/lcd_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..6cf26fc6783a5b586eedbc6ff0940e124795e9bf GIT binary patch literal 490 zcmVwbn1gKp4ks>ggHBQn#f%?f(k66Mz*M@DZc5GX^?yF7n3m0^nAJyA1J9 zXB@WzkY=`ql?*WpcLLz{<2wyX>!$tCwhj4L*#2&>7W_UPg`>t&iX0$icIkD+k+w)JLfu z=^qB|3q53BAu5w2h~wX`dshvxcTNj{TdG$bz$nHq<-!#pSrd0>faF. #include "visualizer.h" #include "led_test.h" -static const char* welcome_text[] = {"TMK", "Infinity Ergodox"}; +// To generate an image array like this +// Ensure the image is 128 x 32 or smaller +// Convert the bitmap to a C array using a program like http://www.riuson.com/lcd-image-converter/ +// Ensure the the conversion process produces a monochrome format array - 1 bit/pixel, left to right, top to bottom +// Update array in the source code with the C array produced by the conversion program + +// The image below is generated from lcd_logo.png +static const uint8_t image_data_lcd_logo[512] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xf8, 0xfe, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x06, 0x29, 0x41, 0x24, 0x52, 0x24, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x42, 0xaa, 0xaa, 0xaa, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x82, 0x28, 0xaa, 0xae, 0x8c, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x43, 0x28, 0xaa, 0xaa, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x0a, 0x55, 0x42, 0x28, 0xaa, 0xaa, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x05, 0x45, 0x42, 0x28, 0x89, 0x4a, 0x86, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x18, 0x38, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x1c, 0x38, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x0e, 0x38, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x03, 0xff, 0x80, 0x04, 0x45, 0x14, 0xa4, 0x92, 0x83, 0x52, 0x22, 0x22, 0x36, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x0a, 0xaa, 0xaa, 0xaa, 0xba, 0x84, 0x55, 0x55, 0x57, 0x45, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x08, 0xaa, 0xaa, 0xaa, 0x92, 0xb2, 0x55, 0x55, 0x42, 0x65, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x08, 0xaa, 0xaa, 0xaa, 0x92, 0x81, 0x56, 0x65, 0x42, 0x45, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x0a, 0xaa, 0xaa, 0xaa, 0x92, 0x81, 0x54, 0x45, 0x42, 0x45, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x04, 0x48, 0xa2, 0x4a, 0x89, 0x06, 0x24, 0x42, 0x41, 0x36, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; + +static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0x80); +static const uint32_t initial_color = LCD_COLOR(0, 0, 0xFF); -// Just an example how to write custom keyframe functions, we could have moved -// all this into the init function -bool display_welcome(keyframe_animation_t* animation, visualizer_state_t* state) { +bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { + (void)state; (void)animation; + (void)state; // Read the uGFX documentation for information how to use the displays // http://wiki.ugfx.org/index.php/Main_Page gdispClear(White); + // You can use static variables for things that can't be found in the animation - // or state structs - gdispDrawString(0, 3, welcome_text[0], state->font_dejavusansbold12, Black); - gdispDrawString(0, 15, welcome_text[1], state->font_dejavusansbold12, Black); + // or state structs, here we use the image + + //gdispGBlitArea is a tricky function to use since it supports blitting part of the image + // if you have full screen image, then just use 128 and 32 for both source and target dimensions + gdispGBlitArea(GDISP, 0, 0, 128, 32, 0, 0, 128, (pixel_t*)image_data_lcd_logo); + // Always remember to flush the display gdispFlush(); - // you could set the backlight color as well, but we won't do it here, since - // it's part of the following animation - // lcd_backlight_color(hue, saturation, intensity); - // We don't need constant updates, just drawing the screen once is enough return false; } @@ -56,13 +99,12 @@ bool display_welcome(keyframe_animation_t* animation, visualizer_state_t* state) // Don't worry, if the startup animation is long, you can use the keyboard like normal // during that time static keyframe_animation_t startup_animation = { - .num_frames = 4, + .num_frames = 3, .loop = false, - .frame_lengths = {0, gfxMillisecondsToTicks(1000), gfxMillisecondsToTicks(5000), 0}, + .frame_lengths = {0, gfxMillisecondsToTicks(10000), 0}, .frame_functions = { - display_welcome, + display_logo, keyframe_animate_backlight_color, - keyframe_no_operation, enable_visualization }, }; @@ -78,6 +120,7 @@ static keyframe_animation_t color_animation = { .frame_functions = {keyframe_no_operation, keyframe_animate_backlight_color}, }; + // The LCD animation alternates between the layer name display and a // bitmap that displays all active layers static keyframe_animation_t lcd_animation = { @@ -99,14 +142,13 @@ static keyframe_animation_t suspend_animation = { }; static keyframe_animation_t resume_animation = { - .num_frames = 5, + .num_frames = 4, .loop = false, - .frame_lengths = {0, 0, gfxMillisecondsToTicks(1000), gfxMillisecondsToTicks(5000), 0}, + .frame_lengths = {0, 0, gfxMillisecondsToTicks(10000), 0}, .frame_functions = { keyframe_enable_lcd_and_backlight, - display_welcome, + display_logo, keyframe_animate_backlight_color, - keyframe_no_operation, enable_visualization, }, }; @@ -115,10 +157,9 @@ void initialize_user_visualizer(visualizer_state_t* state) { // The brightness will be dynamically adjustable in the future // But for now, change it here. lcd_backlight_brightness(0x50); - state->current_lcd_color = LCD_COLOR(0x00, 0x00, 0xFF); - state->target_lcd_color = LCD_COLOR(0x10, 0xFF, 0xFF); + state->current_lcd_color = initial_color; + state->target_lcd_color = logo_background_color; start_keyframe_animation(&startup_animation); - start_keyframe_animation(&led_test_animation); } void update_user_visualizer_state(visualizer_state_t* state) { @@ -161,8 +202,8 @@ void user_visualizer_suspend(visualizer_state_t* state) { } void user_visualizer_resume(visualizer_state_t* state) { - state->current_lcd_color = LCD_COLOR(0x00, 0x00, 0x00); - state->target_lcd_color = LCD_COLOR(0x10, 0xFF, 0xFF); + state->current_lcd_color = initial_color; + state->target_lcd_color = logo_background_color; start_keyframe_animation(&resume_animation); start_keyframe_animation(&led_test_animation); } From bc97413bf70b1906b387dea35bb22575ec57eff8 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 1 Apr 2017 16:38:12 +0300 Subject: [PATCH 090/117] Disable LEDs on Infinity Ergodox --- keyboards/ergodox/infinity/rules.mk | 2 +- keyboards/ergodox/infinity/visualizer.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/ergodox/infinity/rules.mk b/keyboards/ergodox/infinity/rules.mk index d51574ac..aaadfe34 100644 --- a/keyboards/ergodox/infinity/rules.mk +++ b/keyboards/ergodox/infinity/rules.mk @@ -61,7 +61,7 @@ CUSTOM_MATRIX ?= yes # Custom matrix file SERIAL_LINK_ENABLE = yes VISUALIZER_ENABLE ?= yes LCD_ENABLE ?= yes -LED_ENABLE ?= yes +LED_ENABLE ?= no LCD_BACKLIGHT_ENABLE ?= yes MIDI_ENABLE = no RGBLIGHT_ENABLE = no diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index 0ce1d4ae..c8fc3d78 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -27,7 +27,6 @@ along with this program. If not, see . #endif #include "visualizer.h" -#include "led_test.h" // To generate an image array like this // Ensure the image is 128 x 32 or smaller @@ -205,5 +204,4 @@ void user_visualizer_resume(visualizer_state_t* state) { state->current_lcd_color = initial_color; state->target_lcd_color = logo_background_color; start_keyframe_animation(&resume_animation); - start_keyframe_animation(&led_test_animation); } From f113f95440f8cd7377930868656caf515dbd609c Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 1 Apr 2017 17:43:38 +0300 Subject: [PATCH 091/117] Move CIE1931 and breathing tables to its own file --- build_keyboard.mk | 23 ++++++ .../gdisp/IS31FL3731C/gdisp_IS31FL3731C.c | 37 ++-------- quantum/led_tables.c | 71 +++++++++++++++++++ quantum/led_tables.h | 30 ++++++++ quantum/rgblight.c | 58 ++------------- quantum/visualizer/visualizer.mk | 4 +- 6 files changed, 136 insertions(+), 87 deletions(-) create mode 100644 quantum/led_tables.c create mode 100644 quantum/led_tables.h diff --git a/build_keyboard.mk b/build_keyboard.mk index ad92892e..79d2b6b0 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk @@ -196,6 +196,8 @@ ifeq ($(strip $(RGBLIGHT_ENABLE)), yes) OPT_DEFS += -DRGBLIGHT_ENABLE SRC += $(QUANTUM_DIR)/light_ws2812.c SRC += $(QUANTUM_DIR)/rgblight.c + CIE1931_CURVE = yes + LED_BREATHING_TABLE = yes endif ifeq ($(strip $(TAP_DANCE_ENABLE)), yes) @@ -223,6 +225,27 @@ ifneq ($(strip $(MAX_VARIABLE_TRACE_SIZE)),) endif endif +ifeq ($(strip $(LCD_ENABLE)), yes) +CIE1931_CURVE = yes +endif + +ifeq ($(strip $(LED_ENABLE)), yes) +CIE1931_CURVE = yes +endif + +ifeq ($(strip $(CIE1931_CURVE)), yes) + OPT_DEFS += -DUSE_CIE1931_CURVE + LED_TABLES = yes +endif +ifeq ($(strip $(LED_BREATHING_TABLE)), yes) + OPT_DEFS += -DUSE_LED_BREATHING_TABLE + LED_TABLES = yes +endif + +ifeq ($(strip $(LED_TABLES)), yes) + SRC += $(QUANTUM_DIR)/led_tables.c +endif + # Optimize size but this may cause error "relocation truncated to fit" #EXTRALDFLAGS = -Wl,--relax diff --git a/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c index 1d21f0c4..ea09c4bb 100644 --- a/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c +++ b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c @@ -25,6 +25,10 @@ along with this program. If not, see . #include "board_IS31FL3731C.h" + +// Can't include led_tables from here +extern const uint8_t CIE1931_CURVE[]; + /*===========================================================================*/ /* Driver local definitions. */ /*===========================================================================*/ @@ -100,37 +104,6 @@ along with this program. If not, see . #define IS31 -//Generated by http://jared.geek.nz/2013/feb/linear-led-pwm -const unsigned char cie[256] = { - 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, - 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, - 5, 5, 6, 6, 6, 6, 6, 7, 7, 7, - 7, 8, 8, 8, 8, 9, 9, 9, 10, 10, - 10, 10, 11, 11, 11, 12, 12, 12, 13, 13, - 13, 14, 14, 15, 15, 15, 16, 16, 17, 17, - 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, - 22, 23, 23, 24, 24, 25, 25, 26, 26, 27, - 28, 28, 29, 29, 30, 31, 31, 32, 32, 33, - 34, 34, 35, 36, 37, 37, 38, 39, 39, 40, - 41, 42, 43, 43, 44, 45, 46, 47, 47, 48, - 49, 50, 51, 52, 53, 54, 54, 55, 56, 57, - 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, - 68, 70, 71, 72, 73, 74, 75, 76, 77, 79, - 80, 81, 82, 83, 85, 86, 87, 88, 90, 91, - 92, 94, 95, 96, 98, 99, 100, 102, 103, 105, - 106, 108, 109, 110, 112, 113, 115, 116, 118, 120, - 121, 123, 124, 126, 128, 129, 131, 132, 134, 136, - 138, 139, 141, 143, 145, 146, 148, 150, 152, 154, - 155, 157, 159, 161, 163, 165, 167, 169, 171, 173, - 175, 177, 179, 181, 183, 185, 187, 189, 191, 193, - 196, 198, 200, 202, 204, 207, 209, 211, 214, 216, - 218, 220, 223, 225, 228, 230, 232, 235, 237, 240, - 242, 245, 247, 250, 252, 255, -}; - - /*===========================================================================*/ /* Driver local functions. */ /*===========================================================================*/ @@ -231,7 +204,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { uint8_t* src = PRIV(g)->frame_buffer; for (int y=0;ywrite_buffer[get_led_address(g, x, y)]=cie[*src]; + PRIV(g)->write_buffer[get_led_address(g, x, y)]=CIE1931_CURVE[*src]; ++src; } } diff --git a/quantum/led_tables.c b/quantum/led_tables.c new file mode 100644 index 00000000..b99f2620 --- /dev/null +++ b/quantum/led_tables.c @@ -0,0 +1,71 @@ +/* +Copyright 2017 Fred Sundvik + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include "led_tables.h" + + +#ifdef USE_CIE1931_CURVE +// Lightness curve using the CIE 1931 lightness formula +//Generated by the python script provided in http://jared.geek.nz/2013/feb/linear-led-pwm +const uint8_t CIE1931_CURVE[] PROGMEM = { + 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, + 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, + 5, 5, 6, 6, 6, 6, 6, 7, 7, 7, + 7, 8, 8, 8, 8, 9, 9, 9, 10, 10, + 10, 10, 11, 11, 11, 12, 12, 12, 13, 13, + 13, 14, 14, 15, 15, 15, 16, 16, 17, 17, + 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, + 22, 23, 23, 24, 24, 25, 25, 26, 26, 27, + 28, 28, 29, 29, 30, 31, 31, 32, 32, 33, + 34, 34, 35, 36, 37, 37, 38, 39, 39, 40, + 41, 42, 43, 43, 44, 45, 46, 47, 47, 48, + 49, 50, 51, 52, 53, 54, 54, 55, 56, 57, + 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, + 68, 70, 71, 72, 73, 74, 75, 76, 77, 79, + 80, 81, 82, 83, 85, 86, 87, 88, 90, 91, + 92, 94, 95, 96, 98, 99, 100, 102, 103, 105, + 106, 108, 109, 110, 112, 113, 115, 116, 118, 120, + 121, 123, 124, 126, 128, 129, 131, 132, 134, 136, + 138, 139, 141, 143, 145, 146, 148, 150, 152, 154, + 155, 157, 159, 161, 163, 165, 167, 169, 171, 173, + 175, 177, 179, 181, 183, 185, 187, 189, 191, 193, + 196, 198, 200, 202, 204, 207, 209, 211, 214, 216, + 218, 220, 223, 225, 228, 230, 232, 235, 237, 240, + 242, 245, 247, 250, 252, 255, + }; +#endif + +#ifdef USE_LED_BREATHING_TABLE +const uint8_t LED_BREATHING_TABLE[] PROGMEM = { + 0, 0, 0, 0, 1, 1, 1, 2, 2, 3, 4, 5, 5, 6, 7, 9, + 10, 11, 12, 14, 15, 17, 18, 20, 21, 23, 25, 27, 29, 31, 33, 35, + 37, 40, 42, 44, 47, 49, 52, 54, 57, 59, 62, 65, 67, 70, 73, 76, + 79, 82, 85, 88, 90, 93, 97, 100, 103, 106, 109, 112, 115, 118, 121, 124, + 127, 131, 134, 137, 140, 143, 146, 149, 152, 155, 158, 162, 165, 167, 170, 173, + 176, 179, 182, 185, 188, 190, 193, 196, 198, 201, 203, 206, 208, 211, 213, 215, + 218, 220, 222, 224, 226, 228, 230, 232, 234, 235, 237, 238, 240, 241, 243, 244, + 245, 246, 248, 249, 250, 250, 251, 252, 253, 253, 254, 254, 254, 255, 255, 255, + 255, 255, 255, 255, 254, 254, 254, 253, 253, 252, 251, 250, 250, 249, 248, 246, + 245, 244, 243, 241, 240, 238, 237, 235, 234, 232, 230, 228, 226, 224, 222, 220, + 218, 215, 213, 211, 208, 206, 203, 201, 198, 196, 193, 190, 188, 185, 182, 179, + 176, 173, 170, 167, 165, 162, 158, 155, 152, 149, 146, 143, 140, 137, 134, 131, + 128, 124, 121, 118, 115, 112, 109, 106, 103, 100, 97, 93, 90, 88, 85, 82, + 79, 76, 73, 70, 67, 65, 62, 59, 57, 54, 52, 49, 47, 44, 42, 40, + 37, 35, 33, 31, 29, 27, 25, 23, 21, 20, 18, 17, 15, 14, 12, 11, + 10, 9, 7, 6, 5, 5, 4, 3, 2, 2, 1, 1, 1, 0, 0, 0 +}; +#endif diff --git a/quantum/led_tables.h b/quantum/led_tables.h new file mode 100644 index 00000000..af49bf33 --- /dev/null +++ b/quantum/led_tables.h @@ -0,0 +1,30 @@ +/* +Copyright 2017 Fred Sundvik + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#ifndef LED_TABLES_H +#define LED_TABLES_H + +#include "progmem.h" +#include + +#ifdef USE_CIE1931_CURVE +extern const uint8_t CIE1931_CURVE[] PROGMEM; +#endif + +#ifdef USE_LED_BREATHING_TABLE +extern const uint8_t LED_BREATHING_TABLE[] PROGMEM; +#endif + +#endif diff --git a/quantum/rgblight.c b/quantum/rgblight.c index eff70aae..4eec2a77 100644 --- a/quantum/rgblight.c +++ b/quantum/rgblight.c @@ -20,56 +20,8 @@ #include "timer.h" #include "rgblight.h" #include "debug.h" +#include "led_tables.h" -// Lightness curve using the CIE 1931 lightness formula -//Generated by the python script provided in http://jared.geek.nz/2013/feb/linear-led-pwm -const uint8_t DIM_CURVE[] PROGMEM = { - 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, - 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, - 5, 5, 6, 6, 6, 6, 6, 7, 7, 7, - 7, 8, 8, 8, 8, 9, 9, 9, 10, 10, - 10, 10, 11, 11, 11, 12, 12, 12, 13, 13, - 13, 14, 14, 15, 15, 15, 16, 16, 17, 17, - 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, - 22, 23, 23, 24, 24, 25, 25, 26, 26, 27, - 28, 28, 29, 29, 30, 31, 31, 32, 32, 33, - 34, 34, 35, 36, 37, 37, 38, 39, 39, 40, - 41, 42, 43, 43, 44, 45, 46, 47, 47, 48, - 49, 50, 51, 52, 53, 54, 54, 55, 56, 57, - 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, - 68, 70, 71, 72, 73, 74, 75, 76, 77, 79, - 80, 81, 82, 83, 85, 86, 87, 88, 90, 91, - 92, 94, 95, 96, 98, 99, 100, 102, 103, 105, - 106, 108, 109, 110, 112, 113, 115, 116, 118, 120, - 121, 123, 124, 126, 128, 129, 131, 132, 134, 136, - 138, 139, 141, 143, 145, 146, 148, 150, 152, 154, - 155, 157, 159, 161, 163, 165, 167, 169, 171, 173, - 175, 177, 179, 181, 183, 185, 187, 189, 191, 193, - 196, 198, 200, 202, 204, 207, 209, 211, 214, 216, - 218, 220, 223, 225, 228, 230, 232, 235, 237, 240, - 242, 245, 247, 250, 252, 255, - }; - -const uint8_t RGBLED_BREATHING_TABLE[] PROGMEM = { - 0, 0, 0, 0, 1, 1, 1, 2, 2, 3, 4, 5, 5, 6, 7, 9, - 10, 11, 12, 14, 15, 17, 18, 20, 21, 23, 25, 27, 29, 31, 33, 35, - 37, 40, 42, 44, 47, 49, 52, 54, 57, 59, 62, 65, 67, 70, 73, 76, - 79, 82, 85, 88, 90, 93, 97, 100, 103, 106, 109, 112, 115, 118, 121, 124, - 127, 131, 134, 137, 140, 143, 146, 149, 152, 155, 158, 162, 165, 167, 170, 173, - 176, 179, 182, 185, 188, 190, 193, 196, 198, 201, 203, 206, 208, 211, 213, 215, - 218, 220, 222, 224, 226, 228, 230, 232, 234, 235, 237, 238, 240, 241, 243, 244, - 245, 246, 248, 249, 250, 250, 251, 252, 253, 253, 254, 254, 254, 255, 255, 255, - 255, 255, 255, 255, 254, 254, 254, 253, 253, 252, 251, 250, 250, 249, 248, 246, - 245, 244, 243, 241, 240, 238, 237, 235, 234, 232, 230, 228, 226, 224, 222, 220, - 218, 215, 213, 211, 208, 206, 203, 201, 198, 196, 193, 190, 188, 185, 182, 179, - 176, 173, 170, 167, 165, 162, 158, 155, 152, 149, 146, 143, 140, 137, 134, 131, - 128, 124, 121, 118, 115, 112, 109, 106, 103, 100, 97, 93, 90, 88, 85, 82, - 79, 76, 73, 70, 67, 65, 62, 59, 57, 54, 52, 49, 47, 44, 42, 40, - 37, 35, 33, 31, 29, 27, 25, 23, 21, 20, 18, 17, 15, 14, 12, 11, - 10, 9, 7, 6, 5, 5, 4, 3, 2, 2, 1, 1, 1, 0, 0, 0 -}; __attribute__ ((weak)) const uint8_t RGBLED_BREATHING_INTERVALS[] PROGMEM = {30, 20, 10, 5}; @@ -135,9 +87,9 @@ void sethsv(uint16_t hue, uint8_t sat, uint8_t val, LED_TYPE *led1) { break; } } - r = pgm_read_byte(&DIM_CURVE[r]); - g = pgm_read_byte(&DIM_CURVE[g]); - b = pgm_read_byte(&DIM_CURVE[b]); + r = pgm_read_byte(&CIE1931_CURVE[r]); + g = pgm_read_byte(&CIE1931_CURVE[g]); + b = pgm_read_byte(&CIE1931_CURVE[b]); setrgb(r, g, b, led1); } @@ -509,7 +461,7 @@ void rgblight_effect_breathing(uint8_t interval) { } last_timer = timer_read(); - rgblight_sethsv_noeeprom(rgblight_config.hue, rgblight_config.sat, pgm_read_byte(&RGBLED_BREATHING_TABLE[pos])); + rgblight_sethsv_noeeprom(rgblight_config.hue, rgblight_config.sat, pgm_read_byte(&LED_BREATHING_TABLE[pos])); pos = (pos + 1) % 256; } void rgblight_effect_rainbow_mood(uint8_t interval) { diff --git a/quantum/visualizer/visualizer.mk b/quantum/visualizer/visualizer.mk index 8f5fb893..3861cb1f 100644 --- a/quantum/visualizer/visualizer.mk +++ b/quantum/visualizer/visualizer.mk @@ -32,12 +32,12 @@ OPT_DEFS += -DLCD_ENABLE ULIBS += -lm endif -ifdef LCD_BACKLIGHT_ENABLE +ifeq ($(strip $(LCD_ENABLE)), yes) SRC += $(VISUALIZER_DIR)/lcd_backlight.c OPT_DEFS += -DLCD_BACKLIGHT_ENABLE endif -ifdef LED_ENABLE +ifeq ($(strip $(LED_ENABLE)), yes) SRC += $(VISUALIZER_DIR)/led_test.c OPT_DEFS += -DLED_ENABLE endif From 951b6f33a0dc479d29831aaa5c73fc526faf0471 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 1 Apr 2017 21:28:27 +0300 Subject: [PATCH 092/117] CIE 1931 for the LCD backlight --- keyboards/ergodox/infinity/infinity.c | 29 ++++++++++++++++++++++--- keyboards/ergodox/infinity/visualizer.c | 6 ++--- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/keyboards/ergodox/infinity/infinity.c b/keyboards/ergodox/infinity/infinity.c index 02db67ea..ecc072ab 100644 --- a/keyboards/ergodox/infinity/infinity.c +++ b/keyboards/ergodox/infinity/infinity.c @@ -70,10 +70,33 @@ void lcd_backlight_hal_init(void) { RGB_PORT->PCR[BLUE_PIN] = RGB_MODE; } +static uint16_t cie_lightness(uint16_t v) { + // The CIE 1931 formula for lightness + // Y = luminance (output) 0-1 + // L = lightness input 0 - 100 + + // Y = (L* / 902.3) if L* <= 8 + // Y = ((L* + 16) / 116)^3 if L* > 8 + + float l = 100.0f * (v / 65535.0f); + float y = 0.0f; + if (l <= 8.0f) { + y = l / 902.3; + } + else { + y = ((l + 16.0f) / 116.0f); + y = y * y * y; + if (y > 1.0f) { + y = 1.0f; + } + } + return y * 65535.0f; +} + void lcd_backlight_hal_color(uint16_t r, uint16_t g, uint16_t b) { - CHANNEL_RED.CnV = r; - CHANNEL_GREEN.CnV = g; - CHANNEL_BLUE.CnV = b; + CHANNEL_RED.CnV = cie_lightness(r); + CHANNEL_GREEN.CnV = cie_lightness(g); + CHANNEL_BLUE.CnV = cie_lightness(b); } __attribute__ ((weak)) diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index c8fc3d78..12336fdc 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -70,8 +70,8 @@ static const uint8_t image_data_lcd_logo[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; -static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0x80); -static const uint32_t initial_color = LCD_COLOR(0, 0, 0xFF); +static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0xFF); +static const uint32_t initial_color = LCD_COLOR(0, 0, 0); bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { (void)state; @@ -155,7 +155,7 @@ static keyframe_animation_t resume_animation = { void initialize_user_visualizer(visualizer_state_t* state) { // The brightness will be dynamically adjustable in the future // But for now, change it here. - lcd_backlight_brightness(0x50); + lcd_backlight_brightness(130); state->current_lcd_color = initial_color; state->target_lcd_color = logo_background_color; start_keyframe_animation(&startup_animation); From 9a4ce28683b667ab67d48d92196bab7e277d4800 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 1 Apr 2017 22:52:58 +0300 Subject: [PATCH 093/117] Display layer bitmap and keyboard led states on the LCD --- keyboards/ergodox/infinity/visualizer.c | 86 ++++++++++++++++--------- quantum/visualizer/visualizer.c | 38 ++++++++++- quantum/visualizer/visualizer.h | 4 +- 3 files changed, 97 insertions(+), 31 deletions(-) diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index 12336fdc..6af3a72e 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -73,6 +73,14 @@ static const uint8_t image_data_lcd_logo[512] = { static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0xFF); static const uint32_t initial_color = LCD_COLOR(0, 0, 0); +typedef enum { + LCD_STATE_INITIAL, + LCD_STATE_LAYER_BITMAP, + LCD_STATE_BITMAP_AND_LEDS, +} lcd_state_t; + +static lcd_state_t lcd_state = LCD_STATE_INITIAL; + bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { (void)state; (void)animation; @@ -122,11 +130,18 @@ static keyframe_animation_t color_animation = { // The LCD animation alternates between the layer name display and a // bitmap that displays all active layers -static keyframe_animation_t lcd_animation = { +static keyframe_animation_t lcd_bitmap_animation = { + .num_frames = 1, + .loop = false, + .frame_lengths = {gfxMillisecondsToTicks(0)}, + .frame_functions = {keyframe_display_layer_bitmap}, +}; + +static keyframe_animation_t lcd_bitmap_leds_animation = { .num_frames = 2, .loop = true, .frame_lengths = {gfxMillisecondsToTicks(2000), gfxMillisecondsToTicks(2000)}, - .frame_functions = {keyframe_display_layer_text, keyframe_display_layer_bitmap}, + .frame_functions = {keyframe_display_layer_bitmap, keyframe_display_led_states}, }; static keyframe_animation_t suspend_animation = { @@ -158,38 +173,50 @@ void initialize_user_visualizer(visualizer_state_t* state) { lcd_backlight_brightness(130); state->current_lcd_color = initial_color; state->target_lcd_color = logo_background_color; + lcd_state = LCD_STATE_INITIAL; start_keyframe_animation(&startup_animation); } -void update_user_visualizer_state(visualizer_state_t* state) { - // Add more tests, change the colors and layer texts here - // Usually you want to check the high bits (higher layers first) - // because that's the order layers are processed for keypresses - // You can for check for example: - // state->status.layer - // state->status.default_layer - // state->status.leds (see led.h for available statuses) - if (state->status.layer & 0x8) { - state->target_lcd_color = LCD_COLOR(0xC0, 0xB0, 0xFF); - state->layer_text = "Numpad"; - } - else if (state->status.layer & 0x4) { - state->target_lcd_color = LCD_COLOR(0, 0xB0, 0xFF); - state->layer_text = "KBD functions"; - } - else if (state->status.layer & 0x2) { - state->target_lcd_color = LCD_COLOR(0x80, 0xB0, 0xFF); - state->layer_text = "Function keys"; - } - else { +void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t prev_status) { + // Check the status here to start and stop animations + // You might have to save some state, like the current animation here so that you can start the right + // This function is called every time the status changes + + // NOTE that this is called from the visualizer thread, so don't access anything else outside the status + // This is also important because the slave won't have access to the active layer for example outside the + // status. + + if (lcd_state == LCD_STATE_INITIAL) { state->target_lcd_color = LCD_COLOR(0x40, 0xB0, 0xFF); - state->layer_text = "Default"; + start_keyframe_animation(&color_animation); + } + + if (state->status.leds) { + if (lcd_state != LCD_STATE_BITMAP_AND_LEDS || + state->status.leds != prev_status.leds || + state->status.layer != prev_status.layer || + state->status.default_layer != prev_status.default_layer) { + + // NOTE: that it doesn't matter if the animation isn't playing, stop will do nothing in that case + stop_keyframe_animation(&lcd_bitmap_animation); + + lcd_state = LCD_STATE_BITMAP_AND_LEDS; + // For information: + // The logic in this function makes sure that this doesn't happen, but if you call start on an + // animation that is already playing it will be restarted. + start_keyframe_animation(&lcd_bitmap_leds_animation); + } + } else { + if (lcd_state != LCD_STATE_LAYER_BITMAP || + state->status.layer != prev_status.layer || + state->status.default_layer != prev_status.default_layer) { + + stop_keyframe_animation(&lcd_bitmap_leds_animation); + + lcd_state = LCD_STATE_LAYER_BITMAP; + start_keyframe_animation(&lcd_bitmap_animation); + } } - // You can also stop existing animations, and start your custom ones here - // remember that you should normally have only one animation for the LCD - // and one for the background. But you can also combine them if you want. - start_keyframe_animation(&lcd_animation); - start_keyframe_animation(&color_animation); } void user_visualizer_suspend(visualizer_state_t* state) { @@ -203,5 +230,6 @@ void user_visualizer_suspend(visualizer_state_t* state) { void user_visualizer_resume(visualizer_state_t* state) { state->current_lcd_color = initial_color; state->target_lcd_color = logo_background_color; + lcd_state = LCD_STATE_INITIAL; start_keyframe_animation(&resume_animation); } diff --git a/quantum/visualizer/visualizer.c b/quantum/visualizer/visualizer.c index 5826d909..62ebebce 100644 --- a/quantum/visualizer/visualizer.c +++ b/quantum/visualizer/visualizer.c @@ -56,6 +56,8 @@ SOFTWARE. // mods status #include "action_util.h" +#include "led.h" + static visualizer_keyboard_status_t current_status = { .layer = 0xFFFFFFFF, .default_layer = 0xFFFFFFFF, @@ -350,6 +352,39 @@ bool keyframe_display_mods_bitmap(keyframe_animation_t* animation, visualizer_st gdispFlush(); return false; } + +bool keyframe_display_led_states(keyframe_animation_t* animation, visualizer_state_t* state) +{ + char output[sizeof("NUM CAPS SCRL COMP KANA")]; + uint8_t pos = 0; + + if (state->status.leds & (1u << USB_LED_NUM_LOCK)) { + memcpy(output + pos, "NUM ", 4); + pos += 4; + } + if (state->status.leds & (1u << USB_LED_CAPS_LOCK)) { + memcpy(output + pos, "CAPS ", 5); + pos += 5; + } + if (state->status.leds & (1u << USB_LED_SCROLL_LOCK)) { + memcpy(output + pos, "SCRL ", 5); + pos += 5; + } + if (state->status.leds & (1u << USB_LED_COMPOSE)) { + memcpy(output + pos, "COMP ", 5); + pos += 5; + } + if (state->status.leds & (1u << USB_LED_KANA)) { + memcpy(output + pos, "KANA ", 5); + pos += 5; + } + output[pos] = 0; + gdispClear(White); + gdispDrawString(0, 10, output, state->font_dejavusansbold12, Black); + gdispFlush(); + return false; +} + #endif // LCD_ENABLE bool keyframe_disable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state) { @@ -433,8 +468,9 @@ static DECLARE_THREAD_FUNCTION(visualizerThread, arg) { user_visualizer_suspend(&state); } else { + visualizer_keyboard_status_t prev_status = state.status; state.status = current_status; - update_user_visualizer_state(&state); + update_user_visualizer_state(&state, prev_status); } state.prev_lcd_color = state.current_lcd_color; } diff --git a/quantum/visualizer/visualizer.h b/quantum/visualizer/visualizer.h index 315af502..2c81cb9f 100644 --- a/quantum/visualizer/visualizer.h +++ b/quantum/visualizer/visualizer.h @@ -136,6 +136,8 @@ bool keyframe_display_layer_text(keyframe_animation_t* animation, visualizer_sta bool keyframe_display_layer_bitmap(keyframe_animation_t* animation, visualizer_state_t* state); // Displays a bitmap (0/1) of all the currently active mods bool keyframe_display_mods_bitmap(keyframe_animation_t* animation, visualizer_state_t* state); +// Displays the keyboard led states (CAPS (Caps lock), NUM (Num lock), SCRL (Scroll lock), COMP (Compose), KANA) +bool keyframe_display_led_states(keyframe_animation_t* animation, visualizer_state_t* state); bool keyframe_disable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state); bool keyframe_enable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state); @@ -146,7 +148,7 @@ bool enable_visualization(keyframe_animation_t* animation, visualizer_state_t* s // These functions have to be implemented by the user void initialize_user_visualizer(visualizer_state_t* state); -void update_user_visualizer_state(visualizer_state_t* state); +void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t prev_status); void user_visualizer_suspend(visualizer_state_t* state); void user_visualizer_resume(visualizer_state_t* state); From 39385144e7dc3337e623cdc8147b4a441f22fd62 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 2 Apr 2017 01:31:04 +0300 Subject: [PATCH 094/117] Emulate Ergodox EZ leds by LCD colors --- keyboards/ergodox/infinity/config.h | 2 + keyboards/ergodox/infinity/infinity.c | 22 ++- keyboards/ergodox/infinity/infinity.h | 71 ++++++---- keyboards/ergodox/infinity/visualizer.c | 175 ++++++++++++++++++++++-- quantum/visualizer/visualizer.c | 25 +++- quantum/visualizer/visualizer.h | 8 ++ 6 files changed, 258 insertions(+), 45 deletions(-) diff --git a/keyboards/ergodox/infinity/config.h b/keyboards/ergodox/infinity/config.h index 9e264083..6cde193e 100644 --- a/keyboards/ergodox/infinity/config.h +++ b/keyboards/ergodox/infinity/config.h @@ -54,6 +54,8 @@ along with this program. If not, see . // The visualizer needs gfx thread priorities #define VISUALIZER_THREAD_PRIORITY (NORMAL_PRIORITY - 2) +#define VISUALIZER_USER_DATA_SIZE 16 + /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/ergodox/infinity/infinity.c b/keyboards/ergodox/infinity/infinity.c index ecc072ab..62259ed3 100644 --- a/keyboards/ergodox/infinity/infinity.c +++ b/keyboards/ergodox/infinity/infinity.c @@ -126,34 +126,48 @@ void matrix_scan_kb(void) { matrix_scan_user(); } +__attribute__ ((weak)) void ergodox_board_led_on(void){ } +__attribute__ ((weak)) void ergodox_right_led_1_on(void){ } +__attribute__ ((weak)) void ergodox_right_led_2_on(void){ } +__attribute__ ((weak)) void ergodox_right_led_3_on(void){ } -void ergodox_right_led_on(uint8_t led){ -} - +__attribute__ ((weak)) void ergodox_board_led_off(void){ } +__attribute__ ((weak)) void ergodox_right_led_1_off(void){ } +__attribute__ ((weak)) void ergodox_right_led_2_off(void){ } +__attribute__ ((weak)) void ergodox_right_led_3_off(void){ } -void ergodox_right_led_off(uint8_t led){ +__attribute__ ((weak)) +void ergodox_right_led_1_set(uint8_t n) { +} + +__attribute__ ((weak)) +void ergodox_right_led_2_set(uint8_t n) { +} + +__attribute__ ((weak)) +void ergodox_right_led_3_set(uint8_t n) { } #ifdef ONEHAND_ENABLE diff --git a/keyboards/ergodox/infinity/infinity.h b/keyboards/ergodox/infinity/infinity.h index fec9e565..73a0f4bf 100644 --- a/keyboards/ergodox/infinity/infinity.h +++ b/keyboards/ergodox/infinity/infinity.h @@ -7,13 +7,38 @@ void ergodox_board_led_on(void); void ergodox_right_led_1_on(void); void ergodox_right_led_2_on(void); void ergodox_right_led_3_on(void); -void ergodox_right_led_on(uint8_t led); + +inline void ergodox_right_led_on(uint8_t led) { + switch (led) { + case 0: + ergodox_right_led_1_on(); + break; + case 1: + ergodox_right_led_2_on(); + break; + case 2: + ergodox_right_led_3_on(); + break; + } +} void ergodox_board_led_off(void); void ergodox_right_led_1_off(void); void ergodox_right_led_2_off(void); void ergodox_right_led_3_off(void); -void ergodox_right_led_off(uint8_t led); +inline void ergodox_right_led_off(uint8_t led) { + switch (led) { + case 0: + ergodox_right_led_1_off(); + break; + case 1: + ergodox_right_led_2_off(); + break; + case 2: + ergodox_right_led_3_off(); + break; + } +} inline void ergodox_led_all_on(void) { @@ -31,36 +56,22 @@ inline void ergodox_led_all_off(void) ergodox_right_led_3_off(); } -inline void ergodox_right_led_1_set(uint8_t n){ - if (n) { - ergodox_right_led_1_on(); - } else { - ergodox_right_led_1_off(); - } -} - -inline void ergodox_right_led_2_set(uint8_t n){ - if (n) { - ergodox_right_led_2_on(); - } else { - ergodox_right_led_2_off(); - } -} - -inline void ergodox_right_led_3_set(uint8_t n){ - if (n) { - ergodox_right_led_3_on(); - } else { - ergodox_right_led_3_off(); - } -} +void ergodox_right_led_1_set(uint8_t n); +void ergodox_right_led_2_set(uint8_t n); +void ergodox_right_led_3_set(uint8_t n); inline void ergodox_right_led_set(uint8_t led, uint8_t n){ - if (n) { - ergodox_right_led_on(led); - } else { - ergodox_right_led_off(led); - } + switch (led) { + case 0: + ergodox_right_led_1_set(n); + break; + case 1: + ergodox_right_led_2_set(n); + break; + case 2: + ergodox_right_led_3_set(n); + break; + } } inline void ergodox_led_all_set(uint8_t n) { diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index 6af3a72e..7bc42fbc 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -27,6 +27,7 @@ along with this program. If not, see . #endif #include "visualizer.h" +#include "system/serial_link.h" // To generate an image array like this // Ensure the image is 128 x 32 or smaller @@ -73,6 +74,15 @@ static const uint8_t image_data_lcd_logo[512] = { static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0xFF); static const uint32_t initial_color = LCD_COLOR(0, 0, 0); +static const uint32_t led_emulation_colors[4] = { + LCD_COLOR(0, 0, 0), + LCD_COLOR(255, 255, 255), + LCD_COLOR(84, 255, 255), + LCD_COLOR(168, 255, 255), +}; + +static uint32_t next_led_target_color = 0; + typedef enum { LCD_STATE_INITIAL, LCD_STATE_LAYER_BITMAP, @@ -81,6 +91,19 @@ typedef enum { static lcd_state_t lcd_state = LCD_STATE_INITIAL; +typedef struct { + uint8_t led_on; + uint8_t led1; + uint8_t led2; + uint8_t led3; +} visualizer_user_data_t; + +// Don't access from visualization function, use the visualizer state instead +static visualizer_user_data_t user_data_keyboard = {}; + +_Static_assert(sizeof(visualizer_user_data_t) <= VISUALIZER_USER_DATA_SIZE, + "Please increase the VISUALIZER_USER_DATA_SIZE"); + bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { (void)state; (void)animation; @@ -117,16 +140,27 @@ static keyframe_animation_t startup_animation = { }; // The color animation animates the LCD color when you change layers -static keyframe_animation_t color_animation = { - .num_frames = 2, +static keyframe_animation_t one_led_color = { + .num_frames = 1, .loop = false, - // Note that there's a 200 ms no-operation frame, - // this prevents the color from changing when activating the layer - // momentarily - .frame_lengths = {gfxMillisecondsToTicks(200), gfxMillisecondsToTicks(500)}, - .frame_functions = {keyframe_no_operation, keyframe_animate_backlight_color}, + .frame_lengths = {gfxMillisecondsToTicks(0)}, + .frame_functions = {keyframe_set_backlight_color}, }; +bool swap_led_target_color(keyframe_animation_t* animation, visualizer_state_t* state) { + uint32_t temp = next_led_target_color; + next_led_target_color = state->target_lcd_color; + state->target_lcd_color = temp; + return false; +} + +// The color animation animates the LCD color when you change layers +static keyframe_animation_t two_led_colors = { + .num_frames = 2, + .loop = true, + .frame_lengths = {gfxMillisecondsToTicks(1000), gfxMillisecondsToTicks(0)}, + .frame_functions = {keyframe_set_backlight_color, swap_led_target_color}, +}; // The LCD animation alternates between the layer name display and a // bitmap that displays all active layers @@ -177,6 +211,45 @@ void initialize_user_visualizer(visualizer_state_t* state) { start_keyframe_animation(&startup_animation); } +static const uint32_t red; +static const uint32_t green; +static const uint32_t blue; + +inline bool is_led_on(visualizer_user_data_t* user_data, uint8_t num) { + return user_data->led_on & (1u << num); +} + +static uint8_t get_led_index_master(visualizer_user_data_t* user_data) { + for (int i=0; i < 3; i++) { + if (is_led_on(user_data, i)) { + return i + 1; + } + } + return 0; +} + +static uint8_t get_led_index_slave(visualizer_user_data_t* user_data) { + uint8_t master_index = get_led_index_master(user_data); + if (master_index!=0) { + for (int i=master_index; i < 3; i++) { + if (is_led_on(user_data, i)) { + return i + 1; + } + } + } + + return 0; +} + +static uint8_t get_secondary_led_index(visualizer_user_data_t* user_data) { + if (is_led_on(user_data, 0) && + is_led_on(user_data, 1) && + is_led_on(user_data, 2)) { + return 3; + } + return 0; +} + void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t prev_status) { // Check the status here to start and stop animations // You might have to save some state, like the current animation here so that you can start the right @@ -186,9 +259,38 @@ void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard // This is also important because the slave won't have access to the active layer for example outside the // status. - if (lcd_state == LCD_STATE_INITIAL) { - state->target_lcd_color = LCD_COLOR(0x40, 0xB0, 0xFF); - start_keyframe_animation(&color_animation); + + visualizer_user_data_t* user_data_new = (visualizer_user_data_t*)state->status.user_data; + visualizer_user_data_t* user_data_old = (visualizer_user_data_t*)prev_status.user_data; + + uint8_t new_index; + uint8_t old_index; + + if (is_serial_link_master()) { + new_index = get_led_index_master(user_data_new); + old_index = get_led_index_master(user_data_old); + } + else { + new_index = get_led_index_slave(user_data_new); + old_index = get_led_index_slave(user_data_old); + } + uint8_t new_secondary_index = get_secondary_led_index(user_data_new); + uint8_t old_secondary_index = get_secondary_led_index(user_data_old); + + if (lcd_state == LCD_STATE_INITIAL || + new_index != old_index || + new_secondary_index != old_secondary_index) { + + if (new_secondary_index != 0) { + state->target_lcd_color = led_emulation_colors[new_index]; + next_led_target_color = led_emulation_colors[new_secondary_index]; + stop_keyframe_animation(&one_led_color); + start_keyframe_animation(&two_led_colors); + } else { + state->target_lcd_color = led_emulation_colors[new_index]; + stop_keyframe_animation(&two_led_colors); + start_keyframe_animation(&one_led_color); + } } if (state->status.leds) { @@ -233,3 +335,56 @@ void user_visualizer_resume(visualizer_state_t* state) { lcd_state = LCD_STATE_INITIAL; start_keyframe_animation(&resume_animation); } + +void ergodox_board_led_on(void){ + // No board led support +} + +void ergodox_right_led_1_on(void){ + user_data_keyboard.led_on |= (1u << 0); + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_2_on(void){ + user_data_keyboard.led_on |= (1u << 1); + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_3_on(void){ + user_data_keyboard.led_on |= (1u << 2); + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_board_led_off(void){ + // No board led support +} + +void ergodox_right_led_1_off(void){ + user_data_keyboard.led_on &= ~(1u << 0); + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_2_off(void){ + user_data_keyboard.led_on &= ~(1u << 1); + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_3_off(void){ + user_data_keyboard.led_on &= ~(1u << 2); + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_1_set(uint8_t n) { + user_data_keyboard.led1 = n; + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_2_set(uint8_t n) { + user_data_keyboard.led2 = n; + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_3_set(uint8_t n) { + user_data_keyboard.led3 = n; + visualizer_set_user_data(&user_data_keyboard); +} diff --git a/quantum/visualizer/visualizer.c b/quantum/visualizer/visualizer.c index 62ebebce..bff0df49 100644 --- a/quantum/visualizer/visualizer.c +++ b/quantum/visualizer/visualizer.c @@ -64,6 +64,9 @@ static visualizer_keyboard_status_t current_status = { .mods = 0xFF, .leds = 0xFFFFFFFF, .suspended = false, +#ifdef VISUALIZER_USER_DATA_SIZE + .user_data = {0} +#endif }; static bool same_status(visualizer_keyboard_status_t* status1, visualizer_keyboard_status_t* status2) { @@ -71,11 +74,19 @@ static bool same_status(visualizer_keyboard_status_t* status1, visualizer_keyboa status1->default_layer == status2->default_layer && status1->mods == status2->mods && status1->leds == status2->leds && - status1->suspended == status2->suspended; + status1->suspended == status2->suspended +#ifdef VISUALIZER_USER_DATA_SIZE + && memcmp(status1->user_data, status2->user_data, VISUALIZER_USER_DATA_SIZE) == 0 +#endif + ; } static bool visualizer_enabled = false; +#ifdef VISUALIZER_USER_DATA_SIZE +static uint8_t user_data[VISUALIZER_USER_DATA_SIZE]; +#endif + #define MAX_SIMULTANEOUS_ANIMATIONS 4 static keyframe_animation_t* animations[MAX_SIMULTANEOUS_ANIMATIONS] = {}; @@ -431,6 +442,9 @@ static DECLARE_THREAD_FUNCTION(visualizerThread, arg) { .mods = 0xFF, .leds = 0xFFFFFFFF, .suspended = false, +#ifdef VISUALIZER_USER_DATA_SIZE + .user_data = {0}, +#endif }; visualizer_state_t state = { @@ -590,6 +604,12 @@ uint8_t visualizer_get_mods() { return mods; } +#ifdef VISUALIZER_USER_DATA_SIZE +void visualizer_set_user_data(void* u) { + memcpy(user_data, u, VISUALIZER_USER_DATA_SIZE); +} +#endif + void visualizer_update(uint32_t default_state, uint32_t state, uint8_t mods, uint32_t leds) { // Note that there's a small race condition here, the thread could read // a state where one of these are set but not the other. But this should @@ -618,6 +638,9 @@ void visualizer_update(uint32_t default_state, uint32_t state, uint8_t mods, uin .leds = leds, .suspended = current_status.suspended, }; +#ifdef VISUALIZER_USER_DATA_SIZE + memcpy(new_status.user_data, user_data, VISUALIZER_USER_DATA_SIZE); +#endif if (!same_status(¤t_status, &new_status)) { changed = true; current_status = new_status; diff --git a/quantum/visualizer/visualizer.h b/quantum/visualizer/visualizer.h index 2c81cb9f..beb8f2ab 100644 --- a/quantum/visualizer/visualizer.h +++ b/quantum/visualizer/visualizer.h @@ -68,6 +68,9 @@ typedef struct { uint8_t mods; uint32_t leds; // See led.h for available statuses bool suspended; +#ifdef VISUALIZER_USER_DATA_SIZE + uint8_t user_data[VISUALIZER_USER_DATA_SIZE]; +#endif } visualizer_keyboard_status_t; // The state struct is used by the various keyframe functions @@ -146,6 +149,11 @@ bool keyframe_enable_lcd_and_backlight(keyframe_animation_t* animation, visualiz // directly from the initalize_user_visualizer function (the animation can be null) bool enable_visualization(keyframe_animation_t* animation, visualizer_state_t* state); +// The master can set userdata which will be transferred to the slave +#ifdef VISUALIZER_USER_DATA_SIZE +void visualizer_set_user_data(void* user_data); +#endif + // These functions have to be implemented by the user void initialize_user_visualizer(visualizer_state_t* state); void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t prev_status); From 5fbaf31dc26a7bb27eb276ec419255e92b293d60 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 2 Apr 2017 02:29:50 +0300 Subject: [PATCH 095/117] Brightness for Ergodox Infinity emulated LEDs --- keyboards/ergodox/infinity/config.h | 2 +- keyboards/ergodox/infinity/visualizer.c | 76 ++++++++++++++++++------- quantum/visualizer/lcd_backlight.h | 4 ++ quantum/visualizer/visualizer.c | 2 +- quantum/visualizer/visualizer.h | 2 +- 5 files changed, 63 insertions(+), 23 deletions(-) diff --git a/keyboards/ergodox/infinity/config.h b/keyboards/ergodox/infinity/config.h index 6cde193e..95f71381 100644 --- a/keyboards/ergodox/infinity/config.h +++ b/keyboards/ergodox/infinity/config.h @@ -40,7 +40,7 @@ along with this program. If not, see . /* number of backlight levels */ #define BACKLIGHT_LEVELS 3 -#define LED_BRIGHTNESS_LO 15 +#define LED_BRIGHTNESS_LO 100 #define LED_BRIGHTNESS_HI 255 /* define if matrix has ghost */ diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index 7bc42fbc..c7afd938 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -99,7 +99,12 @@ typedef struct { } visualizer_user_data_t; // Don't access from visualization function, use the visualizer state instead -static visualizer_user_data_t user_data_keyboard = {}; +static visualizer_user_data_t user_data_keyboard = { + .led_on = 0, + .led1 = LED_BRIGHTNESS_HI, + .led2 = LED_BRIGHTNESS_HI, + .led3 = LED_BRIGHTNESS_HI, +}; _Static_assert(sizeof(visualizer_user_data_t) <= VISUALIZER_USER_DATA_SIZE, "Please increase the VISUALIZER_USER_DATA_SIZE"); @@ -250,18 +255,21 @@ static uint8_t get_secondary_led_index(visualizer_user_data_t* user_data) { return 0; } -void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t prev_status) { - // Check the status here to start and stop animations - // You might have to save some state, like the current animation here so that you can start the right - // This function is called every time the status changes - - // NOTE that this is called from the visualizer thread, so don't access anything else outside the status - // This is also important because the slave won't have access to the active layer for example outside the - // status. - +static uint8_t get_brightness(visualizer_user_data_t* user_data, uint8_t index) { + switch (index) { + case 1: + return user_data->led1; + case 2: + return user_data->led2; + case 3: + return user_data->led3; + } + return 0; +} +static void update_emulated_leds(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) { visualizer_user_data_t* user_data_new = (visualizer_user_data_t*)state->status.user_data; - visualizer_user_data_t* user_data_old = (visualizer_user_data_t*)prev_status.user_data; + visualizer_user_data_t* user_data_old = (visualizer_user_data_t*)prev_status->user_data; uint8_t new_index; uint8_t old_index; @@ -277,27 +285,41 @@ void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard uint8_t new_secondary_index = get_secondary_led_index(user_data_new); uint8_t old_secondary_index = get_secondary_led_index(user_data_old); + uint8_t old_brightness = get_brightness(user_data_old, old_index); + uint8_t new_brightness = get_brightness(user_data_new, new_index); + + uint8_t old_secondary_brightness = get_brightness(user_data_old, old_secondary_index); + uint8_t new_secondary_brightness = get_brightness(user_data_new, new_secondary_index); + if (lcd_state == LCD_STATE_INITIAL || new_index != old_index || - new_secondary_index != old_secondary_index) { + new_secondary_index != old_secondary_index || + new_brightness != old_brightness || + new_secondary_brightness != old_secondary_brightness) { if (new_secondary_index != 0) { - state->target_lcd_color = led_emulation_colors[new_index]; - next_led_target_color = led_emulation_colors[new_secondary_index]; + state->target_lcd_color = change_lcd_color_intensity( + led_emulation_colors[new_index], new_brightness); + next_led_target_color = change_lcd_color_intensity( + led_emulation_colors[new_secondary_index], new_secondary_brightness); + stop_keyframe_animation(&one_led_color); start_keyframe_animation(&two_led_colors); } else { - state->target_lcd_color = led_emulation_colors[new_index]; + state->target_lcd_color = change_lcd_color_intensity( + led_emulation_colors[new_index], new_brightness); stop_keyframe_animation(&two_led_colors); start_keyframe_animation(&one_led_color); } } +} +static void update_lcd_text(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) { if (state->status.leds) { if (lcd_state != LCD_STATE_BITMAP_AND_LEDS || - state->status.leds != prev_status.leds || - state->status.layer != prev_status.layer || - state->status.default_layer != prev_status.default_layer) { + state->status.leds != prev_status->leds || + state->status.layer != prev_status->layer || + state->status.default_layer != prev_status->default_layer) { // NOTE: that it doesn't matter if the animation isn't playing, stop will do nothing in that case stop_keyframe_animation(&lcd_bitmap_animation); @@ -310,8 +332,8 @@ void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard } } else { if (lcd_state != LCD_STATE_LAYER_BITMAP || - state->status.layer != prev_status.layer || - state->status.default_layer != prev_status.default_layer) { + state->status.layer != prev_status->layer || + state->status.default_layer != prev_status->default_layer) { stop_keyframe_animation(&lcd_bitmap_leds_animation); @@ -321,6 +343,20 @@ void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard } } +void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) { + // Check the status here to start and stop animations + // You might have to save some state, like the current animation here so that you can start the right + // This function is called every time the status changes + + // NOTE that this is called from the visualizer thread, so don't access anything else outside the status + // This is also important because the slave won't have access to the active layer for example outside the + // status. + + update_emulated_leds(state, prev_status); + update_lcd_text(state, prev_status); + +} + void user_visualizer_suspend(visualizer_state_t* state) { state->layer_text = "Suspending..."; uint8_t hue = LCD_HUE(state->current_lcd_color); diff --git a/quantum/visualizer/lcd_backlight.h b/quantum/visualizer/lcd_backlight.h index dd3e37a0..14dde64a 100644 --- a/quantum/visualizer/lcd_backlight.h +++ b/quantum/visualizer/lcd_backlight.h @@ -32,6 +32,10 @@ SOFTWARE. #define LCD_SAT(color) ((color >> 8) & 0xFF) #define LCD_INT(color) (color & 0xFF) +inline uint32_t change_lcd_color_intensity(uint32_t color, uint8_t new_intensity) { + return (color & 0xFFFFFF00) | new_intensity; +} + void lcd_backlight_init(void); void lcd_backlight_color(uint8_t hue, uint8_t saturation, uint8_t intensity); void lcd_backlight_brightness(uint8_t b); diff --git a/quantum/visualizer/visualizer.c b/quantum/visualizer/visualizer.c index bff0df49..3b3f51b1 100644 --- a/quantum/visualizer/visualizer.c +++ b/quantum/visualizer/visualizer.c @@ -484,7 +484,7 @@ static DECLARE_THREAD_FUNCTION(visualizerThread, arg) { else { visualizer_keyboard_status_t prev_status = state.status; state.status = current_status; - update_user_visualizer_state(&state, prev_status); + update_user_visualizer_state(&state, &prev_status); } state.prev_lcd_color = state.current_lcd_color; } diff --git a/quantum/visualizer/visualizer.h b/quantum/visualizer/visualizer.h index beb8f2ab..e8ace5b3 100644 --- a/quantum/visualizer/visualizer.h +++ b/quantum/visualizer/visualizer.h @@ -156,7 +156,7 @@ void visualizer_set_user_data(void* user_data); // These functions have to be implemented by the user void initialize_user_visualizer(visualizer_state_t* state); -void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t prev_status); +void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status); void user_visualizer_suspend(visualizer_state_t* state); void user_visualizer_resume(visualizer_state_t* state); From 65e8127c91c6a0fc027a1a482de443302e00d019 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Mon, 3 Apr 2017 22:08:34 +0300 Subject: [PATCH 096/117] Add visualizer for Ergodox default --- .../ergodox/keymaps/default/visualizer.c | 426 ++++++++++++++++++ 1 file changed, 426 insertions(+) create mode 100644 keyboards/ergodox/keymaps/default/visualizer.c diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c new file mode 100644 index 00000000..c7afd938 --- /dev/null +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -0,0 +1,426 @@ +/* +Copyright 2016 Fred Sundvik + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +// Currently we are assuming that both the backlight and LCD are enabled +// But it's entirely possible to write a custom visualizer that use only +// one of them +#ifndef LCD_BACKLIGHT_ENABLE +#error This visualizer needs that LCD backlight is enabled +#endif + +#ifndef LCD_ENABLE +#error This visualizer needs that LCD is enabled +#endif + +#include "visualizer.h" +#include "system/serial_link.h" + +// To generate an image array like this +// Ensure the image is 128 x 32 or smaller +// Convert the bitmap to a C array using a program like http://www.riuson.com/lcd-image-converter/ +// Ensure the the conversion process produces a monochrome format array - 1 bit/pixel, left to right, top to bottom +// Update array in the source code with the C array produced by the conversion program + +// The image below is generated from lcd_logo.png +static const uint8_t image_data_lcd_logo[512] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xf8, 0xfe, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x06, 0x29, 0x41, 0x24, 0x52, 0x24, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x42, 0xaa, 0xaa, 0xaa, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x82, 0x28, 0xaa, 0xae, 0x8c, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x43, 0x28, 0xaa, 0xaa, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x0a, 0x55, 0x42, 0x28, 0xaa, 0xaa, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x05, 0x45, 0x42, 0x28, 0x89, 0x4a, 0x86, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x18, 0x38, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x1c, 0x38, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x0e, 0x38, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x03, 0xff, 0x80, 0x04, 0x45, 0x14, 0xa4, 0x92, 0x83, 0x52, 0x22, 0x22, 0x36, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x0a, 0xaa, 0xaa, 0xaa, 0xba, 0x84, 0x55, 0x55, 0x57, 0x45, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x08, 0xaa, 0xaa, 0xaa, 0x92, 0xb2, 0x55, 0x55, 0x42, 0x65, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x08, 0xaa, 0xaa, 0xaa, 0x92, 0x81, 0x56, 0x65, 0x42, 0x45, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x0a, 0xaa, 0xaa, 0xaa, 0x92, 0x81, 0x54, 0x45, 0x42, 0x45, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x04, 0x48, 0xa2, 0x4a, 0x89, 0x06, 0x24, 0x42, 0x41, 0x36, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; + +static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0xFF); +static const uint32_t initial_color = LCD_COLOR(0, 0, 0); + +static const uint32_t led_emulation_colors[4] = { + LCD_COLOR(0, 0, 0), + LCD_COLOR(255, 255, 255), + LCD_COLOR(84, 255, 255), + LCD_COLOR(168, 255, 255), +}; + +static uint32_t next_led_target_color = 0; + +typedef enum { + LCD_STATE_INITIAL, + LCD_STATE_LAYER_BITMAP, + LCD_STATE_BITMAP_AND_LEDS, +} lcd_state_t; + +static lcd_state_t lcd_state = LCD_STATE_INITIAL; + +typedef struct { + uint8_t led_on; + uint8_t led1; + uint8_t led2; + uint8_t led3; +} visualizer_user_data_t; + +// Don't access from visualization function, use the visualizer state instead +static visualizer_user_data_t user_data_keyboard = { + .led_on = 0, + .led1 = LED_BRIGHTNESS_HI, + .led2 = LED_BRIGHTNESS_HI, + .led3 = LED_BRIGHTNESS_HI, +}; + +_Static_assert(sizeof(visualizer_user_data_t) <= VISUALIZER_USER_DATA_SIZE, + "Please increase the VISUALIZER_USER_DATA_SIZE"); + +bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { + (void)state; + (void)animation; + (void)state; + // Read the uGFX documentation for information how to use the displays + // http://wiki.ugfx.org/index.php/Main_Page + gdispClear(White); + + // You can use static variables for things that can't be found in the animation + // or state structs, here we use the image + + //gdispGBlitArea is a tricky function to use since it supports blitting part of the image + // if you have full screen image, then just use 128 and 32 for both source and target dimensions + gdispGBlitArea(GDISP, 0, 0, 128, 32, 0, 0, 128, (pixel_t*)image_data_lcd_logo); + + // Always remember to flush the display + gdispFlush(); + return false; +} + +// Feel free to modify the animations below, or even add new ones if needed + +// Don't worry, if the startup animation is long, you can use the keyboard like normal +// during that time +static keyframe_animation_t startup_animation = { + .num_frames = 3, + .loop = false, + .frame_lengths = {0, gfxMillisecondsToTicks(10000), 0}, + .frame_functions = { + display_logo, + keyframe_animate_backlight_color, + enable_visualization + }, +}; + +// The color animation animates the LCD color when you change layers +static keyframe_animation_t one_led_color = { + .num_frames = 1, + .loop = false, + .frame_lengths = {gfxMillisecondsToTicks(0)}, + .frame_functions = {keyframe_set_backlight_color}, +}; + +bool swap_led_target_color(keyframe_animation_t* animation, visualizer_state_t* state) { + uint32_t temp = next_led_target_color; + next_led_target_color = state->target_lcd_color; + state->target_lcd_color = temp; + return false; +} + +// The color animation animates the LCD color when you change layers +static keyframe_animation_t two_led_colors = { + .num_frames = 2, + .loop = true, + .frame_lengths = {gfxMillisecondsToTicks(1000), gfxMillisecondsToTicks(0)}, + .frame_functions = {keyframe_set_backlight_color, swap_led_target_color}, +}; + +// The LCD animation alternates between the layer name display and a +// bitmap that displays all active layers +static keyframe_animation_t lcd_bitmap_animation = { + .num_frames = 1, + .loop = false, + .frame_lengths = {gfxMillisecondsToTicks(0)}, + .frame_functions = {keyframe_display_layer_bitmap}, +}; + +static keyframe_animation_t lcd_bitmap_leds_animation = { + .num_frames = 2, + .loop = true, + .frame_lengths = {gfxMillisecondsToTicks(2000), gfxMillisecondsToTicks(2000)}, + .frame_functions = {keyframe_display_layer_bitmap, keyframe_display_led_states}, +}; + +static keyframe_animation_t suspend_animation = { + .num_frames = 3, + .loop = false, + .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0}, + .frame_functions = { + keyframe_display_layer_text, + keyframe_animate_backlight_color, + keyframe_disable_lcd_and_backlight, + }, +}; + +static keyframe_animation_t resume_animation = { + .num_frames = 4, + .loop = false, + .frame_lengths = {0, 0, gfxMillisecondsToTicks(10000), 0}, + .frame_functions = { + keyframe_enable_lcd_and_backlight, + display_logo, + keyframe_animate_backlight_color, + enable_visualization, + }, +}; + +void initialize_user_visualizer(visualizer_state_t* state) { + // The brightness will be dynamically adjustable in the future + // But for now, change it here. + lcd_backlight_brightness(130); + state->current_lcd_color = initial_color; + state->target_lcd_color = logo_background_color; + lcd_state = LCD_STATE_INITIAL; + start_keyframe_animation(&startup_animation); +} + +static const uint32_t red; +static const uint32_t green; +static const uint32_t blue; + +inline bool is_led_on(visualizer_user_data_t* user_data, uint8_t num) { + return user_data->led_on & (1u << num); +} + +static uint8_t get_led_index_master(visualizer_user_data_t* user_data) { + for (int i=0; i < 3; i++) { + if (is_led_on(user_data, i)) { + return i + 1; + } + } + return 0; +} + +static uint8_t get_led_index_slave(visualizer_user_data_t* user_data) { + uint8_t master_index = get_led_index_master(user_data); + if (master_index!=0) { + for (int i=master_index; i < 3; i++) { + if (is_led_on(user_data, i)) { + return i + 1; + } + } + } + + return 0; +} + +static uint8_t get_secondary_led_index(visualizer_user_data_t* user_data) { + if (is_led_on(user_data, 0) && + is_led_on(user_data, 1) && + is_led_on(user_data, 2)) { + return 3; + } + return 0; +} + +static uint8_t get_brightness(visualizer_user_data_t* user_data, uint8_t index) { + switch (index) { + case 1: + return user_data->led1; + case 2: + return user_data->led2; + case 3: + return user_data->led3; + } + return 0; +} + +static void update_emulated_leds(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) { + visualizer_user_data_t* user_data_new = (visualizer_user_data_t*)state->status.user_data; + visualizer_user_data_t* user_data_old = (visualizer_user_data_t*)prev_status->user_data; + + uint8_t new_index; + uint8_t old_index; + + if (is_serial_link_master()) { + new_index = get_led_index_master(user_data_new); + old_index = get_led_index_master(user_data_old); + } + else { + new_index = get_led_index_slave(user_data_new); + old_index = get_led_index_slave(user_data_old); + } + uint8_t new_secondary_index = get_secondary_led_index(user_data_new); + uint8_t old_secondary_index = get_secondary_led_index(user_data_old); + + uint8_t old_brightness = get_brightness(user_data_old, old_index); + uint8_t new_brightness = get_brightness(user_data_new, new_index); + + uint8_t old_secondary_brightness = get_brightness(user_data_old, old_secondary_index); + uint8_t new_secondary_brightness = get_brightness(user_data_new, new_secondary_index); + + if (lcd_state == LCD_STATE_INITIAL || + new_index != old_index || + new_secondary_index != old_secondary_index || + new_brightness != old_brightness || + new_secondary_brightness != old_secondary_brightness) { + + if (new_secondary_index != 0) { + state->target_lcd_color = change_lcd_color_intensity( + led_emulation_colors[new_index], new_brightness); + next_led_target_color = change_lcd_color_intensity( + led_emulation_colors[new_secondary_index], new_secondary_brightness); + + stop_keyframe_animation(&one_led_color); + start_keyframe_animation(&two_led_colors); + } else { + state->target_lcd_color = change_lcd_color_intensity( + led_emulation_colors[new_index], new_brightness); + stop_keyframe_animation(&two_led_colors); + start_keyframe_animation(&one_led_color); + } + } +} + +static void update_lcd_text(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) { + if (state->status.leds) { + if (lcd_state != LCD_STATE_BITMAP_AND_LEDS || + state->status.leds != prev_status->leds || + state->status.layer != prev_status->layer || + state->status.default_layer != prev_status->default_layer) { + + // NOTE: that it doesn't matter if the animation isn't playing, stop will do nothing in that case + stop_keyframe_animation(&lcd_bitmap_animation); + + lcd_state = LCD_STATE_BITMAP_AND_LEDS; + // For information: + // The logic in this function makes sure that this doesn't happen, but if you call start on an + // animation that is already playing it will be restarted. + start_keyframe_animation(&lcd_bitmap_leds_animation); + } + } else { + if (lcd_state != LCD_STATE_LAYER_BITMAP || + state->status.layer != prev_status->layer || + state->status.default_layer != prev_status->default_layer) { + + stop_keyframe_animation(&lcd_bitmap_leds_animation); + + lcd_state = LCD_STATE_LAYER_BITMAP; + start_keyframe_animation(&lcd_bitmap_animation); + } + } +} + +void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) { + // Check the status here to start and stop animations + // You might have to save some state, like the current animation here so that you can start the right + // This function is called every time the status changes + + // NOTE that this is called from the visualizer thread, so don't access anything else outside the status + // This is also important because the slave won't have access to the active layer for example outside the + // status. + + update_emulated_leds(state, prev_status); + update_lcd_text(state, prev_status); + +} + +void user_visualizer_suspend(visualizer_state_t* state) { + state->layer_text = "Suspending..."; + uint8_t hue = LCD_HUE(state->current_lcd_color); + uint8_t sat = LCD_SAT(state->current_lcd_color); + state->target_lcd_color = LCD_COLOR(hue, sat, 0); + start_keyframe_animation(&suspend_animation); +} + +void user_visualizer_resume(visualizer_state_t* state) { + state->current_lcd_color = initial_color; + state->target_lcd_color = logo_background_color; + lcd_state = LCD_STATE_INITIAL; + start_keyframe_animation(&resume_animation); +} + +void ergodox_board_led_on(void){ + // No board led support +} + +void ergodox_right_led_1_on(void){ + user_data_keyboard.led_on |= (1u << 0); + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_2_on(void){ + user_data_keyboard.led_on |= (1u << 1); + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_3_on(void){ + user_data_keyboard.led_on |= (1u << 2); + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_board_led_off(void){ + // No board led support +} + +void ergodox_right_led_1_off(void){ + user_data_keyboard.led_on &= ~(1u << 0); + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_2_off(void){ + user_data_keyboard.led_on &= ~(1u << 1); + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_3_off(void){ + user_data_keyboard.led_on &= ~(1u << 2); + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_1_set(uint8_t n) { + user_data_keyboard.led1 = n; + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_2_set(uint8_t n) { + user_data_keyboard.led2 = n; + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_3_set(uint8_t n) { + user_data_keyboard.led3 = n; + visualizer_set_user_data(&user_data_keyboard); +} From fa6da78ff3c96a71ed65684e276352700843d539 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Mon, 3 Apr 2017 23:00:58 +0300 Subject: [PATCH 097/117] Simple layer display on Infinity Ergodox default layout --- .../ergodox/keymaps/default/visualizer.c | 286 ++++-------------- 1 file changed, 62 insertions(+), 224 deletions(-) diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c index c7afd938..d99d5f70 100644 --- a/keyboards/ergodox/keymaps/default/visualizer.c +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -1,5 +1,5 @@ /* -Copyright 2016 Fred Sundvik +Copyright 2017 Fred Sundvik This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -74,15 +74,6 @@ static const uint8_t image_data_lcd_logo[512] = { static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0xFF); static const uint32_t initial_color = LCD_COLOR(0, 0, 0); -static const uint32_t led_emulation_colors[4] = { - LCD_COLOR(0, 0, 0), - LCD_COLOR(255, 255, 255), - LCD_COLOR(84, 255, 255), - LCD_COLOR(168, 255, 255), -}; - -static uint32_t next_led_target_color = 0; - typedef enum { LCD_STATE_INITIAL, LCD_STATE_LAYER_BITMAP, @@ -91,24 +82,6 @@ typedef enum { static lcd_state_t lcd_state = LCD_STATE_INITIAL; -typedef struct { - uint8_t led_on; - uint8_t led1; - uint8_t led2; - uint8_t led3; -} visualizer_user_data_t; - -// Don't access from visualization function, use the visualizer state instead -static visualizer_user_data_t user_data_keyboard = { - .led_on = 0, - .led1 = LED_BRIGHTNESS_HI, - .led2 = LED_BRIGHTNESS_HI, - .led3 = LED_BRIGHTNESS_HI, -}; - -_Static_assert(sizeof(visualizer_user_data_t) <= VISUALIZER_USER_DATA_SIZE, - "Please increase the VISUALIZER_USER_DATA_SIZE"); - bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { (void)state; (void)animation; @@ -144,43 +117,34 @@ static keyframe_animation_t startup_animation = { }, }; -// The color animation animates the LCD color when you change layers -static keyframe_animation_t one_led_color = { - .num_frames = 1, - .loop = false, - .frame_lengths = {gfxMillisecondsToTicks(0)}, - .frame_functions = {keyframe_set_backlight_color}, -}; - -bool swap_led_target_color(keyframe_animation_t* animation, visualizer_state_t* state) { - uint32_t temp = next_led_target_color; - next_led_target_color = state->target_lcd_color; - state->target_lcd_color = temp; - return false; -} - -// The color animation animates the LCD color when you change layers -static keyframe_animation_t two_led_colors = { - .num_frames = 2, - .loop = true, - .frame_lengths = {gfxMillisecondsToTicks(1000), gfxMillisecondsToTicks(0)}, - .frame_functions = {keyframe_set_backlight_color, swap_led_target_color}, -}; - // The LCD animation alternates between the layer name display and a // bitmap that displays all active layers -static keyframe_animation_t lcd_bitmap_animation = { - .num_frames = 1, - .loop = false, - .frame_lengths = {gfxMillisecondsToTicks(0)}, - .frame_functions = {keyframe_display_layer_bitmap}, +static keyframe_animation_t lcd_layer_bitmap_animation = { + .num_frames = 2, + .loop = true, + .frame_lengths = { + gfxMillisecondsToTicks(2000), + gfxMillisecondsToTicks(2000) + }, + .frame_functions = { + keyframe_display_layer_text, + keyframe_display_layer_bitmap + }, }; -static keyframe_animation_t lcd_bitmap_leds_animation = { - .num_frames = 2, +static keyframe_animation_t lcd_layer_bitmap_leds_animation = { + .num_frames = 3, .loop = true, - .frame_lengths = {gfxMillisecondsToTicks(2000), gfxMillisecondsToTicks(2000)}, - .frame_functions = {keyframe_display_layer_bitmap, keyframe_display_led_states}, + .frame_lengths = { + gfxMillisecondsToTicks(2000), + gfxMillisecondsToTicks(2000), + gfxMillisecondsToTicks(2000) + }, + .frame_functions = { + keyframe_display_layer_text, + keyframe_display_led_states, + keyframe_display_layer_bitmap, + }, }; static keyframe_animation_t suspend_animation = { @@ -206,6 +170,17 @@ static keyframe_animation_t resume_animation = { }, }; +// The color animation animates the LCD color when you change layers +static keyframe_animation_t color_animation = { + .num_frames = 2, + .loop = false, + // Note that there's a 200 ms no-operation frame, + // this prevents the color from changing when activating the layer + // momentarily + .frame_lengths = {gfxMillisecondsToTicks(200), gfxMillisecondsToTicks(500)}, + .frame_functions = {keyframe_no_operation, keyframe_animate_backlight_color}, +}; + void initialize_user_visualizer(visualizer_state_t* state) { // The brightness will be dynamically adjustable in the future // But for now, change it here. @@ -216,105 +191,32 @@ void initialize_user_visualizer(visualizer_state_t* state) { start_keyframe_animation(&startup_animation); } -static const uint32_t red; -static const uint32_t green; -static const uint32_t blue; - -inline bool is_led_on(visualizer_user_data_t* user_data, uint8_t num) { - return user_data->led_on & (1u << num); -} - -static uint8_t get_led_index_master(visualizer_user_data_t* user_data) { - for (int i=0; i < 3; i++) { - if (is_led_on(user_data, i)) { - return i + 1; - } - } - return 0; -} - -static uint8_t get_led_index_slave(visualizer_user_data_t* user_data) { - uint8_t master_index = get_led_index_master(user_data); - if (master_index!=0) { - for (int i=master_index; i < 3; i++) { - if (is_led_on(user_data, i)) { - return i + 1; - } - } - } - - return 0; -} - -static uint8_t get_secondary_led_index(visualizer_user_data_t* user_data) { - if (is_led_on(user_data, 0) && - is_led_on(user_data, 1) && - is_led_on(user_data, 2)) { - return 3; - } - return 0; -} - -static uint8_t get_brightness(visualizer_user_data_t* user_data, uint8_t index) { - switch (index) { - case 1: - return user_data->led1; - case 2: - return user_data->led2; - case 3: - return user_data->led3; +void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) { + // Add more tests, change the colors and layer texts here + // Usually you want to check the high bits (higher layers first) + // because that's the order layers are processed for keypresses + // You can for check for example: + // state->status.layer + // state->status.default_layer + // state->status.leds (see led.h for available statuses) + + if (state->status.layer & 0x4) { + state->target_lcd_color = LCD_COLOR(0, 0xB0, 0xFF); + state->layer_text = "Media & Mouse"; } - return 0; -} - -static void update_emulated_leds(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) { - visualizer_user_data_t* user_data_new = (visualizer_user_data_t*)state->status.user_data; - visualizer_user_data_t* user_data_old = (visualizer_user_data_t*)prev_status->user_data; - - uint8_t new_index; - uint8_t old_index; - - if (is_serial_link_master()) { - new_index = get_led_index_master(user_data_new); - old_index = get_led_index_master(user_data_old); + else if (state->status.layer & 0x2) { + state->target_lcd_color = LCD_COLOR(0x80, 0xB0, 0xFF); + state->layer_text = "Symbol"; } else { - new_index = get_led_index_slave(user_data_new); - old_index = get_led_index_slave(user_data_old); + state->target_lcd_color = LCD_COLOR(0x40, 0xB0, 0xFF); + state->layer_text = "Default"; } - uint8_t new_secondary_index = get_secondary_led_index(user_data_new); - uint8_t old_secondary_index = get_secondary_led_index(user_data_old); - - uint8_t old_brightness = get_brightness(user_data_old, old_index); - uint8_t new_brightness = get_brightness(user_data_new, new_index); - - uint8_t old_secondary_brightness = get_brightness(user_data_old, old_secondary_index); - uint8_t new_secondary_brightness = get_brightness(user_data_new, new_secondary_index); - - if (lcd_state == LCD_STATE_INITIAL || - new_index != old_index || - new_secondary_index != old_secondary_index || - new_brightness != old_brightness || - new_secondary_brightness != old_secondary_brightness) { - - if (new_secondary_index != 0) { - state->target_lcd_color = change_lcd_color_intensity( - led_emulation_colors[new_index], new_brightness); - next_led_target_color = change_lcd_color_intensity( - led_emulation_colors[new_secondary_index], new_secondary_brightness); - - stop_keyframe_animation(&one_led_color); - start_keyframe_animation(&two_led_colors); - } else { - state->target_lcd_color = change_lcd_color_intensity( - led_emulation_colors[new_index], new_brightness); - stop_keyframe_animation(&two_led_colors); - start_keyframe_animation(&one_led_color); - } + + if (lcd_state == LCD_STATE_INITIAL || state->status.layer != prev_status->layer) { + start_keyframe_animation(&color_animation); } -} -static void update_lcd_text(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) { if (state->status.leds) { if (lcd_state != LCD_STATE_BITMAP_AND_LEDS || state->status.leds != prev_status->leds || @@ -322,39 +224,28 @@ static void update_lcd_text(visualizer_state_t* state, visualizer_keyboard_statu state->status.default_layer != prev_status->default_layer) { // NOTE: that it doesn't matter if the animation isn't playing, stop will do nothing in that case - stop_keyframe_animation(&lcd_bitmap_animation); + stop_keyframe_animation(&lcd_layer_bitmap_animation); lcd_state = LCD_STATE_BITMAP_AND_LEDS; // For information: // The logic in this function makes sure that this doesn't happen, but if you call start on an // animation that is already playing it will be restarted. - start_keyframe_animation(&lcd_bitmap_leds_animation); + start_keyframe_animation(&lcd_layer_bitmap_leds_animation); } } else { if (lcd_state != LCD_STATE_LAYER_BITMAP || state->status.layer != prev_status->layer || state->status.default_layer != prev_status->default_layer) { - stop_keyframe_animation(&lcd_bitmap_leds_animation); + stop_keyframe_animation(&lcd_layer_bitmap_leds_animation); lcd_state = LCD_STATE_LAYER_BITMAP; - start_keyframe_animation(&lcd_bitmap_animation); + start_keyframe_animation(&lcd_layer_bitmap_animation); } } -} - -void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) { - // Check the status here to start and stop animations - // You might have to save some state, like the current animation here so that you can start the right - // This function is called every time the status changes - - // NOTE that this is called from the visualizer thread, so don't access anything else outside the status - // This is also important because the slave won't have access to the active layer for example outside the - // status. - - update_emulated_leds(state, prev_status); - update_lcd_text(state, prev_status); - + // You can also stop existing animations, and start your custom ones here + // remember that you should normally have only one animation for the LCD + // and one for the background. But you can also combine them if you want. } void user_visualizer_suspend(visualizer_state_t* state) { @@ -371,56 +262,3 @@ void user_visualizer_resume(visualizer_state_t* state) { lcd_state = LCD_STATE_INITIAL; start_keyframe_animation(&resume_animation); } - -void ergodox_board_led_on(void){ - // No board led support -} - -void ergodox_right_led_1_on(void){ - user_data_keyboard.led_on |= (1u << 0); - visualizer_set_user_data(&user_data_keyboard); -} - -void ergodox_right_led_2_on(void){ - user_data_keyboard.led_on |= (1u << 1); - visualizer_set_user_data(&user_data_keyboard); -} - -void ergodox_right_led_3_on(void){ - user_data_keyboard.led_on |= (1u << 2); - visualizer_set_user_data(&user_data_keyboard); -} - -void ergodox_board_led_off(void){ - // No board led support -} - -void ergodox_right_led_1_off(void){ - user_data_keyboard.led_on &= ~(1u << 0); - visualizer_set_user_data(&user_data_keyboard); -} - -void ergodox_right_led_2_off(void){ - user_data_keyboard.led_on &= ~(1u << 1); - visualizer_set_user_data(&user_data_keyboard); -} - -void ergodox_right_led_3_off(void){ - user_data_keyboard.led_on &= ~(1u << 2); - visualizer_set_user_data(&user_data_keyboard); -} - -void ergodox_right_led_1_set(uint8_t n) { - user_data_keyboard.led1 = n; - visualizer_set_user_data(&user_data_keyboard); -} - -void ergodox_right_led_2_set(uint8_t n) { - user_data_keyboard.led2 = n; - visualizer_set_user_data(&user_data_keyboard); -} - -void ergodox_right_led_3_set(uint8_t n) { - user_data_keyboard.led3 = n; - visualizer_set_user_data(&user_data_keyboard); -} From 05bc4880ddc9e904cfa1773caff1ae81977d2a76 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Tue, 4 Apr 2017 22:29:40 +0300 Subject: [PATCH 098/117] Tweaks to the Ergodox default visualizer No animation, display led statuses and layer name on the same screen Don't display layer bitmap Fully saturated colors for caps, less saturated ones normally --- .../ergodox/keymaps/default/visualizer.c | 76 +++++-------------- quantum/visualizer/visualizer.c | 28 ++++++- quantum/visualizer/visualizer.h | 1 + 3 files changed, 44 insertions(+), 61 deletions(-) diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c index d99d5f70..305aaae1 100644 --- a/keyboards/ergodox/keymaps/default/visualizer.c +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -28,6 +28,7 @@ along with this program. If not, see . #include "visualizer.h" #include "system/serial_link.h" +#include "led.h" // To generate an image array like this // Ensure the image is 128 x 32 or smaller @@ -117,34 +118,11 @@ static keyframe_animation_t startup_animation = { }, }; -// The LCD animation alternates between the layer name display and a -// bitmap that displays all active layers -static keyframe_animation_t lcd_layer_bitmap_animation = { - .num_frames = 2, - .loop = true, - .frame_lengths = { - gfxMillisecondsToTicks(2000), - gfxMillisecondsToTicks(2000) - }, - .frame_functions = { - keyframe_display_layer_text, - keyframe_display_layer_bitmap - }, -}; - -static keyframe_animation_t lcd_layer_bitmap_leds_animation = { - .num_frames = 3, - .loop = true, - .frame_lengths = { - gfxMillisecondsToTicks(2000), - gfxMillisecondsToTicks(2000), - gfxMillisecondsToTicks(2000) - }, - .frame_functions = { - keyframe_display_layer_text, - keyframe_display_led_states, - keyframe_display_layer_bitmap, - }, +static keyframe_animation_t lcd_layer_display = { + .num_frames = 1, + .loop = false, + .frame_lengths = {gfxMillisecondsToTicks(0)}, + .frame_functions = {keyframe_display_layer_and_led_states} }; static keyframe_animation_t suspend_animation = { @@ -200,49 +178,31 @@ void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard // state->status.default_layer // state->status.leds (see led.h for available statuses) + uint8_t saturation = 60; + if (state->status.leds & (1u << USB_LED_CAPS_LOCK)) { + saturation = 255; + } if (state->status.layer & 0x4) { - state->target_lcd_color = LCD_COLOR(0, 0xB0, 0xFF); + state->target_lcd_color = LCD_COLOR(0, saturation, 0xFF); state->layer_text = "Media & Mouse"; } else if (state->status.layer & 0x2) { - state->target_lcd_color = LCD_COLOR(0x80, 0xB0, 0xFF); + state->target_lcd_color = LCD_COLOR(168, saturation, 0xFF); state->layer_text = "Symbol"; } else { - state->target_lcd_color = LCD_COLOR(0x40, 0xB0, 0xFF); + state->target_lcd_color = LCD_COLOR(84, saturation, 0xFF); state->layer_text = "Default"; } - if (lcd_state == LCD_STATE_INITIAL || state->status.layer != prev_status->layer) { + if (lcd_state == LCD_STATE_INITIAL || + state->status.layer != prev_status->layer || + state->status.default_layer != prev_status->default_layer || + state->status.leds != prev_status->leds) { start_keyframe_animation(&color_animation); + start_keyframe_animation(&lcd_layer_display); } - if (state->status.leds) { - if (lcd_state != LCD_STATE_BITMAP_AND_LEDS || - state->status.leds != prev_status->leds || - state->status.layer != prev_status->layer || - state->status.default_layer != prev_status->default_layer) { - - // NOTE: that it doesn't matter if the animation isn't playing, stop will do nothing in that case - stop_keyframe_animation(&lcd_layer_bitmap_animation); - - lcd_state = LCD_STATE_BITMAP_AND_LEDS; - // For information: - // The logic in this function makes sure that this doesn't happen, but if you call start on an - // animation that is already playing it will be restarted. - start_keyframe_animation(&lcd_layer_bitmap_leds_animation); - } - } else { - if (lcd_state != LCD_STATE_LAYER_BITMAP || - state->status.layer != prev_status->layer || - state->status.default_layer != prev_status->default_layer) { - - stop_keyframe_animation(&lcd_layer_bitmap_leds_animation); - - lcd_state = LCD_STATE_LAYER_BITMAP; - start_keyframe_animation(&lcd_layer_bitmap_animation); - } - } // You can also stop existing animations, and start your custom ones here // remember that you should normally have only one animation for the LCD // and one for the background. But you can also combine them if you want. diff --git a/quantum/visualizer/visualizer.c b/quantum/visualizer/visualizer.c index 3b3f51b1..2533eb70 100644 --- a/quantum/visualizer/visualizer.c +++ b/quantum/visualizer/visualizer.c @@ -364,9 +364,9 @@ bool keyframe_display_mods_bitmap(keyframe_animation_t* animation, visualizer_st return false; } -bool keyframe_display_led_states(keyframe_animation_t* animation, visualizer_state_t* state) -{ - char output[sizeof("NUM CAPS SCRL COMP KANA")]; +#define LED_STATE_STRING_SIZE sizeof("NUM CAPS SCRL COMP KANA") + +static void get_led_state_string(char* output, visualizer_state_t* state) { uint8_t pos = 0; if (state->status.leds & (1u << USB_LED_NUM_LOCK)) { @@ -390,12 +390,34 @@ bool keyframe_display_led_states(keyframe_animation_t* animation, visualizer_sta pos += 5; } output[pos] = 0; +} + +bool keyframe_display_led_states(keyframe_animation_t* animation, visualizer_state_t* state) +{ + (void)animation; + char output[LED_STATE_STRING_SIZE]; + get_led_state_string(output, state); gdispClear(White); gdispDrawString(0, 10, output, state->font_dejavusansbold12, Black); gdispFlush(); return false; } +bool keyframe_display_layer_and_led_states(keyframe_animation_t* animation, visualizer_state_t* state) { + (void)animation; + gdispClear(White); + uint8_t y = 10; + if (state->status.leds) { + char output[LED_STATE_STRING_SIZE]; + get_led_state_string(output, state); + gdispDrawString(0, 1, output, state->font_dejavusansbold12, Black); + y = 17; + } + gdispDrawString(0, y, state->layer_text, state->font_dejavusansbold12, Black); + gdispFlush(); + return false; +} + #endif // LCD_ENABLE bool keyframe_disable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state) { diff --git a/quantum/visualizer/visualizer.h b/quantum/visualizer/visualizer.h index e8ace5b3..3b05c305 100644 --- a/quantum/visualizer/visualizer.h +++ b/quantum/visualizer/visualizer.h @@ -141,6 +141,7 @@ bool keyframe_display_layer_bitmap(keyframe_animation_t* animation, visualizer_s bool keyframe_display_mods_bitmap(keyframe_animation_t* animation, visualizer_state_t* state); // Displays the keyboard led states (CAPS (Caps lock), NUM (Num lock), SCRL (Scroll lock), COMP (Compose), KANA) bool keyframe_display_led_states(keyframe_animation_t* animation, visualizer_state_t* state); +bool keyframe_display_layer_and_led_states(keyframe_animation_t* animation, visualizer_state_t* state); bool keyframe_disable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state); bool keyframe_enable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state); From 05530b193f4d4476b01c2e7f882619a81194888a Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Wed, 5 Apr 2017 07:48:51 +0300 Subject: [PATCH 099/117] Delete visualizer example integration It's much better to refer to the actual code than to to try to keep some examples up to date. --- .../example_integration/callbacks.c | 36 -- .../visualizer/example_integration/gfxconf.h | 325 ------------------ .../example_integration/lcd_backlight_hal.c | 91 ----- .../example_integration/visualizer_user.c | 121 ------- 4 files changed, 573 deletions(-) delete mode 100644 quantum/visualizer/example_integration/callbacks.c delete mode 100644 quantum/visualizer/example_integration/gfxconf.h delete mode 100644 quantum/visualizer/example_integration/lcd_backlight_hal.c delete mode 100644 quantum/visualizer/example_integration/visualizer_user.c diff --git a/quantum/visualizer/example_integration/callbacks.c b/quantum/visualizer/example_integration/callbacks.c deleted file mode 100644 index 2539615d..00000000 --- a/quantum/visualizer/example_integration/callbacks.c +++ /dev/null @@ -1,36 +0,0 @@ -/* -The MIT License (MIT) - -Copyright (c) 2016 Fred Sundvik - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -#include "keyboard.h" -#include "action_layer.h" -#include "visualizer.h" -#include "host.h" - -void post_keyboard_init(void) { - visualizer_init(); -} - -void post_keyboard_task() { - visualizer_set_state(default_layer_state, layer_state, host_keyboard_leds()); -} diff --git a/quantum/visualizer/example_integration/gfxconf.h b/quantum/visualizer/example_integration/gfxconf.h deleted file mode 100644 index 304c5d18..00000000 --- a/quantum/visualizer/example_integration/gfxconf.h +++ /dev/null @@ -1,325 +0,0 @@ -/** - * This file has a different license to the rest of the uGFX system. - * You can copy, modify and distribute this file as you see fit. - * You do not need to publish your source modifications to this file. - * The only thing you are not permitted to do is to relicense it - * under a different license. - */ - -/** - * Copy this file into your project directory and rename it as gfxconf.h - * Edit your copy to turn on the uGFX features you want to use. - * The values below are the defaults. - * - * Only remove the comments from lines where you want to change the - * default value. This allows definitions to be included from - * driver makefiles when required and provides the best future - * compatibility for your project. - * - * Please use spaces instead of tabs in this file. - */ - -#ifndef _GFXCONF_H -#define _GFXCONF_H - - -/////////////////////////////////////////////////////////////////////////// -// GOS - One of these must be defined, preferably in your Makefile // -/////////////////////////////////////////////////////////////////////////// -#define GFX_USE_OS_CHIBIOS TRUE -//#define GFX_USE_OS_FREERTOS FALSE -// #define GFX_FREERTOS_USE_TRACE FALSE -//#define GFX_USE_OS_WIN32 FALSE -//#define GFX_USE_OS_LINUX FALSE -//#define GFX_USE_OS_OSX FALSE -//#define GFX_USE_OS_ECOS FALSE -//#define GFX_USE_OS_RAWRTOS FALSE -//#define GFX_USE_OS_ARDUINO FALSE -//#define GFX_USE_OS_KEIL FALSE -//#define GFX_USE_OS_CMSIS FALSE -//#define GFX_USE_OS_RAW32 FALSE -// #define INTERRUPTS_OFF() optional_code -// #define INTERRUPTS_ON() optional_code -// These are not defined by default for some reason -#define GOS_NEED_X_THREADS FALSE -#define GOS_NEED_X_HEAP FALSE - -// Options that (should where relevant) apply to all operating systems - #define GFX_NO_INLINE FALSE -// #define GFX_COMPILER GFX_COMPILER_UNKNOWN -// #define GFX_CPU GFX_CPU_UNKNOWN -// #define GFX_OS_HEAP_SIZE 0 -// #define GFX_OS_NO_INIT FALSE -// #define GFX_OS_INIT_NO_WARNING FALSE -// #define GFX_OS_PRE_INIT_FUNCTION myHardwareInitRoutine -// #define GFX_OS_EXTRA_INIT_FUNCTION myOSInitRoutine -// #define GFX_OS_EXTRA_DEINIT_FUNCTION myOSDeInitRoutine - - -/////////////////////////////////////////////////////////////////////////// -// GDISP // -/////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GDISP TRUE - -//#define GDISP_NEED_AUTOFLUSH FALSE -//#define GDISP_NEED_TIMERFLUSH FALSE -//#define GDISP_NEED_VALIDATION TRUE -//#define GDISP_NEED_CLIP TRUE -//#define GDISP_NEED_CIRCLE FALSE -//#define GDISP_NEED_ELLIPSE FALSE -//#define GDISP_NEED_ARC FALSE -//#define GDISP_NEED_ARCSECTORS FALSE -//#define GDISP_NEED_CONVEX_POLYGON FALSE -//#define GDISP_NEED_SCROLL FALSE -//#define GDISP_NEED_PIXELREAD FALSE -//#define GDISP_NEED_CONTROL FALSE -//#define GDISP_NEED_QUERY FALSE -//#define GDISP_NEED_MULTITHREAD FALSE -//#define GDISP_NEED_STREAMING FALSE -#define GDISP_NEED_TEXT TRUE -// #define GDISP_NEED_TEXT_WORDWRAP FALSE -// #define GDISP_NEED_ANTIALIAS FALSE -// #define GDISP_NEED_UTF8 FALSE - #define GDISP_NEED_TEXT_KERNING TRUE -// #define GDISP_INCLUDE_FONT_UI1 FALSE -// #define GDISP_INCLUDE_FONT_UI2 FALSE // The smallest preferred font. -// #define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE -// #define GDISP_INCLUDE_FONT_DEJAVUSANS10 FALSE -// #define GDISP_INCLUDE_FONT_DEJAVUSANS12 FALSE -// #define GDISP_INCLUDE_FONT_DEJAVUSANS16 FALSE -// #define GDISP_INCLUDE_FONT_DEJAVUSANS20 FALSE -// #define GDISP_INCLUDE_FONT_DEJAVUSANS24 FALSE -// #define GDISP_INCLUDE_FONT_DEJAVUSANS32 FALSE - #define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12 TRUE -// #define GDISP_INCLUDE_FONT_FIXED_10X20 FALSE -// #define GDISP_INCLUDE_FONT_FIXED_7X14 FALSE - #define GDISP_INCLUDE_FONT_FIXED_5X8 TRUE -// #define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA FALSE -// #define GDISP_INCLUDE_FONT_DEJAVUSANS16_AA FALSE -// #define GDISP_INCLUDE_FONT_DEJAVUSANS20_AA FALSE -// #define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA FALSE -// #define GDISP_INCLUDE_FONT_DEJAVUSANS32_AA FALSE -// #define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA FALSE -// #define GDISP_INCLUDE_USER_FONTS FALSE - -//#define GDISP_NEED_IMAGE FALSE -// #define GDISP_NEED_IMAGE_NATIVE FALSE -// #define GDISP_NEED_IMAGE_GIF FALSE -// #define GDISP_NEED_IMAGE_BMP FALSE -// #define GDISP_NEED_IMAGE_BMP_1 FALSE -// #define GDISP_NEED_IMAGE_BMP_4 FALSE -// #define GDISP_NEED_IMAGE_BMP_4_RLE FALSE -// #define GDISP_NEED_IMAGE_BMP_8 FALSE -// #define GDISP_NEED_IMAGE_BMP_8_RLE FALSE -// #define GDISP_NEED_IMAGE_BMP_16 FALSE -// #define GDISP_NEED_IMAGE_BMP_24 FALSE -// #define GDISP_NEED_IMAGE_BMP_32 FALSE -// #define GDISP_NEED_IMAGE_JPG FALSE -// #define GDISP_NEED_IMAGE_PNG FALSE -// #define GDISP_NEED_IMAGE_ACCOUNTING FALSE - -//#define GDISP_NEED_PIXMAP FALSE -// #define GDISP_NEED_PIXMAP_IMAGE FALSE - -//#define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE // If not defined the native hardware orientation is used. -//#define GDISP_LINEBUF_SIZE 128 -//#define GDISP_STARTUP_COLOR Black -#define GDISP_NEED_STARTUP_LOGO FALSE - -//#define GDISP_TOTAL_DISPLAYS 1 - -//#define GDISP_DRIVER_LIST GDISPVMT_Win32, GDISPVMT_Win32 -// #ifdef GDISP_DRIVER_LIST -// // For code and speed optimization define as TRUE or FALSE if all controllers have the same capability -// #define GDISP_HARDWARE_STREAM_WRITE FALSE -// #define GDISP_HARDWARE_STREAM_READ FALSE -// #define GDISP_HARDWARE_STREAM_POS FALSE -// #define GDISP_HARDWARE_DRAWPIXEL FALSE -// #define GDISP_HARDWARE_CLEARS FALSE -// #define GDISP_HARDWARE_FILLS FALSE -// #define GDISP_HARDWARE_BITFILLS FALSE -// #define GDISP_HARDWARE_SCROLL FALSE -// #define GDISP_HARDWARE_PIXELREAD FALSE -// #define GDISP_HARDWARE_CONTROL FALSE -// #define GDISP_HARDWARE_QUERY FALSE -// #define GDISP_HARDWARE_CLIP FALSE - - #define GDISP_PIXELFORMAT GDISP_PIXELFORMAT_RGB888 -// #endif - -// The custom format is not defined for some reason, so define it as error -// so we don't get compiler warnings -#define GDISP_PIXELFORMAT_CUSTOM GDISP_PIXELFORMAT_ERROR - -#define GDISP_USE_GFXNET FALSE -// #define GDISP_GFXNET_PORT 13001 -// #define GDISP_GFXNET_CUSTOM_LWIP_STARTUP FALSE -// #define GDISP_DONT_WAIT_FOR_NET_DISPLAY FALSE -// #define GDISP_GFXNET_UNSAFE_SOCKETS FALSE - - -/////////////////////////////////////////////////////////////////////////// -// GWIN // -/////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GWIN FALSE - -//#define GWIN_NEED_WINDOWMANAGER FALSE -// #define GWIN_REDRAW_IMMEDIATE FALSE -// #define GWIN_REDRAW_SINGLEOP FALSE -// #define GWIN_NEED_FLASHING FALSE -// #define GWIN_FLASHING_PERIOD 250 - -//#define GWIN_NEED_CONSOLE FALSE -// #define GWIN_CONSOLE_USE_HISTORY FALSE -// #define GWIN_CONSOLE_HISTORY_AVERAGING FALSE -// #define GWIN_CONSOLE_HISTORY_ATCREATE FALSE -// #define GWIN_CONSOLE_ESCSEQ FALSE -// #define GWIN_CONSOLE_USE_BASESTREAM FALSE -// #define GWIN_CONSOLE_USE_FLOAT FALSE -//#define GWIN_NEED_GRAPH FALSE -//#define GWIN_NEED_GL3D FALSE - -//#define GWIN_NEED_WIDGET FALSE -//#define GWIN_FOCUS_HIGHLIGHT_WIDTH 1 -// #define GWIN_NEED_LABEL FALSE -// #define GWIN_LABEL_ATTRIBUTE FALSE -// #define GWIN_NEED_BUTTON FALSE -// #define GWIN_BUTTON_LAZY_RELEASE FALSE -// #define GWIN_NEED_SLIDER FALSE -// #define GWIN_SLIDER_NOSNAP FALSE -// #define GWIN_SLIDER_DEAD_BAND 5 -// #define GWIN_SLIDER_TOGGLE_INC 20 -// #define GWIN_NEED_CHECKBOX FALSE -// #define GWIN_NEED_IMAGE FALSE -// #define GWIN_NEED_IMAGE_ANIMATION FALSE -// #define GWIN_NEED_RADIO FALSE -// #define GWIN_NEED_LIST FALSE -// #define GWIN_NEED_LIST_IMAGES FALSE -// #define GWIN_NEED_PROGRESSBAR FALSE -// #define GWIN_PROGRESSBAR_AUTO FALSE -// #define GWIN_NEED_KEYBOARD FALSE -// #define GWIN_KEYBOARD_DEFAULT_LAYOUT VirtualKeyboard_English1 -// #define GWIN_NEED_KEYBOARD_ENGLISH1 TRUE -// #define GWIN_NEED_TEXTEDIT FALSE -// #define GWIN_FLAT_STYLING FALSE -// #define GWIN_WIDGET_TAGS FALSE - -//#define GWIN_NEED_CONTAINERS FALSE -// #define GWIN_NEED_CONTAINER FALSE -// #define GWIN_NEED_FRAME FALSE -// #define GWIN_NEED_TABSET FALSE -// #define GWIN_TABSET_TABHEIGHT 18 - - -/////////////////////////////////////////////////////////////////////////// -// GEVENT // -/////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GEVENT FALSE - -//#define GEVENT_ASSERT_NO_RESOURCE FALSE -//#define GEVENT_MAXIMUM_SIZE 32 -//#define GEVENT_MAX_SOURCE_LISTENERS 32 - - -/////////////////////////////////////////////////////////////////////////// -// GTIMER // -/////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GTIMER FALSE - -//#define GTIMER_THREAD_PRIORITY HIGH_PRIORITY -//#define GTIMER_THREAD_WORKAREA_SIZE 2048 - - -/////////////////////////////////////////////////////////////////////////// -// GQUEUE // -/////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GQUEUE FALSE - -//#define GQUEUE_NEED_ASYNC FALSE -//#define GQUEUE_NEED_GSYNC FALSE -//#define GQUEUE_NEED_FSYNC FALSE -//#define GQUEUE_NEED_BUFFERS FALSE - -/////////////////////////////////////////////////////////////////////////// -// GINPUT // -/////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GINPUT FALSE - -//#define GINPUT_NEED_MOUSE FALSE -// #define GINPUT_TOUCH_STARTRAW FALSE -// #define GINPUT_TOUCH_NOTOUCH FALSE -// #define GINPUT_TOUCH_NOCALIBRATE FALSE -// #define GINPUT_TOUCH_NOCALIBRATE_GUI FALSE -// #define GINPUT_MOUSE_POLL_PERIOD 25 -// #define GINPUT_MOUSE_CLICK_TIME 300 -// #define GINPUT_TOUCH_CXTCLICK_TIME 700 -// #define GINPUT_TOUCH_USER_CALIBRATION_LOAD FALSE -// #define GINPUT_TOUCH_USER_CALIBRATION_SAVE FALSE -// #define GMOUSE_DRIVER_LIST GMOUSEVMT_Win32, GMOUSEVMT_Win32 -//#define GINPUT_NEED_KEYBOARD FALSE -// #define GINPUT_KEYBOARD_POLL_PERIOD 200 -// #define GKEYBOARD_DRIVER_LIST GKEYBOARDVMT_Win32, GKEYBOARDVMT_Win32 -// #define GKEYBOARD_LAYOUT_OFF FALSE -// #define GKEYBOARD_LAYOUT_SCANCODE2_US FALSE -//#define GINPUT_NEED_TOGGLE FALSE -//#define GINPUT_NEED_DIAL FALSE - - -/////////////////////////////////////////////////////////////////////////// -// GFILE // -/////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GFILE FALSE - -//#define GFILE_NEED_PRINTG FALSE -//#define GFILE_NEED_SCANG FALSE -//#define GFILE_NEED_STRINGS FALSE -//#define GFILE_NEED_FILELISTS FALSE -//#define GFILE_NEED_STDIO FALSE -//#define GFILE_NEED_NOAUTOMOUNT FALSE -//#define GFILE_NEED_NOAUTOSYNC FALSE - -//#define GFILE_NEED_MEMFS FALSE -//#define GFILE_NEED_ROMFS FALSE -//#define GFILE_NEED_RAMFS FALSE -//#define GFILE_NEED_FATFS FALSE -//#define GFILE_NEED_NATIVEFS FALSE -//#define GFILE_NEED_CHBIOSFS FALSE - -//#define GFILE_ALLOW_FLOATS FALSE -//#define GFILE_ALLOW_DEVICESPECIFIC FALSE -//#define GFILE_MAX_GFILES 3 - -/////////////////////////////////////////////////////////////////////////// -// GADC // -/////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GADC FALSE - -//#define GADC_MAX_LOWSPEED_DEVICES 4 - - -/////////////////////////////////////////////////////////////////////////// -// GAUDIO // -/////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GAUDIO FALSE -// There seems to be a bug in the ugfx code, the wrong define is used -// So define it in order to avoid warnings -#define GFX_USE_GAUDIN GFX_USE_GAUDIO -// #define GAUDIO_NEED_PLAY FALSE -// #define GAUDIO_NEED_RECORD FALSE - - -/////////////////////////////////////////////////////////////////////////// -// GMISC // -/////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GMISC FALSE - -//#define GMISC_NEED_ARRAYOPS FALSE -//#define GMISC_NEED_FASTTRIG FALSE -//#define GMISC_NEED_FIXEDTRIG FALSE -//#define GMISC_NEED_INVSQRT FALSE -// #define GMISC_INVSQRT_MIXED_ENDIAN FALSE -// #define GMISC_INVSQRT_REAL_SLOW FALSE -//#define GMISC_NEED_MATRIXFLOAT2D FALSE -//#define GMISC_NEED_MATRIXFIXED2D FALSE - -#endif /* _GFXCONF_H */ diff --git a/quantum/visualizer/example_integration/lcd_backlight_hal.c b/quantum/visualizer/example_integration/lcd_backlight_hal.c deleted file mode 100644 index 913131b1..00000000 --- a/quantum/visualizer/example_integration/lcd_backlight_hal.c +++ /dev/null @@ -1,91 +0,0 @@ -/* -The MIT License (MIT) - -Copyright (c) 2016 Fred Sundvik - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -#include "lcd_backlight.h" -#include "hal.h" - -#define RED_PIN 1 -#define GREEN_PIN 2 -#define BLUE_PIN 3 -#define CHANNEL_RED FTM0->CHANNEL[0] -#define CHANNEL_GREEN FTM0->CHANNEL[1] -#define CHANNEL_BLUE FTM0->CHANNEL[2] - -#define RGB_PORT PORTC -#define RGB_PORT_GPIO GPIOC - -// Base FTM clock selection (72 MHz system clock) -// @ 0xFFFF period, 72 MHz / (0xFFFF * 2) = Actual period -// Higher pre-scalar will use the most power (also look the best) -// Pre-scalar calculations -// 0 - 72 MHz -> 549 Hz -// 1 - 36 MHz -> 275 Hz -// 2 - 18 MHz -> 137 Hz -// 3 - 9 MHz -> 69 Hz (Slightly visible flicker) -// 4 - 4 500 kHz -> 34 Hz (Visible flickering) -// 5 - 2 250 kHz -> 17 Hz -// 6 - 1 125 kHz -> 9 Hz -// 7 - 562 500 Hz -> 4 Hz -// Using a higher pre-scalar without flicker is possible but FTM0_MOD will need to be reduced -// Which will reduce the brightness range -#define PRESCALAR_DEFINE 0 - -void lcd_backlight_hal_init(void) { - // Setup Backlight - SIM->SCGC6 |= SIM_SCGC6_FTM0; - FTM0->CNT = 0; // Reset counter - - // PWM Period - // 16-bit maximum - FTM0->MOD = 0xFFFF; - - // Set FTM to PWM output - Edge Aligned, Low-true pulses -#define CNSC_MODE FTM_SC_CPWMS | FTM_SC_PS(4) | FTM_SC_CLKS(0) - CHANNEL_RED.CnSC = CNSC_MODE; - CHANNEL_GREEN.CnSC = CNSC_MODE; - CHANNEL_BLUE.CnSC = CNSC_MODE; - - // System clock, /w prescalar setting - FTM0->SC = FTM_SC_CLKS(1) | FTM_SC_PS(PRESCALAR_DEFINE); - - CHANNEL_RED.CnV = 0; - CHANNEL_GREEN.CnV = 0; - CHANNEL_BLUE.CnV = 0; - - RGB_PORT_GPIO->PDDR |= (1 << RED_PIN); - RGB_PORT_GPIO->PDDR |= (1 << GREEN_PIN); - RGB_PORT_GPIO->PDDR |= (1 << BLUE_PIN); - -#define RGB_MODE PORTx_PCRn_SRE | PORTx_PCRn_DSE | PORTx_PCRn_MUX(4) - RGB_PORT->PCR[RED_PIN] = RGB_MODE; - RGB_PORT->PCR[GREEN_PIN] = RGB_MODE; - RGB_PORT->PCR[BLUE_PIN] = RGB_MODE; -} - -void lcd_backlight_hal_color(uint16_t r, uint16_t g, uint16_t b) { - CHANNEL_RED.CnV = r; - CHANNEL_GREEN.CnV = g; - CHANNEL_BLUE.CnV = b; -} - diff --git a/quantum/visualizer/example_integration/visualizer_user.c b/quantum/visualizer/example_integration/visualizer_user.c deleted file mode 100644 index fc09fe2e..00000000 --- a/quantum/visualizer/example_integration/visualizer_user.c +++ /dev/null @@ -1,121 +0,0 @@ -/* -The MIT License (MIT) - -Copyright (c) 2016 Fred Sundvik - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -// Currently we are assuming that both the backlight and LCD are enabled -// But it's entirely possible to write a custom visualizer that use only -// one of them -#ifndef LCD_BACKLIGHT_ENABLE -#error This visualizer needs that LCD backlight is enabled -#endif - -#ifndef LCD_ENABLE -#error This visualizer needs that LCD is enabled -#endif - -#include "visualizer.h" - -static const char* welcome_text[] = {"TMK", "Infinity Ergodox"}; - -// Just an example how to write custom keyframe functions, we could have moved -// all this into the init function -bool display_welcome(keyframe_animation_t* animation, visualizer_state_t* state) { - (void)animation; - // Read the uGFX documentation for information how to use the displays - // http://wiki.ugfx.org/index.php/Main_Page - gdispClear(White); - // You can use static variables for things that can't be found in the animation - // or state structs - gdispDrawString(0, 3, welcome_text[0], state->font_dejavusansbold12, Black); - gdispDrawString(0, 15, welcome_text[1], state->font_dejavusansbold12, Black); - // Always remember to flush the display - gdispFlush(); - // you could set the backlight color as well, but we won't do it here, since - // it's part of the following animation - // lcd_backlight_color(hue, saturation, intensity); - // We don't need constant updates, just drawing the screen once is enough - return false; -} - -// Feel free to modify the animations below, or even add new ones if needed - -// Don't worry, if the startup animation is long, you can use the keyboard like normal -// during that time -static keyframe_animation_t startup_animation = { - .num_frames = 4, - .loop = false, - .frame_lengths = {0, MS2ST(1000), MS2ST(5000), 0}, - .frame_functions = {display_welcome, keyframe_animate_backlight_color, keyframe_no_operation, enable_visualization}, -}; - -// The color animation animates the LCD color when you change layers -static keyframe_animation_t color_animation = { - .num_frames = 2, - .loop = false, - // Note that there's a 200 ms no-operation frame, - // this prevents the color from changing when activating the layer - // momentarily - .frame_lengths = {MS2ST(200), MS2ST(500)}, - .frame_functions = {keyframe_no_operation, keyframe_animate_backlight_color}, -}; - -// The LCD animation alternates between the layer name display and a -// bitmap that displays all active layers -static keyframe_animation_t lcd_animation = { - .num_frames = 2, - .loop = true, - .frame_lengths = {MS2ST(2000), MS2ST(2000)}, - .frame_functions = {keyframe_display_layer_text, keyframe_display_layer_bitmap}, -}; - -void initialize_user_visualizer(visualizer_state_t* state) { - // The brightness will be dynamically adjustable in the future - // But for now, change it here. - lcd_backlight_brightness(0x50); - state->current_lcd_color = LCD_COLOR(0x00, 0x00, 0xFF); - state->target_lcd_color = LCD_COLOR(0x10, 0xFF, 0xFF); - start_keyframe_animation(&startup_animation); -} - -void update_user_visualizer_state(visualizer_state_t* state) { - // Add more tests, change the colors and layer texts here - // Usually you want to check the high bits (higher layers first) - // because that's the order layers are processed for keypresses - // You can for check for example: - // state->status.layer - // state->status.default_layer - // state->status.leds (see led.h for available statuses) - if (state->status.layer & 0x2) { - state->target_lcd_color = LCD_COLOR(0xA0, 0xB0, 0xFF); - state->layer_text = "Layer 2"; - } - else { - state->target_lcd_color = LCD_COLOR(0x50, 0xB0, 0xFF); - state->layer_text = "Layer 1"; - } - // You can also stop existing animations, and start your custom ones here - // remember that you should normally have only one animation for the LCD - // and one for the background. But you can also combine them if you want. - start_keyframe_animation(&lcd_animation); - start_keyframe_animation(&color_animation); -} From 5815c5d317b02d688990980fdf01848e81247c21 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Wed, 5 Apr 2017 08:40:39 +0300 Subject: [PATCH 100/117] Move LCD keyframes to its own file --- keyboards/ergodox/infinity/visualizer.c | 7 +- .../ergodox/keymaps/default/visualizer.c | 5 +- quantum/visualizer/lcd_keyframes.c | 160 ++++++++++++++++++ quantum/visualizer/lcd_keyframes.h | 33 ++++ quantum/visualizer/visualizer.c | 150 +--------------- quantum/visualizer/visualizer.h | 9 - quantum/visualizer/visualizer.mk | 1 + 7 files changed, 203 insertions(+), 162 deletions(-) create mode 100644 quantum/visualizer/lcd_keyframes.c create mode 100644 quantum/visualizer/lcd_keyframes.h diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index c7afd938..3abed08d 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -27,6 +27,7 @@ along with this program. If not, see . #endif #include "visualizer.h" +#include "lcd_keyframes.h" #include "system/serial_link.h" // To generate an image array like this @@ -173,14 +174,14 @@ static keyframe_animation_t lcd_bitmap_animation = { .num_frames = 1, .loop = false, .frame_lengths = {gfxMillisecondsToTicks(0)}, - .frame_functions = {keyframe_display_layer_bitmap}, + .frame_functions = {lcd_keyframe_display_layer_bitmap}, }; static keyframe_animation_t lcd_bitmap_leds_animation = { .num_frames = 2, .loop = true, .frame_lengths = {gfxMillisecondsToTicks(2000), gfxMillisecondsToTicks(2000)}, - .frame_functions = {keyframe_display_layer_bitmap, keyframe_display_led_states}, + .frame_functions = {lcd_keyframe_display_layer_bitmap, lcd_keyframe_display_led_states}, }; static keyframe_animation_t suspend_animation = { @@ -188,7 +189,7 @@ static keyframe_animation_t suspend_animation = { .loop = false, .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0}, .frame_functions = { - keyframe_display_layer_text, + lcd_keyframe_display_layer_text, keyframe_animate_backlight_color, keyframe_disable_lcd_and_backlight, }, diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c index 305aaae1..ef87ac41 100644 --- a/keyboards/ergodox/keymaps/default/visualizer.c +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -27,6 +27,7 @@ along with this program. If not, see . #endif #include "visualizer.h" +#include "lcd_keyframes.h" #include "system/serial_link.h" #include "led.h" @@ -122,7 +123,7 @@ static keyframe_animation_t lcd_layer_display = { .num_frames = 1, .loop = false, .frame_lengths = {gfxMillisecondsToTicks(0)}, - .frame_functions = {keyframe_display_layer_and_led_states} + .frame_functions = {lcd_keyframe_display_layer_and_led_states} }; static keyframe_animation_t suspend_animation = { @@ -130,7 +131,7 @@ static keyframe_animation_t suspend_animation = { .loop = false, .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0}, .frame_functions = { - keyframe_display_layer_text, + lcd_keyframe_display_layer_text, keyframe_animate_backlight_color, keyframe_disable_lcd_and_backlight, }, diff --git a/quantum/visualizer/lcd_keyframes.c b/quantum/visualizer/lcd_keyframes.c new file mode 100644 index 00000000..00d9734e --- /dev/null +++ b/quantum/visualizer/lcd_keyframes.c @@ -0,0 +1,160 @@ +/* Copyright 2017 Fred Sundvik + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "lcd_keyframes.h" +#include +#include "action_util.h" +#include "led.h" + +bool lcd_keyframe_display_layer_text(keyframe_animation_t* animation, visualizer_state_t* state) { + (void)animation; + gdispClear(White); + gdispDrawString(0, 10, state->layer_text, state->font_dejavusansbold12, Black); + gdispFlush(); + return false; +} + +static void format_layer_bitmap_string(uint16_t default_layer, uint16_t layer, char* buffer) { + for (int i=0; i<16;i++) + { + uint32_t mask = (1u << i); + if (default_layer & mask) { + if (layer & mask) { + *buffer = 'B'; + } else { + *buffer = 'D'; + } + } else if (layer & mask) { + *buffer = '1'; + } else { + *buffer = '0'; + } + ++buffer; + + if (i==3 || i==7 || i==11) { + *buffer = ' '; + ++buffer; + } + } + *buffer = 0; +} + +bool lcd_keyframe_display_layer_bitmap(keyframe_animation_t* animation, visualizer_state_t* state) { + (void)animation; + const char* layer_help = "1=On D=Default B=Both"; + char layer_buffer[16 + 4]; // 3 spaces and one null terminator + gdispClear(White); + gdispDrawString(0, 0, layer_help, state->font_fixed5x8, Black); + format_layer_bitmap_string(state->status.default_layer, state->status.layer, layer_buffer); + gdispDrawString(0, 10, layer_buffer, state->font_fixed5x8, Black); + format_layer_bitmap_string(state->status.default_layer >> 16, state->status.layer >> 16, layer_buffer); + gdispDrawString(0, 20, layer_buffer, state->font_fixed5x8, Black); + gdispFlush(); + return false; +} + +static void format_mods_bitmap_string(uint8_t mods, char* buffer) { + *buffer = ' '; + ++buffer; + + for (int i = 0; i<8; i++) + { + uint32_t mask = (1u << i); + if (mods & mask) { + *buffer = '1'; + } else { + *buffer = '0'; + } + ++buffer; + + if (i==3) { + *buffer = ' '; + ++buffer; + } + } + *buffer = 0; +} + +bool lcd_keyframe_display_mods_bitmap(keyframe_animation_t* animation, visualizer_state_t* state) { + (void)animation; + + const char* title = "Modifier states"; + const char* mods_header = " CSAG CSAG "; + char status_buffer[12]; + + gdispClear(White); + gdispDrawString(0, 0, title, state->font_fixed5x8, Black); + gdispDrawString(0, 10, mods_header, state->font_fixed5x8, Black); + format_mods_bitmap_string(state->status.mods, status_buffer); + gdispDrawString(0, 20, status_buffer, state->font_fixed5x8, Black); + + gdispFlush(); + return false; +} + +#define LED_STATE_STRING_SIZE sizeof("NUM CAPS SCRL COMP KANA") + +static void get_led_state_string(char* output, visualizer_state_t* state) { + uint8_t pos = 0; + + if (state->status.leds & (1u << USB_LED_NUM_LOCK)) { + memcpy(output + pos, "NUM ", 4); + pos += 4; + } + if (state->status.leds & (1u << USB_LED_CAPS_LOCK)) { + memcpy(output + pos, "CAPS ", 5); + pos += 5; + } + if (state->status.leds & (1u << USB_LED_SCROLL_LOCK)) { + memcpy(output + pos, "SCRL ", 5); + pos += 5; + } + if (state->status.leds & (1u << USB_LED_COMPOSE)) { + memcpy(output + pos, "COMP ", 5); + pos += 5; + } + if (state->status.leds & (1u << USB_LED_KANA)) { + memcpy(output + pos, "KANA ", 5); + pos += 5; + } + output[pos] = 0; +} + +bool lcd_keyframe_display_led_states(keyframe_animation_t* animation, visualizer_state_t* state) +{ + (void)animation; + char output[LED_STATE_STRING_SIZE]; + get_led_state_string(output, state); + gdispClear(White); + gdispDrawString(0, 10, output, state->font_dejavusansbold12, Black); + gdispFlush(); + return false; +} + +bool lcd_keyframe_display_layer_and_led_states(keyframe_animation_t* animation, visualizer_state_t* state) { + (void)animation; + gdispClear(White); + uint8_t y = 10; + if (state->status.leds) { + char output[LED_STATE_STRING_SIZE]; + get_led_state_string(output, state); + gdispDrawString(0, 1, output, state->font_dejavusansbold12, Black); + y = 17; + } + gdispDrawString(0, y, state->layer_text, state->font_dejavusansbold12, Black); + gdispFlush(); + return false; +} diff --git a/quantum/visualizer/lcd_keyframes.h b/quantum/visualizer/lcd_keyframes.h new file mode 100644 index 00000000..0c9f39ab --- /dev/null +++ b/quantum/visualizer/lcd_keyframes.h @@ -0,0 +1,33 @@ +/* Copyright 2017 Fred Sundvik + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef QUANTUM_VISUALIZER_LCD_KEYFRAMES_H_ +#define QUANTUM_VISUALIZER_LCD_KEYFRAMES_H_ + +#include "visualizer.h" + +// Displays the layer text centered vertically on the screen +bool lcd_keyframe_display_layer_text(keyframe_animation_t* animation, visualizer_state_t* state); +// Displays a bitmap (0/1) of all the currently active layers +bool lcd_keyframe_display_layer_bitmap(keyframe_animation_t* animation, visualizer_state_t* state); +// Displays a bitmap (0/1) of all the currently active mods +bool lcd_keyframe_display_mods_bitmap(keyframe_animation_t* animation, visualizer_state_t* state); +// Displays the keyboard led states (CAPS (Caps lock), NUM (Num lock), SCRL (Scroll lock), COMP (Compose), KANA) +bool lcd_keyframe_display_led_states(keyframe_animation_t* animation, visualizer_state_t* state); +// Displays both the layer text and the led states +bool lcd_keyframe_display_layer_and_led_states(keyframe_animation_t* animation, visualizer_state_t* state); + +#endif /* QUANTUM_VISUALIZER_LCD_KEYFRAMES_H_ */ diff --git a/quantum/visualizer/visualizer.c b/quantum/visualizer/visualizer.c index 2533eb70..514d7c44 100644 --- a/quantum/visualizer/visualizer.c +++ b/quantum/visualizer/visualizer.c @@ -48,16 +48,13 @@ SOFTWARE. #include "serial_link/system/serial_link.h" #endif +#include "action_util.h" + // Define this in config.h #ifndef VISUALIZER_THREAD_PRIORITY #define "Visualizer thread priority not defined" #endif -// mods status -#include "action_util.h" - -#include "led.h" - static visualizer_keyboard_status_t current_status = { .layer = 0xFFFFFFFF, .default_layer = 0xFFFFFFFF, @@ -277,149 +274,6 @@ bool keyframe_set_backlight_color(keyframe_animation_t* animation, visualizer_st } #endif // LCD_BACKLIGHT_ENABLE -#ifdef LCD_ENABLE -bool keyframe_display_layer_text(keyframe_animation_t* animation, visualizer_state_t* state) { - (void)animation; - gdispClear(White); - gdispDrawString(0, 10, state->layer_text, state->font_dejavusansbold12, Black); - gdispFlush(); - return false; -} - -static void format_layer_bitmap_string(uint16_t default_layer, uint16_t layer, char* buffer) { - for (int i=0; i<16;i++) - { - uint32_t mask = (1u << i); - if (default_layer & mask) { - if (layer & mask) { - *buffer = 'B'; - } else { - *buffer = 'D'; - } - } else if (layer & mask) { - *buffer = '1'; - } else { - *buffer = '0'; - } - ++buffer; - - if (i==3 || i==7 || i==11) { - *buffer = ' '; - ++buffer; - } - } - *buffer = 0; -} - -bool keyframe_display_layer_bitmap(keyframe_animation_t* animation, visualizer_state_t* state) { - (void)animation; - const char* layer_help = "1=On D=Default B=Both"; - char layer_buffer[16 + 4]; // 3 spaces and one null terminator - gdispClear(White); - gdispDrawString(0, 0, layer_help, state->font_fixed5x8, Black); - format_layer_bitmap_string(state->status.default_layer, state->status.layer, layer_buffer); - gdispDrawString(0, 10, layer_buffer, state->font_fixed5x8, Black); - format_layer_bitmap_string(state->status.default_layer >> 16, state->status.layer >> 16, layer_buffer); - gdispDrawString(0, 20, layer_buffer, state->font_fixed5x8, Black); - gdispFlush(); - return false; -} - -static void format_mods_bitmap_string(uint8_t mods, char* buffer) { - *buffer = ' '; - ++buffer; - - for (int i = 0; i<8; i++) - { - uint32_t mask = (1u << i); - if (mods & mask) { - *buffer = '1'; - } else { - *buffer = '0'; - } - ++buffer; - - if (i==3) { - *buffer = ' '; - ++buffer; - } - } - *buffer = 0; -} - -bool keyframe_display_mods_bitmap(keyframe_animation_t* animation, visualizer_state_t* state) { - (void)animation; - - const char* title = "Modifier states"; - const char* mods_header = " CSAG CSAG "; - char status_buffer[12]; - - gdispClear(White); - gdispDrawString(0, 0, title, state->font_fixed5x8, Black); - gdispDrawString(0, 10, mods_header, state->font_fixed5x8, Black); - format_mods_bitmap_string(state->status.mods, status_buffer); - gdispDrawString(0, 20, status_buffer, state->font_fixed5x8, Black); - - gdispFlush(); - return false; -} - -#define LED_STATE_STRING_SIZE sizeof("NUM CAPS SCRL COMP KANA") - -static void get_led_state_string(char* output, visualizer_state_t* state) { - uint8_t pos = 0; - - if (state->status.leds & (1u << USB_LED_NUM_LOCK)) { - memcpy(output + pos, "NUM ", 4); - pos += 4; - } - if (state->status.leds & (1u << USB_LED_CAPS_LOCK)) { - memcpy(output + pos, "CAPS ", 5); - pos += 5; - } - if (state->status.leds & (1u << USB_LED_SCROLL_LOCK)) { - memcpy(output + pos, "SCRL ", 5); - pos += 5; - } - if (state->status.leds & (1u << USB_LED_COMPOSE)) { - memcpy(output + pos, "COMP ", 5); - pos += 5; - } - if (state->status.leds & (1u << USB_LED_KANA)) { - memcpy(output + pos, "KANA ", 5); - pos += 5; - } - output[pos] = 0; -} - -bool keyframe_display_led_states(keyframe_animation_t* animation, visualizer_state_t* state) -{ - (void)animation; - char output[LED_STATE_STRING_SIZE]; - get_led_state_string(output, state); - gdispClear(White); - gdispDrawString(0, 10, output, state->font_dejavusansbold12, Black); - gdispFlush(); - return false; -} - -bool keyframe_display_layer_and_led_states(keyframe_animation_t* animation, visualizer_state_t* state) { - (void)animation; - gdispClear(White); - uint8_t y = 10; - if (state->status.leds) { - char output[LED_STATE_STRING_SIZE]; - get_led_state_string(output, state); - gdispDrawString(0, 1, output, state->font_dejavusansbold12, Black); - y = 17; - } - gdispDrawString(0, y, state->layer_text, state->font_dejavusansbold12, Black); - gdispFlush(); - return false; -} - -#endif // LCD_ENABLE - bool keyframe_disable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state) { (void)animation; (void)state; diff --git a/quantum/visualizer/visualizer.h b/quantum/visualizer/visualizer.h index 3b05c305..440044fd 100644 --- a/quantum/visualizer/visualizer.h +++ b/quantum/visualizer/visualizer.h @@ -133,15 +133,6 @@ bool keyframe_no_operation(keyframe_animation_t* animation, visualizer_state_t* bool keyframe_animate_backlight_color(keyframe_animation_t* animation, visualizer_state_t* state); // Sets the backlight color to the target color bool keyframe_set_backlight_color(keyframe_animation_t* animation, visualizer_state_t* state); -// Displays the layer text centered vertically on the screen -bool keyframe_display_layer_text(keyframe_animation_t* animation, visualizer_state_t* state); -// Displays a bitmap (0/1) of all the currently active layers -bool keyframe_display_layer_bitmap(keyframe_animation_t* animation, visualizer_state_t* state); -// Displays a bitmap (0/1) of all the currently active mods -bool keyframe_display_mods_bitmap(keyframe_animation_t* animation, visualizer_state_t* state); -// Displays the keyboard led states (CAPS (Caps lock), NUM (Num lock), SCRL (Scroll lock), COMP (Compose), KANA) -bool keyframe_display_led_states(keyframe_animation_t* animation, visualizer_state_t* state); -bool keyframe_display_layer_and_led_states(keyframe_animation_t* animation, visualizer_state_t* state); bool keyframe_disable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state); bool keyframe_enable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state); diff --git a/quantum/visualizer/visualizer.mk b/quantum/visualizer/visualizer.mk index 3861cb1f..325cefd6 100644 --- a/quantum/visualizer/visualizer.mk +++ b/quantum/visualizer/visualizer.mk @@ -34,6 +34,7 @@ endif ifeq ($(strip $(LCD_ENABLE)), yes) SRC += $(VISUALIZER_DIR)/lcd_backlight.c +SRC += $(VISUALIZER_DIR)/lcd_keyframes.c OPT_DEFS += -DLCD_BACKLIGHT_ENABLE endif From 5ba228b684a32c1099efc6207842a56ff102961a Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Wed, 5 Apr 2017 08:48:30 +0300 Subject: [PATCH 101/117] Move LCD backlight keyframes to its own file --- keyboards/ergodox/infinity/visualizer.c | 11 ++-- .../ergodox/keymaps/default/visualizer.c | 9 +-- quantum/visualizer/lcd_backlight_keyframes.c | 61 +++++++++++++++++++ quantum/visualizer/lcd_backlight_keyframes.h | 27 ++++++++ quantum/visualizer/visualizer.c | 46 -------------- quantum/visualizer/visualizer.h | 4 -- quantum/visualizer/visualizer.mk | 1 + 7 files changed, 100 insertions(+), 59 deletions(-) create mode 100644 quantum/visualizer/lcd_backlight_keyframes.c create mode 100644 quantum/visualizer/lcd_backlight_keyframes.h diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index 3abed08d..bbed4e98 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -28,6 +28,7 @@ along with this program. If not, see . #include "visualizer.h" #include "lcd_keyframes.h" +#include "lcd_backlight_keyframes.h" #include "system/serial_link.h" // To generate an image array like this @@ -140,7 +141,7 @@ static keyframe_animation_t startup_animation = { .frame_lengths = {0, gfxMillisecondsToTicks(10000), 0}, .frame_functions = { display_logo, - keyframe_animate_backlight_color, + backlight_keyframe_animate_color, enable_visualization }, }; @@ -150,7 +151,7 @@ static keyframe_animation_t one_led_color = { .num_frames = 1, .loop = false, .frame_lengths = {gfxMillisecondsToTicks(0)}, - .frame_functions = {keyframe_set_backlight_color}, + .frame_functions = {backlight_keyframe_set_color}, }; bool swap_led_target_color(keyframe_animation_t* animation, visualizer_state_t* state) { @@ -165,7 +166,7 @@ static keyframe_animation_t two_led_colors = { .num_frames = 2, .loop = true, .frame_lengths = {gfxMillisecondsToTicks(1000), gfxMillisecondsToTicks(0)}, - .frame_functions = {keyframe_set_backlight_color, swap_led_target_color}, + .frame_functions = {backlight_keyframe_set_color, swap_led_target_color}, }; // The LCD animation alternates between the layer name display and a @@ -190,7 +191,7 @@ static keyframe_animation_t suspend_animation = { .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0}, .frame_functions = { lcd_keyframe_display_layer_text, - keyframe_animate_backlight_color, + backlight_keyframe_animate_color, keyframe_disable_lcd_and_backlight, }, }; @@ -202,7 +203,7 @@ static keyframe_animation_t resume_animation = { .frame_functions = { keyframe_enable_lcd_and_backlight, display_logo, - keyframe_animate_backlight_color, + backlight_keyframe_animate_color, enable_visualization, }, }; diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c index ef87ac41..07f5a44a 100644 --- a/keyboards/ergodox/keymaps/default/visualizer.c +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -28,6 +28,7 @@ along with this program. If not, see . #include "visualizer.h" #include "lcd_keyframes.h" +#include "lcd_backlight_keyframes.h" #include "system/serial_link.h" #include "led.h" @@ -114,7 +115,7 @@ static keyframe_animation_t startup_animation = { .frame_lengths = {0, gfxMillisecondsToTicks(10000), 0}, .frame_functions = { display_logo, - keyframe_animate_backlight_color, + backlight_keyframe_animate_color, enable_visualization }, }; @@ -132,7 +133,7 @@ static keyframe_animation_t suspend_animation = { .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0}, .frame_functions = { lcd_keyframe_display_layer_text, - keyframe_animate_backlight_color, + backlight_keyframe_animate_color, keyframe_disable_lcd_and_backlight, }, }; @@ -144,7 +145,7 @@ static keyframe_animation_t resume_animation = { .frame_functions = { keyframe_enable_lcd_and_backlight, display_logo, - keyframe_animate_backlight_color, + backlight_keyframe_animate_color, enable_visualization, }, }; @@ -157,7 +158,7 @@ static keyframe_animation_t color_animation = { // this prevents the color from changing when activating the layer // momentarily .frame_lengths = {gfxMillisecondsToTicks(200), gfxMillisecondsToTicks(500)}, - .frame_functions = {keyframe_no_operation, keyframe_animate_backlight_color}, + .frame_functions = {keyframe_no_operation, backlight_keyframe_animate_color}, }; void initialize_user_visualizer(visualizer_state_t* state) { diff --git a/quantum/visualizer/lcd_backlight_keyframes.c b/quantum/visualizer/lcd_backlight_keyframes.c new file mode 100644 index 00000000..09647370 --- /dev/null +++ b/quantum/visualizer/lcd_backlight_keyframes.c @@ -0,0 +1,61 @@ +/* Copyright 2017 Fred Sundvik + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "lcd_backlight_keyframes.h" + +bool backlight_keyframe_animate_color(keyframe_animation_t* animation, visualizer_state_t* state) { + int frame_length = animation->frame_lengths[animation->current_frame]; + int current_pos = frame_length - animation->time_left_in_frame; + uint8_t t_h = LCD_HUE(state->target_lcd_color); + uint8_t t_s = LCD_SAT(state->target_lcd_color); + uint8_t t_i = LCD_INT(state->target_lcd_color); + uint8_t p_h = LCD_HUE(state->prev_lcd_color); + uint8_t p_s = LCD_SAT(state->prev_lcd_color); + uint8_t p_i = LCD_INT(state->prev_lcd_color); + + uint8_t d_h1 = t_h - p_h; //Modulo arithmetic since we want to wrap around + int d_h2 = t_h - p_h; + // Chose the shortest way around + int d_h = abs(d_h2) < d_h1 ? d_h2 : d_h1; + int d_s = t_s - p_s; + int d_i = t_i - p_i; + + int hue = (d_h * current_pos) / frame_length; + int sat = (d_s * current_pos) / frame_length; + int intensity = (d_i * current_pos) / frame_length; + //dprintf("%X -> %X = %X\n", p_h, t_h, hue); + hue += p_h; + sat += p_s; + intensity += p_i; + state->current_lcd_color = LCD_COLOR(hue, sat, intensity); + lcd_backlight_color( + LCD_HUE(state->current_lcd_color), + LCD_SAT(state->current_lcd_color), + LCD_INT(state->current_lcd_color)); + + return true; +} + +bool backlight_keyframe_set_color(keyframe_animation_t* animation, visualizer_state_t* state) { + (void)animation; + state->prev_lcd_color = state->target_lcd_color; + state->current_lcd_color = state->target_lcd_color; + lcd_backlight_color( + LCD_HUE(state->current_lcd_color), + LCD_SAT(state->current_lcd_color), + LCD_INT(state->current_lcd_color)); + return false; +} diff --git a/quantum/visualizer/lcd_backlight_keyframes.h b/quantum/visualizer/lcd_backlight_keyframes.h new file mode 100644 index 00000000..8cd5a46c --- /dev/null +++ b/quantum/visualizer/lcd_backlight_keyframes.h @@ -0,0 +1,27 @@ +/* Copyright 2017 Fred Sundvik + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef QUANTUM_VISUALIZER_LCD_BACKLIGHT_KEYFRAMES_H_ +#define QUANTUM_VISUALIZER_LCD_BACKLIGHT_KEYFRAMES_H_ + +#include "visualizer.h" + +// Animates the LCD backlight color between the current color and the target color (of the state) +bool backlight_keyframe_animate_color(keyframe_animation_t* animation, visualizer_state_t* state); +// Sets the backlight color to the target color +bool backlight_keyframe_set_color(keyframe_animation_t* animation, visualizer_state_t* state); + +#endif /* QUANTUM_VISUALIZER_LCD_BACKLIGHT_KEYFRAMES_H_ */ diff --git a/quantum/visualizer/visualizer.c b/quantum/visualizer/visualizer.c index 514d7c44..6ebd806e 100644 --- a/quantum/visualizer/visualizer.c +++ b/quantum/visualizer/visualizer.c @@ -228,52 +228,6 @@ bool keyframe_no_operation(keyframe_animation_t* animation, visualizer_state_t* return false; } -#ifdef LCD_BACKLIGHT_ENABLE -bool keyframe_animate_backlight_color(keyframe_animation_t* animation, visualizer_state_t* state) { - int frame_length = animation->frame_lengths[animation->current_frame]; - int current_pos = frame_length - animation->time_left_in_frame; - uint8_t t_h = LCD_HUE(state->target_lcd_color); - uint8_t t_s = LCD_SAT(state->target_lcd_color); - uint8_t t_i = LCD_INT(state->target_lcd_color); - uint8_t p_h = LCD_HUE(state->prev_lcd_color); - uint8_t p_s = LCD_SAT(state->prev_lcd_color); - uint8_t p_i = LCD_INT(state->prev_lcd_color); - - uint8_t d_h1 = t_h - p_h; //Modulo arithmetic since we want to wrap around - int d_h2 = t_h - p_h; - // Chose the shortest way around - int d_h = abs(d_h2) < d_h1 ? d_h2 : d_h1; - int d_s = t_s - p_s; - int d_i = t_i - p_i; - - int hue = (d_h * current_pos) / frame_length; - int sat = (d_s * current_pos) / frame_length; - int intensity = (d_i * current_pos) / frame_length; - //dprintf("%X -> %X = %X\n", p_h, t_h, hue); - hue += p_h; - sat += p_s; - intensity += p_i; - state->current_lcd_color = LCD_COLOR(hue, sat, intensity); - lcd_backlight_color( - LCD_HUE(state->current_lcd_color), - LCD_SAT(state->current_lcd_color), - LCD_INT(state->current_lcd_color)); - - return true; -} - -bool keyframe_set_backlight_color(keyframe_animation_t* animation, visualizer_state_t* state) { - (void)animation; - state->prev_lcd_color = state->target_lcd_color; - state->current_lcd_color = state->target_lcd_color; - lcd_backlight_color( - LCD_HUE(state->current_lcd_color), - LCD_SAT(state->current_lcd_color), - LCD_INT(state->current_lcd_color)); - return false; -} -#endif // LCD_BACKLIGHT_ENABLE - bool keyframe_disable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state) { (void)animation; (void)state; diff --git a/quantum/visualizer/visualizer.h b/quantum/visualizer/visualizer.h index 440044fd..5c870dbf 100644 --- a/quantum/visualizer/visualizer.h +++ b/quantum/visualizer/visualizer.h @@ -129,10 +129,6 @@ void run_next_keyframe(keyframe_animation_t* animation, visualizer_state_t* stat // Some predefined keyframe functions that can be used by the user code // Does nothing, useful for adding delays bool keyframe_no_operation(keyframe_animation_t* animation, visualizer_state_t* state); -// Animates the LCD backlight color between the current color and the target color (of the state) -bool keyframe_animate_backlight_color(keyframe_animation_t* animation, visualizer_state_t* state); -// Sets the backlight color to the target color -bool keyframe_set_backlight_color(keyframe_animation_t* animation, visualizer_state_t* state); bool keyframe_disable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state); bool keyframe_enable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state); diff --git a/quantum/visualizer/visualizer.mk b/quantum/visualizer/visualizer.mk index 325cefd6..c9eb8c5b 100644 --- a/quantum/visualizer/visualizer.mk +++ b/quantum/visualizer/visualizer.mk @@ -35,6 +35,7 @@ endif ifeq ($(strip $(LCD_ENABLE)), yes) SRC += $(VISUALIZER_DIR)/lcd_backlight.c SRC += $(VISUALIZER_DIR)/lcd_keyframes.c +SRC += $(VISUALIZER_DIR)/lcd_backlight_keyframes.c OPT_DEFS += -DLCD_BACKLIGHT_ENABLE endif From 1e7585e76771e1a2d8ca733fc09c19f9fa0e903c Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Wed, 5 Apr 2017 09:21:18 +0300 Subject: [PATCH 102/117] Separated backlight and LCD disable/enable Also moved them to correct places --- keyboards/ergodox/infinity/visualizer.c | 14 +++++++------ .../ergodox/keymaps/default/visualizer.c | 14 +++++++------ quantum/visualizer/lcd_backlight_keyframes.c | 16 ++++++++++++++ quantum/visualizer/lcd_backlight_keyframes.h | 3 +++ quantum/visualizer/lcd_keyframes.c | 14 +++++++++++++ quantum/visualizer/lcd_keyframes.h | 4 ++++ quantum/visualizer/visualizer.c | 21 ------------------- quantum/visualizer/visualizer.h | 3 --- 8 files changed, 53 insertions(+), 36 deletions(-) diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index bbed4e98..8e684d99 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -186,22 +186,24 @@ static keyframe_animation_t lcd_bitmap_leds_animation = { }; static keyframe_animation_t suspend_animation = { - .num_frames = 3, + .num_frames = 4, .loop = false, - .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0}, + .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0, 0}, .frame_functions = { lcd_keyframe_display_layer_text, backlight_keyframe_animate_color, - keyframe_disable_lcd_and_backlight, + lcd_keyframe_disable, + lcd_keyframe_disable, }, }; static keyframe_animation_t resume_animation = { - .num_frames = 4, + .num_frames = 5, .loop = false, - .frame_lengths = {0, 0, gfxMillisecondsToTicks(10000), 0}, + .frame_lengths = {0, 0, 0, gfxMillisecondsToTicks(10000), 0}, .frame_functions = { - keyframe_enable_lcd_and_backlight, + lcd_keyframe_enable, + backlight_keyframe_enable, display_logo, backlight_keyframe_animate_color, enable_visualization, diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c index 07f5a44a..5ee49c9b 100644 --- a/keyboards/ergodox/keymaps/default/visualizer.c +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -128,22 +128,24 @@ static keyframe_animation_t lcd_layer_display = { }; static keyframe_animation_t suspend_animation = { - .num_frames = 3, + .num_frames = 4, .loop = false, - .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0}, + .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0, 0}, .frame_functions = { lcd_keyframe_display_layer_text, backlight_keyframe_animate_color, - keyframe_disable_lcd_and_backlight, + lcd_keyframe_disable, + lcd_keyframe_disable, }, }; static keyframe_animation_t resume_animation = { - .num_frames = 4, + .num_frames = 5, .loop = false, - .frame_lengths = {0, 0, gfxMillisecondsToTicks(10000), 0}, + .frame_lengths = {0, 0, 0, gfxMillisecondsToTicks(10000), 0}, .frame_functions = { - keyframe_enable_lcd_and_backlight, + lcd_keyframe_enable, + backlight_keyframe_enable, display_logo, backlight_keyframe_animate_color, enable_visualization, diff --git a/quantum/visualizer/lcd_backlight_keyframes.c b/quantum/visualizer/lcd_backlight_keyframes.c index 09647370..8436d4e3 100644 --- a/quantum/visualizer/lcd_backlight_keyframes.c +++ b/quantum/visualizer/lcd_backlight_keyframes.c @@ -59,3 +59,19 @@ bool backlight_keyframe_set_color(keyframe_animation_t* animation, visualizer_st LCD_INT(state->current_lcd_color)); return false; } + +bool backlight_keyframe_disable(keyframe_animation_t* animation, visualizer_state_t* state) { + (void)animation; + (void)state; + lcd_backlight_hal_color(0, 0, 0); + return false; +} + +bool backlight_keyframe_enable(keyframe_animation_t* animation, visualizer_state_t* state) { + (void)animation; + (void)state; + lcd_backlight_color(LCD_HUE(state->current_lcd_color), + LCD_SAT(state->current_lcd_color), + LCD_INT(state->current_lcd_color)); + return false; +} diff --git a/quantum/visualizer/lcd_backlight_keyframes.h b/quantum/visualizer/lcd_backlight_keyframes.h index 8cd5a46c..e1c125cf 100644 --- a/quantum/visualizer/lcd_backlight_keyframes.h +++ b/quantum/visualizer/lcd_backlight_keyframes.h @@ -24,4 +24,7 @@ bool backlight_keyframe_animate_color(keyframe_animation_t* animation, visualize // Sets the backlight color to the target color bool backlight_keyframe_set_color(keyframe_animation_t* animation, visualizer_state_t* state); +bool backlight_keyframe_disable(keyframe_animation_t* animation, visualizer_state_t* state); +bool backlight_keyframe_enable(keyframe_animation_t* animation, visualizer_state_t* state); + #endif /* QUANTUM_VISUALIZER_LCD_BACKLIGHT_KEYFRAMES_H_ */ diff --git a/quantum/visualizer/lcd_keyframes.c b/quantum/visualizer/lcd_keyframes.c index 00d9734e..74f6e3b4 100644 --- a/quantum/visualizer/lcd_keyframes.c +++ b/quantum/visualizer/lcd_keyframes.c @@ -158,3 +158,17 @@ bool lcd_keyframe_display_layer_and_led_states(keyframe_animation_t* animation, gdispFlush(); return false; } + +bool lcd_keyframe_disable(keyframe_animation_t* animation, visualizer_state_t* state) { + (void)animation; + (void)state; + gdispSetPowerMode(powerOff); + return false; +} + +bool lcd_keyframe_enable(keyframe_animation_t* animation, visualizer_state_t* state) { + (void)animation; + (void)state; + gdispSetPowerMode(powerOn); + return false; +} diff --git a/quantum/visualizer/lcd_keyframes.h b/quantum/visualizer/lcd_keyframes.h index 0c9f39ab..8f79a541 100644 --- a/quantum/visualizer/lcd_keyframes.h +++ b/quantum/visualizer/lcd_keyframes.h @@ -30,4 +30,8 @@ bool lcd_keyframe_display_led_states(keyframe_animation_t* animation, visualizer // Displays both the layer text and the led states bool lcd_keyframe_display_layer_and_led_states(keyframe_animation_t* animation, visualizer_state_t* state); +bool lcd_keyframe_disable(keyframe_animation_t* animation, visualizer_state_t* state); +bool lcd_keyframe_enable(keyframe_animation_t* animation, visualizer_state_t* state); + + #endif /* QUANTUM_VISUALIZER_LCD_KEYFRAMES_H_ */ diff --git a/quantum/visualizer/visualizer.c b/quantum/visualizer/visualizer.c index 6ebd806e..98cd7ba5 100644 --- a/quantum/visualizer/visualizer.c +++ b/quantum/visualizer/visualizer.c @@ -228,27 +228,6 @@ bool keyframe_no_operation(keyframe_animation_t* animation, visualizer_state_t* return false; } -bool keyframe_disable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state) { - (void)animation; - (void)state; -#ifdef LCD_ENABLE - gdispSetPowerMode(powerOff); -#endif -#ifdef LCD_BACKLIGHT_ENABLE - lcd_backlight_hal_color(0, 0, 0); -#endif - return false; -} - -bool keyframe_enable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state) { - (void)animation; - (void)state; -#ifdef LCD_ENABLE - gdispSetPowerMode(powerOn); -#endif - return false; -} - bool enable_visualization(keyframe_animation_t* animation, visualizer_state_t* state) { (void)animation; (void)state; diff --git a/quantum/visualizer/visualizer.h b/quantum/visualizer/visualizer.h index 5c870dbf..f37ce841 100644 --- a/quantum/visualizer/visualizer.h +++ b/quantum/visualizer/visualizer.h @@ -130,9 +130,6 @@ void run_next_keyframe(keyframe_animation_t* animation, visualizer_state_t* stat // Does nothing, useful for adding delays bool keyframe_no_operation(keyframe_animation_t* animation, visualizer_state_t* state); -bool keyframe_disable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state); -bool keyframe_enable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state); - // Call this once, when the initial animation has finished, alternatively you can call it // directly from the initalize_user_visualizer function (the animation can be null) bool enable_visualization(keyframe_animation_t* animation, visualizer_state_t* state); From 64d63ab42281318d891434fbc00277043298dd70 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Wed, 5 Apr 2017 10:08:25 +0300 Subject: [PATCH 103/117] Remove the need to manually enable the visualizer --- keyboards/ergodox/infinity/visualizer.c | 6 ++-- .../ergodox/keymaps/default/visualizer.c | 6 ++-- quantum/visualizer/visualizer.c | 28 ++++++++++--------- quantum/visualizer/visualizer.h | 14 ++++++---- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index 8e684d99..0897ea34 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -136,13 +136,12 @@ bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { // Don't worry, if the startup animation is long, you can use the keyboard like normal // during that time static keyframe_animation_t startup_animation = { - .num_frames = 3, + .num_frames = 2, .loop = false, .frame_lengths = {0, gfxMillisecondsToTicks(10000), 0}, .frame_functions = { display_logo, backlight_keyframe_animate_color, - enable_visualization }, }; @@ -198,7 +197,7 @@ static keyframe_animation_t suspend_animation = { }; static keyframe_animation_t resume_animation = { - .num_frames = 5, + .num_frames = 4, .loop = false, .frame_lengths = {0, 0, 0, gfxMillisecondsToTicks(10000), 0}, .frame_functions = { @@ -206,7 +205,6 @@ static keyframe_animation_t resume_animation = { backlight_keyframe_enable, display_logo, backlight_keyframe_animate_color, - enable_visualization, }, }; diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c index 5ee49c9b..73d864c6 100644 --- a/keyboards/ergodox/keymaps/default/visualizer.c +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -110,13 +110,12 @@ bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { // Don't worry, if the startup animation is long, you can use the keyboard like normal // during that time static keyframe_animation_t startup_animation = { - .num_frames = 3, + .num_frames = 2, .loop = false, .frame_lengths = {0, gfxMillisecondsToTicks(10000), 0}, .frame_functions = { display_logo, backlight_keyframe_animate_color, - enable_visualization }, }; @@ -140,7 +139,7 @@ static keyframe_animation_t suspend_animation = { }; static keyframe_animation_t resume_animation = { - .num_frames = 5, + .num_frames = 4, .loop = false, .frame_lengths = {0, 0, 0, gfxMillisecondsToTicks(10000), 0}, .frame_functions = { @@ -148,7 +147,6 @@ static keyframe_animation_t resume_animation = { backlight_keyframe_enable, display_logo, backlight_keyframe_animate_color, - enable_visualization, }, }; diff --git a/quantum/visualizer/visualizer.c b/quantum/visualizer/visualizer.c index 98cd7ba5..5fbd1203 100644 --- a/quantum/visualizer/visualizer.c +++ b/quantum/visualizer/visualizer.c @@ -154,6 +154,14 @@ void stop_all_keyframe_animations(void) { } } +static uint8_t get_num_running_animations(void) { + uint8_t count = 0; + for (int i=0;icurrent_frame, @@ -228,14 +236,6 @@ bool keyframe_no_operation(keyframe_animation_t* animation, visualizer_state_t* return false; } -bool enable_visualization(keyframe_animation_t* animation, visualizer_state_t* state) { - (void)animation; - (void)state; - dprint("User visualizer inited\n"); - visualizer_enabled = true; - return false; -} - // TODO: Optimize the stack size, this is probably way too big static DECLARE_THREAD_STACK(visualizerThreadStack, 1024); static DECLARE_THREAD_FUNCTION(visualizerThread, arg) { @@ -276,13 +276,15 @@ static DECLARE_THREAD_FUNCTION(visualizerThread, arg) { systemticks_t sleep_time = TIME_INFINITE; systemticks_t current_time = gfxSystemTicks(); + bool force_update = true; while(true) { systemticks_t new_time = gfxSystemTicks(); systemticks_t delta = new_time - current_time; current_time = new_time; bool enabled = visualizer_enabled; - if (!same_status(&state.status, ¤t_status)) { + if (force_update || !same_status(&state.status, ¤t_status)) { + force_update = false; if (visualizer_enabled) { if (current_status.suspended) { stop_all_keyframe_animations(); @@ -320,10 +322,10 @@ static DECLARE_THREAD_FUNCTION(visualizerThread, arg) { #ifdef EMULATOR draw_emulator(); #endif - // The animation can enable the visualizer - // And we might need to update the state when that happens - // so don't sleep - if (enabled != visualizer_enabled) { + // Enable the visualizer when the startup or the suspend animation has finished + if (!visualizer_enabled && state.status.suspended == false && get_num_running_animations() == 0) { + visualizer_enabled = true; + force_update = true; sleep_time = 0; } diff --git a/quantum/visualizer/visualizer.h b/quantum/visualizer/visualizer.h index f37ce841..46393484 100644 --- a/quantum/visualizer/visualizer.h +++ b/quantum/visualizer/visualizer.h @@ -130,20 +130,22 @@ void run_next_keyframe(keyframe_animation_t* animation, visualizer_state_t* stat // Does nothing, useful for adding delays bool keyframe_no_operation(keyframe_animation_t* animation, visualizer_state_t* state); -// Call this once, when the initial animation has finished, alternatively you can call it -// directly from the initalize_user_visualizer function (the animation can be null) -bool enable_visualization(keyframe_animation_t* animation, visualizer_state_t* state); - // The master can set userdata which will be transferred to the slave #ifdef VISUALIZER_USER_DATA_SIZE void visualizer_set_user_data(void* user_data); #endif // These functions have to be implemented by the user -void initialize_user_visualizer(visualizer_state_t* state); +// Called regularly each time the state has changed (but not every scan loop) void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status); +// Called when the computer goes to suspend, will also stop calling update_user_visualizer_state void user_visualizer_suspend(visualizer_state_t* state); +// You have to start at least one animation as a response to the following two functions +// When the animation has finished the visualizer will resume normal operation and start calling the +// update_user_visualizer_state again +// Called when the keyboard boots up +void initialize_user_visualizer(visualizer_state_t* state); +// Called when the computer resumes from a suspend void user_visualizer_resume(visualizer_state_t* state); - #endif /* VISUALIZER_H */ From b7041d06aef4dcf2f2a47504a699e538cfb1d9ac Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Wed, 5 Apr 2017 10:14:24 +0300 Subject: [PATCH 104/117] Move common visualizer keyframes into visualizer_keyframes.h --- keyboards/ergodox/infinity/visualizer.c | 1 + .../ergodox/keymaps/default/visualizer.c | 1 + quantum/visualizer/visualizer.c | 6 ----- quantum/visualizer/visualizer.h | 6 +---- quantum/visualizer/visualizer.mk | 3 ++- quantum/visualizer/visualizer_keyframes.c | 23 ++++++++++++++++ quantum/visualizer/visualizer_keyframes.h | 26 +++++++++++++++++++ 7 files changed, 54 insertions(+), 12 deletions(-) create mode 100644 quantum/visualizer/visualizer_keyframes.c create mode 100644 quantum/visualizer/visualizer_keyframes.h diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index 0897ea34..2e10fdd7 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -27,6 +27,7 @@ along with this program. If not, see . #endif #include "visualizer.h" +#include "visualizer_keyframes.h" #include "lcd_keyframes.h" #include "lcd_backlight_keyframes.h" #include "system/serial_link.h" diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c index 73d864c6..f6159e1e 100644 --- a/keyboards/ergodox/keymaps/default/visualizer.c +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -27,6 +27,7 @@ along with this program. If not, see . #endif #include "visualizer.h" +#include "visualizer_keyframes.h" #include "lcd_keyframes.h" #include "lcd_backlight_keyframes.h" #include "system/serial_link.h" diff --git a/quantum/visualizer/visualizer.c b/quantum/visualizer/visualizer.c index 5fbd1203..2479a64c 100644 --- a/quantum/visualizer/visualizer.c +++ b/quantum/visualizer/visualizer.c @@ -230,12 +230,6 @@ void run_next_keyframe(keyframe_animation_t* animation, visualizer_state_t* stat (*temp_animation.frame_functions[next_frame])(&temp_animation, &temp_state); } -bool keyframe_no_operation(keyframe_animation_t* animation, visualizer_state_t* state) { - (void)animation; - (void)state; - return false; -} - // TODO: Optimize the stack size, this is probably way too big static DECLARE_THREAD_STACK(visualizerThreadStack, 1024); static DECLARE_THREAD_FUNCTION(visualizerThread, arg) { diff --git a/quantum/visualizer/visualizer.h b/quantum/visualizer/visualizer.h index 46393484..d6f279e1 100644 --- a/quantum/visualizer/visualizer.h +++ b/quantum/visualizer/visualizer.h @@ -34,7 +34,7 @@ SOFTWARE. #include "lcd_backlight.h" #endif -// use this function to merget both real_mods and oneshot_mods in a uint16_t +// use this function to merge both real_mods and oneshot_mods in a uint16_t uint8_t visualizer_get_mods(void); // This need to be called once at the start @@ -126,10 +126,6 @@ void stop_keyframe_animation(keyframe_animation_t* animation); // Useful for crossfades for example void run_next_keyframe(keyframe_animation_t* animation, visualizer_state_t* state); -// Some predefined keyframe functions that can be used by the user code -// Does nothing, useful for adding delays -bool keyframe_no_operation(keyframe_animation_t* animation, visualizer_state_t* state); - // The master can set userdata which will be transferred to the slave #ifdef VISUALIZER_USER_DATA_SIZE void visualizer_set_user_data(void* user_data); diff --git a/quantum/visualizer/visualizer.mk b/quantum/visualizer/visualizer.mk index c9eb8c5b..799379e3 100644 --- a/quantum/visualizer/visualizer.mk +++ b/quantum/visualizer/visualizer.mk @@ -20,7 +20,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -SRC += $(VISUALIZER_DIR)/visualizer.c +SRC += $(VISUALIZER_DIR)/visualizer.c \ + $(VISUALIZER_DIR)/visualizer_keyframes.c EXTRAINCDIRS += $(GFXINC) $(VISUALIZER_DIR) GFXLIB = $(LIB_PATH)/ugfx VPATH += $(VISUALIZER_PATH) diff --git a/quantum/visualizer/visualizer_keyframes.c b/quantum/visualizer/visualizer_keyframes.c new file mode 100644 index 00000000..8f6a7e15 --- /dev/null +++ b/quantum/visualizer/visualizer_keyframes.c @@ -0,0 +1,23 @@ +/* Copyright 2017 Fred Sundvik + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "visualizer_keyframes.h" + +bool keyframe_no_operation(keyframe_animation_t* animation, visualizer_state_t* state) { + (void)animation; + (void)state; + return false; +} diff --git a/quantum/visualizer/visualizer_keyframes.h b/quantum/visualizer/visualizer_keyframes.h new file mode 100644 index 00000000..9ef7653c --- /dev/null +++ b/quantum/visualizer/visualizer_keyframes.h @@ -0,0 +1,26 @@ +/* Copyright 2017 Fred Sundvik + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef QUANTUM_VISUALIZER_VISUALIZER_KEYFRAMES_H_ +#define QUANTUM_VISUALIZER_VISUALIZER_KEYFRAMES_H_ + +#include "visualizer.h" + +// Some predefined keyframe functions that can be used by the user code +// Does nothing, useful for adding delays +bool keyframe_no_operation(keyframe_animation_t* animation, visualizer_state_t* state); + +#endif /* QUANTUM_VISUALIZER_VISUALIZER_KEYFRAMES_H_ */ From 3994fb1e79615af849aa03378293831f59c9b259 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Fri, 7 Apr 2017 10:51:53 +0300 Subject: [PATCH 105/117] Yet another try to fix the LCD corruption It turns out that the ChibiOS K20 SPI driver doesn't handle the chip select, so it needs to be done manually. Acquiring the bus is not enough since the pin was in the wrong mode. This is now fixed. Also increase the frequency of the SPI from around 200kHz to nearly 20 Mhz. --- .../gdisp/st7565ergodox/board_ST7565.h | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h index c2092b5e..e8c17e6e 100644 --- a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h +++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h @@ -45,15 +45,28 @@ static const SPIConfig spi1config = { .sspad=ST7565_SS_PIN, // SPI initialization data. .tar0 = - SPIx_CTARn_FMSZ(7) - | SPIx_CTARn_ASC(7) - | SPIx_CTARn_DT(7) - | SPIx_CTARn_CSSCK(7) - | SPIx_CTARn_PBR(0) - | SPIx_CTARn_BR(7) - //SPI_CR1_BR_0 + SPIx_CTARn_FMSZ(7) // Frame size = 8 bytes + | SPIx_CTARn_ASC(1) // After SCK Delay Scaler (min 50 ns) = 55.56ns + | SPIx_CTARn_DT(0) // Delay After Transfer Scaler (no minimum)= 27.78ns + | SPIx_CTARn_CSSCK(0) // PCS to SCK Delay Scaler (min 20 ns) = 27.78ns + | SPIx_CTARn_PBR(0) // Baud Rate Prescaler = 2 + | SPIx_CTARn_BR(0) // Baud rate (min 50ns) = 55.56ns }; +static GFXINLINE void acquire_bus(GDisplay *g) { + (void) g; + // Only the LCD is using the SPI bus, so no need to acquire + // spiAcquireBus(&SPID1); + spiSelect(&SPID1); +} + +static GFXINLINE void release_bus(GDisplay *g) { + (void) g; + // Only the LCD is using the SPI bus, so no need to release + //spiReleaseBus(&SPID1); + spiUnselect(&SPID1); +} + static GFXINLINE void init_board(GDisplay *g) { (void) g; palSetPadModeNamed(A0, PAL_MODE_OUTPUT_PUSHPULL); @@ -62,10 +75,11 @@ static GFXINLINE void init_board(GDisplay *g) { palSetPad(ST7565_GPIOPORT, ST7565_RST_PIN); palSetPadModeRaw(MOSI, ST7565_SPI_MODE); palSetPadModeRaw(SLCK, ST7565_SPI_MODE); - palSetPadModeRaw(SS, ST7565_SPI_MODE); + palSetPadModeRaw(SS, PAL_MODE_OUTPUT_PUSHPULL); spiInit(); spiStart(&SPID1, &spi1config); + release_bus(g); } static GFXINLINE void post_init_board(GDisplay *g) { @@ -82,20 +96,6 @@ static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { } } -static GFXINLINE void acquire_bus(GDisplay *g) { - (void) g; - // Only the LCD is using the SPI bus, so no need to acquire - // spiAcquireBus(&SPID1); - spiSelect(&SPID1); -} - -static GFXINLINE void release_bus(GDisplay *g) { - (void) g; - // Only the LCD is using the SPI bus, so no need to release - //spiReleaseBus(&SPID1); - spiUnselect(&SPID1); -} - static GFXINLINE void enter_data_mode(GDisplay *g) { palSetPad(ST7565_GPIOPORT, ST7565_A0_PIN); } From 995002fa912545128625ec2d8c53cff5de560b97 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Fri, 7 Apr 2017 10:55:29 +0300 Subject: [PATCH 106/117] LCD initialization sequence according to the docs The LCD initialization show now be much better and faster with no flickering at the startup. Also fix the contrast control. --- .../gdisp/st7565ergodox/gdisp_lld_ST7565.c | 40 +++++-------------- .../drivers/gdisp/st7565ergodox/st7565.h | 2 + 2 files changed, 13 insertions(+), 29 deletions(-) diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c index 2c8a168e..0de457a7 100644 --- a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c +++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c @@ -26,7 +26,7 @@ #define GDISP_SCREEN_WIDTH 128 #endif #ifndef GDISP_INITIAL_CONTRAST -#define GDISP_INITIAL_CONTRAST 0 +#define GDISP_INITIAL_CONTRAST 35 #endif #ifndef GDISP_INITIAL_BACKLIGHT #define GDISP_INITIAL_BACKLIGHT 100 @@ -111,41 +111,25 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { gfxSleepMilliseconds(20); setpin_reset(g, FALSE); gfxSleepMilliseconds(20); - acquire_bus(g); enter_cmd_mode(g); - write_cmd(g, ST7565_DISPLAY_OFF); + + write_cmd(g, ST7565_RESET); write_cmd(g, ST7565_LCD_BIAS); write_cmd(g, ST7565_ADC); write_cmd(g, ST7565_COM_SCAN); - write_cmd(g, ST7565_START_LINE | 0); - - write_cmd(g, ST7565_RESISTOR_RATIO | 0x6); - - // turn on voltage converter (VC=1, VR=0, VF=0) - write_cmd(g, ST7565_POWER_CONTROL | 0x04); - flush_cmd(g); - delay_ms(50); - - // turn on voltage regulator (VC=1, VR=1, VF=0) - write_cmd(g, ST7565_POWER_CONTROL | 0x06); - flush_cmd(g); - delay_ms(50); + write_cmd(g, ST7565_RESISTOR_RATIO | 0x1); + write_cmd2(g, ST7565_CONTRAST, GDISP_INITIAL_CONTRAST); - // turn on voltage follower (VC=1, VR=1, VF=1) + // turn on internal power supply (VC=1, VR=1, VF=1) write_cmd(g, ST7565_POWER_CONTROL | 0x07); - flush_cmd(g); - delay_ms(50); - write_cmd(g, 0xE2); - write_cmd(g, ST7565_COM_SCAN); - write_cmd2(g, ST7565_CONTRAST, GDISP_INITIAL_CONTRAST*64/101); - //write_cmd2(g, ST7565_CONTRAST, 0); - write_cmd(g, ST7565_DISPLAY_ON); - write_cmd(g, ST7565_ALLON_NORMAL); write_cmd(g, ST7565_INVERT_DISPLAY); + write_cmd(g, ST7565_ALLON_NORMAL); + write_cmd(g, ST7565_DISPLAY_ON); + write_cmd(g, ST7565_START_LINE | 0); write_cmd(g, ST7565_RMW); flush_cmd(g); @@ -331,14 +315,12 @@ LLDSPEC void gdisp_lld_control(GDisplay *g) { return; case GDISP_CONTROL_CONTRAST: - if ((unsigned)g->p.ptr > 100) - g->p.ptr = (void *)100; + g->g.Contrast = (unsigned)g->p.ptr & 63; acquire_bus(g); enter_cmd_mode(g); - write_cmd2(g, ST7565_CONTRAST, ((((unsigned)g->p.ptr)<<6)/101) & 0x3F); + write_cmd2(g, ST7565_CONTRAST, g->g.Contrast); flush_cmd(g); release_bus(g); - g->g.Contrast = (unsigned)g->p.ptr; return; } } diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/st7565.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/st7565.h index 48636b33..24924ff0 100644 --- a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/st7565.h +++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/st7565.h @@ -34,4 +34,6 @@ #define ST7565_RESISTOR_RATIO 0x20 #define ST7565_POWER_CONTROL 0x28 +#define ST7565_RESET 0xE2 + #endif /* _ST7565_H */ From 3eb8785e8770c07e6a4280c50240d5d951461911 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 8 Apr 2017 20:10:20 +0300 Subject: [PATCH 107/117] Add automatic flush for the LCD screen --- .../infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c | 1 + keyboards/ergodox/infinity/visualizer.c | 2 -- keyboards/ergodox/keymaps/default/visualizer.c | 2 -- quantum/visualizer/lcd_keyframes.c | 5 ----- quantum/visualizer/visualizer.c | 4 ++++ 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c index 0de457a7..5b7b6d44 100644 --- a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c +++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c @@ -262,6 +262,7 @@ LLDSPEC void gdisp_lld_blit_area(GDisplay *g) { srcbit++; } } + g->flags |= GDISP_FLG_NEEDFLUSH; } #if GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index 2e10fdd7..6f9b0210 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -127,8 +127,6 @@ bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { // if you have full screen image, then just use 128 and 32 for both source and target dimensions gdispGBlitArea(GDISP, 0, 0, 128, 32, 0, 0, 128, (pixel_t*)image_data_lcd_logo); - // Always remember to flush the display - gdispFlush(); return false; } diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c index f6159e1e..1b0f12f2 100644 --- a/keyboards/ergodox/keymaps/default/visualizer.c +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -101,8 +101,6 @@ bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { // if you have full screen image, then just use 128 and 32 for both source and target dimensions gdispGBlitArea(GDISP, 0, 0, 128, 32, 0, 0, 128, (pixel_t*)image_data_lcd_logo); - // Always remember to flush the display - gdispFlush(); return false; } diff --git a/quantum/visualizer/lcd_keyframes.c b/quantum/visualizer/lcd_keyframes.c index 74f6e3b4..c6e04d0c 100644 --- a/quantum/visualizer/lcd_keyframes.c +++ b/quantum/visualizer/lcd_keyframes.c @@ -23,7 +23,6 @@ bool lcd_keyframe_display_layer_text(keyframe_animation_t* animation, visualizer (void)animation; gdispClear(White); gdispDrawString(0, 10, state->layer_text, state->font_dejavusansbold12, Black); - gdispFlush(); return false; } @@ -62,7 +61,6 @@ bool lcd_keyframe_display_layer_bitmap(keyframe_animation_t* animation, visualiz gdispDrawString(0, 10, layer_buffer, state->font_fixed5x8, Black); format_layer_bitmap_string(state->status.default_layer >> 16, state->status.layer >> 16, layer_buffer); gdispDrawString(0, 20, layer_buffer, state->font_fixed5x8, Black); - gdispFlush(); return false; } @@ -101,7 +99,6 @@ bool lcd_keyframe_display_mods_bitmap(keyframe_animation_t* animation, visualize format_mods_bitmap_string(state->status.mods, status_buffer); gdispDrawString(0, 20, status_buffer, state->font_fixed5x8, Black); - gdispFlush(); return false; } @@ -140,7 +137,6 @@ bool lcd_keyframe_display_led_states(keyframe_animation_t* animation, visualizer get_led_state_string(output, state); gdispClear(White); gdispDrawString(0, 10, output, state->font_dejavusansbold12, Black); - gdispFlush(); return false; } @@ -155,7 +151,6 @@ bool lcd_keyframe_display_layer_and_led_states(keyframe_animation_t* animation, y = 17; } gdispDrawString(0, y, state->layer_text, state->font_dejavusansbold12, Black); - gdispFlush(); return false; } diff --git a/quantum/visualizer/visualizer.c b/quantum/visualizer/visualizer.c index 2479a64c..6f134097 100644 --- a/quantum/visualizer/visualizer.c +++ b/quantum/visualizer/visualizer.c @@ -313,6 +313,10 @@ static DECLARE_THREAD_FUNCTION(visualizerThread, arg) { gdispGFlush(LED_DISPLAY); #endif +#ifdef LCD_ENABLE + gdispGFlush(LCD_DISPLAY); +#endif + #ifdef EMULATOR draw_emulator(); #endif From df67169d4260881443d88b142855d4aa2def6dc3 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 8 Apr 2017 21:19:44 +0300 Subject: [PATCH 108/117] Move LCD logo to visualizer resources --- keyboards/ergodox/infinity/visualizer.c | 44 +------------ .../ergodox/keymaps/default/visualizer.c | 44 +------------ quantum/visualizer/resources/lcd_logo.c | 61 ++++++++++++++++++ .../visualizer/resources}/lcd_logo.png | Bin quantum/visualizer/resources/resources.h | 27 ++++++++ quantum/visualizer/visualizer.mk | 2 + 6 files changed, 94 insertions(+), 84 deletions(-) create mode 100644 quantum/visualizer/resources/lcd_logo.c rename {keyboards/ergodox/infinity => quantum/visualizer/resources}/lcd_logo.png (100%) create mode 100644 quantum/visualizer/resources/resources.h diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index 6f9b0210..90933b00 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -32,47 +32,7 @@ along with this program. If not, see . #include "lcd_backlight_keyframes.h" #include "system/serial_link.h" -// To generate an image array like this -// Ensure the image is 128 x 32 or smaller -// Convert the bitmap to a C array using a program like http://www.riuson.com/lcd-image-converter/ -// Ensure the the conversion process produces a monochrome format array - 1 bit/pixel, left to right, top to bottom -// Update array in the source code with the C array produced by the conversion program - -// The image below is generated from lcd_logo.png -static const uint8_t image_data_lcd_logo[512] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0xf8, 0xfe, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x06, 0x29, 0x41, 0x24, 0x52, 0x24, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x42, 0xaa, 0xaa, 0xaa, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x82, 0x28, 0xaa, 0xae, 0x8c, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x43, 0x28, 0xaa, 0xaa, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x0a, 0x55, 0x42, 0x28, 0xaa, 0xaa, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x05, 0x45, 0x42, 0x28, 0x89, 0x4a, 0x86, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x18, 0x38, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x1c, 0x38, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x0e, 0x38, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x03, 0xff, 0x80, 0x04, 0x45, 0x14, 0xa4, 0x92, 0x83, 0x52, 0x22, 0x22, 0x36, 0x00, 0x00, - 0x00, 0x00, 0x38, 0x00, 0x0a, 0xaa, 0xaa, 0xaa, 0xba, 0x84, 0x55, 0x55, 0x57, 0x45, 0x00, 0x00, - 0x00, 0x00, 0x38, 0x00, 0x08, 0xaa, 0xaa, 0xaa, 0x92, 0xb2, 0x55, 0x55, 0x42, 0x65, 0x00, 0x00, - 0x00, 0x00, 0x38, 0x00, 0x08, 0xaa, 0xaa, 0xaa, 0x92, 0x81, 0x56, 0x65, 0x42, 0x45, 0x00, 0x00, - 0x00, 0x00, 0x38, 0x00, 0x0a, 0xaa, 0xaa, 0xaa, 0x92, 0x81, 0x54, 0x45, 0x42, 0x45, 0x00, 0x00, - 0x00, 0x00, 0x38, 0x00, 0x04, 0x48, 0xa2, 0x4a, 0x89, 0x06, 0x24, 0x42, 0x41, 0x36, 0x00, 0x00, - 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -}; +#include "resources/resources.h" static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0xFF); static const uint32_t initial_color = LCD_COLOR(0, 0, 0); @@ -125,7 +85,7 @@ bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { //gdispGBlitArea is a tricky function to use since it supports blitting part of the image // if you have full screen image, then just use 128 and 32 for both source and target dimensions - gdispGBlitArea(GDISP, 0, 0, 128, 32, 0, 0, 128, (pixel_t*)image_data_lcd_logo); + gdispGBlitArea(GDISP, 0, 0, 128, 32, 0, 0, 128, (pixel_t*)resource_lcd_logo); return false; } diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c index 1b0f12f2..f03702f6 100644 --- a/keyboards/ergodox/keymaps/default/visualizer.c +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -33,47 +33,7 @@ along with this program. If not, see . #include "system/serial_link.h" #include "led.h" -// To generate an image array like this -// Ensure the image is 128 x 32 or smaller -// Convert the bitmap to a C array using a program like http://www.riuson.com/lcd-image-converter/ -// Ensure the the conversion process produces a monochrome format array - 1 bit/pixel, left to right, top to bottom -// Update array in the source code with the C array produced by the conversion program - -// The image below is generated from lcd_logo.png -static const uint8_t image_data_lcd_logo[512] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0xf8, 0xfe, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x06, 0x29, 0x41, 0x24, 0x52, 0x24, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x42, 0xaa, 0xaa, 0xaa, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x82, 0x28, 0xaa, 0xae, 0x8c, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x43, 0x28, 0xaa, 0xaa, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x0a, 0x55, 0x42, 0x28, 0xaa, 0xaa, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x05, 0x45, 0x42, 0x28, 0x89, 0x4a, 0x86, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x18, 0x38, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x1c, 0x38, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x0e, 0x38, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x03, 0xff, 0x80, 0x04, 0x45, 0x14, 0xa4, 0x92, 0x83, 0x52, 0x22, 0x22, 0x36, 0x00, 0x00, - 0x00, 0x00, 0x38, 0x00, 0x0a, 0xaa, 0xaa, 0xaa, 0xba, 0x84, 0x55, 0x55, 0x57, 0x45, 0x00, 0x00, - 0x00, 0x00, 0x38, 0x00, 0x08, 0xaa, 0xaa, 0xaa, 0x92, 0xb2, 0x55, 0x55, 0x42, 0x65, 0x00, 0x00, - 0x00, 0x00, 0x38, 0x00, 0x08, 0xaa, 0xaa, 0xaa, 0x92, 0x81, 0x56, 0x65, 0x42, 0x45, 0x00, 0x00, - 0x00, 0x00, 0x38, 0x00, 0x0a, 0xaa, 0xaa, 0xaa, 0x92, 0x81, 0x54, 0x45, 0x42, 0x45, 0x00, 0x00, - 0x00, 0x00, 0x38, 0x00, 0x04, 0x48, 0xa2, 0x4a, 0x89, 0x06, 0x24, 0x42, 0x41, 0x36, 0x00, 0x00, - 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -}; +#include "resources/resources.h" static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0xFF); static const uint32_t initial_color = LCD_COLOR(0, 0, 0); @@ -99,7 +59,7 @@ bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { //gdispGBlitArea is a tricky function to use since it supports blitting part of the image // if you have full screen image, then just use 128 and 32 for both source and target dimensions - gdispGBlitArea(GDISP, 0, 0, 128, 32, 0, 0, 128, (pixel_t*)image_data_lcd_logo); + gdispGBlitArea(GDISP, 0, 0, 128, 32, 0, 0, 128, (pixel_t*)resource_lcd_logo); return false; } diff --git a/quantum/visualizer/resources/lcd_logo.c b/quantum/visualizer/resources/lcd_logo.c new file mode 100644 index 00000000..d1a0ffa7 --- /dev/null +++ b/quantum/visualizer/resources/lcd_logo.c @@ -0,0 +1,61 @@ +/* Copyright 2017 Fred Sundvik + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "resources.h" + + +// To generate an image array like this +// Ensure the image is 128 x 32 or smaller +// Convert the bitmap to a C array using a program like http://www.riuson.com/lcd-image-converter/ +// Ensure the the conversion process produces a monochrome format array - 1 bit/pixel, left to right, top to bottom +// Update array in the source code with the C array produced by the conversion program + +// The image below is generated from lcd_logo.png +const uint8_t resource_lcd_logo[512] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xf8, 0xfe, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x06, 0x29, 0x41, 0x24, 0x52, 0x24, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x42, 0xaa, 0xaa, 0xaa, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x82, 0x28, 0xaa, 0xae, 0x8c, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x43, 0x28, 0xaa, 0xaa, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x0a, 0x55, 0x42, 0x28, 0xaa, 0xaa, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x05, 0x45, 0x42, 0x28, 0x89, 0x4a, 0x86, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x18, 0x38, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x1c, 0x38, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x0e, 0x38, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x03, 0xff, 0x80, 0x04, 0x45, 0x14, 0xa4, 0x92, 0x83, 0x52, 0x22, 0x22, 0x36, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x0a, 0xaa, 0xaa, 0xaa, 0xba, 0x84, 0x55, 0x55, 0x57, 0x45, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x08, 0xaa, 0xaa, 0xaa, 0x92, 0xb2, 0x55, 0x55, 0x42, 0x65, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x08, 0xaa, 0xaa, 0xaa, 0x92, 0x81, 0x56, 0x65, 0x42, 0x45, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x0a, 0xaa, 0xaa, 0xaa, 0x92, 0x81, 0x54, 0x45, 0x42, 0x45, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x04, 0x48, 0xa2, 0x4a, 0x89, 0x06, 0x24, 0x42, 0x41, 0x36, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; + diff --git a/keyboards/ergodox/infinity/lcd_logo.png b/quantum/visualizer/resources/lcd_logo.png similarity index 100% rename from keyboards/ergodox/infinity/lcd_logo.png rename to quantum/visualizer/resources/lcd_logo.png diff --git a/quantum/visualizer/resources/resources.h b/quantum/visualizer/resources/resources.h new file mode 100644 index 00000000..1ea27a53 --- /dev/null +++ b/quantum/visualizer/resources/resources.h @@ -0,0 +1,27 @@ +/* Copyright 2017 Fred Sundvik + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef QUANTUM_VISUALIZER_RESOURCES_RESOURCES_H_ +#define QUANTUM_VISUALIZER_RESOURCES_RESOURCES_H_ + +#include + +#ifdef LCD_ENABLE +extern const uint8_t resource_lcd_logo[]; +#endif + + +#endif /* QUANTUM_VISUALIZER_RESOURCES_RESOURCES_H_ */ diff --git a/quantum/visualizer/visualizer.mk b/quantum/visualizer/visualizer.mk index 799379e3..7c8e98d6 100644 --- a/quantum/visualizer/visualizer.mk +++ b/quantum/visualizer/visualizer.mk @@ -37,6 +37,8 @@ ifeq ($(strip $(LCD_ENABLE)), yes) SRC += $(VISUALIZER_DIR)/lcd_backlight.c SRC += $(VISUALIZER_DIR)/lcd_keyframes.c SRC += $(VISUALIZER_DIR)/lcd_backlight_keyframes.c +# Note, that the linker will strip out any resources that are not actually in use +SRC += $(VISUALIZER_DIR)/resources/lcd_logo.c OPT_DEFS += -DLCD_BACKLIGHT_ENABLE endif From 3074269c4a07ff7f1ab2a76ebdb8904cd642e283 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 8 Apr 2017 21:30:11 +0300 Subject: [PATCH 109/117] Move the logo drawing keyframe to lcd_keyframes --- keyboards/ergodox/infinity/visualizer.c | 22 ++----------------- .../ergodox/keymaps/default/visualizer.c | 22 ++----------------- quantum/visualizer/lcd_keyframes.c | 19 ++++++++++++++++ quantum/visualizer/lcd_keyframes.h | 2 ++ 4 files changed, 25 insertions(+), 40 deletions(-) diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index 90933b00..bac85c59 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -72,24 +72,6 @@ static visualizer_user_data_t user_data_keyboard = { _Static_assert(sizeof(visualizer_user_data_t) <= VISUALIZER_USER_DATA_SIZE, "Please increase the VISUALIZER_USER_DATA_SIZE"); -bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { - (void)state; - (void)animation; - (void)state; - // Read the uGFX documentation for information how to use the displays - // http://wiki.ugfx.org/index.php/Main_Page - gdispClear(White); - - // You can use static variables for things that can't be found in the animation - // or state structs, here we use the image - - //gdispGBlitArea is a tricky function to use since it supports blitting part of the image - // if you have full screen image, then just use 128 and 32 for both source and target dimensions - gdispGBlitArea(GDISP, 0, 0, 128, 32, 0, 0, 128, (pixel_t*)resource_lcd_logo); - - return false; -} - // Feel free to modify the animations below, or even add new ones if needed // Don't worry, if the startup animation is long, you can use the keyboard like normal @@ -99,7 +81,7 @@ static keyframe_animation_t startup_animation = { .loop = false, .frame_lengths = {0, gfxMillisecondsToTicks(10000), 0}, .frame_functions = { - display_logo, + lcd_keyframe_draw_logo, backlight_keyframe_animate_color, }, }; @@ -162,7 +144,7 @@ static keyframe_animation_t resume_animation = { .frame_functions = { lcd_keyframe_enable, backlight_keyframe_enable, - display_logo, + lcd_keyframe_draw_logo, backlight_keyframe_animate_color, }, }; diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c index f03702f6..afa6f1bd 100644 --- a/keyboards/ergodox/keymaps/default/visualizer.c +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -46,24 +46,6 @@ typedef enum { static lcd_state_t lcd_state = LCD_STATE_INITIAL; -bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { - (void)state; - (void)animation; - (void)state; - // Read the uGFX documentation for information how to use the displays - // http://wiki.ugfx.org/index.php/Main_Page - gdispClear(White); - - // You can use static variables for things that can't be found in the animation - // or state structs, here we use the image - - //gdispGBlitArea is a tricky function to use since it supports blitting part of the image - // if you have full screen image, then just use 128 and 32 for both source and target dimensions - gdispGBlitArea(GDISP, 0, 0, 128, 32, 0, 0, 128, (pixel_t*)resource_lcd_logo); - - return false; -} - // Feel free to modify the animations below, or even add new ones if needed // Don't worry, if the startup animation is long, you can use the keyboard like normal @@ -73,7 +55,7 @@ static keyframe_animation_t startup_animation = { .loop = false, .frame_lengths = {0, gfxMillisecondsToTicks(10000), 0}, .frame_functions = { - display_logo, + lcd_keyframe_draw_logo, backlight_keyframe_animate_color, }, }; @@ -104,7 +86,7 @@ static keyframe_animation_t resume_animation = { .frame_functions = { lcd_keyframe_enable, backlight_keyframe_enable, - display_logo, + lcd_keyframe_draw_logo, backlight_keyframe_animate_color, }, }; diff --git a/quantum/visualizer/lcd_keyframes.c b/quantum/visualizer/lcd_keyframes.c index c6e04d0c..df11861d 100644 --- a/quantum/visualizer/lcd_keyframes.c +++ b/quantum/visualizer/lcd_keyframes.c @@ -18,6 +18,7 @@ #include #include "action_util.h" #include "led.h" +#include "resources/resources.h" bool lcd_keyframe_display_layer_text(keyframe_animation_t* animation, visualizer_state_t* state) { (void)animation; @@ -154,6 +155,24 @@ bool lcd_keyframe_display_layer_and_led_states(keyframe_animation_t* animation, return false; } +bool lcd_keyframe_draw_logo(keyframe_animation_t* animation, visualizer_state_t* state) { + (void)state; + (void)animation; + // Read the uGFX documentation for information how to use the displays + // http://wiki.ugfx.org/index.php/Main_Page + gdispClear(White); + + // You can use static variables for things that can't be found in the animation + // or state structs, here we use the image + + //gdispGBlitArea is a tricky function to use since it supports blitting part of the image + // if you have full screen image, then just use 128 and 32 for both source and target dimensions + gdispGBlitArea(GDISP, 0, 0, 128, 32, 0, 0, 128, (pixel_t*)resource_lcd_logo); + + return false; +} + + bool lcd_keyframe_disable(keyframe_animation_t* animation, visualizer_state_t* state) { (void)animation; (void)state; diff --git a/quantum/visualizer/lcd_keyframes.h b/quantum/visualizer/lcd_keyframes.h index 8f79a541..2e912b4c 100644 --- a/quantum/visualizer/lcd_keyframes.h +++ b/quantum/visualizer/lcd_keyframes.h @@ -29,6 +29,8 @@ bool lcd_keyframe_display_mods_bitmap(keyframe_animation_t* animation, visualize bool lcd_keyframe_display_led_states(keyframe_animation_t* animation, visualizer_state_t* state); // Displays both the layer text and the led states bool lcd_keyframe_display_layer_and_led_states(keyframe_animation_t* animation, visualizer_state_t* state); +// Displays the QMK logo on the LCD screen +bool lcd_keyframe_draw_logo(keyframe_animation_t* animation, visualizer_state_t* state); bool lcd_keyframe_disable(keyframe_animation_t* animation, visualizer_state_t* state); bool lcd_keyframe_enable(keyframe_animation_t* animation, visualizer_state_t* state); From ed1710589f2f63e485c8780c7c8c03e0f65136a0 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 8 Apr 2017 21:34:30 +0300 Subject: [PATCH 110/117] Fix suspend not disabling backlight --- keyboards/ergodox/infinity/visualizer.c | 2 +- keyboards/ergodox/keymaps/default/visualizer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index bac85c59..8c3f3f29 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -133,7 +133,7 @@ static keyframe_animation_t suspend_animation = { lcd_keyframe_display_layer_text, backlight_keyframe_animate_color, lcd_keyframe_disable, - lcd_keyframe_disable, + backlight_keyframe_disable, }, }; diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c index afa6f1bd..6a717896 100644 --- a/keyboards/ergodox/keymaps/default/visualizer.c +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -75,7 +75,7 @@ static keyframe_animation_t suspend_animation = { lcd_keyframe_display_layer_text, backlight_keyframe_animate_color, lcd_keyframe_disable, - lcd_keyframe_disable, + backlight_keyframe_disable, }, }; From c6ca996f4eaa4cce90e02c123230e1e655c9465a Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 8 Apr 2017 22:30:37 +0300 Subject: [PATCH 111/117] Combine startup and resume animations --- .../gdisp/st7565ergodox/gdisp_lld_ST7565.c | 3 +-- keyboards/ergodox/infinity/visualizer.c | 20 +++++-------------- quantum/visualizer/lcd_backlight.c | 8 ++++---- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c index 5b7b6d44..b04ad029 100644 --- a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c +++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c @@ -127,7 +127,6 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { write_cmd(g, ST7565_INVERT_DISPLAY); write_cmd(g, ST7565_ALLON_NORMAL); - write_cmd(g, ST7565_DISPLAY_ON); write_cmd(g, ST7565_START_LINE | 0); write_cmd(g, ST7565_RMW); @@ -143,7 +142,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Width = GDISP_SCREEN_WIDTH; g->g.Height = GDISP_SCREEN_HEIGHT; g->g.Orientation = GDISP_ROTATE_0; - g->g.Powermode = powerOn; + g->g.Powermode = powerOff; g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; return TRUE; diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index 8c3f3f29..7ae371c5 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -77,10 +77,12 @@ _Static_assert(sizeof(visualizer_user_data_t) <= VISUALIZER_USER_DATA_SIZE, // Don't worry, if the startup animation is long, you can use the keyboard like normal // during that time static keyframe_animation_t startup_animation = { - .num_frames = 2, + .num_frames = 4, .loop = false, - .frame_lengths = {0, gfxMillisecondsToTicks(10000), 0}, + .frame_lengths = {0, 0, 0, gfxMillisecondsToTicks(10000), 0}, .frame_functions = { + lcd_keyframe_enable, + backlight_keyframe_enable, lcd_keyframe_draw_logo, backlight_keyframe_animate_color, }, @@ -137,18 +139,6 @@ static keyframe_animation_t suspend_animation = { }, }; -static keyframe_animation_t resume_animation = { - .num_frames = 4, - .loop = false, - .frame_lengths = {0, 0, 0, gfxMillisecondsToTicks(10000), 0}, - .frame_functions = { - lcd_keyframe_enable, - backlight_keyframe_enable, - lcd_keyframe_draw_logo, - backlight_keyframe_animate_color, - }, -}; - void initialize_user_visualizer(visualizer_state_t* state) { // The brightness will be dynamically adjustable in the future // But for now, change it here. @@ -312,7 +302,7 @@ void user_visualizer_resume(visualizer_state_t* state) { state->current_lcd_color = initial_color; state->target_lcd_color = logo_background_color; lcd_state = LCD_STATE_INITIAL; - start_keyframe_animation(&resume_animation); + start_keyframe_animation(&startup_animation); } void ergodox_board_led_on(void){ diff --git a/quantum/visualizer/lcd_backlight.c b/quantum/visualizer/lcd_backlight.c index 70187d1e..00de3fab 100644 --- a/quantum/visualizer/lcd_backlight.c +++ b/quantum/visualizer/lcd_backlight.c @@ -25,10 +25,10 @@ SOFTWARE. #include "lcd_backlight.h" #include -static uint8_t current_hue = 0x00; -static uint8_t current_saturation = 0x00; -static uint8_t current_intensity = 0xFF; -static uint8_t current_brightness = 0x7F; +static uint8_t current_hue = 0; +static uint8_t current_saturation = 0; +static uint8_t current_intensity = 0; +static uint8_t current_brightness = 0; void lcd_backlight_init(void) { lcd_backlight_hal_init(); From 306353bf06e5e5a76890ffb0c48a4dcca76c4399 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 8 Apr 2017 22:48:18 +0300 Subject: [PATCH 112/117] Create a file for shared Ergodox Infinity animations --- keyboards/ergodox/infinity/animations.c | 54 +++++++++++++++++++ keyboards/ergodox/infinity/animations.h | 25 +++++++++ keyboards/ergodox/infinity/rules.mk | 5 +- keyboards/ergodox/infinity/visualizer.c | 38 ++----------- .../ergodox/keymaps/default/visualizer.c | 45 ++-------------- 5 files changed, 90 insertions(+), 77 deletions(-) create mode 100644 keyboards/ergodox/infinity/animations.c create mode 100644 keyboards/ergodox/infinity/animations.h diff --git a/keyboards/ergodox/infinity/animations.c b/keyboards/ergodox/infinity/animations.c new file mode 100644 index 00000000..54ab9946 --- /dev/null +++ b/keyboards/ergodox/infinity/animations.c @@ -0,0 +1,54 @@ +/* Copyright 2017 Fred Sundvik + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "animations.h" +#include "visualizer.h" +#ifdef LCD_ENABLE +#include "lcd_keyframes.h" +#endif +#ifdef LCD_BACKLIGHT_ENABLE +#include "lcd_backlight_keyframes.h" +#endif + +#if defined(VISUALIZER_ENABLE) && defined(LCD_ENABLE) && defined(LCD_BACKLIGHT_ENABLE) + +// Don't worry, if the startup animation is long, you can use the keyboard like normal +// during that time +keyframe_animation_t default_startup_animation = { + .num_frames = 4, + .loop = false, + .frame_lengths = {0, 0, 0, gfxMillisecondsToTicks(5000), 0}, + .frame_functions = { + lcd_keyframe_enable, + backlight_keyframe_enable, + lcd_keyframe_draw_logo, + backlight_keyframe_animate_color, + }, +}; + +keyframe_animation_t default_suspend_animation = { + .num_frames = 4, + .loop = false, + .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0, 0}, + .frame_functions = { + lcd_keyframe_display_layer_text, + backlight_keyframe_animate_color, + lcd_keyframe_disable, + backlight_keyframe_disable, + }, +}; + +#endif diff --git a/keyboards/ergodox/infinity/animations.h b/keyboards/ergodox/infinity/animations.h new file mode 100644 index 00000000..0c441ff7 --- /dev/null +++ b/keyboards/ergodox/infinity/animations.h @@ -0,0 +1,25 @@ +/* Copyright 2017 Fred Sundvik + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef KEYBOARDS_ERGODOX_INFINITY_ANIMATIONS_H_ +#define KEYBOARDS_ERGODOX_INFINITY_ANIMATIONS_H_ + +#include "visualizer.h" + +extern keyframe_animation_t default_startup_animation; +extern keyframe_animation_t default_suspend_animation; + +#endif /* KEYBOARDS_ERGODOX_INFINITY_ANIMATIONS_H_ */ diff --git a/keyboards/ergodox/infinity/rules.mk b/keyboards/ergodox/infinity/rules.mk index aaadfe34..9e6170d8 100644 --- a/keyboards/ergodox/infinity/rules.mk +++ b/keyboards/ergodox/infinity/rules.mk @@ -1,6 +1,7 @@ # project specific files SRC = matrix.c \ - led.c + led.c \ + animations.c ## chip/board settings # - the next two should match the directories in @@ -72,4 +73,4 @@ endif ifdef LED_ENABLE include $(SUBPROJECT_PATH)/drivers/gdisp/IS31FL3731C/driver.mk -endif +endif \ No newline at end of file diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index 7ae371c5..a4b09a34 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -31,8 +31,7 @@ along with this program. If not, see . #include "lcd_keyframes.h" #include "lcd_backlight_keyframes.h" #include "system/serial_link.h" - -#include "resources/resources.h" +#include "animations.h" static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0xFF); static const uint32_t initial_color = LCD_COLOR(0, 0, 0); @@ -74,19 +73,6 @@ _Static_assert(sizeof(visualizer_user_data_t) <= VISUALIZER_USER_DATA_SIZE, // Feel free to modify the animations below, or even add new ones if needed -// Don't worry, if the startup animation is long, you can use the keyboard like normal -// during that time -static keyframe_animation_t startup_animation = { - .num_frames = 4, - .loop = false, - .frame_lengths = {0, 0, 0, gfxMillisecondsToTicks(10000), 0}, - .frame_functions = { - lcd_keyframe_enable, - backlight_keyframe_enable, - lcd_keyframe_draw_logo, - backlight_keyframe_animate_color, - }, -}; // The color animation animates the LCD color when you change layers static keyframe_animation_t one_led_color = { @@ -127,18 +113,6 @@ static keyframe_animation_t lcd_bitmap_leds_animation = { .frame_functions = {lcd_keyframe_display_layer_bitmap, lcd_keyframe_display_led_states}, }; -static keyframe_animation_t suspend_animation = { - .num_frames = 4, - .loop = false, - .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0, 0}, - .frame_functions = { - lcd_keyframe_display_layer_text, - backlight_keyframe_animate_color, - lcd_keyframe_disable, - backlight_keyframe_disable, - }, -}; - void initialize_user_visualizer(visualizer_state_t* state) { // The brightness will be dynamically adjustable in the future // But for now, change it here. @@ -146,13 +120,9 @@ void initialize_user_visualizer(visualizer_state_t* state) { state->current_lcd_color = initial_color; state->target_lcd_color = logo_background_color; lcd_state = LCD_STATE_INITIAL; - start_keyframe_animation(&startup_animation); + start_keyframe_animation(&default_startup_animation); } -static const uint32_t red; -static const uint32_t green; -static const uint32_t blue; - inline bool is_led_on(visualizer_user_data_t* user_data, uint8_t num) { return user_data->led_on & (1u << num); } @@ -295,14 +265,14 @@ void user_visualizer_suspend(visualizer_state_t* state) { uint8_t hue = LCD_HUE(state->current_lcd_color); uint8_t sat = LCD_SAT(state->current_lcd_color); state->target_lcd_color = LCD_COLOR(hue, sat, 0); - start_keyframe_animation(&suspend_animation); + start_keyframe_animation(&default_suspend_animation); } void user_visualizer_resume(visualizer_state_t* state) { state->current_lcd_color = initial_color; state->target_lcd_color = logo_background_color; lcd_state = LCD_STATE_INITIAL; - start_keyframe_animation(&startup_animation); + start_keyframe_animation(&default_startup_animation); } void ergodox_board_led_on(void){ diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c index 6a717896..779de005 100644 --- a/keyboards/ergodox/keymaps/default/visualizer.c +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -32,8 +32,7 @@ along with this program. If not, see . #include "lcd_backlight_keyframes.h" #include "system/serial_link.h" #include "led.h" - -#include "resources/resources.h" +#include "animations.h" static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0xFF); static const uint32_t initial_color = LCD_COLOR(0, 0, 0); @@ -48,18 +47,6 @@ static lcd_state_t lcd_state = LCD_STATE_INITIAL; // Feel free to modify the animations below, or even add new ones if needed -// Don't worry, if the startup animation is long, you can use the keyboard like normal -// during that time -static keyframe_animation_t startup_animation = { - .num_frames = 2, - .loop = false, - .frame_lengths = {0, gfxMillisecondsToTicks(10000), 0}, - .frame_functions = { - lcd_keyframe_draw_logo, - backlight_keyframe_animate_color, - }, -}; - static keyframe_animation_t lcd_layer_display = { .num_frames = 1, .loop = false, @@ -67,30 +54,6 @@ static keyframe_animation_t lcd_layer_display = { .frame_functions = {lcd_keyframe_display_layer_and_led_states} }; -static keyframe_animation_t suspend_animation = { - .num_frames = 4, - .loop = false, - .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0, 0}, - .frame_functions = { - lcd_keyframe_display_layer_text, - backlight_keyframe_animate_color, - lcd_keyframe_disable, - backlight_keyframe_disable, - }, -}; - -static keyframe_animation_t resume_animation = { - .num_frames = 4, - .loop = false, - .frame_lengths = {0, 0, 0, gfxMillisecondsToTicks(10000), 0}, - .frame_functions = { - lcd_keyframe_enable, - backlight_keyframe_enable, - lcd_keyframe_draw_logo, - backlight_keyframe_animate_color, - }, -}; - // The color animation animates the LCD color when you change layers static keyframe_animation_t color_animation = { .num_frames = 2, @@ -109,7 +72,7 @@ void initialize_user_visualizer(visualizer_state_t* state) { state->current_lcd_color = initial_color; state->target_lcd_color = logo_background_color; lcd_state = LCD_STATE_INITIAL; - start_keyframe_animation(&startup_animation); + start_keyframe_animation(&default_startup_animation); } void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) { @@ -156,12 +119,12 @@ void user_visualizer_suspend(visualizer_state_t* state) { uint8_t hue = LCD_HUE(state->current_lcd_color); uint8_t sat = LCD_SAT(state->current_lcd_color); state->target_lcd_color = LCD_COLOR(hue, sat, 0); - start_keyframe_animation(&suspend_animation); + start_keyframe_animation(&default_suspend_animation); } void user_visualizer_resume(visualizer_state_t* state) { state->current_lcd_color = initial_color; state->target_lcd_color = logo_background_color; lcd_state = LCD_STATE_INITIAL; - start_keyframe_animation(&resume_animation); + start_keyframe_animation(&default_startup_animation); } From c5d2b7ff16f81a8061127e0ec636cf9b914725c5 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 8 Apr 2017 23:04:27 +0300 Subject: [PATCH 113/117] Rename led test to led_keyframes and move animation to Ergodox --- keyboards/ergodox/infinity/animations.c | 55 +++++++++++++++++- keyboards/ergodox/infinity/animations.h | 5 ++ .../{led_test.c => led_keyframes.c} | 57 +++---------------- .../{led_test.h => led_keyframes.h} | 20 +++---- quantum/visualizer/visualizer.mk | 2 +- 5 files changed, 78 insertions(+), 61 deletions(-) rename quantum/visualizer/{led_test.c => led_keyframes.c} (68%) rename quantum/visualizer/{led_test.h => led_keyframes.h} (69%) diff --git a/keyboards/ergodox/infinity/animations.c b/keyboards/ergodox/infinity/animations.c index 54ab9946..4c9f6d9c 100644 --- a/keyboards/ergodox/infinity/animations.c +++ b/keyboards/ergodox/infinity/animations.c @@ -14,6 +14,8 @@ * along with this program. If not, see . */ +#if defined(VISUALIZER_ENABLE) + #include "animations.h" #include "visualizer.h" #ifdef LCD_ENABLE @@ -23,7 +25,14 @@ #include "lcd_backlight_keyframes.h" #endif -#if defined(VISUALIZER_ENABLE) && defined(LCD_ENABLE) && defined(LCD_BACKLIGHT_ENABLE) +#ifdef LED_ENABLE +#include "led_keyframes.h" +#endif + +#include "visualizer_keyframes.h" + + +#if defined(LCD_ENABLE) && defined(LCD_BACKLIGHT_ENABLE) // Don't worry, if the startup animation is long, you can use the keyboard like normal // during that time @@ -50,5 +59,49 @@ keyframe_animation_t default_suspend_animation = { backlight_keyframe_disable, }, }; +#endif + +#if defined(LED_ENABLE) +#define CROSSFADE_TIME 1000 +#define GRADIENT_TIME 3000 + +keyframe_animation_t led_test_animation = { + .num_frames = 14, + .loop = true, + .frame_lengths = { + gfxMillisecondsToTicks(1000), // fade in + gfxMillisecondsToTicks(1000), // no op (leds on) + gfxMillisecondsToTicks(1000), // fade out + gfxMillisecondsToTicks(CROSSFADE_TIME), // crossfade + gfxMillisecondsToTicks(GRADIENT_TIME), // left to rigt (outside in) + gfxMillisecondsToTicks(CROSSFADE_TIME), // crossfade + gfxMillisecondsToTicks(GRADIENT_TIME), // top_to_bottom + 0, // mirror leds + gfxMillisecondsToTicks(CROSSFADE_TIME), // crossfade + gfxMillisecondsToTicks(GRADIENT_TIME), // left_to_right (mirrored, so inside out) + gfxMillisecondsToTicks(CROSSFADE_TIME), // crossfade + gfxMillisecondsToTicks(GRADIENT_TIME), // top_to_bottom + 0, // normal leds + gfxMillisecondsToTicks(CROSSFADE_TIME), // crossfade + + }, + .frame_functions = { + led_keyframe_fade_in_all, + keyframe_no_operation, + led_keyframe_fade_out_all, + led_keyframe_crossfade, + led_keyframe_left_to_right_gradient, + led_keyframe_crossfade, + led_keyframe_top_to_bottom_gradient, + led_keyframe_mirror_orientation, + led_keyframe_crossfade, + led_keyframe_left_to_right_gradient, + led_keyframe_crossfade, + led_keyframe_top_to_bottom_gradient, + led_keyframe_normal_orientation, + led_keyframe_crossfade, + }, +}; +#endif #endif diff --git a/keyboards/ergodox/infinity/animations.h b/keyboards/ergodox/infinity/animations.h index 0c441ff7..6d8b9830 100644 --- a/keyboards/ergodox/infinity/animations.h +++ b/keyboards/ergodox/infinity/animations.h @@ -19,7 +19,12 @@ #include "visualizer.h" +// You can use these default animations, but of course you can also write your own custom ones instead extern keyframe_animation_t default_startup_animation; extern keyframe_animation_t default_suspend_animation; +// An animation for testing and demonstrating the led support, should probably not be used for real world +// cases +extern keyframe_animation_t led_test_animation; + #endif /* KEYBOARDS_ERGODOX_INFINITY_ANIMATIONS_H_ */ diff --git a/quantum/visualizer/led_test.c b/quantum/visualizer/led_keyframes.c similarity index 68% rename from quantum/visualizer/led_test.c rename to quantum/visualizer/led_keyframes.c index a9abace8..2dacd990 100644 --- a/quantum/visualizer/led_test.c +++ b/quantum/visualizer/led_keyframes.c @@ -21,50 +21,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "led_test.h" #include "gfx.h" #include "math.h" - -#define CROSSFADE_TIME 1000 -#define GRADIENT_TIME 3000 - -keyframe_animation_t led_test_animation = { - .num_frames = 14, - .loop = true, - .frame_lengths = { - gfxMillisecondsToTicks(1000), // fade in - gfxMillisecondsToTicks(1000), // no op (leds on) - gfxMillisecondsToTicks(1000), // fade out - gfxMillisecondsToTicks(CROSSFADE_TIME), // crossfade - gfxMillisecondsToTicks(GRADIENT_TIME), // left to rigt (outside in) - gfxMillisecondsToTicks(CROSSFADE_TIME), // crossfade - gfxMillisecondsToTicks(GRADIENT_TIME), // top_to_bottom - 0, // mirror leds - gfxMillisecondsToTicks(CROSSFADE_TIME), // crossfade - gfxMillisecondsToTicks(GRADIENT_TIME), // left_to_right (mirrored, so inside out) - gfxMillisecondsToTicks(CROSSFADE_TIME), // crossfade - gfxMillisecondsToTicks(GRADIENT_TIME), // top_to_bottom - 0, // normal leds - gfxMillisecondsToTicks(CROSSFADE_TIME), // crossfade - - }, - .frame_functions = { - keyframe_fade_in_all_leds, - keyframe_no_operation, - keyframe_fade_out_all_leds, - keyframe_led_crossfade, - keyframe_led_left_to_right_gradient, - keyframe_led_crossfade, - keyframe_led_top_to_bottom_gradient, - keyframe_mirror_led_orientation, - keyframe_led_crossfade, - keyframe_led_left_to_right_gradient, - keyframe_led_crossfade, - keyframe_led_top_to_bottom_gradient, - keyframe_normal_led_orientation, - keyframe_led_crossfade, - }, -}; +#include "led_keyframes.h" static uint8_t fade_led_color(keyframe_animation_t* animation, int from, int to) { int frame_length = animation->frame_lengths[animation->current_frame]; @@ -96,19 +55,19 @@ static uint8_t compute_gradient_color(float t, float index, float num) { return (uint8_t)(255.0f * v); } -bool keyframe_fade_in_all_leds(keyframe_animation_t* animation, visualizer_state_t* state) { +bool led_keyframe_fade_in_all(keyframe_animation_t* animation, visualizer_state_t* state) { (void)state; keyframe_fade_all_leds_from_to(animation, 0, 255); return true; } -bool keyframe_fade_out_all_leds(keyframe_animation_t* animation, visualizer_state_t* state) { +bool led_keyframe_fade_out_all(keyframe_animation_t* animation, visualizer_state_t* state) { (void)state; keyframe_fade_all_leds_from_to(animation, 255, 0); return true; } -bool keyframe_led_left_to_right_gradient(keyframe_animation_t* animation, visualizer_state_t* state) { +bool led_keyframe_left_to_right_gradient(keyframe_animation_t* animation, visualizer_state_t* state) { (void)state; float frame_length = animation->frame_lengths[animation->current_frame]; float current_pos = frame_length - animation->time_left_in_frame; @@ -120,7 +79,7 @@ bool keyframe_led_left_to_right_gradient(keyframe_animation_t* animation, visual return true; } -bool keyframe_led_top_to_bottom_gradient(keyframe_animation_t* animation, visualizer_state_t* state) { +bool led_keyframe_top_to_bottom_gradient(keyframe_animation_t* animation, visualizer_state_t* state) { (void)state; float frame_length = animation->frame_lengths[animation->current_frame]; float current_pos = frame_length - animation->time_left_in_frame; @@ -139,7 +98,7 @@ static void copy_current_led_state(uint8_t* dest) { } } } -bool keyframe_led_crossfade(keyframe_animation_t* animation, visualizer_state_t* state) { +bool led_keyframe_crossfade(keyframe_animation_t* animation, visualizer_state_t* state) { (void)state; if (animation->first_update_of_frame) { copy_current_led_state(&crossfade_start_frame[0][0]); @@ -155,14 +114,14 @@ bool keyframe_led_crossfade(keyframe_animation_t* animation, visualizer_state_t* return true; } -bool keyframe_mirror_led_orientation(keyframe_animation_t* animation, visualizer_state_t* state) { +bool led_keyframe_mirror_orientation(keyframe_animation_t* animation, visualizer_state_t* state) { (void)state; (void)animation; gdispGSetOrientation(LED_DISPLAY, GDISP_ROTATE_180); return false; } -bool keyframe_normal_led_orientation(keyframe_animation_t* animation, visualizer_state_t* state) { +bool led_keyframe_normal_orientation(keyframe_animation_t* animation, visualizer_state_t* state) { (void)state; (void)animation; gdispGSetOrientation(LED_DISPLAY, GDISP_ROTATE_0); diff --git a/quantum/visualizer/led_test.h b/quantum/visualizer/led_keyframes.h similarity index 69% rename from quantum/visualizer/led_test.h rename to quantum/visualizer/led_keyframes.h index 5e232575..a6894304 100644 --- a/quantum/visualizer/led_test.h +++ b/quantum/visualizer/led_keyframes.h @@ -22,20 +22,20 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TMK_VISUALIZER_LED_TEST_H_ -#define TMK_VISUALIZER_LED_TEST_H_ +#ifndef LED_KEYFRAMES_H +#define LED_KEYFRAMES_H #include "visualizer.h" -bool keyframe_fade_in_all_leds(keyframe_animation_t* animation, visualizer_state_t* state); -bool keyframe_fade_out_all_leds(keyframe_animation_t* animation, visualizer_state_t* state); -bool keyframe_led_left_to_right_gradient(keyframe_animation_t* animation, visualizer_state_t* state); -bool keyframe_led_top_to_bottom_gradient(keyframe_animation_t* animation, visualizer_state_t* state); -bool keyframe_led_crossfade(keyframe_animation_t* animation, visualizer_state_t* state); -bool keyframe_mirror_led_orientation(keyframe_animation_t* animation, visualizer_state_t* state); -bool keyframe_normal_led_orientation(keyframe_animation_t* animation, visualizer_state_t* state); +bool led_keyframe_fade_in_all(keyframe_animation_t* animation, visualizer_state_t* state); +bool led_keyframe_fade_out_all(keyframe_animation_t* animation, visualizer_state_t* state); +bool led_keyframe_left_to_right_gradient(keyframe_animation_t* animation, visualizer_state_t* state); +bool led_keyframe_top_to_bottom_gradient(keyframe_animation_t* animation, visualizer_state_t* state); +bool led_keyframe_crossfade(keyframe_animation_t* animation, visualizer_state_t* state); +bool led_keyframe_mirror_orientation(keyframe_animation_t* animation, visualizer_state_t* state); +bool led_keyframe_normal_orientation(keyframe_animation_t* animation, visualizer_state_t* state); extern keyframe_animation_t led_test_animation; -#endif /* TMK_VISUALIZER_LED_TEST_H_ */ +#endif /* LED_KEYFRAMES_H */ diff --git a/quantum/visualizer/visualizer.mk b/quantum/visualizer/visualizer.mk index 7c8e98d6..5f710124 100644 --- a/quantum/visualizer/visualizer.mk +++ b/quantum/visualizer/visualizer.mk @@ -43,7 +43,7 @@ OPT_DEFS += -DLCD_BACKLIGHT_ENABLE endif ifeq ($(strip $(LED_ENABLE)), yes) -SRC += $(VISUALIZER_DIR)/led_test.c +SRC += $(VISUALIZER_DIR)/led_keyframes.c OPT_DEFS += -DLED_ENABLE endif From 65b7bf68785b5b1d4257ba4fd95c3f53df230985 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 9 Apr 2017 18:32:10 +0300 Subject: [PATCH 114/117] Extract Ergodox default visualizer into simple_visualizer It's good enough if you only want to change the lcd text and color. --- .../ergodox/infinity/simple_visualizer.h | 123 ++++++++++++++++++ .../ergodox/keymaps/default/visualizer.c | 104 ++------------- 2 files changed, 131 insertions(+), 96 deletions(-) create mode 100644 keyboards/ergodox/infinity/simple_visualizer.h diff --git a/keyboards/ergodox/infinity/simple_visualizer.h b/keyboards/ergodox/infinity/simple_visualizer.h new file mode 100644 index 00000000..ded8a322 --- /dev/null +++ b/keyboards/ergodox/infinity/simple_visualizer.h @@ -0,0 +1,123 @@ +/* Copyright 2017 Fred Sundvik + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef KEYBOARDS_ERGODOX_INFINITY_SIMPLE_VISUALIZER_H_ +#define KEYBOARDS_ERGODOX_INFINITY_SIMPLE_VISUALIZER_H_ + +// Currently we are assuming that both the backlight and LCD are enabled +// But it's entirely possible to write a custom visualizer that use only +// one of them +#ifndef LCD_BACKLIGHT_ENABLE +#error This visualizer needs that LCD backlight is enabled +#endif + +#ifndef LCD_ENABLE +#error This visualizer needs that LCD is enabled +#endif + +#include "visualizer.h" +#include "visualizer_keyframes.h" +#include "lcd_keyframes.h" +#include "lcd_backlight_keyframes.h" +#include "system/serial_link.h" +#include "led.h" +#include "animations.h" + +static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0xFF); +static const uint32_t initial_color = LCD_COLOR(0, 0, 0); + +static bool initial_update = true; + +// Feel free to modify the animations below, or even add new ones if needed + +static keyframe_animation_t lcd_layer_display = { + .num_frames = 1, + .loop = false, + .frame_lengths = {gfxMillisecondsToTicks(0)}, + .frame_functions = {lcd_keyframe_display_layer_and_led_states} +}; + +// The color animation animates the LCD color when you change layers +static keyframe_animation_t color_animation = { + .num_frames = 2, + .loop = false, + // Note that there's a 200 ms no-operation frame, + // this prevents the color from changing when activating the layer + // momentarily + .frame_lengths = {gfxMillisecondsToTicks(200), gfxMillisecondsToTicks(500)}, + .frame_functions = {keyframe_no_operation, backlight_keyframe_animate_color}, +}; + +void initialize_user_visualizer(visualizer_state_t* state) { + // The brightness will be dynamically adjustable in the future + // But for now, change it here. + lcd_backlight_brightness(130); + state->current_lcd_color = initial_color; + state->target_lcd_color = logo_background_color; + initial_update = true; + start_keyframe_animation(&default_startup_animation); +} + + +// This function should be implemented by the keymap visualizer +// Don't change anything else than state->target_lcd_color and state->layer_text as that's the only thing +// that the simple_visualizer assumes that you are updating +// Also make sure that the buffer passed to state->layer_text remains valid until the previous animation is +// stopped. This can be done by either double buffering it or by using constant strings +static void get_visualizer_layer_and_color(visualizer_state_t* state); + +void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) { + // Add more tests, change the colors and layer texts here + // Usually you want to check the high bits (higher layers first) + // because that's the order layers are processed for keypresses + // You can for check for example: + // state->status.layer + // state->status.default_layer + // state->status.leds (see led.h for available statuses) + + uint32_t prev_color = state->target_lcd_color; + const char* prev_layer_text = state->layer_text; + + get_visualizer_layer_and_color(state); + + if (initial_update || prev_color != state->target_lcd_color) { + start_keyframe_animation(&color_animation); + } + + if (initial_update || prev_layer_text != state->layer_text) { + start_keyframe_animation(&lcd_layer_display); + } + // You can also stop existing animations, and start your custom ones here + // remember that you should normally have only one animation for the LCD + // and one for the background. But you can also combine them if you want. +} + +void user_visualizer_suspend(visualizer_state_t* state) { + state->layer_text = "Suspending..."; + uint8_t hue = LCD_HUE(state->current_lcd_color); + uint8_t sat = LCD_SAT(state->current_lcd_color); + state->target_lcd_color = LCD_COLOR(hue, sat, 0); + start_keyframe_animation(&default_suspend_animation); +} + +void user_visualizer_resume(visualizer_state_t* state) { + state->current_lcd_color = initial_color; + state->target_lcd_color = logo_background_color; + initial_update = true; + start_keyframe_animation(&default_startup_animation); +} + +#endif /* KEYBOARDS_ERGODOX_INFINITY_SIMPLE_VISUALIZER_H_ */ diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c index 779de005..502e53f3 100644 --- a/keyboards/ergodox/keymaps/default/visualizer.c +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -15,75 +15,14 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -// Currently we are assuming that both the backlight and LCD are enabled -// But it's entirely possible to write a custom visualizer that use only -// one of them -#ifndef LCD_BACKLIGHT_ENABLE -#error This visualizer needs that LCD backlight is enabled -#endif - -#ifndef LCD_ENABLE -#error This visualizer needs that LCD is enabled -#endif - -#include "visualizer.h" -#include "visualizer_keyframes.h" -#include "lcd_keyframes.h" -#include "lcd_backlight_keyframes.h" -#include "system/serial_link.h" -#include "led.h" -#include "animations.h" - -static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0xFF); -static const uint32_t initial_color = LCD_COLOR(0, 0, 0); - -typedef enum { - LCD_STATE_INITIAL, - LCD_STATE_LAYER_BITMAP, - LCD_STATE_BITMAP_AND_LEDS, -} lcd_state_t; - -static lcd_state_t lcd_state = LCD_STATE_INITIAL; - -// Feel free to modify the animations below, or even add new ones if needed - -static keyframe_animation_t lcd_layer_display = { - .num_frames = 1, - .loop = false, - .frame_lengths = {gfxMillisecondsToTicks(0)}, - .frame_functions = {lcd_keyframe_display_layer_and_led_states} -}; - -// The color animation animates the LCD color when you change layers -static keyframe_animation_t color_animation = { - .num_frames = 2, - .loop = false, - // Note that there's a 200 ms no-operation frame, - // this prevents the color from changing when activating the layer - // momentarily - .frame_lengths = {gfxMillisecondsToTicks(200), gfxMillisecondsToTicks(500)}, - .frame_functions = {keyframe_no_operation, backlight_keyframe_animate_color}, -}; - -void initialize_user_visualizer(visualizer_state_t* state) { - // The brightness will be dynamically adjustable in the future - // But for now, change it here. - lcd_backlight_brightness(130); - state->current_lcd_color = initial_color; - state->target_lcd_color = logo_background_color; - lcd_state = LCD_STATE_INITIAL; - start_keyframe_animation(&default_startup_animation); -} - -void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) { - // Add more tests, change the colors and layer texts here - // Usually you want to check the high bits (higher layers first) - // because that's the order layers are processed for keypresses - // You can for check for example: - // state->status.layer - // state->status.default_layer - // state->status.leds (see led.h for available statuses) - +#include "simple_visualizer.h" + +// This function should be implemented by the keymap visualizer +// Don't change anything else than state->target_lcd_color and state->layer_text as that's the only thing +// that the simple_visualizer assumes that you are updating +// Also make sure that the buffer passed to state->layer_text remains valid until the previous animation is +// stopped. This can be done by either double buffering it or by using constant strings +static void get_visualizer_layer_and_color(visualizer_state_t* state) { uint8_t saturation = 60; if (state->status.leds & (1u << USB_LED_CAPS_LOCK)) { saturation = 255; @@ -100,31 +39,4 @@ void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard state->target_lcd_color = LCD_COLOR(84, saturation, 0xFF); state->layer_text = "Default"; } - - if (lcd_state == LCD_STATE_INITIAL || - state->status.layer != prev_status->layer || - state->status.default_layer != prev_status->default_layer || - state->status.leds != prev_status->leds) { - start_keyframe_animation(&color_animation); - start_keyframe_animation(&lcd_layer_display); - } - - // You can also stop existing animations, and start your custom ones here - // remember that you should normally have only one animation for the LCD - // and one for the background. But you can also combine them if you want. -} - -void user_visualizer_suspend(visualizer_state_t* state) { - state->layer_text = "Suspending..."; - uint8_t hue = LCD_HUE(state->current_lcd_color); - uint8_t sat = LCD_SAT(state->current_lcd_color); - state->target_lcd_color = LCD_COLOR(hue, sat, 0); - start_keyframe_animation(&default_suspend_animation); -} - -void user_visualizer_resume(visualizer_state_t* state) { - state->current_lcd_color = initial_color; - state->target_lcd_color = logo_background_color; - lcd_state = LCD_STATE_INITIAL; - start_keyframe_animation(&default_startup_animation); } From dc96fa24e488ebb899d38c8360916b27142f56eb Mon Sep 17 00:00:00 2001 From: Joe DeVivo Date: Mon, 10 Apr 2017 17:19:27 -0700 Subject: [PATCH 115/117] mimic atreus firmware defaults --- keyboards/atreus/keymaps/default/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/atreus/keymaps/default/keymap.c b/keyboards/atreus/keymaps/default/keymap.c index ce92e89c..15ebad14 100644 --- a/keyboards/atreus/keymaps/default/keymap.c +++ b/keyboards/atreus/keymaps/default/keymap.c @@ -39,8 +39,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LW] = { /* [> LOWER <] */ {KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_TRNS, KC_UP, KC_F7, KC_F8, KC_F9, KC_F10}, {KC_DELT, KC_LEFT, KC_DOWN, KC_RGHT, KC_DOWN, KC_TRNS, KC_DOWN, KC_F4, KC_F5, KC_F6, KC_F11}, - {KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, RESET, KC_LCTL, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F12}, - {KC_TRNS, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LALT, KC_SPC, DF(_QW), KC_PSCR, KC_SLCK, KC_PAUS} + {KC_NO, KC_VOLU, KC_NO, KC_NO, RESET, KC_LCTL, KC_NO, KC_F1, KC_F2, KC_F3, KC_F12}, + {KC_NO, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LALT, KC_SPC, TO(_QW), KC_PSCR, KC_SLCK, KC_PAUS} }}; const uint16_t PROGMEM fn_actions[] = { From 1d5567a3a9ae1ca45bd5ff09f21edb7d1388afc3 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Wed, 12 Apr 2017 09:52:40 +0300 Subject: [PATCH 116/117] Fix code formatting in build_keyboard.mk --- build_keyboard.mk | 165 +++++++++++++++++++++++----------------------- 1 file changed, 83 insertions(+), 82 deletions(-) diff --git a/build_keyboard.mk b/build_keyboard.mk index 79d2b6b0..9da8277d 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk @@ -7,11 +7,11 @@ endif include common.mk ifneq ($(SUBPROJECT),) - TARGET ?= $(KEYBOARD)_$(SUBPROJECT)_$(KEYMAP) - KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD)_$(SUBPROJECT) + TARGET ?= $(KEYBOARD)_$(SUBPROJECT)_$(KEYMAP) + KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD)_$(SUBPROJECT) else - TARGET ?= $(KEYBOARD)_$(KEYMAP) - KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD) + TARGET ?= $(KEYBOARD)_$(KEYMAP) + KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD) endif # Force expansion @@ -20,15 +20,15 @@ TARGET := $(TARGET) MASTER ?= left ifdef master - MASTER = $(master) + MASTER = $(master) endif ifeq ($(MASTER),right) - OPT_DEFS += -DMASTER_IS_ON_RIGHT + OPT_DEFS += -DMASTER_IS_ON_RIGHT else - ifneq ($(MASTER),left) + ifneq ($(MASTER),left) $(error MASTER does not have a valid value(left/right)) - endif + endif endif @@ -56,31 +56,31 @@ endif # We can assume a ChibiOS target When MCU_FAMILY is defined, since it's not used for LUFA ifdef MCU_FAMILY - PLATFORM=CHIBIOS + PLATFORM=CHIBIOS else - PLATFORM=AVR + PLATFORM=AVR endif ifeq ($(PLATFORM),CHIBIOS) - include $(TMK_PATH)/protocol/chibios.mk - include $(TMK_PATH)/chibios.mk - OPT_OS = chibios - ifneq ("$(wildcard $(SUBPROJECT_PATH)/bootloader_defs.h)","") - OPT_DEFS += -include $(SUBPROJECT_PATH)/bootloader_defs.h - else ifneq ("$(wildcard $(SUBPROJECT_PATH)/boards/$(BOARD)/bootloader_defs.h)","") - OPT_DEFS += -include $(SUBPROJECT_PATH)/boards/$(BOARD)/bootloader_defs.h - else ifneq ("$(wildcard $(KEYBOARD_PATH)/bootloader_defs.h)","") - OPT_DEFS += -include $(KEYBOARD_PATH)/bootloader_defs.h - else ifneq ("$(wildcard $(KEYBOARD_PATH)/boards/$(BOARD)/bootloader_defs.h)","") - OPT_DEFS += -include $(KEYBOARD_PATH)/boards/$(BOARD)/bootloader_defs.h - endif + include $(TMK_PATH)/protocol/chibios.mk + include $(TMK_PATH)/chibios.mk + OPT_OS = chibios + ifneq ("$(wildcard $(SUBPROJECT_PATH)/bootloader_defs.h)","") + OPT_DEFS += -include $(SUBPROJECT_PATH)/bootloader_defs.h + else ifneq ("$(wildcard $(SUBPROJECT_PATH)/boards/$(BOARD)/bootloader_defs.h)","") + OPT_DEFS += -include $(SUBPROJECT_PATH)/boards/$(BOARD)/bootloader_defs.h + else ifneq ("$(wildcard $(KEYBOARD_PATH)/bootloader_defs.h)","") + OPT_DEFS += -include $(KEYBOARD_PATH)/bootloader_defs.h + else ifneq ("$(wildcard $(KEYBOARD_PATH)/boards/$(BOARD)/bootloader_defs.h)","") + OPT_DEFS += -include $(KEYBOARD_PATH)/boards/$(BOARD)/bootloader_defs.h + endif endif CONFIG_H = $(KEYBOARD_PATH)/config.h ifneq ($(SUBPROJECT),) - ifneq ("$(wildcard $(SUBPROJECT_C))","") - CONFIG_H = $(SUBPROJECT_PATH)/config.h - endif + ifneq ("$(wildcard $(SUBPROJECT_C))","") + CONFIG_H = $(SUBPROJECT_PATH)/config.h + endif endif # Save the defines and includes here, so we don't include any keymap specific ones @@ -112,30 +112,30 @@ KEYMAP_OUTPUT := $(BUILD_DIR)/obj_$(TARGET) ifneq ("$(wildcard $(KEYMAP_PATH)/config.h)","") - CONFIG_H = $(KEYMAP_PATH)/config.h + CONFIG_H = $(KEYMAP_PATH)/config.h endif # # project specific files SRC += $(KEYBOARD_C) \ - $(KEYMAP_C) \ - $(QUANTUM_DIR)/quantum.c \ - $(QUANTUM_DIR)/keymap_common.c \ - $(QUANTUM_DIR)/keycode_config.c \ - $(QUANTUM_DIR)/process_keycode/process_leader.c + $(KEYMAP_C) \ + $(QUANTUM_DIR)/quantum.c \ + $(QUANTUM_DIR)/keymap_common.c \ + $(QUANTUM_DIR)/keycode_config.c \ + $(QUANTUM_DIR)/process_keycode/process_leader.c ifneq ($(SUBPROJECT),) - SRC += $(SUBPROJECT_C) + SRC += $(SUBPROJECT_C) endif ifndef CUSTOM_MATRIX - SRC += $(QUANTUM_DIR)/matrix.c + SRC += $(QUANTUM_DIR)/matrix.c endif ifeq ($(strip $(API_SYSEX_ENABLE)), yes) - OPT_DEFS += -DAPI_SYSEX_ENABLE - SRC += $(QUANTUM_DIR)/api/api_sysex.c - OPT_DEFS += -DAPI_ENABLE - SRC += $(QUANTUM_DIR)/api.c + OPT_DEFS += -DAPI_SYSEX_ENABLE + SRC += $(QUANTUM_DIR)/api/api_sysex.c + OPT_DEFS += -DAPI_ENABLE + SRC += $(QUANTUM_DIR)/api.c MIDI_ENABLE=yes endif @@ -144,25 +144,25 @@ MUSIC_ENABLE := 0 ifeq ($(strip $(AUDIO_ENABLE)), yes) OPT_DEFS += -DAUDIO_ENABLE MUSIC_ENABLE := 1 - SRC += $(QUANTUM_DIR)/process_keycode/process_audio.c - SRC += $(QUANTUM_DIR)/audio/audio.c - SRC += $(QUANTUM_DIR)/audio/voices.c - SRC += $(QUANTUM_DIR)/audio/luts.c + SRC += $(QUANTUM_DIR)/process_keycode/process_audio.c + SRC += $(QUANTUM_DIR)/audio/audio.c + SRC += $(QUANTUM_DIR)/audio/voices.c + SRC += $(QUANTUM_DIR)/audio/luts.c endif ifeq ($(strip $(MIDI_ENABLE)), yes) OPT_DEFS += -DMIDI_ENABLE - MUSIC_ENABLE := 1 - SRC += $(QUANTUM_DIR)/process_keycode/process_midi.c + MUSIC_ENABLE := 1 + SRC += $(QUANTUM_DIR)/process_keycode/process_midi.c endif ifeq ($(MUSIC_ENABLE), 1) - SRC += $(QUANTUM_DIR)/process_keycode/process_music.c + SRC += $(QUANTUM_DIR)/process_keycode/process_music.c endif ifeq ($(strip $(COMBO_ENABLE)), yes) OPT_DEFS += -DCOMBO_ENABLE - SRC += $(QUANTUM_DIR)/process_keycode/process_combo.c + SRC += $(QUANTUM_DIR)/process_keycode/process_combo.c endif ifeq ($(strip $(VIRTSER_ENABLE)), yes) @@ -171,79 +171,80 @@ endif ifeq ($(strip $(FAUXCLICKY_ENABLE)), yes) OPT_DEFS += -DFAUXCLICKY_ENABLE - SRC += $(QUANTUM_DIR)/fauxclicky.c + SRC += $(QUANTUM_DIR)/fauxclicky.c endif ifeq ($(strip $(UCIS_ENABLE)), yes) - OPT_DEFS += -DUCIS_ENABLE - SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c - SRC += $(QUANTUM_DIR)/process_keycode/process_ucis.c + OPT_DEFS += -DUCIS_ENABLE + SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c + SRC += $(QUANTUM_DIR)/process_keycode/process_ucis.c endif ifeq ($(strip $(UNICODEMAP_ENABLE)), yes) - OPT_DEFS += -DUNICODEMAP_ENABLE - SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c - SRC += $(QUANTUM_DIR)/process_keycode/process_unicodemap.c + OPT_DEFS += -DUNICODEMAP_ENABLE + SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c + SRC += $(QUANTUM_DIR)/process_keycode/process_unicodemap.c endif ifeq ($(strip $(UNICODE_ENABLE)), yes) OPT_DEFS += -DUNICODE_ENABLE - SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c - SRC += $(QUANTUM_DIR)/process_keycode/process_unicode.c + SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c + SRC += $(QUANTUM_DIR)/process_keycode/process_unicode.c endif ifeq ($(strip $(RGBLIGHT_ENABLE)), yes) - OPT_DEFS += -DRGBLIGHT_ENABLE - SRC += $(QUANTUM_DIR)/light_ws2812.c - SRC += $(QUANTUM_DIR)/rgblight.c + OPT_DEFS += -DRGBLIGHT_ENABLE + SRC += $(QUANTUM_DIR)/light_ws2812.c + SRC += $(QUANTUM_DIR)/rgblight.c CIE1931_CURVE = yes LED_BREATHING_TABLE = yes endif ifeq ($(strip $(TAP_DANCE_ENABLE)), yes) - OPT_DEFS += -DTAP_DANCE_ENABLE - SRC += $(QUANTUM_DIR)/process_keycode/process_tap_dance.c + OPT_DEFS += -DTAP_DANCE_ENABLE + SRC += $(QUANTUM_DIR)/process_keycode/process_tap_dance.c endif ifeq ($(strip $(PRINTING_ENABLE)), yes) - OPT_DEFS += -DPRINTING_ENABLE - SRC += $(QUANTUM_DIR)/process_keycode/process_printer.c - SRC += $(TMK_DIR)/protocol/serial_uart.c + OPT_DEFS += -DPRINTING_ENABLE + SRC += $(QUANTUM_DIR)/process_keycode/process_printer.c + SRC += $(TMK_DIR)/protocol/serial_uart.c endif ifeq ($(strip $(SERIAL_LINK_ENABLE)), yes) - SRC += $(patsubst $(QUANTUM_PATH)/%,%,$(SERIAL_SRC)) - OPT_DEFS += $(SERIAL_DEFS) - VAPTH += $(SERIAL_PATH) + SRC += $(patsubst $(QUANTUM_PATH)/%,%,$(SERIAL_SRC)) + OPT_DEFS += $(SERIAL_DEFS) + VAPTH += $(SERIAL_PATH) endif ifneq ($(strip $(VARIABLE_TRACE)),) - SRC += $(QUANTUM_DIR)/variable_trace.c - OPT_DEFS += -DNUM_TRACED_VARIABLES=$(strip $(VARIABLE_TRACE)) + SRC += $(QUANTUM_DIR)/variable_trace.c + OPT_DEFS += -DNUM_TRACED_VARIABLES=$(strip $(VARIABLE_TRACE)) ifneq ($(strip $(MAX_VARIABLE_TRACE_SIZE)),) - OPT_DEFS += -DMAX_VARIABLE_TRACE_SIZE=$(strip $(MAX_VARIABLE_TRACE_SIZE)) + OPT_DEFS += -DMAX_VARIABLE_TRACE_SIZE=$(strip $(MAX_VARIABLE_TRACE_SIZE)) endif endif ifeq ($(strip $(LCD_ENABLE)), yes) -CIE1931_CURVE = yes + CIE1931_CURVE = yes endif ifeq ($(strip $(LED_ENABLE)), yes) -CIE1931_CURVE = yes + CIE1931_CURVE = yes endif ifeq ($(strip $(CIE1931_CURVE)), yes) - OPT_DEFS += -DUSE_CIE1931_CURVE - LED_TABLES = yes + OPT_DEFS += -DUSE_CIE1931_CURVE + LED_TABLES = yes endif + ifeq ($(strip $(LED_BREATHING_TABLE)), yes) - OPT_DEFS += -DUSE_LED_BREATHING_TABLE - LED_TABLES = yes + OPT_DEFS += -DUSE_LED_BREATHING_TABLE + LED_TABLES = yes endif ifeq ($(strip $(LED_TABLES)), yes) - SRC += $(QUANTUM_DIR)/led_tables.c + SRC += $(QUANTUM_DIR)/led_tables.c endif # Optimize size but this may cause error "relocation truncated to fit" @@ -252,7 +253,7 @@ endif # Search Path VPATH += $(KEYMAP_PATH) ifneq ($(SUBPROJECT),) - VPATH += $(SUBPROJECT_PATH) + VPATH += $(SUBPROJECT_PATH) endif VPATH += $(KEYBOARD_PATH) VPATH += $(COMMON_VPATH) @@ -266,17 +267,17 @@ EXTRALDFLAGS += $(TMK_COMMON_LDFLAGS) ifeq ($(PLATFORM),AVR) ifeq ($(strip $(PROTOCOL)), VUSB) - include $(TMK_PATH)/protocol/vusb.mk + include $(TMK_PATH)/protocol/vusb.mk else - include $(TMK_PATH)/protocol/lufa.mk + include $(TMK_PATH)/protocol/lufa.mk endif - include $(TMK_PATH)/avr.mk + include $(TMK_PATH)/avr.mk endif ifeq ($(strip $(VISUALIZER_ENABLE)), yes) - VISUALIZER_DIR = $(QUANTUM_DIR)/visualizer - VISUALIZER_PATH = $(QUANTUM_PATH)/visualizer - include $(VISUALIZER_PATH)/visualizer.mk + VISUALIZER_DIR = $(QUANTUM_DIR)/visualizer + VISUALIZER_PATH = $(QUANTUM_PATH)/visualizer + include $(VISUALIZER_PATH)/visualizer.mk endif OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT) From 446b34edecc644e03073b92ff6886f367d3bf29f Mon Sep 17 00:00:00 2001 From: kamisamamizu Date: Wed, 12 Apr 2017 12:18:38 +0200 Subject: [PATCH 117/117] Fixed position of BSLS and BSPC They were in the incorrect positions before. --- keyboards/xd60/keymaps/default/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/xd60/keymaps/default/keymap.c b/keyboards/xd60/keymaps/default/keymap.c index 11be9afc..784088d5 100644 --- a/keyboards/xd60/keymaps/default/keymap.c +++ b/keyboards/xd60/keymaps/default/keymap.c @@ -5,8 +5,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // 0: Base Layer KEYMAP( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, \ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_GRV, \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, \ KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL, \ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RGUI, F(0), KC_LEFT, KC_DOWN, KC_RIGHT),