diff options
Diffstat (limited to 'keyboards')
-rw-r--r-- | keyboards/kinesis/keymaps/xyverz/keymap.c | 52 | ||||
-rw-r--r-- | keyboards/kinesis/keymaps/xyverz/readme.md | 4 | ||||
-rw-r--r-- | keyboards/kinesis/stapelberg/stapelberg.c | 86 |
3 files changed, 31 insertions, 111 deletions
diff --git a/keyboards/kinesis/keymaps/xyverz/keymap.c b/keyboards/kinesis/keymaps/xyverz/keymap.c index 533047b156..1025df0769 100644 --- a/keyboards/kinesis/keymaps/xyverz/keymap.c +++ b/keyboards/kinesis/keymaps/xyverz/keymap.c @@ -299,58 +299,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { 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) { - }; - -void led_set_user(uint8_t usb_led) { - if (usb_led & (1<<USB_LED_NUM_LOCK)) { - PORTF |= (1<<2); - } else { - PORTF &= ~(1<<2); - } - if (usb_led & (1<<USB_LED_CAPS_LOCK)) { - PORTF |= (1<<3); - } else { - PORTF &= ~(1<<3); - } - if (usb_led & (1<<USB_LED_SCROLL_LOCK)) { - PORTF |= (1<<1); - } else { - PORTF &= ~(1<<1); - } -} diff --git a/keyboards/kinesis/keymaps/xyverz/readme.md b/keyboards/kinesis/keymaps/xyverz/readme.md index 12320996ed..4f270445d8 100644 --- a/keyboards/kinesis/keymaps/xyverz/readme.md +++ b/keyboards/kinesis/keymaps/xyverz/readme.md @@ -10,9 +10,11 @@ The QWERTY layout shown here is based entirely on the Kinesis Advantage layout. I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar to the default Planck layouts. +As of August 4 2018, I've got the LEDs working ... mostly. Caps Lock and Num Lock LEDs work for me. The Scroll Lock LED does work on my keyboard, but I can't get it to work when I use the Scroll Lock key on my keyboard. I also have no idea how to get the Num Pad LED working when I switch to the Numpad layer. + ## Still to do: - * Implement the CapsLock, NumLock, and ScrLck LEDs on the off-chance that I decide to actually solder some to the keyboard. + * Figure out how to make the Numpad and ScrLck LEDs work properly. ### Function Keys on All Layers (keypad toggles): ,-----------------------------------------------------------------. diff --git a/keyboards/kinesis/stapelberg/stapelberg.c b/keyboards/kinesis/stapelberg/stapelberg.c index 94d15316df..af407ac4fc 100644 --- a/keyboards/kinesis/stapelberg/stapelberg.c +++ b/keyboards/kinesis/stapelberg/stapelberg.c @@ -27,65 +27,35 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *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 + // * 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) { - 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); - -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); } - - + if (usb_led & (1<<USB_LED_COMPOSE)) { + PORTF &= ~(1<<0); + } else { + PORTF |= (1<<0); + } + + if (usb_led & (1<<USB_LED_SCROLL_LOCK)) { + PORTF &= ~(1<<1); + } else { + PORTF |= (1<<1); + } + + if (usb_led & (1<<USB_LED_NUM_LOCK)) { + PORTF &= ~(1<<2); + } else { + PORTF |= (1<<2); + } + + if (usb_led & (1<<USB_LED_CAPS_LOCK)) { + PORTF &= ~(1<<3); + } else { + 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); } -*/ |