summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2019-11-03 22:42:21 +0000
committerDrashna Jaelre <drashna@live.com>2019-11-03 14:42:21 -0800
commita4d138645fdb5043cd76bc135eea48453cc50dff (patch)
tree151ef1cdb28119c9d09a8189cc0925a3ef4e26d6
parent363cdb5fc00519a4eb45a4401b93451949c59d6a (diff)
[Keyboard] Fix v60_type_r compile failures (#7250)
-rw-r--r--keyboards/v60_type_r/config.h8
-rw-r--r--keyboards/v60_type_r/rules.mk9
-rw-r--r--keyboards/v60_type_r/v60_type_r.c10
-rw-r--r--keyboards/v60_type_r/v60_type_r.h2
4 files changed, 13 insertions, 16 deletions
diff --git a/keyboards/v60_type_r/config.h b/keyboards/v60_type_r/config.h
index 51ca6def94..d1a788a858 100644
--- a/keyboards/v60_type_r/config.h
+++ b/keyboards/v60_type_r/config.h
@@ -53,14 +53,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BACKLIGHT_LEVELS 3
#define BACKLIGHT_ON_STATE 0
-#define RGBLIGHT_CUSTOM_DRIVER
-#define RGBLIGHT_ANIMATIONS
+//#define RGB_DI_PIN 0
#define RGBLED_NUM 1
+#define RGBLIGHT_ANIMATIONS
+#define RGB_STEP 16
+
#define RGB_RED_PIN PF6
#define RGB_GREEN_PIN PF5
#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 */
#define DEBOUNCE 5
diff --git a/keyboards/v60_type_r/rules.mk b/keyboards/v60_type_r/rules.mk
index 7533dff3db..37acd03d1a 100644
--- a/keyboards/v60_type_r/rules.mk
+++ b/keyboards/v60_type_r/rules.mk
@@ -17,18 +17,21 @@ BOOTLOADER = atmel-dfu
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
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
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
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
NKRO_ENABLE = no # USB Nkey Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default
-RGBLIGHT_ENABLE = yes # Enable the RGB Underglow
+BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default
+RGBLIGHT_ENABLE = yes # Enable the RGB Underglow
+RGBLIGHT_CUSTOM_DRIVER = yes
MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config)
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
AUDIO_ENABLE = no # Audio output on port C6
FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
+LINK_TIME_OPTIMIZATION_ENABLE = yes
+
LAYOUTS = 60_ansi 60_iso
diff --git a/keyboards/v60_type_r/v60_type_r.c b/keyboards/v60_type_r/v60_type_r.c
index 5caa149b45..871d9915d3 100644
--- a/keyboards/v60_type_r/v60_type_r.c
+++ b/keyboards/v60_type_r/v60_type_r.c
@@ -18,13 +18,7 @@
#include "quantum.h"
// if we've got an RGB underglow!
-#ifdef V60_POLESTAR
-
-#include "rgblight.h"
-
-#include <avr/pgmspace.h>
-
-#include "action_layer.h"
+#ifdef RGBLIGHT_ENABLE
#define SOFTPWM_LED_TIMER_TOP F_CPU/(256*64)
@@ -191,4 +185,4 @@ ISR(TIMER3_COMPA_vect)
softpwm_buff[2] = led[0].b;
}
}
-#endif // V60_POLESTAR
+#endif // RGBLIGHT_ENABLE
diff --git a/keyboards/v60_type_r/v60_type_r.h b/keyboards/v60_type_r/v60_type_r.h
index c33a2840b0..78b6561ba5 100644
--- a/keyboards/v60_type_r/v60_type_r.h
+++ b/keyboards/v60_type_r/v60_type_r.h
@@ -17,7 +17,7 @@
#include "quantum.h"
-#ifdef V60_POLESTAR
+#ifdef RGBLIGHT_ENABLE
#include "rgblight.h"