summaryrefslogtreecommitdiff
path: root/keyboards/ergodox_ez
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2018-03-01 07:46:57 -0800
committerskullydazed <skullydazed@users.noreply.github.com>2018-03-01 07:46:57 -0800
commit452d23da5267899933ca336ae91e7b297d5dfb0b (patch)
treebe1a454d387ee339a5b581239224fdaf5eeaac39 /keyboards/ergodox_ez
parent7f7f763598b7be7b2081a73be2124f40349d8032 (diff)
downloadqmk_firmware-452d23da5267899933ca336ae91e7b297d5dfb0b.tar.gz
qmk_firmware-452d23da5267899933ca336ae91e7b297d5dfb0b.zip
Update to drashna keymaps and userspace (#2450)
* Add OSL keycodes and macro handling * Re-add AVRDUDE target * Userspace document cleanup and commenting * Fix Orthodox keymap layout (cosmetic) * Add caveat for KEYMAP Macros * Minor tweaks * Enable Bootmagic in Ergodox EZ * Minor tweaks
Diffstat (limited to 'keyboards/ergodox_ez')
-rw-r--r--keyboards/ergodox_ez/keymaps/drashna/keymap.c58
-rw-r--r--keyboards/ergodox_ez/keymaps/drashna/rules.mk3
2 files changed, 39 insertions, 22 deletions
diff --git a/keyboards/ergodox_ez/keymaps/drashna/keymap.c b/keyboards/ergodox_ez/keymaps/drashna/keymap.c
index e8e092ad1b..aeadbb1fc4 100644
--- a/keyboards/ergodox_ez/keymaps/drashna/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/drashna/keymap.c
@@ -19,6 +19,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
+//enum more_custom_keycodes {
+// KC_P00 = NEW_SAFE_RANGE
+//};
+
//define layer change stuff for underglow indicator
bool skip_leds = false;
@@ -49,20 +53,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `---------------------' `---------------------'
*/
[_QWERTY] = LAYOUT_ergodox_wrapper(
- KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, TT(_MOUS),
+ KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, OSL(_MOUS),
KC_TAB, _________________QWERTY_L1_________________, TG(_DIABLO),
KC_BSPC, _________________QWERTY_L2_________________,
- KC_LSFT, _________________QWERTY_L3_________________, TG(_GAMEPAD),
+ KC_MLSF, _________________QWERTY_L3_________________, TG(_GAMEPAD),
LT(_SYMB,KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________,
ALT_T(KC_APP), KC_LGUI,
KC_HOME,
KC_SPACE,KC_BSPC, KC_END,
- TT(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
+ OSL(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
TG(_DIABLO), _________________QWERTY_R1_________________, KC_BSLS,
_________________QWERTY_R2_________________, GUI_T(KC_QUOT),
- TG(_GAMEPAD), _________________QWERTY_R3_________________, KC_RSFT,
+ TG(_GAMEPAD), _________________QWERTY_R3_________________, KC_MRSF,
___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB),
KC_RGUI, CTL_T(KC_ESCAPE),
KC_PGUP,
@@ -93,19 +97,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Otherwise, it needs KC_*
[_COLEMAK] = LAYOUT_ergodox_wrapper(
// left hand
- KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, TT(_MOUS),
+ KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, OSL(_MOUS),
KC_TAB, _________________COLEMAK_L1________________, TG(_DIABLO),
KC_BSPC, _________________COLEMAK_L2________________,
- KC_LSFT, _________________COLEMAK_L3________________, TG(_GAMEPAD),
+ KC_MLSF, _________________COLEMAK_L3________________, TG(_GAMEPAD),
LT(_SYMB,KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________,
ALT_T(KC_APP), KC_LGUI,
KC_HOME,
KC_SPACE,KC_BSPC, KC_END,
// right hand
- TT(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
+ OSL(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
TG(_DIABLO), _________________COLEMAK_R1________________, KC_BSLS,
_________________COLEMAK_R2________________, GUI_T(KC_QUOT),
- TG(_GAMEPAD), _________________COLEMAK_R3________________, KC_RSFT,
+ TG(_GAMEPAD), _________________COLEMAK_R3________________, KC_MRSF,
___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB),
KC_RGUI, CTL_T(KC_ESCAPE),
KC_PGUP,
@@ -136,19 +140,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Otherwise, it needs KC_*
[_DVORAK] = LAYOUT_ergodox_wrapper(
// left hand
- KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, TT(_MOUS),
+ KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, OSL(_MOUS),
KC_TAB, _________________DVORAK_L1_________________, TG(_DIABLO),
KC_BSPC, _________________DVORAK_L2_________________,
- KC_LSFT, _________________DVORAK_L3_________________, TG(_GAMEPAD),
+ KC_MLSF, _________________DVORAK_L3_________________, TG(_GAMEPAD),
LT(_SYMB,KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________,
ALT_T(KC_APP), KC_LGUI,
KC_HOME,
KC_SPACE,KC_BSPC, KC_END,
// right hand
- TT(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS,
+ OSL(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS,
TG(_DIABLO), _________________DVORAK_R1_________________, KC_SLSH,
_________________DVORAK_R2_________________, GUI_T(KC_MINS),
- TG(_GAMEPAD), _________________DVORAK_R3_________________, KC_RSFT,
+ TG(_GAMEPAD), _________________DVORAK_R3_________________, KC_MRSF,
___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB),
KC_RGUI, CTL_T(KC_ESCAPE),
KC_PGUP,
@@ -179,19 +183,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Otherwise, it needs KC_*
[_WORKMAN] = LAYOUT_ergodox_wrapper(
// left hand
- KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, TT(_MOUS),
+ KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, OSL(_MOUS),
KC_TAB, _________________WORKMAN_L1________________, TG(_DIABLO),
KC_BSPC, _________________WORKMAN_L2________________,
- KC_LSFT, _________________WORKMAN_L3________________, TG(_GAMEPAD),
+ KC_MLSF, _________________WORKMAN_L3________________, TG(_GAMEPAD),
LT(_SYMB,KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________,
ALT_T(KC_APP), KC_LGUI,
KC_HOME,
KC_SPACE,KC_BSPC, KC_END,
// right hand
- TT(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
+ OSL(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
TG(_DIABLO), _________________WORKMAN_R1________________, KC_BSLS,
_________________WORKMAN_R2________________, GUI_T(KC_QUOT),
- TG(_GAMEPAD), _________________WORKMAN_R3________________, KC_RSFT,
+ TG(_GAMEPAD), _________________WORKMAN_R3________________, KC_MRSF,
___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB),
KC_RGUI, CTL_T(KC_ESCAPE),
KC_PGUP,
@@ -202,7 +206,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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,
- OSM(MOD_LSFT),KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_LSFT,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,
@@ -211,7 +215,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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_TRNS, OSM(MOD_RSFT),
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS,
KC_TRNS,
@@ -241,9 +245,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_SYMB] = LAYOUT_ergodox(
EPRM, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, TG(_MODS),
- VRSN, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_WORKMAN,
+ KC_RESET, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_WORKMAN,
KC_MAKE, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRAVE,
- KC_RESET, KC_PERC, KC_CIRC, KC_LBRACKET,KC_RBRACKET,KC_TILD, KC_COLEMAK,
+ VRSN, KC_PERC, KC_CIRC, KC_LBRACKET,KC_RBRACKET,KC_TILD, KC_COLEMAK,
KC_TRNS, KC_AMPR, KC_ASTR, KC_COLN, KC_SCOLON,
RGB_SMOD, KC_RGB_T,
RGB_HUI,
@@ -387,12 +391,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
-
bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
+
+ //switch (keycode) {
+ // case KC_P00:
+ // if (!record->event.pressed) {
+ // register_code(KC_KP_0);
+ // unregister_code(KC_KP_0);
+ // register_code(KC_KP_0);
+ // unregister_code(KC_KP_0);
+ // }
+ // return false;
+ // break;
+ //}
return true;
}
+
void matrix_init_keymap(void) { // Runs boot tasks for keyboard
};
diff --git a/keyboards/ergodox_ez/keymaps/drashna/rules.mk b/keyboards/ergodox_ez/keymaps/drashna/rules.mk
index 6f30c5491d..12f100d665 100644
--- a/keyboards/ergodox_ez/keymaps/drashna/rules.mk
+++ b/keyboards/ergodox_ez/keymaps/drashna/rules.mk
@@ -1,6 +1,7 @@
TAP_DANCE_ENABLE = yes
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
-COMMAND_ENABLE = no # Commands for debug and configuration
+COMMAND_ENABLE = yes # Commands for debug and configuration
RGBLIGHT_ENABLE = yes
CONSOLE_ENABLE = no
+BOOTMAGIC_ENABLE = yes
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-22 18:54:57 +0000