diff options
Diffstat (limited to 'keyboards/v60_type_r')
-rw-r--r-- | keyboards/v60_type_r/config.h | 1 | ||||
-rw-r--r-- | keyboards/v60_type_r/info.json | 5 | ||||
-rw-r--r-- | keyboards/v60_type_r/keymaps/followingghosts/keymap.c | 5 | ||||
-rw-r--r-- | keyboards/v60_type_r/keymaps/ifohancroft/readme.md | 2 | ||||
-rw-r--r-- | keyboards/v60_type_r/keymaps/ifohancroft/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/v60_type_r/keymaps/vimouse/keymap.c | 5 | ||||
-rw-r--r-- | keyboards/v60_type_r/keymaps/xtonhasvim/keymap.c | 5 | ||||
-rw-r--r-- | keyboards/v60_type_r/rules.mk | 1 |
8 files changed, 15 insertions, 10 deletions
diff --git a/keyboards/v60_type_r/config.h b/keyboards/v60_type_r/config.h index 8eafa8d7b5..34403d0c97 100644 --- a/keyboards/v60_type_r/config.h +++ b/keyboards/v60_type_r/config.h @@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define RGBLED_NUM 1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/v60_type_r/info.json b/keyboards/v60_type_r/info.json index f219dd1727..1d7c104f4f 100644 --- a/keyboards/v60_type_r/info.json +++ b/keyboards/v60_type_r/info.json @@ -14,9 +14,14 @@ }, "diode_direction": "COL2ROW", "backlight": { + "driver": "timer", "pin": "F7", "on_state": 0 }, + "rgblight": { + "driver": "custom", + "led_count": 1 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_iso"], diff --git a/keyboards/v60_type_r/keymaps/followingghosts/keymap.c b/keyboards/v60_type_r/keymaps/followingghosts/keymap.c index ab1fbd70d9..419c9ad5a7 100644 --- a/keyboards/v60_type_r/keymaps/followingghosts/keymap.c +++ b/keyboards/v60_type_r/keymaps/followingghosts/keymap.c @@ -95,8 +95,8 @@ WASD are Up Left Right Down respectively }; -void led_set_user(uint8_t usb_led) { - if (usb_led & (1<<USB_LED_CAPS_LOCK)) { +bool led_update_user(led_t led_state) { + if (led_state.caps_lock) { // output low DDRE |= (1<<PE6); PORTE &= ~(1<<PE6); @@ -106,4 +106,5 @@ void led_set_user(uint8_t usb_led) { DDRE &= ~(1<<PE6); PORTE &= ~(1<<PE6); } + return false; } diff --git a/keyboards/v60_type_r/keymaps/ifohancroft/readme.md b/keyboards/v60_type_r/keymaps/ifohancroft/readme.md index b2d2249081..c8106ae0cd 100644 --- a/keyboards/v60_type_r/keymaps/ifohancroft/readme.md +++ b/keyboards/v60_type_r/keymaps/ifohancroft/readme.md @@ -7,7 +7,7 @@ - Layer 3: An empty layer in-case I need something on-the-fly so I can remap with VIA. - Layer 4: An empty layer in-case I need something on-the-fly so I can remap with VIA. -This keymap also sets the polling rate of the keyboard to 1ms, disables the MOUSEKEY, EXTRAKEY, BACKLIGHT, RGBLIGHT and RGBLIGHT_CUSTOM_DRIVER features, and enables the following features: +This keymap also sets the polling rate of the keyboard to 1ms, disables the MOUSEKEY, EXTRAKEY, BACKLIGHT, and RGBLIGHT features, and enables the following features: - NKRO (forced on) - VIA diff --git a/keyboards/v60_type_r/keymaps/ifohancroft/rules.mk b/keyboards/v60_type_r/keymaps/ifohancroft/rules.mk index b7d5bb5198..03be782d45 100644 --- a/keyboards/v60_type_r/keymaps/ifohancroft/rules.mk +++ b/keyboards/v60_type_r/keymaps/ifohancroft/rules.mk @@ -2,6 +2,5 @@ MOUSEKEY_ENABLE = no EXTRAKEY_ENABLE = no BACKLIGHT_ENABLE = no RGBLIGHT_ENABLE = no -RGBLIGHT_CUSTOM_DRIVER = no NKRO_ENABLE = yes VIA_ENABLE = yes
\ No newline at end of file diff --git a/keyboards/v60_type_r/keymaps/vimouse/keymap.c b/keyboards/v60_type_r/keymaps/vimouse/keymap.c index f426a94044..2eb06c0503 100644 --- a/keyboards/v60_type_r/keymaps/vimouse/keymap.c +++ b/keyboards/v60_type_r/keymaps/vimouse/keymap.c @@ -97,8 +97,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _____, _____, _____, _____, _____, _____, _____, _____), }; -void led_set_user(uint8_t usb_led) { - if (usb_led & (1<<USB_LED_CAPS_LOCK)) { +bool led_update_user(led_t led_state) { + if (led_state.caps_lock) { // output low DDRE |= (1<<PE6); PORTE &= ~(1<<PE6); @@ -108,4 +108,5 @@ void led_set_user(uint8_t usb_led) { DDRE &= ~(1<<PE6); PORTE &= ~(1<<PE6); } + return false; } diff --git a/keyboards/v60_type_r/keymaps/xtonhasvim/keymap.c b/keyboards/v60_type_r/keymaps/xtonhasvim/keymap.c index 98bfa70d2f..f2fd693ece 100644 --- a/keyboards/v60_type_r/keymaps/xtonhasvim/keymap.c +++ b/keyboards/v60_type_r/keymaps/xtonhasvim/keymap.c @@ -69,8 +69,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -void led_set_user(uint8_t usb_led) { - if (usb_led & (1<<USB_LED_CAPS_LOCK)) { +bool led_update_user(led_t led_state) { + if (led_state.caps_lock) { // output low DDRE |= (1<<PE6); PORTE &= ~(1<<PE6); @@ -80,6 +80,7 @@ void led_set_user(uint8_t usb_led) { DDRE &= ~(1<<PE6); PORTE &= ~(1<<PE6); } + return false; } #define C_RED 0xFF, 0x00, 0x00 diff --git a/keyboards/v60_type_r/rules.mk b/keyboards/v60_type_r/rules.mk index 77b555c20c..d6654ffea6 100644 --- a/keyboards/v60_type_r/rules.mk +++ b/keyboards/v60_type_r/rules.mk @@ -9,7 +9,6 @@ COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable the RGB Underglow -RGBLIGHT_CUSTOM_DRIVER = yes AUDIO_ENABLE = no # Audio output LTO_ENABLE = yes |