diff options
Diffstat (limited to 'keyboards')
-rw-r--r-- | keyboards/clueboard/keymaps/xyverz/config.h | 3 | ||||
-rw-r--r-- | keyboards/fourier/keymaps/xyverz/keymap.c | 1 | ||||
-rw-r--r-- | keyboards/kinesis/keymaps/xyverz/keymap.c | 104 | ||||
-rw-r--r-- | keyboards/kinesis/stapelberg/stapelberg.c | 53 | ||||
-rw-r--r-- | keyboards/preonic/keymaps/seph/config.h | 4 | ||||
-rw-r--r-- | keyboards/preonic/keymaps/seph/keymap.c | 50 | ||||
-rw-r--r-- | keyboards/preonic/keymaps/seph/rules.mk | 4 |
7 files changed, 156 insertions, 63 deletions
diff --git a/keyboards/clueboard/keymaps/xyverz/config.h b/keyboards/clueboard/keymaps/xyverz/config.h new file mode 100644 index 0000000000..4999e4ff6c --- /dev/null +++ b/keyboards/clueboard/keymaps/xyverz/config.h @@ -0,0 +1,3 @@ +#include "../config.h" + +#define TAPPING_TERM 600 // ms diff --git a/keyboards/fourier/keymaps/xyverz/keymap.c b/keyboards/fourier/keymaps/xyverz/keymap.c index 3dd191be51..09aaa97f7d 100644 --- a/keyboards/fourier/keymaps/xyverz/keymap.c +++ b/keyboards/fourier/keymaps/xyverz/keymap.c @@ -21,6 +21,7 @@ enum custom_keycodes { #define XXXXXXX KC_NO #define KC_FN1 MO(_FN1) #define KC_FN2 MO(_FN2) +#define KC_ESFN1 LT(_FN1, KC_ESC) #define KC_SPFN1 LT(_FN1, KC_SPACE) #define KC_SPFN2 LT(_FN2, KC_SPACE) #define KC_BSFN1 LT(_FN1, KC_BSPC) diff --git a/keyboards/kinesis/keymaps/xyverz/keymap.c b/keyboards/kinesis/keymaps/xyverz/keymap.c index 4f3dbf83eb..533047b156 100644 --- a/keyboards/kinesis/keymaps/xyverz/keymap.c +++ b/keyboards/kinesis/keymaps/xyverz/keymap.c @@ -2,16 +2,19 @@ extern keymap_config_t keymap_config; -#define _DV 0 // Dvorak layer -#define _QW 1 // Qwerty layer -#define _CM 2 // Colemak layer -#define _MD 3 // Media Layer -#define _KP 4 // Keypad Layer +#define _DVORAK 0 // Dvorak layer +#define _QWERTY 1 // Qwerty layer +#define _COLEMAK 2 // Colemak layer +#define _MEDIA 3 // Media Layer +#define _KEYPAD 4 // Keypad Layer -// Macro name shortcuts -#define DVORAK M(_DV) -#define QWERTY M(_QW) -#define COLEMAK M(_CM) +enum custom_keycodes { + DVORAK = SAFE_RANGE, + QWERTY, + COLEMAK, + MEDIA, + KEYPAD +}; // Fillers to make layering more clear #define _______ KC_TRNS @@ -130,7 +133,7 @@ extern keymap_config_t keymap_config; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[_DV] = LAYOUT ( +[_DVORAK] = LAYOUT ( // Left Hand KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_RBRC, KC_1, KC_2, KC_3, KC_4, KC_5, @@ -141,10 +144,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Left Thumb KC_LCTL, KC_LALT, KC_HOME, - KC_BSPC, LT(_MD, KC_DEL), KC_END, + KC_BSPC, LT(_MEDIA, KC_DEL), KC_END, // Right Hand - KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KP), RESET, + KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD), RESET, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSLS, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, @@ -153,10 +156,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Right Thumb KC_RGUI, KC_RCTL, KC_PGUP, - KC_PGDN, LT(_KP, KC_ENT), KC_SPC + KC_PGDN, LT(_KEYPAD, KC_ENT), KC_SPC ), -[_QW] = LAYOUT ( +[_QWERTY] = LAYOUT ( // Left Hand KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, @@ -167,10 +170,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Left Thumb KC_LCTL, KC_LALT, KC_HOME, - KC_BSPC, LT(_MD, KC_DEL), KC_END, + KC_BSPC, LT(_MEDIA, KC_DEL), KC_END, // Right Hand - KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KP), RESET, + KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD), RESET, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL , KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, @@ -179,10 +182,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Right Thumb KC_RGUI, KC_RCTL, KC_PGUP, - KC_PGDN, LT(_KP, KC_ENT), KC_SPC + KC_PGDN, LT(_KEYPAD, KC_ENT), KC_SPC ), -[_CM] = LAYOUT ( +[_COLEMAK] = LAYOUT ( // Left Hand KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, @@ -193,10 +196,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Left Thumb KC_LCTL, KC_LALT, KC_HOME, - KC_BSPC, LT(_MD, KC_DEL), KC_END, + KC_BSPC, LT(_MEDIA, KC_DEL), KC_END, // Right Hand - KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KP), RESET, + KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD), RESET, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, @@ -205,10 +208,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Right Thumb KC_RGUI, KC_RCTL, KC_PGUP, - KC_PGDN, LT(_KP, KC_ENT), KC_SPC + KC_PGDN, LT(_KEYPAD, KC_ENT), KC_SPC ), -[_MD] = LAYOUT ( +[_MEDIA] = LAYOUT ( // Left Hand _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, @@ -234,7 +237,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______ ), -[_KP] = LAYOUT ( +[_KEYPAD] = LAYOUT ( // Left Hand _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PWR, _______, _______, _______, _______, _______, @@ -272,28 +275,63 @@ void persistent_default_layer_set(uint16_t default_layer) { default_layer_set(default_layer); } -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - switch(id) { - case _DV: +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case DVORAK: if (record->event.pressed) { - persistent_default_layer_set(1UL<<_DV); + persistent_default_layer_set(1UL<<_DVORAK); } + return false; break; - case _QW: + case QWERTY: if (record->event.pressed) { - persistent_default_layer_set(1UL<<_QW); + persistent_default_layer_set(1UL<<_QWERTY); } + return false; break; - case _CM: + case COLEMAK: if (record->event.pressed) { - persistent_default_layer_set(1UL<<_CM); + persistent_default_layer_set(1UL<<_COLEMAK); } + return false; break; } - return MACRO_NONE; + return true; }; +// getting the LEDs working... +void led_set_user(uint8_t usb_led) { + + DDRF |= (1<<0); // Keypad LED + if (usb_led & (1<<USB_LED_COMPOSE)) { + PORTF |= (1<<0); + } else { + PORTF &= ~(1<<0); + } + + DDRF |= (1<<1); // ScrLock LED + if (usb_led & (1<<USB_LED_SCROLL_LOCK)) { + PORTF |= (1<<1); + } else { + PORTF &= ~(1<<1); + } + + DDRF |= (1<<2); // NumLock LED + if (usb_led & (1<<USB_LED_NUM_LOCK)) { + PORTF |= (1<<2); + } else { + PORTF &= ~(1<<2); + } + + DDRF |= (1<<3); // CapsLock LED + if (usb_led & (1<<USB_LED_CAPS_LOCK)) { + PORTF |= (1<<3); + } else { + PORTF &= ~(1<<3); + } + +} + // Runs just one time when the keyboard initializes. void matrix_init_user(void) { diff --git a/keyboards/kinesis/stapelberg/stapelberg.c b/keyboards/kinesis/stapelberg/stapelberg.c index e551dacc4e..94d15316df 100644 --- a/keyboards/kinesis/stapelberg/stapelberg.c +++ b/keyboards/kinesis/stapelberg/stapelberg.c @@ -3,6 +3,11 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up + // * Set our LED pins as output + DDRF |= (1<<0); // Keypad LED + DDRF |= (1<<1); // ScrLock LED + DDRF |= (1<<2); // NumLock LED + DDRF |= (1<<3); // CapsLock LED matrix_init_user(); } @@ -21,8 +26,42 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { return process_record_user(keycode, record); } +void led_init_ports() { + // * Set our LED pins as output + DDRF |= (1<<0); // Keypad LED + DDRF |= (1<<1); // ScrLock LED + DDRF |= (1<<2); // NumLock LED + DDRF |= (1<<3); // CapsLock LED +} + void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here + DDRF |= (1<<0); // Keypad LED + if (usb_led & (1<<USB_LED_COMPOSE)) { + PORTF |= (1<<0); + } else { + PORTF &= ~(1<<0); + } + + DDRF |= (1<<1); // ScrLock LED + if (usb_led & (1<<USB_LED_SCROLL_LOCK)) { + PORTF |= (1<<1); + } else { + PORTF &= ~(1<<1); + } + + DDRF |= (1<<2); // NumLock LED + if (usb_led & (1<<USB_LED_NUM_LOCK)) { + PORTF |= (1<<2); + } else { + PORTF &= ~(1<<2); + } + + DDRF |= (1<<3); // CapsLock LED + if (usb_led & (1<<USB_LED_CAPS_LOCK)) { + PORTF |= (1<<3); + } else { + PORTF &= ~(1<<3); + } led_set_user(usb_led); @@ -38,3 +77,15 @@ inline void kinesis_caps_led_off(void) { DDRF &= ~(1<<3); PORTF &= ~(1<<3); } } + +/* This is the old code that has the port information in it. +inline void kinesis_keypad_led_on(void) { DDRF |= (1<<0); PORTF |= (1<<0); } +inline void kinesis_scroll_led_on(void) { DDRF |= (1<<1); PORTF |= (1<<1); } +inline void kinesis_num_led_on(void) { DDRF |= (1<<2); PORTF |= (1<<2); } +inline void kinesis_caps_led_on(void) { DDRF |= (1<<3); PORTF |= (1<<3); } + +inline void kinesis_keypad_led_off(void) { DDRF &= ~(1<<0); PORTF &= ~(1<<0); } +inline void kinesis_scroll_led_off(void) { DDRF &= ~(1<<1); PORTF &= ~(1<<1); } +inline void kinesis_num_led_off(void) { DDRF &= ~(1<<2); PORTF &= ~(1<<2); } +inline void kinesis_caps_led_off(void) { DDRF &= ~(1<<3); PORTF &= ~(1<<3); } +*/ diff --git a/keyboards/preonic/keymaps/seph/config.h b/keyboards/preonic/keymaps/seph/config.h index 4e12921fef..64a942e21c 100644 --- a/keyboards/preonic/keymaps/seph/config.h +++ b/keyboards/preonic/keymaps/seph/config.h @@ -5,7 +5,7 @@ // Number of backlight levels #undef BACKLIGHT_LEVELS -#define BACKLIGHT_LEVELS 3 +#define BACKLIGHT_LEVELS 8 /* ws2812 RGB LED */ #undef RGB_DI_PIN @@ -18,4 +18,4 @@ #define RGBLIGHT_VAL_STEP 17 -#endif
\ No newline at end of file +#endif diff --git a/keyboards/preonic/keymaps/seph/keymap.c b/keyboards/preonic/keymaps/seph/keymap.c index a80199c092..3d26060067 100644 --- a/keyboards/preonic/keymaps/seph/keymap.c +++ b/keyboards/preonic/keymaps/seph/keymap.c @@ -26,13 +26,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | Ctrl | Alt | Left |Right |Lower | Space |Raise | Up | Down | GUI |Enter | * `-----------------------------------------------------------------------------------' */ -[_QW] = { - {KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, - {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL }, - {KC_MINS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, - {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT}, - {KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, MO(_LO), KC_SPC, KC_SPC, MO(_RA), KC_UP, KC_DOWN, KC_RGUI, KC_ENT } -}, +[_QW] = LAYOUT_ortho_5x12 ( \ + KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL , \ + KC_MINS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ + KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, MO(_LO), KC_SPC, KC_SPC, MO(_RA), KC_UP, KC_DOWN, KC_RGUI, KC_ENT \ +), /* Lower * ,-----------------------------------------------------------------------------------. @@ -40,20 +40,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+-------------+------+------+------+------+------| * | ~ | | | | | | | | | | | | | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Caps | | | | | | | _ | + | { | } | | + * | Caps | | Mute | Vol- | Vol+ | | | | + | { | } | PrSc | * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | | | Mute | Vol- | Vol+ | | + * | | | Prev | Play | Next | | | | | | | | * |------+------+------+------+------+------+------+------+------+------+------+------| * | Brite| | Home | End | | Ins | | PgUp | PgDN | |Enter | * `-----------------------------------------------------------------------------------' */ -[_LO] = { - {KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 }, - {KC_TILD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PIPE}, - {KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PLUS, KC_LCBR, KC_RCBR, _______}, - {_______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______}, - {BL_STEP, _______, KC_HOME, KC_END, _______, KC_INS, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______} -}, +[_LO] = LAYOUT_ortho_5x12 ( \ + KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 , \ + KC_TILD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PIPE, \ + KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, KC_PLUS, KC_LCBR, KC_RCBR, KC_PSCR, \ + _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, \ + BL_STEP, _______, KC_HOME, KC_END, _______, KC_INS, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______ \ +), /* Raise * ,-----------------------------------------------------------------------------------. @@ -61,19 +61,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------+------+------+------+------+------+------| * | ` | | | | | | | | | | | \ | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Caps | | | | | | | - | = | [ | ] | | + * | Caps | | Mute | Vol- | Vol+ | | | | = | [ | ] | PrSc | * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | | | Prev | Play | Next | | + * | | | Prev | Play | Next | | | | | | | | * |------+------+------+------+------+------+------+------+------+------+------+------| * | Brite| | Home | End | | Ins | | PgUp | PgDN | |Enter | * `-----------------------------------------------------------------------------------' */ -[_RA] = { - {KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 }, - {KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLS}, - {KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_EQL, KC_LBRC, KC_RBRC, _______}, - {_______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______}, - {BL_STEP, _______, KC_HOME, KC_END, _______, KC_INS, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______} -} +[_RA] = LAYOUT_ortho_5x12 ( \ + KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12 , \ + KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLS, \ + KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, KC_EQL, KC_LBRC, KC_RBRC, KC_PSCR, \ + _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, \ + BL_STEP, _______, KC_HOME, KC_END, _______, KC_INS, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______ \ +) }; diff --git a/keyboards/preonic/keymaps/seph/rules.mk b/keyboards/preonic/keymaps/seph/rules.mk index 5ccd4377a1..4333bf4553 100644 --- a/keyboards/preonic/keymaps/seph/rules.mk +++ b/keyboards/preonic/keymaps/seph/rules.mk @@ -10,10 +10,10 @@ COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI controls -AUDIO_ENABLE = no # Audio output on port C6 +AUDIO_ENABLE = yes # Audio output on port C6 UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend |