diff options
| author | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2018-07-29 15:18:45 -0700 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-07-29 15:18:45 -0700 |
| commit | 841ea7ceb64648b14b44909745b13e127327be15 (patch) | |
| tree | 7e7db9a916953a3f5b5340bd7e49a071331c162e | |
| parent | 54517f8b344580c49a1ce71c319c5c9e858c263b (diff) | |
Keyboard: Add caps lock led support to DZ60 (#3506)
* add caps lock led support to DZ60
* changes from drashna's code review comments
* call led_set_user at the end of led_set_kb
| -rw-r--r-- | keyboards/dz60/dz60.c | 12 | ||||
| -rw-r--r-- | keyboards/dz60/keymaps/default/keymap.c | 8 | ||||
| -rw-r--r-- | keyboards/dz60/keymaps/iso_uk/keymap.c | 8 | ||||
| -rw-r--r-- | keyboards/dz60/keymaps/krusli/keymap.c | 8 |
4 files changed, 9 insertions, 27 deletions
diff --git a/keyboards/dz60/dz60.c b/keyboards/dz60/dz60.c index 33122846c9..b54ff01170 100644 --- a/keyboards/dz60/dz60.c +++ b/keyboards/dz60/dz60.c @@ -22,7 +22,13 @@ void led_init_ports(void) { } void led_set_kb(uint8_t usb_led) { - // Code for caps lock LED as reported by the OS - // Set this per keymap, instead of globally - led_set_user(usb_led); + if (usb_led & (1 << USB_LED_CAPS_LOCK)) { + DDRB |= (1 << 2); + PORTB &= ~(1 << 2); + } else { + DDRB &= ~(1 << 2); + PORTB &= ~(1 << 2); + } + + led_set_user(usb_led); } diff --git a/keyboards/dz60/keymaps/default/keymap.c b/keyboards/dz60/keymaps/default/keymap.c index fdc2795d24..426b10989d 100644 --- a/keyboards/dz60/keymaps/default/keymap.c +++ b/keyboards/dz60/keymaps/default/keymap.c @@ -59,11 +59,3 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { break; } } - -void led_set_user(uint8_t usb_led) { - if (usb_led & (1 << USB_LED_CAPS_LOCK)) { - DDRB |= (1 << 2); PORTB &= ~(1 << 2); - } else { - DDRB &= ~(1 << 2); PORTB &= ~(1 << 2); - } -} diff --git a/keyboards/dz60/keymaps/iso_uk/keymap.c b/keyboards/dz60/keymaps/iso_uk/keymap.c index de06d23521..1c15a59df8 100644 --- a/keyboards/dz60/keymaps/iso_uk/keymap.c +++ b/keyboards/dz60/keymaps/iso_uk/keymap.c @@ -84,11 +84,3 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { break; } } - -void led_set_user(uint8_t usb_led) { - if (usb_led & (1 << USB_LED_CAPS_LOCK)) { - DDRB |= (1 << 2); PORTB &= ~(1 << 2); - } else { - DDRB &= ~(1 << 2); PORTB &= ~(1 << 2); - } -} diff --git a/keyboards/dz60/keymaps/krusli/keymap.c b/keyboards/dz60/keymaps/krusli/keymap.c index c79cb7f910..36e7b801a3 100644 --- a/keyboards/dz60/keymaps/krusli/keymap.c +++ b/keyboards/dz60/keymaps/krusli/keymap.c @@ -19,11 +19,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_NO, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) }; - -void led_set_user(uint8_t usb_led) { - if (usb_led & (1 << USB_LED_CAPS_LOCK)) { - DDRB |= (1 << 2); PORTB &= ~(1 << 2); - } else { - DDRB &= ~(1 << 2); PORTB &= ~(1 << 2); - } -} |