From a5ba30338f8a1c8e7faaf90f4b05e7c5515d00b3 Mon Sep 17 00:00:00 2001 From: jprMesh Date: Tue, 7 Mar 2017 11:44:58 -0500 Subject: [PATCH 01/16] Atreus52- Initial Atreus52 file creation. --- keyboards/atreus62/keymaps/atreus52/Makefile | 5 ++ keyboards/atreus62/keymaps/atreus52/README.md | 10 +++ keyboards/atreus62/keymaps/atreus52/config.h | 23 +++++ keyboards/atreus62/keymaps/atreus52/keymap.c | 90 +++++++++++++++++++ 4 files changed, 128 insertions(+) create mode 100644 keyboards/atreus62/keymaps/atreus52/Makefile create mode 100644 keyboards/atreus62/keymaps/atreus52/README.md create mode 100644 keyboards/atreus62/keymaps/atreus52/config.h create mode 100644 keyboards/atreus62/keymaps/atreus52/keymap.c diff --git a/keyboards/atreus62/keymaps/atreus52/Makefile b/keyboards/atreus62/keymaps/atreus52/Makefile new file mode 100644 index 0000000000..046aec2733 --- /dev/null +++ b/keyboards/atreus62/keymaps/atreus52/Makefile @@ -0,0 +1,5 @@ +TAP_DANCE_ENABLE = yes +NKRO_ENABLE = true +MOUSEKEY_ENABLE = no +EXTRAKEY_ENABLE = yes +CONSOLE_ENABLE = no diff --git a/keyboards/atreus62/keymaps/atreus52/README.md b/keyboards/atreus62/keymaps/atreus52/README.md new file mode 100644 index 0000000000..245df7deb4 --- /dev/null +++ b/keyboards/atreus62/keymaps/atreus52/README.md @@ -0,0 +1,10 @@ + + +Atreus52 Modification +======================= + +Firmware for my custom keyboard based on the Atreus layout, but with 5 rows and only 5 columns per hand. +More documentation coming soon. + +# License + GPL-3+ diff --git a/keyboards/atreus62/keymaps/atreus52/config.h b/keyboards/atreus62/keymaps/atreus52/config.h new file mode 100644 index 0000000000..80c3739b9b --- /dev/null +++ b/keyboards/atreus62/keymaps/atreus52/config.h @@ -0,0 +1,23 @@ +#include "../../config.h" + +#undef MANUFACTURER +#undef PRODUCT +#undef DESCRIPTION +#undef MATRIX_ROWS +#undef MATRIX_COLS +#undef MATRIX_ROW_PINS +#undef MATRIX_COL_PINS + +/* USB Device descriptor parameter */ +#define MANUFACTURER Mesh Industries +#define PRODUCT Atreus52 Treeboard +#define DESCRIPTION q.m.k. keyboard firmware for Atreus52 + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 11 + +// wiring of each half +#define MATRIX_ROW_PINS { D2, D3, D1, D0, D4 } +#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5, B4, E6 } + diff --git a/keyboards/atreus62/keymaps/atreus52/keymap.c b/keyboards/atreus62/keymaps/atreus52/keymap.c new file mode 100644 index 0000000000..c64e9d498c --- /dev/null +++ b/keyboards/atreus62/keymaps/atreus52/keymap.c @@ -0,0 +1,90 @@ +// 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 "menelaus.h" + +#define ____ KC_TRNS +#define xxxx KC_NO + +// Layers +#define QW 0 +#define DV 1 +#define QL 2 +#define DL 3 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[_QWERTY] = KEYMAP( + 1, 2, 3, 4, 5, ____, 6, 7, 8, 9, 0, \ + Q, W, E, R, T, ____, Y, U, I, O, P, \ + A, S, D, F, G, ____, H, J, K, L, SCLN, \ + Z, X, C, V, B, BSPC, N, M, COMM, DOT, SLSH, \ + ESC, TAB, LCTL, MO(QL),LSFT, ENT, SPC, LALT, LGUI, LEFT, RGHT ), + +[_QUP] = KEYMAP( + F1, F2, F3, F4, F5, ____, F6, F7, F8, F9, F10, \ + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \ + ____, ____, ____, ____, ____, ____, ____, LEFT, DOWN, UP, RGHT, \ + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \ + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ), + +[_DVORAK] = KEYMAP( + 1, 2, 3, 4, 5, ____, 6, 7, 8, 9, 0, \ + QUOT, COMM, DOT, P, Y, ____, F, G, C, R, L, \ + A, O, E, U, I, ____, D, H, T, N, S, \ + SCLN, Q, J, K, X, BSPC, B, M, W, V, Z, \ + ESC, TAB, LCTL, MO(DP),LSFT, ENT, SPC, LALT, LGUI, LEFT, RGHT ), + +[_QUP] = KEYMAP( + F1, F2, F3, F4, F5, ____, F6, F7, F8, F9, F10, \ + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \ + ____, ____, ____, ____, ____, ____, ____, LEFT, DOWN, UP, RGHT, \ + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \ + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ) + +}; + +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; +}; + +static uint8_t qw_dv_swap_state = 0; + +bool process_record_user (uint16_t keycode, keyrecord_t *record) { + if (keycode == KC_LGUI) { + if (record->event.pressed) + qw_dv_swap_state |= B00000001; + else + qw_dv_swap_state &= ~(B00000001); + } + if (keycode == KC_LCTL) { + if (record->event.pressed) + qw_dv_swap_state |= B00000010; + else + qw_dv_swap_state &= ~(B00000010); + } + + if (qw_dv_swap_state == B00000011) { + uint8_t layer = biton32(layer_state); + if (layer == QW) + TO(DV); + else if (layer == DV) + TO(QW); + return true; + } +} From bb99d7117c24ba0ef5fa80a166c2ab46d0b1f250 Mon Sep 17 00:00:00 2001 From: jprmesh Date: Wed, 15 Mar 2017 13:42:54 -0700 Subject: [PATCH 02/16] Atreus52- Changed to KEYMAP macro format. --- keyboards/atreus62/keymaps/atreus52/keymap.c | 60 +++++++++----------- 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/keyboards/atreus62/keymaps/atreus52/keymap.c b/keyboards/atreus62/keymaps/atreus52/keymap.c index c64e9d498c..65440e6a2c 100644 --- a/keyboards/atreus62/keymaps/atreus52/keymap.c +++ b/keyboards/atreus62/keymaps/atreus52/keymap.c @@ -1,10 +1,4 @@ -// 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 "menelaus.h" - -#define ____ KC_TRNS -#define xxxx KC_NO +#include "atreus62.h" // Layers #define QW 0 @@ -13,38 +7,38 @@ #define DL 3 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[_QWERTY] = KEYMAP( - 1, 2, 3, 4, 5, ____, 6, 7, 8, 9, 0, \ - Q, W, E, R, T, ____, Y, U, I, O, P, \ - A, S, D, F, G, ____, H, J, K, L, SCLN, \ - Z, X, C, V, B, BSPC, N, M, COMM, DOT, SLSH, \ - ESC, TAB, LCTL, MO(QL),LSFT, ENT, SPC, LALT, LGUI, LEFT, RGHT ), +[QW] = KEYMAP( + NO, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, NO, \ + NO, Q, W, E, R, T, Y, U, I, O, P, NO, \ + NO, A, S, D, F, G, H, J, K, L, SCLN, NO, \ + NO, Z, X, C, V, B, N, M, COMM, DOT, SLSH, NO, \ + NO, ESC, TAB, LCTL, FN1, LSFT, BSPC, ENT, SPC, LALT, LGUI, LEFT, RGHT, NO ), -[_QUP] = KEYMAP( - F1, F2, F3, F4, F5, ____, F6, F7, F8, F9, F10, \ - ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \ - ____, ____, ____, ____, ____, ____, ____, LEFT, DOWN, UP, RGHT, \ - ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \ - ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ), +[QL] = KEYMAP( + NO, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, NO, \ + NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, NO, \ + NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, LEFT, DOWN, UP, RGHT, NO, \ + NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, NO, \ + NO, TRNS, TRNS, TRNS, FN1, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, NO ), -[_DVORAK] = KEYMAP( - 1, 2, 3, 4, 5, ____, 6, 7, 8, 9, 0, \ - QUOT, COMM, DOT, P, Y, ____, F, G, C, R, L, \ - A, O, E, U, I, ____, D, H, T, N, S, \ - SCLN, Q, J, K, X, BSPC, B, M, W, V, Z, \ - ESC, TAB, LCTL, MO(DP),LSFT, ENT, SPC, LALT, LGUI, LEFT, RGHT ), - -[_QUP] = KEYMAP( - F1, F2, F3, F4, F5, ____, F6, F7, F8, F9, F10, \ - ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \ - ____, ____, ____, ____, ____, ____, ____, LEFT, DOWN, UP, RGHT, \ - ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \ - ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ) +[DV] = KEYMAP( + NO, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, NO, \ + NO, QUOT, COMM, DOT, P, Y, F, G, C, R, L, NO, \ + NO, A, O, E, U, I, D, H, T, N, S, NO, \ + NO, SCLN, Q, J, K, X, B, M, W, V, Z, NO, \ + NO, ESC, TAB, LCTL, F2, LSFT, BSPC, ENT, SPC, LALT, LGUI, LEFT, RGHT, NO ), +[DL] = KEYMAP( + NO, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, NO, \ + NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, NO, \ + NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, LEFT, DOWN, UP, RGHT, NO, \ + NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, NO, \ + NO, TRNS, TRNS, TRNS, FN2, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, NO ) }; const uint16_t PROGMEM fn_actions[] = { - + [1] = ACTION_LAYER_MOMENTARY(QL), // Qwerty FN layer + [2] = ACTION_LAYER_MOMENTARY(DV) // Dvorak FN layer }; const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) From f9eb11a674f71ab2669f87442e1e99354f46d3be Mon Sep 17 00:00:00 2001 From: jprmesh Date: Wed, 15 Mar 2017 13:43:16 -0700 Subject: [PATCH 03/16] Atreus52- Fixed Qwerty Dvorak switch --- keyboards/atreus62/keymaps/atreus52/keymap.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/keyboards/atreus62/keymaps/atreus52/keymap.c b/keyboards/atreus62/keymaps/atreus52/keymap.c index 65440e6a2c..7e856066e7 100644 --- a/keyboards/atreus62/keymaps/atreus52/keymap.c +++ b/keyboards/atreus62/keymaps/atreus52/keymap.c @@ -62,23 +62,19 @@ static uint8_t qw_dv_swap_state = 0; bool process_record_user (uint16_t keycode, keyrecord_t *record) { if (keycode == KC_LGUI) { if (record->event.pressed) - qw_dv_swap_state |= B00000001; + qw_dv_swap_state |= 0b00000001; else - qw_dv_swap_state &= ~(B00000001); + qw_dv_swap_state &= ~(0b00000001); } if (keycode == KC_LCTL) { if (record->event.pressed) - qw_dv_swap_state |= B00000010; + qw_dv_swap_state |= 0b00000010; else - qw_dv_swap_state &= ~(B00000010); + qw_dv_swap_state &= ~(0b00000010); } - if (qw_dv_swap_state == B00000011) { - uint8_t layer = biton32(layer_state); - if (layer == QW) - TO(DV); - else if (layer == DV) - TO(QW); - return true; + if (qw_dv_swap_state == 0b00000011) { + layer_invert(DV); } + return true; } From 17e81baab3e5dc442c553080316626c9c8ece4c0 Mon Sep 17 00:00:00 2001 From: jprmesh Date: Wed, 15 Mar 2017 14:27:11 -0700 Subject: [PATCH 04/16] Atreus52- Fixed config. --- keyboards/atreus62/keymaps/atreus52/Makefile | 1 - keyboards/atreus62/keymaps/atreus52/config.h | 13 ------------- 2 files changed, 14 deletions(-) diff --git a/keyboards/atreus62/keymaps/atreus52/Makefile b/keyboards/atreus62/keymaps/atreus52/Makefile index 046aec2733..efa309d201 100644 --- a/keyboards/atreus62/keymaps/atreus52/Makefile +++ b/keyboards/atreus62/keymaps/atreus52/Makefile @@ -1,4 +1,3 @@ -TAP_DANCE_ENABLE = yes NKRO_ENABLE = true MOUSEKEY_ENABLE = no EXTRAKEY_ENABLE = yes diff --git a/keyboards/atreus62/keymaps/atreus52/config.h b/keyboards/atreus62/keymaps/atreus52/config.h index 80c3739b9b..4c8b73dcc1 100644 --- a/keyboards/atreus62/keymaps/atreus52/config.h +++ b/keyboards/atreus62/keymaps/atreus52/config.h @@ -3,21 +3,8 @@ #undef MANUFACTURER #undef PRODUCT #undef DESCRIPTION -#undef MATRIX_ROWS -#undef MATRIX_COLS -#undef MATRIX_ROW_PINS -#undef MATRIX_COL_PINS /* USB Device descriptor parameter */ #define MANUFACTURER Mesh Industries #define PRODUCT Atreus52 Treeboard #define DESCRIPTION q.m.k. keyboard firmware for Atreus52 - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 11 - -// wiring of each half -#define MATRIX_ROW_PINS { D2, D3, D1, D0, D4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5, B4, E6 } - From b236e51b69be3420f2850722a6f3668c5e6b5fbc Mon Sep 17 00:00:00 2001 From: jprmesh Date: Wed, 15 Mar 2017 17:32:58 -0700 Subject: [PATCH 05/16] Atreus52- finished initial keymap layout. --- keyboards/atreus62/keymaps/atreus52/keymap.c | 51 +++++++++++--------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/keyboards/atreus62/keymaps/atreus52/keymap.c b/keyboards/atreus62/keymaps/atreus52/keymap.c index 7e856066e7..6731376c68 100644 --- a/keyboards/atreus62/keymaps/atreus52/keymap.c +++ b/keyboards/atreus62/keymaps/atreus52/keymap.c @@ -1,44 +1,47 @@ #include "atreus62.h" // Layers -#define QW 0 -#define DV 1 -#define QL 2 -#define DL 3 +#define QWERTY 0 +#define DVORAK 1 +#define RAISE 2 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[QW] = KEYMAP( +[QWERTY] = KEYMAP( NO, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, NO, \ NO, Q, W, E, R, T, Y, U, I, O, P, NO, \ NO, A, S, D, F, G, H, J, K, L, SCLN, NO, \ NO, Z, X, C, V, B, N, M, COMM, DOT, SLSH, NO, \ - NO, ESC, TAB, LCTL, FN1, LSFT, BSPC, ENT, SPC, LALT, LGUI, LEFT, RGHT, NO ), + NO, ESC, TAB, LCTL, FN0, FN10, BSPC, ENT, SPC, LALT, LGUI, LEFT, RGHT, NO ), -[QL] = KEYMAP( - NO, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, NO, \ - NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, NO, \ - NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, LEFT, DOWN, UP, RGHT, NO, \ - NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, NO, \ - NO, TRNS, TRNS, TRNS, FN1, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, NO ), - -[DV] = KEYMAP( +[DVORAK] = KEYMAP( NO, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, NO, \ NO, QUOT, COMM, DOT, P, Y, F, G, C, R, L, NO, \ NO, A, O, E, U, I, D, H, T, N, S, NO, \ NO, SCLN, Q, J, K, X, B, M, W, V, Z, NO, \ - NO, ESC, TAB, LCTL, F2, LSFT, BSPC, ENT, SPC, LALT, LGUI, LEFT, RGHT, NO ), + NO, ESC, TAB, LCTL, FN0, FN10, BSPC, ENT, SPC, LALT, LGUI, LEFT, RGHT, NO ), -[DL] = KEYMAP( - NO, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, NO, \ - NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, NO, \ - NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, LEFT, DOWN, UP, RGHT, NO, \ - NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, NO, \ - NO, TRNS, TRNS, TRNS, FN2, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, NO ) +[RAISE] = KEYMAP( + NO, ESC, TRNS, MPRV, MPLY, MNXT, TRNS, MUTE, VOLD, VOLU, DEL, NO, \ + NO, TRNS, TRNS, GRV, FN13, FN14, BSLS, FN16, FN18, LBRC, QUOT, NO, \ + NO, FN12, MINS, FN11, EQL, FN15, SLSH, LEFT, DOWN, UP, RGHT, NO, \ + NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN17, FN19, RBRC, FN20, NO, \ + NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, NO ) }; const uint16_t PROGMEM fn_actions[] = { - [1] = ACTION_LAYER_MOMENTARY(QL), // Qwerty FN layer - [2] = ACTION_LAYER_MOMENTARY(DV) // Dvorak FN layer + [0] = ACTION_LAYER_MOMENTARY(RAISE), // Raise layer + + [10] = OSM(MOD_LSFT), // One shot shift + [11] = LSFT(KC_EQUAL), // + + [12] = LSFT(KC_MINUS), // _ + [13] = LSFT(KC_SLASH), // ? + [14] = LSFT(KC_BSLASH), // | + [15] = LSFT(KC_GRAVE), // ~ + [16] = LSFT(KC_9), // ( + [17] = LSFT(KC_0), // ) + [18] = LSFT(KC_LBRC), // { + [19] = LSFT(KC_RBRC), // } + [20] = LSFT(KC_QUOT) // " }; const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) @@ -74,7 +77,7 @@ bool process_record_user (uint16_t keycode, keyrecord_t *record) { } if (qw_dv_swap_state == 0b00000011) { - layer_invert(DV); + layer_invert(DVORAK); } return true; } From 3c2c489768cf77cd5573a39305198c4c4b2027f1 Mon Sep 17 00:00:00 2001 From: jprMesh Date: Fri, 17 Mar 2017 09:11:20 -0400 Subject: [PATCH 06/16] Atreus52- Fixed spacing and changed to KC_KEYMAP macro. --- keyboards/atreus62/keymaps/atreus52/keymap.c | 50 ++++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/keyboards/atreus62/keymaps/atreus52/keymap.c b/keyboards/atreus62/keymaps/atreus52/keymap.c index 6731376c68..31f94340c4 100644 --- a/keyboards/atreus62/keymaps/atreus52/keymap.c +++ b/keyboards/atreus62/keymaps/atreus52/keymap.c @@ -6,21 +6,21 @@ #define RAISE 2 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[QWERTY] = KEYMAP( - NO, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, NO, \ - NO, Q, W, E, R, T, Y, U, I, O, P, NO, \ - NO, A, S, D, F, G, H, J, K, L, SCLN, NO, \ - NO, Z, X, C, V, B, N, M, COMM, DOT, SLSH, NO, \ - NO, ESC, TAB, LCTL, FN0, FN10, BSPC, ENT, SPC, LALT, LGUI, LEFT, RGHT, NO ), +[QWERTY] = KC_KEYMAP( + NO, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, NO, \ + NO, Q, W, E, R, T, Y, U, I, O, P, NO, \ + NO, A, S, D, F, G, H, J, K, L, SCLN, NO, \ + NO, Z, X, C, V, B, N, M, COMM, DOT, SLSH, NO, \ + NO, ESC, TAB, LCTL, FN0, FN10, BSPC, ENT, SPC, LALT, LGUI, LEFT, RGHT, NO ), -[DVORAK] = KEYMAP( - NO, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, NO, \ - NO, QUOT, COMM, DOT, P, Y, F, G, C, R, L, NO, \ - NO, A, O, E, U, I, D, H, T, N, S, NO, \ - NO, SCLN, Q, J, K, X, B, M, W, V, Z, NO, \ - NO, ESC, TAB, LCTL, FN0, FN10, BSPC, ENT, SPC, LALT, LGUI, LEFT, RGHT, NO ), +[DVORAK] = KC_KEYMAP( + NO, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, NO, \ + NO, QUOT, COMM, DOT, P, Y, F, G, C, R, L, NO, \ + NO, A, O, E, U, I, D, H, T, N, S, NO, \ + NO, SCLN, Q, J, K, X, B, M, W, V, Z, NO, \ + NO, ESC, TAB, LCTL, FN0, FN10, BSPC, ENT, SPC, LALT, LGUI, LEFT, RGHT, NO ), -[RAISE] = KEYMAP( +[RAISE] = KC_KEYMAP( NO, ESC, TRNS, MPRV, MPLY, MNXT, TRNS, MUTE, VOLD, VOLU, DEL, NO, \ NO, TRNS, TRNS, GRV, FN13, FN14, BSLS, FN16, FN18, LBRC, QUOT, NO, \ NO, FN12, MINS, FN11, EQL, FN15, SLSH, LEFT, DOWN, UP, RGHT, NO, \ @@ -46,18 +46,18 @@ 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; + // 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; }; static uint8_t qw_dv_swap_state = 0; From 133908da74245037086e8a79ba0c062368797832 Mon Sep 17 00:00:00 2001 From: jprmesh Date: Sun, 7 May 2017 22:01:35 -0400 Subject: [PATCH 07/16] Atreus52- Some keymap changes. --- keyboards/atreus62/keymaps/atreus52/keymap.c | 26 ++++++-------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/keyboards/atreus62/keymaps/atreus52/keymap.c b/keyboards/atreus62/keymaps/atreus52/keymap.c index 31f94340c4..bb511d353c 100644 --- a/keyboards/atreus62/keymaps/atreus52/keymap.c +++ b/keyboards/atreus62/keymaps/atreus52/keymap.c @@ -11,37 +11,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { NO, Q, W, E, R, T, Y, U, I, O, P, NO, \ NO, A, S, D, F, G, H, J, K, L, SCLN, NO, \ NO, Z, X, C, V, B, N, M, COMM, DOT, SLSH, NO, \ - NO, ESC, TAB, LCTL, FN0, FN10, BSPC, ENT, SPC, LALT, LGUI, LEFT, RGHT, NO ), + NO, UP, DOWN, LCTL, LALT, FN1, BSPC, ENT, SPC, FN0, LGUI, LEFT, RGHT, NO ), [DVORAK] = KC_KEYMAP( NO, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, NO, \ NO, QUOT, COMM, DOT, P, Y, F, G, C, R, L, NO, \ NO, A, O, E, U, I, D, H, T, N, S, NO, \ NO, SCLN, Q, J, K, X, B, M, W, V, Z, NO, \ - NO, ESC, TAB, LCTL, FN0, FN10, BSPC, ENT, SPC, LALT, LGUI, LEFT, RGHT, NO ), + NO, UP, DOWN, LCTL, LALT, FN1, BSPC, ENT, SPC, FN0, LGUI, LEFT, RGHT, NO ), [RAISE] = KC_KEYMAP( - NO, ESC, TRNS, MPRV, MPLY, MNXT, TRNS, MUTE, VOLD, VOLU, DEL, NO, \ - NO, TRNS, TRNS, GRV, FN13, FN14, BSLS, FN16, FN18, LBRC, QUOT, NO, \ - NO, FN12, MINS, FN11, EQL, FN15, SLSH, LEFT, DOWN, UP, RGHT, NO, \ - NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN17, FN19, RBRC, FN20, NO, \ + NO, MRWD, MPRV, MPLY, MNXT, MFFD, TRNS, MUTE, VOLD, VOLU, DEL, NO, \ + NO, TAB, ESC, GRV, QUES, PIPE, BSLS, LPRN, LCBR, LBRC, QUOT, NO, \ + NO, UNDS, MINS, PLUS, EQL, TILD, SLSH, LEFT, DOWN, UP, RGHT, NO, \ + NO, TRNS, TRNS, TRNS, TRNS, TRNS, FN2, RPRN, RCBR, RBRC, DQUO, NO, \ NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, NO ) }; const uint16_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(RAISE), // Raise layer - - [10] = OSM(MOD_LSFT), // One shot shift - [11] = LSFT(KC_EQUAL), // + - [12] = LSFT(KC_MINUS), // _ - [13] = LSFT(KC_SLASH), // ? - [14] = LSFT(KC_BSLASH), // | - [15] = LSFT(KC_GRAVE), // ~ - [16] = LSFT(KC_9), // ( - [17] = LSFT(KC_0), // ) - [18] = LSFT(KC_LBRC), // { - [19] = LSFT(KC_RBRC), // } - [20] = LSFT(KC_QUOT) // " + [1] = OSM(MOD_LSFT), // One shot shift + [2] = LALT(KC_TAB) // Alt Tab key }; const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) From 1552fd6ae13aee6ddc113e2c32a3acf608aa97c0 Mon Sep 17 00:00:00 2001 From: jprmesh Date: Mon, 8 May 2017 00:21:30 -0400 Subject: [PATCH 08/16] Atreus52- Last changes to config to get it workin. --- keyboards/atreus62/keymaps/atreus52/config.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/keyboards/atreus62/keymaps/atreus52/config.h b/keyboards/atreus62/keymaps/atreus52/config.h index 4c8b73dcc1..ba0eaf0dbb 100644 --- a/keyboards/atreus62/keymaps/atreus52/config.h +++ b/keyboards/atreus62/keymaps/atreus52/config.h @@ -3,8 +3,16 @@ #undef MANUFACTURER #undef PRODUCT #undef DESCRIPTION +#undef MATRIX_ROW_PINS +#undef MATRIX_COL_PINS +#undef DIODE_DIRECTION /* USB Device descriptor parameter */ #define MANUFACTURER Mesh Industries #define PRODUCT Atreus52 Treeboard #define DESCRIPTION q.m.k. keyboard firmware for Atreus52 + +#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } +#define MATRIX_COL_PINS { B2, B1, F7, F6, F5, F4, B6, D3, D2, D1, D0, D4, B3 } + +#define DIODE_DIRECTION COL2ROW From 56026dd4df41c852534432fe7bed0c5dbd1fe2d9 Mon Sep 17 00:00:00 2001 From: jprmesh Date: Mon, 8 May 2017 06:09:05 -0400 Subject: [PATCH 09/16] Atreus52- Swapped thumb keys. --- keyboards/atreus62/atreus62.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/atreus62/atreus62.h b/keyboards/atreus62/atreus62.h index ca5cda8a89..d0bf68adcc 100644 --- a/keyboards/atreus62/atreus62.h +++ b/keyboards/atreus62/atreus62.h @@ -35,8 +35,8 @@ void promicro_bootloader_jmp(bool program); { KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_NO, KC_##k06, KC_##k07, KC_##k08, KC_##k09, KC_##k0a, KC_##k0b }, \ { KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_NO, KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k1a, KC_##k1b }, \ { KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_NO, KC_##k26, KC_##k27, KC_##k28, KC_##k29, KC_##k2a, KC_##k2b }, \ - { KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k46, KC_##k36, KC_##k37, KC_##k38, KC_##k39, KC_##k3a, KC_##k3b }, \ - { KC_##k40, KC_##k41, KC_##k42, KC_##k43, KC_##k44, KC_##k45, KC_##k47, KC_##k48, KC_##k49, KC_##k4a, KC_##k4b, KC_##k4c, KC_##k4d } \ + { KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k47, KC_##k36, KC_##k37, KC_##k38, KC_##k39, KC_##k3a, KC_##k3b }, \ + { KC_##k40, KC_##k41, KC_##k42, KC_##k43, KC_##k44, KC_##k45, KC_##k46, KC_##k48, KC_##k49, KC_##k4a, KC_##k4b, KC_##k4c, KC_##k4d } \ } #endif From 7837d96b6eb18131a78925e679402257f33aab95 Mon Sep 17 00:00:00 2001 From: Jonas Date: Wed, 31 May 2017 14:34:44 +0000 Subject: [PATCH 10/16] Atreus52- Reworked keymap to be more 40% like. --- keyboards/atreus62/keymaps/atreus52/keymap.c | 24 ++++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/keyboards/atreus62/keymaps/atreus52/keymap.c b/keyboards/atreus62/keymaps/atreus52/keymap.c index bb511d353c..aef87d6d5d 100644 --- a/keyboards/atreus62/keymaps/atreus52/keymap.c +++ b/keyboards/atreus62/keymaps/atreus52/keymap.c @@ -4,6 +4,7 @@ #define QWERTY 0 #define DVORAK 1 #define RAISE 2 +#define LOWER 3 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [QWERTY] = KC_KEYMAP( @@ -11,27 +12,36 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { NO, Q, W, E, R, T, Y, U, I, O, P, NO, \ NO, A, S, D, F, G, H, J, K, L, SCLN, NO, \ NO, Z, X, C, V, B, N, M, COMM, DOT, SLSH, NO, \ - NO, UP, DOWN, LCTL, LALT, FN1, BSPC, ENT, SPC, FN0, LGUI, LEFT, RGHT, NO ), + NO, FN2, LALT, LCTL, FN1, FN3, BSPC, ENT, SPC, FN0, LGUI, LEFT, RGHT, NO ), [DVORAK] = KC_KEYMAP( NO, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, NO, \ NO, QUOT, COMM, DOT, P, Y, F, G, C, R, L, NO, \ NO, A, O, E, U, I, D, H, T, N, S, NO, \ NO, SCLN, Q, J, K, X, B, M, W, V, Z, NO, \ - NO, UP, DOWN, LCTL, LALT, FN1, BSPC, ENT, SPC, FN0, LGUI, LEFT, RGHT, NO ), + NO, FN2, LALT, LCTL, FN1, FN3, BSPC, ENT, SPC, FN0, LGUI, LEFT, RGHT, NO ), [RAISE] = KC_KEYMAP( NO, MRWD, MPRV, MPLY, MNXT, MFFD, TRNS, MUTE, VOLD, VOLU, DEL, NO, \ - NO, TAB, ESC, GRV, QUES, PIPE, BSLS, LPRN, LCBR, LBRC, QUOT, NO, \ - NO, UNDS, MINS, PLUS, EQL, TILD, SLSH, LEFT, DOWN, UP, RGHT, NO, \ - NO, TRNS, TRNS, TRNS, TRNS, TRNS, FN2, RPRN, RCBR, RBRC, DQUO, NO, \ + NO, TILD, GRV, DQUO, QUOT, LCBR, RCBR, EQL, PLUS, MINS, QUES, NO, \ + NO, ESC, TAB, BSLS, SLS, LPRN, RPRN, LEFT, DOWN, UP, RGHT, NO, \ + NO, TRNS, TRNS, TRNS, TRNS, LBRC, RBRC, PIPE, UNDS, TRNS, TRNS, NO, \ + NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, NO ), + +[LOWER] = KC_KEYMAP( + NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, NO, \ + NO, EXLM, AT, HASH, DLR, PERC, CIRC, AMPR, ASTR, LPRN, RPRN, NO, \ + NO, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, NO, \ + NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, DOT, TRNS, TRNS, TRNS, NO, \ NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, NO ) + }; const uint16_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(RAISE), // Raise layer - [1] = OSM(MOD_LSFT), // One shot shift - [2] = LALT(KC_TAB) // Alt Tab key + [1] = ACTION_LAYER_MOMENTARY(LOWER), // Lower layer + [2] = ACTION_LAYER_TOGGLE(NAV), + [3] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_SPC) }; const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) From a8992a2cfe2e44bbd662591f95b3d7cbd531e658 Mon Sep 17 00:00:00 2001 From: jprmesh Date: Wed, 31 May 2017 22:16:21 -0400 Subject: [PATCH 11/16] Atreus52- Added Nav layer keymap. --- keyboards/atreus62/keymaps/atreus52/keymap.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/keyboards/atreus62/keymaps/atreus52/keymap.c b/keyboards/atreus62/keymaps/atreus52/keymap.c index aef87d6d5d..4a57da6b5e 100644 --- a/keyboards/atreus62/keymaps/atreus52/keymap.c +++ b/keyboards/atreus62/keymaps/atreus52/keymap.c @@ -5,6 +5,7 @@ #define DVORAK 1 #define RAISE 2 #define LOWER 3 +#define NAV 4 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [QWERTY] = KC_KEYMAP( @@ -24,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [RAISE] = KC_KEYMAP( NO, MRWD, MPRV, MPLY, MNXT, MFFD, TRNS, MUTE, VOLD, VOLU, DEL, NO, \ NO, TILD, GRV, DQUO, QUOT, LCBR, RCBR, EQL, PLUS, MINS, QUES, NO, \ - NO, ESC, TAB, BSLS, SLS, LPRN, RPRN, LEFT, DOWN, UP, RGHT, NO, \ + NO, ESC, TAB, BSLS, SLSH, LPRN, RPRN, LEFT, DOWN, UP, RGHT, NO, \ NO, TRNS, TRNS, TRNS, TRNS, LBRC, RBRC, PIPE, UNDS, TRNS, TRNS, NO, \ NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, NO ), @@ -33,6 +34,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { NO, EXLM, AT, HASH, DLR, PERC, CIRC, AMPR, ASTR, LPRN, RPRN, NO, \ NO, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, NO, \ NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, DOT, TRNS, TRNS, TRNS, NO, \ + NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, NO ), + +[NAV] = KC_KEYMAP( + NO, GRV, 1, 2, 3, 4, TRNS, TRNS, TRNS, TRNS, TRNS, NO, \ + NO, 5, Q, W, E, R, TRNS, TRNS, TRNS, TRNS, TRNS, NO, \ + NO, 6, A, S, D, F, TRNS, LEFT, UP, RGHT, TRNS, NO, \ + NO, 7, Z, X, C, V, TRNS, TRNS, DOWN, TRNS, TRNS, NO, \ NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, NO ) }; @@ -40,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(RAISE), // Raise layer [1] = ACTION_LAYER_MOMENTARY(LOWER), // Lower layer - [2] = ACTION_LAYER_TOGGLE(NAV), + [2] = ACTION_LAYER_TOGGLE(NAV), // Nav layer [3] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_SPC) }; From 3b9fabb9aa6fad391063825017878d47a4bdfc08 Mon Sep 17 00:00:00 2001 From: Jonas Date: Thu, 8 Jun 2017 17:43:16 -0400 Subject: [PATCH 12/16] Atreus52- BDO keymap. --- keyboards/atreus62/keymaps/atreus52/keymap.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/keyboards/atreus62/keymaps/atreus52/keymap.c b/keyboards/atreus62/keymaps/atreus52/keymap.c index 4a57da6b5e..0c44d6bd62 100644 --- a/keyboards/atreus62/keymaps/atreus52/keymap.c +++ b/keyboards/atreus62/keymaps/atreus52/keymap.c @@ -5,7 +5,7 @@ #define DVORAK 1 #define RAISE 2 #define LOWER 3 -#define NAV 4 +#define BDO 4 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [QWERTY] = KC_KEYMAP( @@ -36,19 +36,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, DOT, TRNS, TRNS, TRNS, NO, \ NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, NO ), -[NAV] = KC_KEYMAP( - NO, GRV, 1, 2, 3, 4, TRNS, TRNS, TRNS, TRNS, TRNS, NO, \ - NO, 5, Q, W, E, R, TRNS, TRNS, TRNS, TRNS, TRNS, NO, \ - NO, 6, A, S, D, F, TRNS, LEFT, UP, RGHT, TRNS, NO, \ - NO, 7, Z, X, C, V, TRNS, TRNS, DOWN, TRNS, TRNS, NO, \ - NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, NO ) +[BDO] = KC_KEYMAP( + NO, ESC, 1, 2, 3, 4, 5, NO, NO, NO, NO, NO, \ + NO, TAB, Q, W, E, R, 6, Y, I, O, P, NO, \ + NO, LSFT, A, S, D, F, 7, G, H, J, K, NO, \ + NO, T, Z, X, C, V, 8, B, N, M, L, NO, \ + NO, LCTL, SPC, SPC, SPC, SPC, 0, 9, SLSH, NO, NO, NO, FN2, NO ) }; const uint16_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(RAISE), // Raise layer [1] = ACTION_LAYER_MOMENTARY(LOWER), // Lower layer - [2] = ACTION_LAYER_TOGGLE(NAV), // Nav layer + [2] = ACTION_LAYER_TOGGLE(BDO), // BDO layer [3] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_SPC) }; From 3007d01718245672a3fea646f74ecfbe1735443c Mon Sep 17 00:00:00 2001 From: Jonas Date: Fri, 9 Jun 2017 22:00:43 -0400 Subject: [PATCH 13/16] Atreus52- Modified BDO map. --- keyboards/atreus62/keymaps/atreus52/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/atreus62/keymaps/atreus52/keymap.c b/keyboards/atreus62/keymaps/atreus52/keymap.c index 0c44d6bd62..ca77ee1229 100644 --- a/keyboards/atreus62/keymaps/atreus52/keymap.c +++ b/keyboards/atreus62/keymaps/atreus52/keymap.c @@ -37,11 +37,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, NO ), [BDO] = KC_KEYMAP( - NO, ESC, 1, 2, 3, 4, 5, NO, NO, NO, NO, NO, \ + NO, ESC, 1, 2, 3, 4, 5, 0, SLSH, U, C, NO, \ NO, TAB, Q, W, E, R, 6, Y, I, O, P, NO, \ NO, LSFT, A, S, D, F, 7, G, H, J, K, NO, \ NO, T, Z, X, C, V, 8, B, N, M, L, NO, \ - NO, LCTL, SPC, SPC, SPC, SPC, 0, 9, SLSH, NO, NO, NO, FN2, NO ) + NO, LCTL, SPC, SPC, SPC, SPC, COMM, ENT, 9, NO, NO, NO, FN2, NO ) }; From 4c2f04986adf97f02e336d5a47825ccf304916af Mon Sep 17 00:00:00 2001 From: Jonas Rogers Date: Sat, 17 Jun 2017 21:14:32 -0400 Subject: [PATCH 14/16] Atreus52- added software reset key. --- keyboards/atreus62/keymaps/atreus52/keymap.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/keyboards/atreus62/keymaps/atreus52/keymap.c b/keyboards/atreus62/keymaps/atreus52/keymap.c index ca77ee1229..7023606c7f 100644 --- a/keyboards/atreus62/keymaps/atreus52/keymap.c +++ b/keyboards/atreus62/keymaps/atreus52/keymap.c @@ -6,6 +6,7 @@ #define RAISE 2 #define LOWER 3 #define BDO 4 +#define RESETL 5 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [QWERTY] = KC_KEYMAP( @@ -13,21 +14,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { NO, Q, W, E, R, T, Y, U, I, O, P, NO, \ NO, A, S, D, F, G, H, J, K, L, SCLN, NO, \ NO, Z, X, C, V, B, N, M, COMM, DOT, SLSH, NO, \ - NO, FN2, LALT, LCTL, FN1, FN3, BSPC, ENT, SPC, FN0, LGUI, LEFT, RGHT, NO ), + NO, FN2, LALT, LCTL, FN1, LSFT, BSPC, ENT, SPC, FN0, LGUI, LEFT, RGHT, NO ), [DVORAK] = KC_KEYMAP( NO, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, NO, \ NO, QUOT, COMM, DOT, P, Y, F, G, C, R, L, NO, \ NO, A, O, E, U, I, D, H, T, N, S, NO, \ NO, SCLN, Q, J, K, X, B, M, W, V, Z, NO, \ - NO, FN2, LALT, LCTL, FN1, FN3, BSPC, ENT, SPC, FN0, LGUI, LEFT, RGHT, NO ), + NO, FN2, LALT, LCTL, FN1, LSFT, BSPC, ENT, SPC, FN0, LGUI, LEFT, RGHT, NO ), [RAISE] = KC_KEYMAP( NO, MRWD, MPRV, MPLY, MNXT, MFFD, TRNS, MUTE, VOLD, VOLU, DEL, NO, \ NO, TILD, GRV, DQUO, QUOT, LCBR, RCBR, EQL, PLUS, MINS, QUES, NO, \ NO, ESC, TAB, BSLS, SLSH, LPRN, RPRN, LEFT, DOWN, UP, RGHT, NO, \ NO, TRNS, TRNS, TRNS, TRNS, LBRC, RBRC, PIPE, UNDS, TRNS, TRNS, NO, \ - NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, NO ), + NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN3, NO ), [LOWER] = KC_KEYMAP( NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, NO, \ @@ -41,7 +42,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { NO, TAB, Q, W, E, R, 6, Y, I, O, P, NO, \ NO, LSFT, A, S, D, F, 7, G, H, J, K, NO, \ NO, T, Z, X, C, V, 8, B, N, M, L, NO, \ - NO, LCTL, SPC, SPC, SPC, SPC, COMM, ENT, 9, NO, NO, NO, FN2, NO ) + NO, LCTL, SPC, SPC, SPC, SPC, COMM, ENT, 9, NO, NO, NO, FN2, NO ), + +[RESETL] = KEYMAP( + KC_NO, RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_FN3,KC_NO ) }; @@ -49,7 +57,7 @@ const uint16_t PROGMEM fn_actions[] = { [0] = ACTION_LAYER_MOMENTARY(RAISE), // Raise layer [1] = ACTION_LAYER_MOMENTARY(LOWER), // Lower layer [2] = ACTION_LAYER_TOGGLE(BDO), // BDO layer - [3] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_SPC) + [3] = ACTION_LAYER_TOGGLE(RESETL) // RESET layer }; const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) From 85d688e92ca2992c649411b62c70bc8c7ad888ab Mon Sep 17 00:00:00 2001 From: Jonas Rogers Date: Sat, 17 Jun 2017 21:16:06 -0400 Subject: [PATCH 15/16] Atreus52- made dvorak layer default. --- keyboards/atreus62/keymaps/atreus52/keymap.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/keyboards/atreus62/keymaps/atreus52/keymap.c b/keyboards/atreus62/keymaps/atreus52/keymap.c index 7023606c7f..3812d45fd5 100644 --- a/keyboards/atreus62/keymaps/atreus52/keymap.c +++ b/keyboards/atreus62/keymaps/atreus52/keymap.c @@ -1,21 +1,14 @@ #include "atreus62.h" // Layers -#define QWERTY 0 -#define DVORAK 1 +#define DVORAK 0 +#define QWERTY 1 #define RAISE 2 #define LOWER 3 #define BDO 4 #define RESETL 5 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[QWERTY] = KC_KEYMAP( - NO, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, NO, \ - NO, Q, W, E, R, T, Y, U, I, O, P, NO, \ - NO, A, S, D, F, G, H, J, K, L, SCLN, NO, \ - NO, Z, X, C, V, B, N, M, COMM, DOT, SLSH, NO, \ - NO, FN2, LALT, LCTL, FN1, LSFT, BSPC, ENT, SPC, FN0, LGUI, LEFT, RGHT, NO ), - [DVORAK] = KC_KEYMAP( NO, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, NO, \ NO, QUOT, COMM, DOT, P, Y, F, G, C, R, L, NO, \ @@ -23,6 +16,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { NO, SCLN, Q, J, K, X, B, M, W, V, Z, NO, \ NO, FN2, LALT, LCTL, FN1, LSFT, BSPC, ENT, SPC, FN0, LGUI, LEFT, RGHT, NO ), +[QWERTY] = KC_KEYMAP( + NO, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, NO, \ + NO, Q, W, E, R, T, Y, U, I, O, P, NO, \ + NO, A, S, D, F, G, H, J, K, L, SCLN, NO, \ + NO, Z, X, C, V, B, N, M, COMM, DOT, SLSH, NO, \ + NO, FN2, LALT, LCTL, FN1, LSFT, BSPC, ENT, SPC, FN0, LGUI, LEFT, RGHT, NO ), + [RAISE] = KC_KEYMAP( NO, MRWD, MPRV, MPLY, MNXT, MFFD, TRNS, MUTE, VOLD, VOLU, DEL, NO, \ NO, TILD, GRV, DQUO, QUOT, LCBR, RCBR, EQL, PLUS, MINS, QUES, NO, \ From a284245f7776da50865c626bdd5ee5af78df220e Mon Sep 17 00:00:00 2001 From: Jonas Rogers Date: Sat, 17 Jun 2017 22:51:50 -0400 Subject: [PATCH 16/16] Atreus52- moved parens and braces to left hand. --- keyboards/atreus62/keymaps/atreus52/keymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/atreus62/keymaps/atreus52/keymap.c b/keyboards/atreus62/keymaps/atreus52/keymap.c index 3812d45fd5..4adfb9e3c8 100644 --- a/keyboards/atreus62/keymaps/atreus52/keymap.c +++ b/keyboards/atreus62/keymaps/atreus52/keymap.c @@ -25,9 +25,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [RAISE] = KC_KEYMAP( NO, MRWD, MPRV, MPLY, MNXT, MFFD, TRNS, MUTE, VOLD, VOLU, DEL, NO, \ - NO, TILD, GRV, DQUO, QUOT, LCBR, RCBR, EQL, PLUS, MINS, QUES, NO, \ - NO, ESC, TAB, BSLS, SLSH, LPRN, RPRN, LEFT, DOWN, UP, RGHT, NO, \ - NO, TRNS, TRNS, TRNS, TRNS, LBRC, RBRC, PIPE, UNDS, TRNS, TRNS, NO, \ + NO, TILD, GRV, LCBR, RCBR, DQUO, QUOT, EQL, PLUS, MINS, QUES, NO, \ + NO, ESC, TAB, LPRN, RPRN, BSLS, SLSH, LEFT, DOWN, UP, RGHT, NO, \ + NO, TRNS, TRNS, LBRC, RBRC, TRNS, INS, PIPE, UNDS, TRNS, TRNS, NO, \ NO, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN3, NO ), [LOWER] = KC_KEYMAP(