diff options
Diffstat (limited to 'keyboards')
| -rw-r--r-- | keyboards/ergodox_ez/keymaps/drashna/keymap.c | 6 | ||||
| -rw-r--r-- | keyboards/handwired/woodpad/keymaps/drashna/keymap.c | 14 | ||||
| -rw-r--r-- | keyboards/orthodox/keymaps/drashna/config.h | 1 | ||||
| -rw-r--r-- | keyboards/orthodox/keymaps/drashna/keymap.c | 39 | ||||
| -rw-r--r-- | keyboards/viterbi/keymaps/drashna/keymap.c | 2 |
5 files changed, 35 insertions, 27 deletions
diff --git a/keyboards/ergodox_ez/keymaps/drashna/keymap.c b/keyboards/ergodox_ez/keymaps/drashna/keymap.c index 08c2447dd..abfbb5e33 100644 --- a/keyboards/ergodox_ez/keymaps/drashna/keymap.c +++ b/keyboards/ergodox_ez/keymaps/drashna/keymap.c | |||
| @@ -244,9 +244,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 244 | KC_MAKE, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRAVE, | 244 | KC_MAKE, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRAVE, |
| 245 | KC_RESET, KC_PERC, KC_CIRC, KC_LBRACKET,KC_RBRACKET,KC_TILD, KC_COLEMAK, | 245 | KC_RESET, KC_PERC, KC_CIRC, KC_LBRACKET,KC_RBRACKET,KC_TILD, KC_COLEMAK, |
| 246 | KC_TRNS, KC_AMPR, KC_ASTR, KC_COLN, KC_SCOLON, | 246 | KC_TRNS, KC_AMPR, KC_ASTR, KC_COLN, KC_SCOLON, |
| 247 | KC_TRNS, KC_TRNS, | 247 | RGB_SMOD, KC_RGB_T, |
| 248 | KC_TRNS, | 248 | RGB_HUI, |
| 249 | KC_TRNS, KC_TRNS, KC_TRNS, | 249 | RGB_M_R, RGB_M_SW, RGB_HUD, |
| 250 | 250 | ||
| 251 | KC_QWERTY, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, | 251 | KC_QWERTY, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, |
| 252 | KC_DVORAK, KC_KP_PLUS, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_ASTERISK, KC_F12, | 252 | KC_DVORAK, KC_KP_PLUS, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_ASTERISK, KC_F12, |
diff --git a/keyboards/handwired/woodpad/keymaps/drashna/keymap.c b/keyboards/handwired/woodpad/keymaps/drashna/keymap.c index d0c748c43..51b90913c 100644 --- a/keyboards/handwired/woodpad/keymaps/drashna/keymap.c +++ b/keyboards/handwired/woodpad/keymaps/drashna/keymap.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | * You should have received a copy of the GNU General Public License | 13 | * You should have received a copy of the GNU General Public License |
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 15 | */ | 15 | */ |
| 16 | #include "woodpad.h" | 16 | #include QMK_KEYBOARD_H |
| 17 | #include "drashna.h" | 17 | #include "drashna.h" |
| 18 | 18 | ||
| 19 | // Each layer gets a name for readability, which is then used in the keymap matrix below. | 19 | // Each layer gets a name for readability, which is then used in the keymap matrix below. |
| @@ -97,12 +97,6 @@ void matrix_init_keymap(void) { | |||
| 97 | // set Numlock LED to output and low | 97 | // set Numlock LED to output and low |
| 98 | DDRF |= (1 << 7); | 98 | DDRF |= (1 << 7); |
| 99 | PORTF &= ~(1 << 7); | 99 | PORTF &= ~(1 << 7); |
| 100 | |||
| 101 | |||
| 102 | if (!(host_keyboard_leds() & (1 << USB_LED_NUM_LOCK))) { | ||
| 103 | register_code(KC_NUMLOCK); | ||
| 104 | unregister_code(KC_NUMLOCK); | ||
| 105 | } | ||
| 106 | } | 100 | } |
| 107 | 101 | ||
| 108 | void matrix_scan_keymap(void) { | 102 | void matrix_scan_keymap(void) { |
| @@ -114,3 +108,9 @@ void matrix_scan_keymap(void) { | |||
| 114 | // Run Diablo 3 macro checking code. | 108 | // Run Diablo 3 macro checking code. |
| 115 | } | 109 | } |
| 116 | 110 | ||
| 111 | void led_set_keymap(uint8_t usb_led) { | ||
| 112 | if (!(usb_led & (1<<USB_LED_NUM_LOCK))) { | ||
| 113 | register_code(KC_NUMLOCK); | ||
| 114 | unregister_code(KC_NUMLOCK); | ||
| 115 | } | ||
| 116 | } | ||
diff --git a/keyboards/orthodox/keymaps/drashna/config.h b/keyboards/orthodox/keymaps/drashna/config.h index d88481fd6..4dee43905 100644 --- a/keyboards/orthodox/keymaps/drashna/config.h +++ b/keyboards/orthodox/keymaps/drashna/config.h | |||
| @@ -63,6 +63,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 63 | 63 | ||
| 64 | #ifdef AUDIO_ENABLE | 64 | #ifdef AUDIO_ENABLE |
| 65 | #define C6_AUDIO | 65 | #define C6_AUDIO |
| 66 | #define STARTUP_SONG SONG(ZELDA_PUZZLE) | ||
| 66 | #endif | 67 | #endif |
| 67 | 68 | ||
| 68 | #endif | 69 | #endif |
diff --git a/keyboards/orthodox/keymaps/drashna/keymap.c b/keyboards/orthodox/keymaps/drashna/keymap.c index 33e65ac24..3821efa8d 100644 --- a/keyboards/orthodox/keymaps/drashna/keymap.c +++ b/keyboards/orthodox/keymaps/drashna/keymap.c | |||
| @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License | |||
| 19 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 19 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "orthodox.h" | 22 | #include QMK_KEYBOARD_H |
| 23 | #include "drashna.h" | 23 | #include "drashna.h" |
| 24 | 24 | ||
| 25 | 25 | ||
| @@ -32,6 +32,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 32 | #define _______ KC_TRNS | 32 | #define _______ KC_TRNS |
| 33 | #define XXXXXXX KC_NO | 33 | #define XXXXXXX KC_NO |
| 34 | 34 | ||
| 35 | #ifdef FAUXCLICKY_ENABLE | ||
| 36 | float fauxclicky_pressed_note[2] = MUSICAL_NOTE(_A6, 2); // (_D4, 0.25); | ||
| 37 | float fauxclicky_released_note[2] = MUSICAL_NOTE(_A6, 2); // (_C4, 0.125); | ||
| 38 | float fauxclicky_beep_note[2] = MUSICAL_NOTE(_C6, 2); // (_C4, 0.25); | ||
| 39 | #define AUD_ON FC_ON | ||
| 40 | #define AUD_OFF FC_OFF | ||
| 41 | #else | ||
| 42 | #define AUD_ON AU_ON | ||
| 43 | #define AUD_OFF AU_OFF | ||
| 44 | |||
| 45 | #endif | ||
| 46 | |||
| 35 | 47 | ||
| 36 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 48 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 37 | 49 | ||
| @@ -48,20 +60,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 48 | ), | 60 | ), |
| 49 | 61 | ||
| 50 | [_DVORAK] = KEYMAP(\ | 62 | [_DVORAK] = KEYMAP(\ |
| 51 | KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, \ | 63 | KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, \ |
| 52 | KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_UP, XXXXXXX, KC_DOWN, KC_LEFT, XXXXXXX, KC_RIGHT, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ | 64 | KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_UP, XXXXXXX, KC_DOWN, KC_LEFT, XXXXXXX, KC_RIGHT, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ |
| 53 | KC_LSFT, CTL_T(KC_SCLN), KC_Q, KC_J, KC_K, KC_X, LOWER, KC_SPACE, KC_BSPC, KC_DEL, KC_ENT, RAISE, KC_B, KC_M, KC_W, KC_V, CTL_T(KC_Z), KC_LGUI \ | 65 | KC_LSFT, CTL_T(KC_SCLN), KC_Q, KC_J, KC_K, KC_X, LOWER, KC_SPACE, KC_BSPC, KC_DEL, KC_ENT, RAISE, KC_B, KC_M, KC_W, KC_V, CTL_T(KC_Z), KC_LGUI \ |
| 54 | ), | 66 | ), |
| 55 | [_WORKMAN] = KEYMAP(\ | 67 | [_WORKMAN] = KEYMAP(\ |
| 56 | KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, \ | 68 | KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, \ |
| 57 | KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_UP, XXXXXXX, KC_DOWN, KC_LEFT, XXXXXXX, KC_RIGHT, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ | 69 | KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_UP, XXXXXXX, KC_DOWN, KC_LEFT, XXXXXXX, KC_RIGHT, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ |
| 58 | KC_LSFT, CTL_T(KC_SCLN), KC_Q, KC_J, KC_K, KC_X, LOWER, KC_SPACE, KC_BSPC, KC_DEL, KC_ENT, RAISE, KC_B, KC_M, KC_W, KC_V, CTL_T(KC_Z), KC_LGUI \ | 70 | KC_LSFT, CTL_T(KC_SCLN), KC_Q, KC_J, KC_K, KC_X, LOWER, KC_SPACE, KC_BSPC, KC_DEL, KC_ENT, RAISE, KC_B, KC_M, KC_W, KC_V, CTL_T(KC_Z), KC_LGUI \ |
| 59 | ), | 71 | ), |
| 60 | 72 | ||
| 61 | [_LOWER] = KEYMAP(\ | 73 | [_LOWER] = KEYMAP(\ |
| 62 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ | 74 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ |
| 63 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, XXXXXXX, KC_F12, _______, XXXXXXX, KC_RCTL, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ | 75 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, XXXXXXX, KC_F12, _______, XXXXXXX, KC_RCTL, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ |
| 64 | _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_HOME, KC_COMM, KC_DOT, KC_END, _______ \ | 76 | _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_HOME, KC_COMM, KC_DOT, KC_END, _______ \ |
| 65 | ), | 77 | ), |
| 66 | 78 | ||
| 67 | [_RAISE] = KEYMAP(\ | 79 | [_RAISE] = KEYMAP(\ |
| @@ -72,15 +84,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 72 | 84 | ||
| 73 | [_ADJUST] = KEYMAP(\ | 85 | [_ADJUST] = KEYMAP(\ |
| 74 | KC_MAKE,KC_RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | 86 | KC_MAKE,KC_RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
| 75 | RGB_SMOD,RGB_HUI, _______, AU_ON, AU_OFF, AG_NORM, _______, XXXXXXX, _______, _______, XXXXXXX, _______, AG_SWAP, KC_QWERTY, KC_COLEMAK, KC_DVORAK, KC_WORKMAN, _______, \ | 87 | RGB_SMOD,RGB_HUI, _______, AUD_ON, AUD_OFF, AG_NORM, _______, XXXXXXX, _______, _______, XXXXXXX, _______, AG_SWAP, KC_QWERTY, KC_COLEMAK, KC_DVORAK, KC_WORKMAN, _______, \ |
| 76 | KC_RGB_T,RGB_HUD, MU_ON, MU_OFF, MU_TOG, MU_MOD, _______, _______, _______, _______, _______, _______, MAGIC_TOGGLE_NKRO, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY \ | 88 | KC_RGB_T,RGB_HUD, MU_ON, MU_OFF, MU_TOG, MU_MOD, _______, _______, _______, _______, _______, _______, MAGIC_TOGGLE_NKRO, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY \ |
| 77 | ) | 89 | ) |
| 78 | 90 | ||
| 79 | 91 | ||
| 80 | }; | 92 | }; |
| 81 | 93 | ||
| 82 | #ifdef FAUXCLICKY_ENABLE | ||
| 83 | float fauxclicky_pressed_note[2] = MUSICAL_NOTE(_A6, 2); // (_D4, 0.25); | ||
| 84 | float fauxclicky_released_note[2] = MUSICAL_NOTE(_A6, 2); // (_C4, 0.125); | ||
| 85 | float fauxclicky_beep_note[2] = MUSICAL_NOTE(_C6, 2); // (_C4, 0.25); | ||
| 86 | #endif | ||
diff --git a/keyboards/viterbi/keymaps/drashna/keymap.c b/keyboards/viterbi/keymaps/drashna/keymap.c index 89621fa20..3002af038 100644 --- a/keyboards/viterbi/keymaps/drashna/keymap.c +++ b/keyboards/viterbi/keymaps/drashna/keymap.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #include "viterbi.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | #include "action_layer.h" | 2 | #include "action_layer.h" |
| 3 | #include "eeconfig.h" | 3 | #include "eeconfig.h" |
| 4 | #include "drashna.h" | 4 | #include "drashna.h" |
