From f2bc70a2643bd158eb9910c61b682dafab83d41d Mon Sep 17 00:00:00 2001 From: Kenneth Aloysius Date: Tue, 24 Jul 2018 02:11:56 +0700 Subject: ps2avrgb: fix incorrect avr ports specified (for numlock and capslock LEDs) (#3453) * Add M6-A keymap * Update XD60 keymap * Update XD60 keymap readme * Update JJ40 and Let's Split keymaps * Add readme for M6-A * Fix typo, update JJ40 README * Update jj40 readme * Cleanup jj40 keymap * Revert Let's Split QWERTY layer to default before #2010 * Update numpad layers * Fix: Let's Split keymap getting stuck mods due to having keycodes assigned on the Raise layer * Keep ASCII art consistent with keymap * Staryu: initial port * Add personal keymap * Added and updated READMEs * Fix: default keymap for staryu * Rudimentary backlight support. * Enabled mousekeys for default keymap * use QMK_KEYBOARD_H and LAYOUT * Update readme.md for NIU mini: flash using avrdude * Fix missing linebreaks for Staryu README * Update readme.md * Update PS2AVRGB boards with new matrix.c * Update canoe matrix.c; untested * Fix canoe.c for building (needs matrix_scan_user and matrix_init_user) * Add personal Iris keymap * Update keymap * Update keymap * Update keymap, disable backlighting and underglow * Move PrintScreen button * Add README * Update personal keymaps * Add INS key * Limit USB max power consumption, change Fn to MENU * Remove Numpad layer (easy to accidentally toggle) * Fix backlighting for ps2avrgb * Update comments to refer to actual pin naming * Possible fix for xyverz ortho keymap: define RGBLED_NUM * Make led_set_user in backlight.c overridable * Add changes to address points raised in code review, untested (don't have build env right now) --- keyboards/jj40/keymaps/oscillope/backlight.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'keyboards/jj40/keymaps/oscillope') diff --git a/keyboards/jj40/keymaps/oscillope/backlight.c b/keyboards/jj40/keymaps/oscillope/backlight.c index a4cb66e0c4..14c677cd6c 100644 --- a/keyboards/jj40/keymaps/oscillope/backlight.c +++ b/keyboards/jj40/keymaps/oscillope/backlight.c @@ -9,10 +9,10 @@ #include // 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 +#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 @@ -25,6 +25,7 @@ // @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. */ -- cgit v1.2.3