Keymap: Undo my backlight workaround (#4122)

* Update jj40 keymap for easier pgup/pgdn

* Backlight problem fixed by a previous commit

diff --git a/keyboards/jj40/keymaps/oscillope/backlight.c b/keyboards/jj40/keymaps/oscillope/backlight.c
deleted file mode 100644 (file)
index 14c677c..0000000
--- a/keyboards/jj40/keymaps/oscillope/backlight.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * 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 << 0)  // D0
-#define CAPSLOCK_PORT   (1 << 1)  // D1
-#define BACKLIGHT_PORT  (1 << 4)  // D4
-#define SCROLLLOCK_PORT (1 << 6)  // D6
-
-/**
- * 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.
-__attribute__ ((weak))
-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
-}
-

diff --git a/keyboards/jj40/keymaps/oscillope/keymap.c b/keyboards/jj40/keymaps/oscillope/keymap.c
index 49ceff864c0de7cf09e3ed13bc36ffd97db0ff69..8b30f52c8b705cc501539e89f7ef40a8475272de 100644 (file)
--- a/keyboards/jj40/keymaps/oscillope/keymap.c
+++ b/keyboards/jj40/keymaps/oscillope/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------------------------------------------------.
  * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Ins  |      |      |  ()  |  []  |  {}  | Left | Down |  Up  |Right |      |      |
+ * | Ins  |      |      |  ()  |  []  |  {}  | Home | PgDn | PgUp | End  |      |      |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * |RESET | Back | Fwd  |      |      |      |      |      | Mute | Vol- | Vol+ |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -71,7 +71,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_INS,  _______, _______, CC_PRN,  CC_BRC,  CC_CBR,  KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______, \
   RESET,   KC_WBAK, KC_WFWD, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, \
   _______, _______, _______, _______, KC_LOCK, _______, _______,          KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT \
 ),