diff options
| author | noroadsleft <18669334+noroadsleft@users.noreply.github.com> | 2018-10-22 14:18:47 -0700 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-10-22 14:18:47 -0700 |
| commit | 5dc41446aae0b429c72ca020cb20efb3356afee5 (patch) | |
| tree | f76904f2c595d6786a9b81e15d282f9ee92ab9e6 /keyboards/chimera_ls | |
| parent | e26a7b0ed8af7b6b4e99fee718ca265fcc8961f1 (diff) | |
| download | qmk_firmware-5dc41446aae0b429c72ca020cb20efb3356afee5.tar.gz qmk_firmware-5dc41446aae0b429c72ca020cb20efb3356afee5.zip | |
Keyboard: Chimera LS refactor and Configurator support (#3715)
* Matrix/keymap refactor
- Deleted `KC_KEYMAP` macro
- Renamed `KEYMAP` macro to `LAYOUT_ortho_4x12`
- Default keymap updated to current QMK standards
- #include QMK_KEYBOARD_H
- Refactored from `KC_KEYMAP` to `LAYOUT_ortho_4x12` macro
- `action_get_macro()` deprecated in favor of `process_record_user()`
`rules.mk` *not* updated to include `LAYOUTS = ortho_4x12` because I have no idea if and how that works on a split and/or wireless keyboard.
* readme cleanup: markdown formatting
* Add Configurator support
* added support for ortho_4x12 layout
* Macro and readme updates
Macros updated to use `KC_NO` directly.
Readme updates and cleanup.
Diffstat (limited to 'keyboards/chimera_ls')
| -rw-r--r-- | keyboards/chimera_ls/chimera_ls.h | 46 | ||||
| -rw-r--r-- | keyboards/chimera_ls/info.json | 13 | ||||
| -rw-r--r-- | keyboards/chimera_ls/keymaps/default/keymap.c | 227 | ||||
| -rw-r--r-- | keyboards/chimera_ls/readme.md | 10 | ||||
| -rw-r--r-- | keyboards/chimera_ls/rules.mk | 4 |
5 files changed, 152 insertions, 148 deletions
diff --git a/keyboards/chimera_ls/chimera_ls.h b/keyboards/chimera_ls/chimera_ls.h index b39bcf204..bb99684e5 100644 --- a/keyboards/chimera_ls/chimera_ls.h +++ b/keyboards/chimera_ls/chimera_ls.h | |||
| @@ -50,32 +50,30 @@ | |||
| 50 | // The first section contains all of the arguements | 50 | // The first section contains all of the arguements |
| 51 | // The second converts the arguments into a two-dimensional array | 51 | // The second converts the arguments into a two-dimensional array |
| 52 | 52 | ||
| 53 | #define KC_KEYMAP( \ | 53 | #define LAYOUT_ortho_4x12( \ |
| 54 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, \ | 54 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, \ |
| 55 | k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, \ | 55 | k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, \ |
| 56 | k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, \ | 56 | k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, \ |
| 57 | k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47 \ | 57 | k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47 \ |
| 58 | ) \ | 58 | ) { \ |
| 59 | { \ | 59 | { k43, k45, k34, k11, k23, k40, k38, k25, k00, k12 }, \ |
| 60 | { KC_##k43, KC_##k45, KC_##k34, KC_##k11, KC_##k23, KC_##k40, KC_##k38, KC_##k25, KC_##k00, KC_##k12 }, \ | 60 | { k31, k44, k46, k35, k22, k28, k39, k37, k24, k13 }, \ |
| 61 | { KC_##k31, KC_##k44, KC_##k46, KC_##k35, KC_##k22, KC_##k28, KC_##k39, KC_##k37, KC_##k24, KC_##k13 }, \ | 61 | { k30, k32, k33, k47, k09, k29, k27, k26, k36, k02 }, \ |
| 62 | { KC_##k30, KC_##k32, KC_##k33, KC_##k47, KC_##k09, KC_##k29, KC_##k27, KC_##k26, KC_##k36, KC_##k02 }, \ | 62 | { k19, k20, k21, k42, k18, k16, k15, k14, k41, k17 }, \ |
| 63 | { KC_##k19, KC_##k20, KC_##k21, KC_##k42, KC_##k18, KC_##k16, KC_##k15, KC_##k14, KC_##k41, KC_##k17 }, \ | 63 | { k06, k07, k08, k10, KC_NO, k05, k04, k03, k01, KC_NO } \ |
| 64 | { KC_##k06, KC_##k07, KC_##k08, KC_##k10, KC_NO, KC_##k05, KC_##k04, KC_##k03, KC_##k01, KC_NO }, \ | ||
| 65 | } | 64 | } |
| 66 | 65 | ||
| 67 | #define KEYMAP( \ | 66 | #define LAYOUT_kc_ortho_4x12( \ |
| 68 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, \ | 67 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, \ |
| 69 | k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, \ | 68 | k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, \ |
| 70 | k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, \ | 69 | k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, \ |
| 71 | k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47 \ | 70 | k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47 \ |
| 72 | ) \ | 71 | ) { \ |
| 73 | { \ | 72 | { KC_##k43, KC_##k45, KC_##k34, KC_##k11, KC_##k23, KC_##k40, KC_##k38, KC_##k25, KC_##k00, KC_##k12 }, \ |
| 74 | { k43, k45, k34, k11, k23, k40, k38, k25, k00, k12 }, \ | 73 | { KC_##k31, KC_##k44, KC_##k46, KC_##k35, KC_##k22, KC_##k28, KC_##k39, KC_##k37, KC_##k24, KC_##k13 }, \ |
| 75 | { k31, k44, k46, k35, k22, k28, k39, k37, k24, k13 }, \ | 74 | { KC_##k30, KC_##k32, KC_##k33, KC_##k47, KC_##k09, KC_##k29, KC_##k27, KC_##k26, KC_##k36, KC_##k02 }, \ |
| 76 | { k30, k32, k33, k47, k09, k29, k27, k26, k36, k02 }, \ | 75 | { KC_##k19, KC_##k20, KC_##k21, KC_##k42, KC_##k18, KC_##k16, KC_##k15, KC_##k14, KC_##k41, KC_##k17 }, \ |
| 77 | { k19, k20, k21, k42, k18, k16, k15, k14, k41, k17 }, \ | 76 | { KC_##k06, KC_##k07, KC_##k08, KC_##k10, KC_NO, KC_##k05, KC_##k04, KC_##k03, KC_##k01, KC_NO } \ |
| 78 | { k06, k07, k08, k10, KC_NO, k05, k04, k03, k01, KC_NO }, \ | ||
| 79 | } | 77 | } |
| 80 | 78 | ||
| 81 | 79 | ||
diff --git a/keyboards/chimera_ls/info.json b/keyboards/chimera_ls/info.json new file mode 100644 index 000000000..077a76079 --- /dev/null +++ b/keyboards/chimera_ls/info.json | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | { | ||
| 2 | "keyboard_name": "Chimera LS", | ||
| 3 | "url": "", | ||
| 4 | "maintainer": "qmk", | ||
| 5 | "width": 13, | ||
| 6 | "height": 4, | ||
| 7 | "layouts": { | ||
| 8 | "LAYOUT_ortho_4x12": { | ||
| 9 | "key_count": 48, | ||
| 10 | "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}] | ||
| 11 | } | ||
| 12 | } | ||
| 13 | } | ||
diff --git a/keyboards/chimera_ls/keymaps/default/keymap.c b/keyboards/chimera_ls/keymaps/default/keymap.c index 493b8eee1..0affeef38 100644 --- a/keyboards/chimera_ls/keymaps/default/keymap.c +++ b/keyboards/chimera_ls/keymaps/default/keymap.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | // this is the style you want to emulate. | 1 | // this is the style you want to emulate. |
| 2 | // This is the canonical layout file for the Quantum project. If you want to add another keyboard, | 2 | // This is the canonical layout file for the Quantum project. If you want to add another keyboard, |
| 3 | 3 | ||
| 4 | #include "chimera_ls.h" | 4 | #include QMK_KEYBOARD_H |
| 5 | 5 | ||
| 6 | // Each layer gets a name for readability, which is then used in the keymap matrix below. | 6 | // Each layer gets a name for readability, which is then used in the keymap matrix below. |
| 7 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | 7 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. |
| @@ -24,168 +24,163 @@ enum chimera_lets_split_layers | |||
| 24 | #define KC_SCTR MT(MOD_LCTL, KC_RBRC) | 24 | #define KC_SCTR MT(MOD_LCTL, KC_RBRC) |
| 25 | #define KC_SPLT MT(MOD_LALT, KC_MINS) | 25 | #define KC_SPLT MT(MOD_LALT, KC_MINS) |
| 26 | #define KC_MESC LT(_MACROS, KC_ESC) | 26 | #define KC_MESC LT(_MACROS, KC_ESC) |
| 27 | #define KC_INCL M(0) | ||
| 28 | #define KC_PULL M(1) | ||
| 29 | #define KC_PUSH M(2) | ||
| 30 | #define KC_SCAP M(3) | ||
| 31 | #define KC_SCOF M(4) | ||
| 32 | #define KC_CAD LALT(LCTL(KC_DEL)) | 27 | #define KC_CAD LALT(LCTL(KC_DEL)) |
| 33 | 28 | ||
| 29 | enum custom_keycodes { | ||
| 30 | KC_INCL = SAFE_RANGE, | ||
| 31 | KC_PULL, | ||
| 32 | KC_PUSH, | ||
| 33 | KC_SCAP, | ||
| 34 | KC_SCOF | ||
| 35 | }; | ||
| 36 | |||
| 34 | #define LONGPRESS_DELAY 150 | 37 | #define LONGPRESS_DELAY 150 |
| 35 | //#define LAYER_TOGGLE_DELAY 300 | 38 | //#define LAYER_TOGGLE_DELAY 300 |
| 36 | 39 | ||
| 37 | // Fillers to make layering more clear | ||
| 38 | #define _______ KC_TRNS | ||
| 39 | #define XXXXXXX KC_NO | ||
| 40 | #define KC_ KC_TRNS | ||
| 41 | |||
| 42 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 40 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 43 | 41 | ||
| 44 | [_QWERTY] = KC_KEYMAP( | 42 | [_QWERTY] = LAYOUT_ortho_4x12( |
| 45 | //,----+----+----+----+----+----. ,----+----+----+----+----+----. | 43 | //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------. |
| 46 | MESC, Q , W , E , R , T , Y , U , I , O , P ,BSPC, | 44 | KC_MESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, |
| 47 | //|----+----+----+----+----+----| |----+----+----+----+----+----| | 45 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |
| 48 | TAB , A , S , D , F , G , H , J , K , L ,SCLN, ENT, | 46 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, |
| 49 | //|----+----+----+----+----+----| |----+----+----+----+----+----| | 47 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |
| 50 | LSPO, Z , X , C , V , B , N , M ,COMM,DOT ,SLSH,RSPC, | 48 | KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, |
| 51 | //|----+----+----+----+----+----| |----+----+----+----+----+----| | 49 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |
| 52 | SCTL,SPFN,SPLT,AMPR,NMPD,SPC , SPC ,SYMB,ASTR,EXLM,LBRC,SCTR | 50 | KC_SCTL, KC_SPFN, KC_SPLT, KC_AMPR, KC_NMPD, KC_SPC, KC_SPC, KC_SYMB, KC_ASTR, KC_EXLM, KC_LBRC, KC_SCTR |
| 53 | //`----+----+----+----+----+----' `----+----+----+----+----+----' | 51 | //`--------+--------+--------+--------+--------+--------' `--------+--------+--------+--------+--------+--------' |
| 54 | ), | 52 | ), |
| 55 | 53 | ||
| 56 | [_CAPS] = KC_KEYMAP( | 54 | [_CAPS] = LAYOUT_ortho_4x12( |
| 57 | //,----+----+----+----+----+----. ,----+----+----+----+----+----. | 55 | //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------. |
| 58 | , , , , , , , , , , , , | 56 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 59 | //|----+----+----+----+----+----| |----+----+----+----+----+----| | 57 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |
| 60 | , , , , , , , , , ,COLN, , | 58 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_COLN, _______, |
| 61 | //|----+----+----+----+----+----| |----+----+----+----+----+----| | 59 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |
| 62 | , , , , , , , , , , , , | 60 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 63 | //|----+----+----+----+----+----| |----+----+----+----+----+----| | 61 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |
| 64 | , ,UNDS, , , , , , , , , | 62 | _______, _______, KC_UNDS, _______, _______, _______, _______, _______, _______, _______, _______, _______ |
| 65 | //`----+----+----+----+----+----' `----+----+----+----+----+----' | 63 | //`--------+--------+--------+--------+--------+--------' `--------+--------+--------+--------+--------+--------' |
| 66 | ), | 64 | ), |
| 67 | 65 | ||
| 68 | 66 | ||
| 69 | [_NUMPAD] = KC_KEYMAP( | 67 | [_NUMPAD] = LAYOUT_ortho_4x12( |
| 70 | //,----+----+----+----+----+----. ,----+----+----+----+----+----. | 68 | //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------. |
| 71 | , , , , , , , 7 , 8 , 9 ,MINS,QUOT, | 69 | _______, _______, _______, _______, _______, _______, _______, KC_7, KC_8, KC_9, KC_MINS, KC_QUOT, |
| 72 | //|----+----+----+----+----+----| |----+----+----+----+----+----| | 70 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |
| 73 | , , , , , , , 4 , 5 , 6 ,PLUS, ENT, | 71 | _______, _______, _______, _______, _______, _______, _______, KC_4, KC_5, KC_6, KC_PLUS, KC_ENT, |
| 74 | //|----+----+----+----+----+----| |----+----+----+----+----+----| | 72 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |
| 75 | LSFT, , , , , , , 1 , 2 , 3 ,ASTR, EQL, | 73 | KC_LSFT, _______, _______, _______, _______, _______, _______, KC_1, KC_2, KC_3, KC_ASTR, KC_EQL, |
| 76 | //|----+----+----+----+----+----| |----+----+----+----+----+----| | 74 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |
| 77 | , , , , ,BSPC, SPC , 0 , 0 , DOT,SLSH, | 75 | _______, _______, _______, _______, _______, KC_BSPC, KC_SPC, KC_0, KC_0, KC_DOT, KC_SLSH, _______ |
| 78 | //`----+----+----+----+----+----' `----+----+----+----+----+----' | 76 | //`--------+--------+--------+--------+--------+--------' `--------+--------+--------+--------+--------+--------' |
| 79 | ), | 77 | ), |
| 80 | 78 | ||
| 81 | [_SYMBOLS] = KC_KEYMAP( | 79 | [_SYMBOLS] = LAYOUT_ortho_4x12( |
| 82 | //,----+----+----+----+----+----. ,----+----+----+----+----+----. | 80 | //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------. |
| 83 | ,EXLM, AT ,HASH,DLR ,PERC, CIRC,AMPR,ASTR,LPRN,RPRN,QUOT, | 81 | _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_QUOT, |
| 84 | //|----+----+----+----+----+----| |----+----+----+----+----+----| | 82 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |
| 85 | F1 , F2 , F3 , F4 , F5 , F6 , TILD,EQL ,UNDS,LCBR,RCBR,PIPE, | 83 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TILD, KC_EQL, KC_UNDS, KC_LCBR, KC_RCBR, KC_PIPE, |
| 86 | //|----+----+----+----+----+----| |----+----+----+----+----+----| | 84 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |
| 87 | F7 , F8 , F9 , F10, F11, F12, GRV ,PLUS,MINS,LBRC,RBRC,BSLS, | 85 | KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_GRV, KC_PLUS, KC_MINS, KC_LBRC, KC_RBRC, KC_BSLS, |
| 88 | //|----+----+----+----+----+----| |----+----+----+----+----+----| | 86 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |
| 89 | , , , , NO ,BSPC, SPC , , , , , | 87 | _______, _______, _______, _______, XXXXXXX, KC_BSPC, KC_SPC, _______, _______, _______, _______, _______ |
| 90 | //`----+----+----+----+----+----' `----+----+----+----+----+----' | 88 | //`--------+--------+--------+--------+--------+--------' `--------+--------+--------+--------+--------+--------' |
| 91 | ), | 89 | ), |
| 92 | 90 | ||
| 93 | [_NAV] = KC_KEYMAP( | 91 | [_NAV] = LAYOUT_ortho_4x12( |
| 94 | //,----+----+----+----+----+----. ,----+----+----+----+----+----. | 92 | //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------. |
| 95 | , , , , DEL,BSPC, ,HOME, UP , END, INS,PSCR, | 93 | _______, _______, _______, _______, KC_DEL, KC_BSPC, _______, KC_HOME, KC_UP, KC_END, KC_INS, KC_PSCR, |
| 96 | //|----+----+----+----+----+----| |----+----+----+----+----+----| | 94 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |
| 97 | , , ,LSFT,LCTL, ENT, ,LEFT,DOWN,RGHT, DEL, , | 95 | _______, _______, _______, KC_LSFT, KC_LCTL, KC_ENT, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, _______, |
| 98 | //|----+----+----+----+----+----| |----+----+----+----+----+----| | 96 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |
| 99 | , , , , , , ,PGUP,PGDN, , , , | 97 | _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______, _______, |
| 100 | //|----+----+----+----+----+----| |----+----+----+----+----+----| | 98 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |
| 101 | , , , , ,DEL , , , , , , | 99 | _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, _______ |
| 102 | //`----+----+----+----+----+----' `----+----+----+----+----+----' | 100 | //`--------+--------+--------+--------+--------+--------' `--------+--------+--------+--------+--------+--------' |
| 103 | ), | 101 | ), |
| 104 | 102 | ||
| 105 | [_MACROS] = KC_KEYMAP( | 103 | [_MACROS] = LAYOUT_ortho_4x12( |
| 106 | //,----+----+----+----+----+----. ,----+----+----+----+----+----. | 104 | //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------. |
| 107 | , , , , , , , ,INCL, , , , | 105 | _______, _______, _______, _______, _______, _______, _______, _______, KC_INCL, _______, _______, _______, |
| 108 | //|----+----+----+----+----+----| |----+----+----+----+----+----| | 106 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |
| 109 | , , ,CAD , , , , , , , , , | 107 | _______, _______, _______, KC_CAD, _______, _______, _______, _______, _______, _______, _______, _______, |
| 110 | //|----+----+----+----+----+----| |----+----+----+----+----+----| | 108 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |
| 111 | SCAP, , , , , , , ,PULL,PUSH, ,SCAP, | 109 | KC_SCAP, _______, _______, _______, _______, _______, _______, _______, KC_PULL, KC_PUSH, _______, KC_SCAP, |
| 112 | //|----+----+----+----+----+----| |----+----+----+----+----+----| | 110 | //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |
| 113 | , , , , , , , , , , , | 111 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ |
| 114 | //`----+----+----+----+----+----' `----+----+----+----+----+----' | 112 | //`--------+--------+--------+--------+--------+--------' `--------+--------+--------+--------+--------+--------' |
| 115 | ), | 113 | ), |
| 116 | 114 | ||
| 117 | }; | 115 | }; |
| 118 | 116 | ||
| 119 | 117 | ||
| 120 | const uint16_t PROGMEM fn_actions[] = { | 118 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 121 | 119 | switch(keycode) { | |
| 122 | }; | ||
| 123 | |||
| 124 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | ||
| 125 | { | ||
| 126 | switch(id) { | ||
| 127 | /* include some kind of library or header */ | 120 | /* include some kind of library or header */ |
| 128 | case 0: | 121 | case KC_INCL: |
| 129 | if (record->event.pressed) { | 122 | if (record->event.pressed) { |
| 130 | SEND_STRING("#include <>"); | 123 | SEND_STRING("#include <>" SS_TAP(X_LEFT) ); |
| 131 | return MACRO( T(LEFT), END); | 124 | return false; |
| 132 | } | 125 | } |
| 133 | break; | 126 | break; |
| 134 | case 1: | 127 | case KC_PULL: |
| 135 | if (record->event.pressed) { | 128 | if (record->event.pressed) { |
| 136 | SEND_STRING("git pull"); | 129 | SEND_STRING("git pull" SS_TAP(X_ENTER) ); |
| 137 | return MACRO( T(ENT), END ); | 130 | return false; |
| 138 | } | 131 | } |
| 139 | break; | 132 | break; |
| 140 | case 2: | 133 | case KC_PUSH: |
| 141 | if (record->event.pressed){ | 134 | if (record->event.pressed){ |
| 142 | SEND_STRING("git push"); | 135 | SEND_STRING("git push" SS_TAP(X_ENTER) ); |
| 143 | return MACRO( T(ENT), END ); | 136 | return false; |
| 144 | } | 137 | } |
| 145 | break; | 138 | break; |
| 146 | case 3: | 139 | case KC_SCAP: |
| 147 | if (record->event.pressed){ | 140 | if (record->event.pressed){ |
| 148 | layer_on(_CAPS); | 141 | layer_on(_CAPS); |
| 149 | register_code(KC_CAPSLOCK); | 142 | register_code(KC_CAPSLOCK); |
| 150 | unregister_code(KC_CAPSLOCK); | 143 | unregister_code(KC_CAPSLOCK); |
| 144 | return false; | ||
| 151 | } | 145 | } |
| 152 | break; | 146 | break; |
| 153 | case 4: | 147 | case KC_SCOF: |
| 154 | if (record->event.pressed){ | 148 | if (record->event.pressed){ |
| 155 | layer_off(_CAPS); | 149 | layer_off(_CAPS); |
| 156 | register_code(KC_CAPSLOCK); | 150 | register_code(KC_CAPSLOCK); |
| 157 | unregister_code(KC_CAPSLOCK); | 151 | unregister_code(KC_CAPSLOCK); |
| 152 | return false; | ||
| 158 | } | 153 | } |
| 159 | break; | 154 | break; |
| 160 | } | 155 | } |
| 161 | return MACRO_NONE; | 156 | return true; |
| 162 | }; | 157 | }; |
| 163 | 158 | ||
| 164 | 159 | ||
| 165 | void matrix_scan_user(void) { | 160 | void matrix_scan_user(void) { |
| 166 | uint8_t layer = biton32(layer_state); | 161 | uint8_t layer = biton32(layer_state); |
| 167 | 162 | ||
| 168 | switch (layer) { | 163 | switch (layer) { |
| 169 | case _QWERTY: | 164 | case _QWERTY: |
| 170 | set_led_green; | 165 | set_led_green; |
| 171 | break; | 166 | break; |
| 172 | case _CAPS: | 167 | case _CAPS: |
| 173 | set_led_white; | 168 | set_led_white; |
| 174 | break; | 169 | break; |
| 175 | case _NUMPAD: | 170 | case _NUMPAD: |
| 176 | set_led_blue; | 171 | set_led_blue; |
| 177 | break; | 172 | break; |
| 178 | case _SYMBOLS: | 173 | case _SYMBOLS: |
| 179 | set_led_red; | 174 | set_led_red; |
| 180 | break; | 175 | break; |
| 181 | case _NAV: | 176 | case _NAV: |
| 182 | set_led_magenta; | 177 | set_led_magenta; |
| 183 | break; | 178 | break; |
| 184 | case _MACROS: | 179 | case _MACROS: |
| 185 | set_led_cyan; | 180 | set_led_cyan; |
| 186 | break; | 181 | break; |
| 187 | default: | 182 | default: |
| 188 | set_led_green; | 183 | set_led_green; |
| 189 | break; | 184 | break; |
| 190 | } | 185 | } |
| 191 | }; | 186 | }; |
diff --git a/keyboards/chimera_ls/readme.md b/keyboards/chimera_ls/readme.md index 689d9ee61..0170dd8a8 100644 --- a/keyboards/chimera_ls/readme.md +++ b/keyboards/chimera_ls/readme.md | |||
| @@ -2,18 +2,14 @@ | |||
| 2 | 2 | ||
| 3 |  | 3 |  |
| 4 | 4 | ||
| 5 | A wireless version of the let's split: a split 40% ortholinear keyboard | 5 | A wireless version of the Let's Split: a split 40% ortholinear keyboard. |
| 6 | 6 | ||
| 7 | Keyboard Maintainer: [William Wilson](https://github.com/GlenPickle) | 7 | Keyboard Maintainer: [William Wilson](https://github.com/GlenPickle) |
| 8 | 8 | Hardware Supported: Chimera LS PCB, WaveShare core nRF51822 | |
| 9 | |||
| 10 | Hardware Supported: Chimera LS PCB, WaveShare core nRF51822 | ||
| 11 | |||
| 12 | Hardware Availability: [Gerbers](https://github.com/GlenPickle/Chimera/tree/master/ls/gerbers) | 9 | Hardware Availability: [Gerbers](https://github.com/GlenPickle/Chimera/tree/master/ls/gerbers) |
| 13 | 10 | ||
| 14 | Make example for this keyboard (after setting up your build environment): | 11 | Make example for this keyboard (after setting up your build environment): |
| 15 | 12 | ||
| 16 | make chimera_ls:default | 13 | make chimera_ls:default |
| 17 | 14 | ||
| 18 | See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information. | 15 | See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). |
| 19 | |||
diff --git a/keyboards/chimera_ls/rules.mk b/keyboards/chimera_ls/rules.mk index af08f7a87..497e58677 100644 --- a/keyboards/chimera_ls/rules.mk +++ b/keyboards/chimera_ls/rules.mk | |||
| @@ -46,7 +46,7 @@ F_USB = $(F_CPU) | |||
| 46 | 46 | ||
| 47 | # Bootloader | 47 | # Bootloader |
| 48 | # This definition is optional, and if your keyboard supports multiple bootloaders of | 48 | # This definition is optional, and if your keyboard supports multiple bootloaders of |
| 49 | # different sizes, comment this out, and the correct address will be loaded | 49 | # different sizes, comment this out, and the correct address will be loaded |
| 50 | # automatically (+60). See bootloader.mk for all options. | 50 | # automatically (+60). See bootloader.mk for all options. |
| 51 | BOOTLOADER = caterina | 51 | BOOTLOADER = caterina |
| 52 | 52 | ||
| @@ -80,3 +80,5 @@ UNICODE_ENABLE = YES # Unicode | |||
| 80 | # BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID | 80 | # BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID |
| 81 | 81 | ||
| 82 | USB = /dev/ttyACM0 | 82 | USB = /dev/ttyACM0 |
| 83 | |||
| 84 | LAYOUTS = ortho_4x12 | ||
