Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

[Keyboard] V60 Type R - Turn on leds for Configurator + Refactor (#5546)

Browse source 
* use pragma once where applicable

* remove ?

* update default keymap readme

* remove un need include

* update readme with newbs guide

* set underglow and backlight to be on by default, and explicitly set them to no for the default keymap to handle the non Polestar case.

* put mine and benlyall's name in the code

* update readme
This commit is contained in:
MechMerlin 2019-04-03 18:35:53 -07:00 committed by Drashna Jaelre
parent 763b26cdb9
commit b463415d84
11 changed files with 29 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
keyboards/v60_type_r/config.h
View file

@ -1,5 +1,5 @@
/* /*
Copyright 2017 REPLACE_WITH_YOUR_NAME Copyright 2017 benlyall, MechMerlin
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef CONFIG_H #pragma once
#define CONFIG_H
#include "config_common.h" #include "config_common.h"
@ -190,5 +189,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
//#define MIDI_TONE_KEYCODE_OCTAVES 1 //#define MIDI_TONE_KEYCODE_OCTAVES 1
#endif

2
keyboards/v60_type_r/keymaps/default/config.h
View file

@ -1,4 +1,4 @@
/* Copyright 2017 REPLACE_WITH_YOUR_NAME /* Copyright 2017 benlyall, MechMerlin
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

2
keyboards/v60_type_r/keymaps/default/keymap.c
View file

@ -1,4 +1,4 @@
/* Copyright 2017 REPLACE_WITH_YOUR_NAME /* Copyright 2017 benlyall, MechMerlin
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

5
keyboards/v60_type_r/keymaps/default/readme.md
View file

@ -1,5 +1,4 @@
KB Paradise V60 Type R Default Layout # KB Paradise V60 Type R Default Layout
======================
This is the default layout as defined by the KBP V60 Type R manual/keycaps This is the default layout as defined by the KBP V60 Type R manual/keycaps
@ -9,4 +8,4 @@ This is the default layout as defined by the KBP V60 Type R manual/keycaps
### Build ### Build
To build this keymap, simply run `make KEYMAP=default`. To build this keymap, simply run `make v60_type_r:default`.

2
keyboards/v60_type_r/keymaps/default/rules.mk Normal file
View file

@ -0,0 +1,2 @@
BACKLIGHT_ENABLE = no
RGBLIGHT_ENABLE = no

9
keyboards/v60_type_r/keymaps/vimouse/config.h
View file

@ -1,4 +1,4 @@
/* Copyright 2017 REPLACE_WITH_YOUR_NAME /* Copyright 2017 benlyall, MechMerlin
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -14,10 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef CONFIG_USER_H #pragma once
#define CONFIG_USER_H
#include "../../config.h"
#define V60_POLESTAR #define V60_POLESTAR
@ -27,5 +24,3 @@
#define MOUSEKEY_TIME_TO_MAX 60 #define MOUSEKEY_TIME_TO_MAX 60
#define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_MAX_SPEED 7
#define MOUSEKEY_WHEEL_DELAY 0 #define MOUSEKEY_WHEEL_DELAY 0
#endif

2
keyboards/v60_type_r/keymaps/vimouse/keymap.c
View file

@ -1,4 +1,4 @@
/* Copyright 2017 REPLACE_WITH_YOUR_NAME /* Copyright 2017 benlyall, MechMerlin
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

16
keyboards/v60_type_r/readme.md
View file

@ -13,17 +13,6 @@ Please note that other variants of the KBP V60 are not fully programmable.
Backlight and RGB Underglow are both supported. Backlight and RGB Underglow are both supported.
To use the backlight and/or RGB underglow:
* Create a new keymap
* Create a rules.mk file in the keymap
* Add RGBLIGHT_ENABLE = yes and/or BACKLIGHT_ENABLE = yes to the rules.mk
* Setup your keymap to your preference. Use [the `vimouse` keymap](keymaps/vimouse/keymap.c) as a starting point
* Some extra keys are defined to allow you to set the red, green and blue values of the underglow directly, rather than using the HSV spectrum. These are RGB_RI, RGB_RD, RGB_GI, RGB_GD, RGB_BI, RGB_BD for increase and decrease of the red, green and blue channels respectively.
The provided `default` keymap pretty closely matches the default V60 Type R keymap, minus the backlight and underglow control keys. The `vimouse` keymap is completely customised and makes use of many of the possibilities, including mouse keys, backlighting, RGB underglow, etc.
Note for those customising: The configuration used in the `vimouse` keymap results in about 93% of the available flash being utilised. Keep that in mind if you're adding functionality.
Note: By default the V60 Type R uses TMK. You should know what you're doing and none of this is guaranteed to work. If you want to stick with the TMK default, then the KB Paradise preferred way of creating the hex file is by using https://tkg.io/, selecting Fantastic60 and then defining your keymap. Note: By default the V60 Type R uses TMK. You should know what you're doing and none of this is guaranteed to work. If you want to stick with the TMK default, then the KB Paradise preferred way of creating the hex file is by using https://tkg.io/, selecting Fantastic60 and then defining your keymap.
You will then have to use tkg-toolkit to finish the flashing You will then have to use tkg-toolkit to finish the flashing
@ -40,7 +29,4 @@ or
make v60_type_r:vimouse make v60_type_r:vimouse
See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

28
keyboards/v60_type_r/rules.mk
View file

@ -52,21 +52,21 @@ BOOTLOADER = atmel-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #
BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000) BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
CONSOLE_ENABLE ?= yes # Console for debug(+400) CONSOLE_ENABLE = yes # Console for debug(+400)
COMMAND_ENABLE ?= yes # Commands for debug and configuration COMMAND_ENABLE = yes # Commands for debug and configuration
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
NKRO_ENABLE ?= no # USB Nkey Rollover NKRO_ENABLE = no # USB Nkey Rollover
BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default
RGBLIGHT_ENABLE ?= no # Enable the RGB Underglow RGBLIGHT_ENABLE = yes # Enable the RGB Underglow
MIDI_ENABLE ?= no # MIDI support (+2400 to 4200, depending on config) MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config)
UNICODE_ENABLE ?= no # Unicode UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
AUDIO_ENABLE ?= no # Audio output on port C6 AUDIO_ENABLE = no # Audio output on port C6
FAUXCLICKY_ENABLE ?= no # Use buzzer to emulate clicky switches FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
LAYOUTS = 60_ansi LAYOUTS = 60_ansi

2
keyboards/v60_type_r/v60_type_r.c
View file

@ -1,4 +1,4 @@
/* Copyright 2017 REPLACE_WITH_YOUR_NAME /* Copyright 2017 benlyall, MechMerlin
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

6
keyboards/v60_type_r/v60_type_r.h
View file

@ -1,4 +1,4 @@
/* Copyright 2017 REPLACE_WITH_YOUR_NAME /* Copyright 2017 benlyall, MechMerlin
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -13,8 +13,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef V60_TYPE_R_H #pragma once
#define V60_TYPE_R_H
#include "quantum.h" #include "quantum.h"
@ -106,4 +105,3 @@ enum my_keycodes {
{ k40, k41, k42, k43, k44, k45, k46, k47 } \ { k40, k41, k42, k43, k44, k45, k46, k47 } \
} }
#endif