diff options
-rw-r--r-- | keyboards/dz60/keymaps/krusli/config.h | 2 | ||||
-rw-r--r-- | keyboards/dz60/keymaps/krusli/keymap.c | 29 | ||||
-rw-r--r-- | keyboards/dz60/keymaps/krusli/rules.mk | 15 | ||||
-rw-r--r-- | keyboards/jj40/backlight.c | 9 | ||||
-rw-r--r-- | keyboards/jj40/keymaps/krusli/keymap.c | 35 | ||||
-rw-r--r-- | keyboards/jj40/keymaps/krusli/numpad.txt | 17 | ||||
-rw-r--r-- | keyboards/jj40/keymaps/oscillope/backlight.c | 9 | ||||
-rw-r--r-- | keyboards/jj50/backlight.c | 9 | ||||
-rw-r--r-- | keyboards/staryu/keymaps/krusli/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/ymd75/backlight.c | 5 | ||||
-rw-r--r-- | keyboards/ymd96/backlight.c | 5 | ||||
-rw-r--r-- | keyboards/ymdk_np21/backlight.c | 9 | ||||
-rw-r--r-- | layouts/community/ortho_4x12/xyverz/config.h | 3 |
13 files changed, 97 insertions, 52 deletions
diff --git a/keyboards/dz60/keymaps/krusli/config.h b/keyboards/dz60/keymaps/krusli/config.h new file mode 100644 index 000000000..e8cb446e2 --- /dev/null +++ b/keyboards/dz60/keymaps/krusli/config.h | |||
@@ -0,0 +1,2 @@ | |||
1 | #pragma once | ||
2 | #define USB_MAX_POWER_CONSUMPTION 100 | ||
diff --git a/keyboards/dz60/keymaps/krusli/keymap.c b/keyboards/dz60/keymaps/krusli/keymap.c new file mode 100644 index 000000000..c79cb7f91 --- /dev/null +++ b/keyboards/dz60/keymaps/krusli/keymap.c | |||
@@ -0,0 +1,29 @@ | |||
1 | #include QMK_KEYBOARD_H | ||
2 | |||
3 | #define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) | ||
4 | #define _______ KC_TRNS | ||
5 | |||
6 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
7 | |||
8 | LAYOUT( | ||
9 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, | ||
10 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, | ||
11 | KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, | ||
12 | KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), | ||
13 | KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, KC_RALT, KC_APP, KC_APP, KC_RCTL), | ||
14 | |||
15 | LAYOUT( | ||
16 | KC_GRV, 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, KC_DEL, | ||
17 | KC_CAPS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, RESET, | ||
18 | _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, | ||
19 | _______, KC_NO, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, | ||
20 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) | ||
21 | }; | ||
22 | |||
23 | void led_set_user(uint8_t usb_led) { | ||
24 | if (usb_led & (1 << USB_LED_CAPS_LOCK)) { | ||
25 | DDRB |= (1 << 2); PORTB &= ~(1 << 2); | ||
26 | } else { | ||
27 | DDRB &= ~(1 << 2); PORTB &= ~(1 << 2); | ||
28 | } | ||
29 | } | ||
diff --git a/keyboards/dz60/keymaps/krusli/rules.mk b/keyboards/dz60/keymaps/krusli/rules.mk new file mode 100644 index 000000000..3138a24b6 --- /dev/null +++ b/keyboards/dz60/keymaps/krusli/rules.mk | |||
@@ -0,0 +1,15 @@ | |||
1 | # Build Options | ||
2 | # comment out to disable the options. | ||
3 | # | ||
4 | BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) | ||
5 | MOUSEKEY_ENABLE = yes # Mouse keys(+4700) | ||
6 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) | ||
7 | CONSOLE_ENABLE = no # Console for debug(+400) | ||
8 | COMMAND_ENABLE = no # Commands for debug and configuration | ||
9 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | ||
10 | NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | ||
11 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | ||
12 | AUDIO_ENABLE = no | ||
13 | RGBLIGHT_ENABLE = yes | ||
14 | |||
15 | LAYOUTS = 60_ansi | ||
diff --git a/keyboards/jj40/backlight.c b/keyboards/jj40/backlight.c index 079c410ff..fbd241fa9 100644 --- a/keyboards/jj40/backlight.c +++ b/keyboards/jj40/backlight.c | |||
@@ -17,10 +17,10 @@ | |||
17 | #include <stdio.h> | 17 | #include <stdio.h> |
18 | 18 | ||
19 | // Port D: digital pins of the AVR chipset | 19 | // Port D: digital pins of the AVR chipset |
20 | #define NUMLOCK_PORT (1 << 1) // 1st pin of Port D (digital) | 20 | #define NUMLOCK_PORT (1 << 0) // D0 |
21 | #define CAPSLOCK_PORT (1 << 2) // 2nd pin | 21 | #define CAPSLOCK_PORT (1 << 1) // D1 |
22 | #define BACKLIGHT_PORT (1 << 4) // 4th pin | 22 | #define BACKLIGHT_PORT (1 << 4) // D4 |
23 | #define SCROLLLOCK_PORT (1 << 6) // 6th pin | 23 | #define SCROLLLOCK_PORT (1 << 6) // D6 |
24 | 24 | ||
25 | #define TIMER_CLK_DIV64 0x03 ///< Timer clocked at F_CPU/64 | 25 | #define TIMER_CLK_DIV64 0x03 ///< Timer clocked at F_CPU/64 |
26 | #define TIMER1PRESCALE TIMER_CLK_DIV64 ///< timer 1 prescaler default | 26 | #define TIMER1PRESCALE TIMER_CLK_DIV64 ///< timer 1 prescaler default |
@@ -43,6 +43,7 @@ extern backlight_config_t backlight_config; | |||
43 | 43 | ||
44 | // @Override | 44 | // @Override |
45 | // turn LEDs on and off depending on USB caps/num/scroll lock states. | 45 | // turn LEDs on and off depending on USB caps/num/scroll lock states. |
46 | __attribute__ ((weak)) | ||
46 | void led_set_user(uint8_t usb_led) { | 47 | void led_set_user(uint8_t usb_led) { |
47 | if (usb_led & (1 << USB_LED_NUM_LOCK)) { | 48 | if (usb_led & (1 << USB_LED_NUM_LOCK)) { |
48 | // turn on | 49 | // turn on |
diff --git a/keyboards/jj40/keymaps/krusli/keymap.c b/keyboards/jj40/keymaps/krusli/keymap.c index 73dd0b287..6fea9d314 100644 --- a/keyboards/jj40/keymaps/krusli/keymap.c +++ b/keyboards/jj40/keymaps/krusli/keymap.c | |||
@@ -3,7 +3,6 @@ | |||
3 | #define _QWERTY 0 | 3 | #define _QWERTY 0 |
4 | #define _LOWER 1 | 4 | #define _LOWER 1 |
5 | #define _RAISE 2 | 5 | #define _RAISE 2 |
6 | #define _NUMPAD 3 | ||
7 | 6 | ||
8 | enum custom_keycodes { | 7 | enum custom_keycodes { |
9 | QWERTY = SAFE_RANGE, | 8 | QWERTY = SAFE_RANGE, |
@@ -15,14 +14,6 @@ void matrix_scan_user(void) { | |||
15 | // runs at every matrix scan. | 14 | // runs at every matrix scan. |
16 | } | 15 | } |
17 | 16 | ||
18 | // enum { | ||
19 | // TD_H_E = 0 | ||
20 | // }; | ||
21 | // | ||
22 | // qk_tap_dance_action_t tap_dance_actions[] = { | ||
23 | // [TD_H_E] = ACTION_TAP_DANCE_DOUBLE(KC_HOME, KC_END) | ||
24 | // }; | ||
25 | |||
26 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 17 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
27 | /* Qwerty | 18 | /* Qwerty |
28 | * ,-----------------------------------------------------------------------------------. | 19 | * ,-----------------------------------------------------------------------------------. |
@@ -36,10 +27,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
36 | * `-----------------------------------------------------------------------------------' | 27 | * `-----------------------------------------------------------------------------------' |
37 | */ | 28 | */ |
38 | [_QWERTY] = LAYOUT_2U_space( \ | 29 | [_QWERTY] = LAYOUT_2U_space( \ |
39 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ | 30 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ |
40 | KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ | 31 | KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ |
41 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \ | 32 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \ |
42 | TO(_NUMPAD),KC_LCTL, KC_LGUI, KC_LALT, MO(_LOWER), KC_SPC, MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ | 33 | _______, KC_LCTL, KC_LGUI, KC_LALT, MO(_LOWER), KC_SPC, MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ |
43 | ), | 34 | ), |
44 | 35 | ||
45 | /* Lower | 36 | /* Lower |
@@ -76,23 +67,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
76 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ | 67 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ |
77 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_END, KC_PGUP, KC_PGDN, _______, \ | 68 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_END, KC_PGUP, KC_PGDN, _______, \ |
78 | _______, KC_MRWD, KC_MPLY, KC_MNXT, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ | 69 | _______, KC_MRWD, KC_MPLY, KC_MNXT, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ |
79 | ), | ||
80 | |||
81 | /* Numpad | ||
82 | * ,-----------------------------------------------------------------------------------. | ||
83 | * | Esc | 7 | 8 | 9 | * | / | | | | | | | | ||
84 | * |------+------+------+------+------+-------------+------+------+------+------+------| | ||
85 | * | <-- | 4 | 5 | 6 | + | - | | | | | | | | ||
86 | * |------+------+------+------+------+------|------+------+------+------+------+------| | ||
87 | * | | 1 | 2 | 3 |Enter |Enter | | | | | | | | ||
88 | * |------+------+------+------+------+------+------+------+------+------+------+------| | ||
89 | * |Qwerty| 0 | . | . |Enter |Enter | | | | | | | ||
90 | * `-----------------------------------------------------------------------------------' | ||
91 | */ | ||
92 | [_NUMPAD] = LAYOUT_2U_space( \ | ||
93 | KC_ESC, KC_P7, KC_P8, KC_P9, KC_PAST, KC_PSLS, _______, _______, _______, _______, _______, _______, \ | ||
94 | KC_BSPC, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_PMNS, _______, _______, _______, _______, _______, _______, \ | ||
95 | _______, KC_P1, KC_P2, KC_P3, KC_PENT, KC_PENT, _______, _______, _______, _______, _______, _______, \ | ||
96 | TO(_QWERTY),KC_P0, KC_PDOT, KC_PDOT, KC_PENT, _______, _______, _______, _______, _______, _______ \ | ||
97 | ) | 70 | ) |
98 | }; | 71 | }; |
diff --git a/keyboards/jj40/keymaps/krusli/numpad.txt b/keyboards/jj40/keymaps/krusli/numpad.txt new file mode 100644 index 000000000..8fbdc1829 --- /dev/null +++ b/keyboards/jj40/keymaps/krusli/numpad.txt | |||
@@ -0,0 +1,17 @@ | |||
1 | /* Numpad | ||
2 | * ,-----------------------------------------------------------------------------------. | ||
3 | * | Esc | 7 | 8 | 9 | * | / | | | | | | | | ||
4 | * |------+------+------+------+------+-------------+------+------+------+------+------| | ||
5 | * | <-- | 4 | 5 | 6 | + | - | | | | | | | | ||
6 | * |------+------+------+------+------+------|------+------+------+------+------+------| | ||
7 | * | | 1 | 2 | 3 |Enter |Enter | | | | | | | | ||
8 | * |------+------+------+------+------+------+------+------+------+------+------+------| | ||
9 | * |Qwerty| 0 | . | . |Enter |Enter | | | | | | | ||
10 | * `-----------------------------------------------------------------------------------' | ||
11 | */ | ||
12 | [_NUMPAD] = LAYOUT_2U_space( \ | ||
13 | KC_ESC, KC_P7, KC_P8, KC_P9, KC_PAST, KC_PSLS, _______, _______, _______, _______, _______, _______, \ | ||
14 | KC_BSPC, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_PMNS, _______, _______, _______, _______, _______, _______, \ | ||
15 | _______, KC_P1, KC_P2, KC_P3, KC_PENT, KC_PENT, _______, _______, _______, _______, _______, _______, \ | ||
16 | TO(_QWERTY),KC_P0, KC_PDOT, KC_PDOT, KC_PENT, _______, _______, _______, _______, _______, _______ \ | ||
17 | ) | ||
diff --git a/keyboards/jj40/keymaps/oscillope/backlight.c b/keyboards/jj40/keymaps/oscillope/backlight.c index a4cb66e0c..14c677cd6 100644 --- a/keyboards/jj40/keymaps/oscillope/backlight.c +++ b/keyboards/jj40/keymaps/oscillope/backlight.c | |||
@@ -9,10 +9,10 @@ | |||
9 | #include <avr/interrupt.h> | 9 | #include <avr/interrupt.h> |
10 | 10 | ||
11 | // Port D: digital pins of the AVR chipset | 11 | // Port D: digital pins of the AVR chipset |
12 | #define NUMLOCK_PORT (1 << 1) // 1st pin of Port D (digital) | 12 | #define NUMLOCK_PORT (1 << 0) // D0 |
13 | #define CAPSLOCK_PORT (1 << 2) // 2nd pin | 13 | #define CAPSLOCK_PORT (1 << 1) // D1 |
14 | #define BACKLIGHT_PORT (1 << 4) // 4th pin | 14 | #define BACKLIGHT_PORT (1 << 4) // D4 |
15 | #define SCROLLLOCK_PORT (1 << 6) // 6th pin | 15 | #define SCROLLLOCK_PORT (1 << 6) // D6 |
16 | 16 | ||
17 | /** | 17 | /** |
18 | * References | 18 | * References |
@@ -25,6 +25,7 @@ | |||
25 | 25 | ||
26 | // @Override | 26 | // @Override |
27 | // turn LEDs on and off depending on USB caps/num/scroll lock states. | 27 | // turn LEDs on and off depending on USB caps/num/scroll lock states. |
28 | __attribute__ ((weak)) | ||
28 | void led_set_user(uint8_t usb_led) { | 29 | void led_set_user(uint8_t usb_led) { |
29 | /* It appears that these cause the v1 JJ40 PCB to hang. | 30 | /* It appears that these cause the v1 JJ40 PCB to hang. |
30 | * I haven't looked into why, but I don't have any LEDs on my board anyway. */ | 31 | * I haven't looked into why, but I don't have any LEDs on my board anyway. */ |
diff --git a/keyboards/jj50/backlight.c b/keyboards/jj50/backlight.c index 079c410ff..fbd241fa9 100644 --- a/keyboards/jj50/backlight.c +++ b/keyboards/jj50/backlight.c | |||
@@ -17,10 +17,10 @@ | |||
17 | #include <stdio.h> | 17 | #include <stdio.h> |
18 | 18 | ||
19 | // Port D: digital pins of the AVR chipset | 19 | // Port D: digital pins of the AVR chipset |
20 | #define NUMLOCK_PORT (1 << 1) // 1st pin of Port D (digital) | 20 | #define NUMLOCK_PORT (1 << 0) // D0 |
21 | #define CAPSLOCK_PORT (1 << 2) // 2nd pin | 21 | #define CAPSLOCK_PORT (1 << 1) // D1 |
22 | #define BACKLIGHT_PORT (1 << 4) // 4th pin | 22 | #define BACKLIGHT_PORT (1 << 4) // D4 |
23 | #define SCROLLLOCK_PORT (1 << 6) // 6th pin | 23 | #define SCROLLLOCK_PORT (1 << 6) // D6 |
24 | 24 | ||
25 | #define TIMER_CLK_DIV64 0x03 ///< Timer clocked at F_CPU/64 | 25 | #define TIMER_CLK_DIV64 0x03 ///< Timer clocked at F_CPU/64 |
26 | #define TIMER1PRESCALE TIMER_CLK_DIV64 ///< timer 1 prescaler default | 26 | #define TIMER1PRESCALE TIMER_CLK_DIV64 ///< timer 1 prescaler default |
@@ -43,6 +43,7 @@ extern backlight_config_t backlight_config; | |||
43 | 43 | ||
44 | // @Override | 44 | // @Override |
45 | // turn LEDs on and off depending on USB caps/num/scroll lock states. | 45 | // turn LEDs on and off depending on USB caps/num/scroll lock states. |
46 | __attribute__ ((weak)) | ||
46 | void led_set_user(uint8_t usb_led) { | 47 | void led_set_user(uint8_t usb_led) { |
47 | if (usb_led & (1 << USB_LED_NUM_LOCK)) { | 48 | if (usb_led & (1 << USB_LED_NUM_LOCK)) { |
48 | // turn on | 49 | // turn on |
diff --git a/keyboards/staryu/keymaps/krusli/keymap.c b/keyboards/staryu/keymaps/krusli/keymap.c index 2879b68e5..c0fcd00d5 100644 --- a/keyboards/staryu/keymaps/krusli/keymap.c +++ b/keyboards/staryu/keymaps/krusli/keymap.c | |||
@@ -64,7 +64,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
64 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 64 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
65 | [_LAYER0] = LAYOUT( \ | 65 | [_LAYER0] = LAYOUT( \ |
66 | KC_ESC, TO(_LAYER1), \ | 66 | KC_ESC, TO(_LAYER1), \ |
67 | KC_Z, KC_X, KC_SPACE \ | 67 | KC_Z, KC_X, KC_ENT \ |
68 | ), | 68 | ), |
69 | [_LAYER1] = LAYOUT( \ | 69 | [_LAYER1] = LAYOUT( \ |
70 | MUTE, TO(_LAYER2), \ | 70 | MUTE, TO(_LAYER2), \ |
diff --git a/keyboards/ymd75/backlight.c b/keyboards/ymd75/backlight.c index 1f5e19638..cb0a97923 100644 --- a/keyboards/ymd75/backlight.c +++ b/keyboards/ymd75/backlight.c | |||
@@ -20,8 +20,8 @@ | |||
20 | // Port D: digital pins of the AVR chipset | 20 | // Port D: digital pins of the AVR chipset |
21 | //#define NUMLOCK_PORT (1 << 2) // 2nd pin of Port D (digital) | 21 | //#define NUMLOCK_PORT (1 << 2) // 2nd pin of Port D (digital) |
22 | #define CAPSLOCK_PORT (1 << 1) // 1st pin | 22 | #define CAPSLOCK_PORT (1 << 1) // 1st pin |
23 | #define BACKLIGHT_PORT (1 << 4) // 4th pin | 23 | #define BACKLIGHT_PORT (1 << 4) // D4 |
24 | //#define SCROLLLOCK_PORT (1 << 6) // 6th pin | 24 | //#define SCROLLLOCK_PORT (1 << 6) // D6 |
25 | 25 | ||
26 | #define TIMER_CLK_DIV64 0x03 ///< Timer clocked at F_CPU/64 | 26 | #define TIMER_CLK_DIV64 0x03 ///< Timer clocked at F_CPU/64 |
27 | #define TIMER1PRESCALE TIMER_CLK_DIV64 ///< timer 1 prescaler default | 27 | #define TIMER1PRESCALE TIMER_CLK_DIV64 ///< timer 1 prescaler default |
@@ -44,6 +44,7 @@ extern backlight_config_t backlight_config; | |||
44 | 44 | ||
45 | // @Override | 45 | // @Override |
46 | // turn LEDs on and off depending on USB caps/num/scroll lock states. | 46 | // turn LEDs on and off depending on USB caps/num/scroll lock states. |
47 | __attribute__ ((weak)) | ||
47 | void led_set_user(uint8_t usb_led) { | 48 | void led_set_user(uint8_t usb_led) { |
48 | /* | 49 | /* |
49 | if (usb_led & (1 << USB_LED_NUM_LOCK)) { | 50 | if (usb_led & (1 << USB_LED_NUM_LOCK)) { |
diff --git a/keyboards/ymd96/backlight.c b/keyboards/ymd96/backlight.c index 36c556387..f3f2b7a05 100644 --- a/keyboards/ymd96/backlight.c +++ b/keyboards/ymd96/backlight.c | |||
@@ -19,8 +19,8 @@ | |||
19 | // Port D: digital pins of the AVR chipset | 19 | // Port D: digital pins of the AVR chipset |
20 | #define NUMLOCK_PORT (1 << 0) // 0th pin of Port D (digital) | 20 | #define NUMLOCK_PORT (1 << 0) // 0th pin of Port D (digital) |
21 | #define CAPSLOCK_PORT (1 << 1) // 1st pin | 21 | #define CAPSLOCK_PORT (1 << 1) // 1st pin |
22 | #define BACKLIGHT_PORT (1 << 4) // 4th pin | 22 | #define BACKLIGHT_PORT (1 << 4) // D4 |
23 | //#define SCROLLLOCK_PORT (1 << 6) // 6th pin | 23 | //#define SCROLLLOCK_PORT (1 << 6) // D6 |
24 | 24 | ||
25 | #define TIMER_CLK_DIV64 0x03 ///< Timer clocked at F_CPU/64 | 25 | #define TIMER_CLK_DIV64 0x03 ///< Timer clocked at F_CPU/64 |
26 | #define TIMER1PRESCALE TIMER_CLK_DIV64 ///< timer 1 prescaler default | 26 | #define TIMER1PRESCALE TIMER_CLK_DIV64 ///< timer 1 prescaler default |
@@ -43,6 +43,7 @@ extern backlight_config_t backlight_config; | |||
43 | 43 | ||
44 | // @Override | 44 | // @Override |
45 | // turn LEDs on and off depending on USB caps/num/scroll lock states. | 45 | // turn LEDs on and off depending on USB caps/num/scroll lock states. |
46 | __attribute__ ((weak)) | ||
46 | void led_set_user(uint8_t usb_led) { | 47 | void led_set_user(uint8_t usb_led) { |
47 | if (usb_led & (1 << USB_LED_NUM_LOCK)) { | 48 | if (usb_led & (1 << USB_LED_NUM_LOCK)) { |
48 | // turn on | 49 | // turn on |
diff --git a/keyboards/ymdk_np21/backlight.c b/keyboards/ymdk_np21/backlight.c index 079c410ff..fbd241fa9 100644 --- a/keyboards/ymdk_np21/backlight.c +++ b/keyboards/ymdk_np21/backlight.c | |||
@@ -17,10 +17,10 @@ | |||
17 | #include <stdio.h> | 17 | #include <stdio.h> |
18 | 18 | ||
19 | // Port D: digital pins of the AVR chipset | 19 | // Port D: digital pins of the AVR chipset |
20 | #define NUMLOCK_PORT (1 << 1) // 1st pin of Port D (digital) | 20 | #define NUMLOCK_PORT (1 << 0) // D0 |
21 | #define CAPSLOCK_PORT (1 << 2) // 2nd pin | 21 | #define CAPSLOCK_PORT (1 << 1) // D1 |
22 | #define BACKLIGHT_PORT (1 << 4) // 4th pin | 22 | #define BACKLIGHT_PORT (1 << 4) // D4 |
23 | #define SCROLLLOCK_PORT (1 << 6) // 6th pin | 23 | #define SCROLLLOCK_PORT (1 << 6) // D6 |
24 | 24 | ||
25 | #define TIMER_CLK_DIV64 0x03 ///< Timer clocked at F_CPU/64 | 25 | #define TIMER_CLK_DIV64 0x03 ///< Timer clocked at F_CPU/64 |
26 | #define TIMER1PRESCALE TIMER_CLK_DIV64 ///< timer 1 prescaler default | 26 | #define TIMER1PRESCALE TIMER_CLK_DIV64 ///< timer 1 prescaler default |
@@ -43,6 +43,7 @@ extern backlight_config_t backlight_config; | |||
43 | 43 | ||
44 | // @Override | 44 | // @Override |
45 | // turn LEDs on and off depending on USB caps/num/scroll lock states. | 45 | // turn LEDs on and off depending on USB caps/num/scroll lock states. |
46 | __attribute__ ((weak)) | ||
46 | void led_set_user(uint8_t usb_led) { | 47 | void led_set_user(uint8_t usb_led) { |
47 | if (usb_led & (1 << USB_LED_NUM_LOCK)) { | 48 | if (usb_led & (1 << USB_LED_NUM_LOCK)) { |
48 | // turn on | 49 | // turn on |
diff --git a/layouts/community/ortho_4x12/xyverz/config.h b/layouts/community/ortho_4x12/xyverz/config.h index 1292911f2..ec32e71ce 100644 --- a/layouts/community/ortho_4x12/xyverz/config.h +++ b/layouts/community/ortho_4x12/xyverz/config.h | |||
@@ -18,6 +18,9 @@ | |||
18 | #ifdef KEYBOARD_lets_split_rev2 | 18 | #ifdef KEYBOARD_lets_split_rev2 |
19 | #define RGBLED_NUM 8 | 19 | #define RGBLED_NUM 8 |
20 | #endif | 20 | #endif |
21 | #ifdef KEYBOARD_jj40 | ||
22 | #define RGBLED_NUM 5 | ||
23 | #endif | ||
21 | 24 | ||
22 | #define RGBLIGHT_ANIMATIONS | 25 | #define RGBLIGHT_ANIMATIONS |
23 | #define RGBLIGHT_HUE_STEP 8 | 26 | #define RGBLIGHT_HUE_STEP 8 |