From d2ff66a985b938e87fffe55c1d9f1dc55e356f91 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Wed, 23 Aug 2017 22:29:07 -0400 Subject: Creates a layouts/ folder for keymaps shared between keyboards (#1609) * include variables and .h files as pp directives * start layout compilation * split ergodoxes up * don't compile all layouts for everything * might seg fault * reset layouts variable * actually reset layouts * include rules.mk instead * remove includes from rules.mk * update variable setting * load visualizer from path * adds some more examples * adds more layouts * more boards added * more boards added * adds documentation for layouts * use lowercase names for LAYOUT_ * add layout.json files for each layout * add community folder, default keymaps for layouts * touch-up default layouts * touch-up layouts, some keyboard rules.mk * update documentation for layouts * fix up serial/i2c switches --- keyboards/ergodox/keymaps/mclennon_osx/README.md | 5 - keyboards/ergodox/keymaps/mclennon_osx/keymap.c | 144 ----------------------- 2 files changed, 149 deletions(-) delete mode 100644 keyboards/ergodox/keymaps/mclennon_osx/README.md delete mode 100644 keyboards/ergodox/keymaps/mclennon_osx/keymap.c (limited to 'keyboards/ergodox/keymaps/mclennon_osx') diff --git a/keyboards/ergodox/keymaps/mclennon_osx/README.md b/keyboards/ergodox/keymaps/mclennon_osx/README.md deleted file mode 100644 index 28cdb7c108..0000000000 --- a/keyboards/ergodox/keymaps/mclennon_osx/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Ergodox EZ for OS X - -This keymapping is designed to be reasonably familiar to an ordinary Mac keyboard while taking advantage of the Ergodox EZ's features. Caps lock instead enables a layer which allows a user to use HJKL as arrow keys and to control media. Shift and control have additional mappings on S and D to provide easier access while holding down caps lock. - -If you choose to compile this yourself, be sure to compile with `#define PREVENT_STUCK_MODIFIERS` in your `config.h`. Firmware built using [qmk_firmware](https://github.com/qmk/qmk_firmware/). diff --git a/keyboards/ergodox/keymaps/mclennon_osx/keymap.c b/keyboards/ergodox/keymaps/mclennon_osx/keymap.c deleted file mode 100644 index 627ff01e4a..0000000000 --- a/keyboards/ergodox/keymaps/mclennon_osx/keymap.c +++ /dev/null @@ -1,144 +0,0 @@ -// Media keys work on OSX, but not on Windows. -#include "ergodox.h" -#include "debug.h" -#include "action_layer.h" - -#define BASE 0 // Default layer -#define AUXI 1 // Auxiliary layer - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* Keymap 0: Basic Layer - * - * ,--------------------------------------------------. ,--------------------------------------------------. - * | ~` | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 8 | 9 | 0 | -_ | += | Bkspc | - * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | Tab | Q | W | E | R | T | L1 | | Del | Y | U | I | O | P | |\ | - * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | L1 | A | S | D | F | G |------| |------| H | J | K | L | ;: | Enter | - * |--------+------+------+------+------+------| {[ | | }] |------+------+------+------+------+--------| - * | LShift | Z | X | C | V | B | | | | N | M | <, | >. | ?/ | "' | - * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * |LCtrl | | | | Esc | | | | | | | - * `----------------------------------' `----------------------------------' - * ,-------------. ,-------------. - * | | | |Power | | - * ,------|------|------| |------+--------+------. - * | | | | | | | | - * | LGui | LAlt |------| |------| Bkspc |Space | - * | | | | | Del | | | - * `--------------------' `----------------------' - */ -// 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_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, MO(1), - MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, - KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, - KC_LCTL, KC_TRNS,KC_TRNS,KC_TRNS,KC_ESC, - KC_TRNS,KC_TRNS, - KC_TRNS, - KC_LGUI,KC_LALT,KC_TRNS, - - // right hand - KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC, - KC_DELETE, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH, - KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_ENT, - KC_RBRC, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_QUOT, - KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, - KC_PWR, KC_TRNS, - KC_TRNS, - KC_DELETE, KC_BSPC, KC_SPC - ), -/* Keymap 1: Auxiliary Layer - * - * ,--------------------------------------------------. ,--------------------------------------------------. - * | | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | | - * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | | | | | | TRNS | | | Mute | VolDn| VolUp| Play | | | - * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | TRNS | |LShift| LCtrl| | |------| |------| LEFT | DOWN | UP |RIGHT | | | - * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | LShift | | | | | | | | | MPrv | MNxt | | | | | - * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * |LCtrl | | | | | | | | | | | - * `----------------------------------' `----------------------------------' - * ,-------------. ,-------------. - * | | | | | | - * ,------|------|------| |------+------+------. - * | | | | | | | | - * | LGui | LAlt |------| |------| Bkspc| Space| - * | | | | | Del | | | - * `--------------------' `--------------------' - */ -// AUXILIARY -[AUXI] = KEYMAP( - // left hand - KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_LSHIFT,KC_LCTL, KC_TRNS, KC_TRNS, - KC_LSHIFT,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, - KC_TRNS, - KC_LGUI, KC_LALT, KC_TRNS, - // right hand - KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, - KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_TRNS, KC_TRNS, - KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT,KC_TRNS, KC_TRNS, - KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_PWR, KC_TRNS, - KC_TRNS, - KC_DELETE, KC_BSPC, KC_SPC -), -}; - -const uint16_t PROGMEM fn_actions[] = { - [1] = ACTION_LAYER_TAP_TOGGLE(AUXI) // FN1 - Momentary Layer 1 (Auxiliary) -}; - -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; -}; - -// 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); - - ergodox_board_led_off(); - ergodox_right_led_1_off(); - 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; - default: - // none - break; - } - -}; -- cgit v1.2.3