Fix jj40 capslock and minor keymap updates (#3168) * Adjust TAPPING_TERM to make accessing the nav layer easier * JJ40: Add RESET key to lower layer. * Disable all lock LEDs on "oscillope" keymap. I'm not 100% sure why yet, but attempting to turn on a lock LED on my v1 JJ40 PCB causes the PCB to become unresponsive. The easy fix is to just disable all of the lock LEDs, since I don't have any LEDs on my keyboard anyway. Many thanks to u/wanleg on Reddit for suggesting this fix: https://www.reddit.com/r/olkb/comments/8en8f1/strange_caps_lock_behavior/e06kcaf/
3 files changed, 62 insertions(+), 3 deletions(-) A keyboards/jj40/keymaps/oscillope/backlight.c M keyboards/jj40/keymaps/oscillope/config.h M keyboards/jj40/keymaps/oscillope/keymap.c
A keyboards/jj40/keymaps/oscillope/backlight.c => keyboards/jj40/keymaps/oscillope/backlight.c +59 -0
@@ 0,0 1,59 @@ /** * Backlighting code for PS2AVRGB boards (ATMEGA32A) * Kenneth A. (github.com/krusli | krusli.me) */ #include "quantum.h" #include <avr/pgmspace.h> #include <avr/interrupt.h> // Port D: digital pins of the AVR chipset #define NUMLOCK_PORT (1 << 1) // 1st pin of Port D (digital) #define CAPSLOCK_PORT (1 << 2) // 2nd pin #define BACKLIGHT_PORT (1 << 4) // 4th pin #define SCROLLLOCK_PORT (1 << 6) // 6th pin /** * References * Port Registers: https://www.arduino.cc/en/Reference/PortManipulation * TCCR1A: https://electronics.stackexchange.com/questions/92350/what-is-the-difference-between-tccr1a-and-tccr1b * Timers: http://www.avrbeginners.net/architecture/timers/timers.html * 16-bit timer setup: http://sculland.com/ATmega168/Interrupts-And-Timers/16-Bit-Timer-Setup/ * PS2AVRGB firmware: https://github.com/showjean/ps2avrU/tree/master/firmware */ // @Override // turn LEDs on and off depending on USB caps/num/scroll lock states. void led_set_user(uint8_t usb_led) { /* It appears that these cause the v1 JJ40 PCB to hang. * I haven't looked into why, but I don't have any LEDs on my board anyway. */ #if 0 if (usb_led & (1 << USB_LED_NUM_LOCK)) { // turn on DDRD |= NUMLOCK_PORT; PORTD |= NUMLOCK_PORT; } else { // turn off DDRD &= ~NUMLOCK_PORT; PORTD &= ~NUMLOCK_PORT; } if (usb_led & (1 << USB_LED_CAPS_LOCK)) { DDRD |= CAPSLOCK_PORT; PORTD |= CAPSLOCK_PORT; } else { DDRD &= ~CAPSLOCK_PORT; PORTD &= ~CAPSLOCK_PORT; } if (usb_led & (1 << USB_LED_SCROLL_LOCK)) { DDRD |= SCROLLLOCK_PORT; PORTD |= SCROLLLOCK_PORT; } else { DDRD &= ~SCROLLLOCK_PORT; PORTD &= ~SCROLLLOCK_PORT; } #endif }
M keyboards/jj40/keymaps/oscillope/config.h => keyboards/jj40/keymaps/oscillope/config.h +1 -1
@@ 4,6 4,6 @@ #include "../../config.h" #define PREVENT_STUCK_MODIFIERS #define TAPPING_TERM 300 #define TAPPING_TERM 200 #endif
M keyboards/jj40/keymaps/oscillope/keymap.c => keyboards/jj40/keymaps/oscillope/keymap.c +2 -2
@@ 64,7 64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+-------------+------+------+------+------+------| * | Ins | | | () | [] | {} | Left | Down | Up |Right | | | * |------+------+------+------+------+------|------+------+------+------+------+------| * |PrScr | Back | Fwd | | | | | | Mute | Vol- | Vol+ | | * |RESET | Back | Fwd | | | | | | Mute | Vol- | Vol+ | | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | Lock | | | Prev | Stop | Play | Next | @@ * `-----------------------------------------------------------------------------------' 72,7 72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = KEYMAP( \ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ KC_INS, _______, _______, CC_PRN, CC_BRC, CC_CBR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, \ KC_PSCR, KC_WBAK, KC_WFWD, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, \ RESET, KC_WBAK, KC_WFWD, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, \ _______, _______, _______, _______, KC_LOCK, _______, _______, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT \ ),