Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

[Keyboard] Fix v60_type_r compile failures (#7250)

Browse source
This commit is contained in:
Joel Challis 2019-11-03 22:42:21 +00:00 committed by Drashna Jaelre
parent 363cdb5fc0
commit a4d138645f
4 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
keyboards/v60_type_r/config.h
View file

@ -53,14 +53,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BACKLIGHT_LEVELS 3 #define BACKLIGHT_LEVELS 3
#define BACKLIGHT_ON_STATE 0 #define BACKLIGHT_ON_STATE 0
#define RGBLIGHT_CUSTOM_DRIVER //#define RGB_DI_PIN 0
#define RGBLIGHT_ANIMATIONS
#define RGBLED_NUM 1 #define RGBLED_NUM 1
#define RGBLIGHT_ANIMATIONS
#define RGB_STEP 16
#define RGB_RED_PIN PF6 #define RGB_RED_PIN PF6
#define RGB_GREEN_PIN PF5 #define RGB_GREEN_PIN PF5
#define RGB_BLUE_PIN PF4 #define RGB_BLUE_PIN PF4
#define RGB_DI_PIN 0
#define RGB_STEP 16
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5 #define DEBOUNCE 5

5
keyboards/v60_type_r/rules.mk
View file

@ -17,7 +17,7 @@ BOOTLOADER = atmel-dfu
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 = no # 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
@ -25,10 +25,13 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
NKRO_ENABLE = no # USB Nkey Rollover NKRO_ENABLE = no # USB Nkey Rollover
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default
RGBLIGHT_ENABLE = yes # Enable the RGB Underglow RGBLIGHT_ENABLE = yes # Enable the RGB Underglow
RGBLIGHT_CUSTOM_DRIVER = yes
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
LINK_TIME_OPTIMIZATION_ENABLE = yes
LAYOUTS = 60_ansi 60_iso LAYOUTS = 60_ansi 60_iso

10
keyboards/v60_type_r/v60_type_r.c
View file

@ -18,13 +18,7 @@
#include "quantum.h" #include "quantum.h"
// if we've got an RGB underglow! // if we've got an RGB underglow!
#ifdef V60_POLESTAR #ifdef RGBLIGHT_ENABLE
#include "rgblight.h"
#include <avr/pgmspace.h>
#include "action_layer.h"
#define SOFTPWM_LED_TIMER_TOP F_CPU/(256*64) #define SOFTPWM_LED_TIMER_TOP F_CPU/(256*64)
@ -191,4 +185,4 @@ ISR(TIMER3_COMPA_vect)
softpwm_buff[2] = led[0].b; softpwm_buff[2] = led[0].b;
} }
} }
#endif // V60_POLESTAR #endif // RGBLIGHT_ENABLE

2
keyboards/v60_type_r/v60_type_r.h
View file

@ -17,7 +17,7 @@
#include "quantum.h" #include "quantum.h"
#ifdef V60_POLESTAR #ifdef RGBLIGHT_ENABLE
#include "rgblight.h" #include "rgblight.h"