From 9160405d39d82ba787bac07ab569aa74d86d5082 Mon Sep 17 00:00:00 2001 From: skullydazed Date: Wed, 23 Oct 2019 21:14:00 -0700 Subject: Support for the upcoming 1UP Keyboards Sweet 16 rev2 (#7125) * Support for the upcoming 1up Keyboards Sweet 16 rev2 * Update keyboards/1upkeyboards/sweet16/rev1/readme.md Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/1upkeyboards/sweet16/rev1/readme.md Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/1upkeyboards/sweet16/rev2/promicro/readme.md Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/1upkeyboards/sweet16/rev2/proton_c/readme.md Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/1upkeyboards/sweet16/readme.md Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/1upkeyboards/sweet16/rev1/rev1.c Co-Authored-By: fauxpark * Update keyboards/1upkeyboards/sweet16/rev1/rev1.c Co-Authored-By: fauxpark * Update keyboards/1upkeyboards/sweet16/rev1/rev1.c Co-Authored-By: fauxpark * Update keyboards/1upkeyboards/sweet16/rev1/rev1.c Co-Authored-By: fauxpark * Update keyboards/1upkeyboards/sweet16/rev1/rev1.c Co-Authored-By: fauxpark * Update keyboards/1upkeyboards/sweet16/rev1/rev1.c Co-Authored-By: fauxpark * Update keyboards/1upkeyboards/sweet16/rules.mk Co-Authored-By: fauxpark * Update keyboards/1upkeyboards/sweet16/rules.mk Co-Authored-By: fauxpark * Update keyboards/1upkeyboards/sweet16/rules.mk Co-Authored-By: fauxpark * Update keyboards/1upkeyboards/sweet16/rules.mk Co-Authored-By: fauxpark * Update keyboards/1upkeyboards/sweet16/rev1/rules.mk Co-Authored-By: Drashna Jaelre * Update keyboards/1upkeyboards/sweet16/rev2/promicro/rules.mk Co-Authored-By: Drashna Jaelre * tweak readme wording per @noroadsleft * Change rev to V * remove extraneous info.json files --- .../1upkeyboards/sweet16/keymaps/default/keymap.c | 28 +++++++++------------- 1 file changed, 11 insertions(+), 17 deletions(-) (limited to 'keyboards/1upkeyboards/sweet16/keymaps') diff --git a/keyboards/1upkeyboards/sweet16/keymaps/default/keymap.c b/keyboards/1upkeyboards/sweet16/keymaps/default/keymap.c index 4cc754dc16..4778d2108c 100644 --- a/keyboards/1upkeyboards/sweet16/keymaps/default/keymap.c +++ b/keyboards/1upkeyboards/sweet16/keymaps/default/keymap.c @@ -25,21 +25,15 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; } -void led_set_user(uint8_t usb_led) { - - #ifndef CONVERT_TO_PROTON_C - /* Map RXLED to USB_LED_NUM_LOCK */ - if (usb_led & (1 << USB_LED_NUM_LOCK)) { - DDRB |= (1 << 0); PORTB &= ~(1 << 0); - } else { - DDRB &= ~(1 << 0); PORTB &= ~(1 << 0); - } - - /* Map TXLED to USB_LED_CAPS_LOCK */ - if (usb_led & (1 << USB_LED_CAPS_LOCK)) { - DDRD |= (1 << 5); PORTD &= ~(1 << 5); - } else { - DDRD &= ~(1 << 5); PORTD &= ~(1 << 5); - } - #endif +#ifdef ENCODER_ENABLE +#include "encoder.h" +void encoder_update_user(int8_t index, bool clockwise) { + if (index == 0) { /* First encoder */ + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + } } +#endif -- cgit v1.2.3