summaryrefslogtreecommitdiff
path: root/keyboards/terrazzo
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2021-05-22 16:56:17 +1000
committerGitHub <noreply@github.com>2021-05-21 23:56:17 -0700
commit8f4767d9663874c318cd2e66f745503d63a50f05 (patch)
tree148d94936a6bacc0f99f9fab1b9424cfac1635b9 /keyboards/terrazzo
parent9ce4bdfd6ace4c6ab3b7776ecc216f49d71f3088 (diff)
downloadqmk_firmware-8f4767d9663874c318cd2e66f745503d63a50f05.tar.gz
qmk_firmware-8f4767d9663874c318cd2e66f745503d63a50f05.zip
[Keyboard] Fix Terrazzo build failure (#12977)
Diffstat (limited to 'keyboards/terrazzo')
-rw-r--r--keyboards/terrazzo/config.h21
-rw-r--r--keyboards/terrazzo/rules.mk36
-rw-r--r--keyboards/terrazzo/terrazzo.c33
3 files changed, 68 insertions, 22 deletions
diff --git a/keyboards/terrazzo/config.h b/keyboards/terrazzo/config.h
index e13a1e0dba..985110d16b 100644
--- a/keyboards/terrazzo/config.h
+++ b/keyboards/terrazzo/config.h
@@ -91,6 +91,27 @@ so there is only one configuration. */
#define LED_MATRIX_MAXIMUM_BRIGHTNESS 20
#define LED_DISABLE_WHEN_USB_SUSPENDED true
+#define DISABLE_LED_MATRIX_ALPHAS_MODS
+#define DISABLE_LED_MATRIX_BREATHING
+#define DISABLE_LED_MATRIX_BAND
+#define DISABLE_LED_MATRIX_BAND_PINWHEEL
+#define DISABLE_LED_MATRIX_BAND_SPIRAL
+#define DISABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
+#define DISABLE_LED_MATRIX_CYCLE_UP_DOWN
+#define DISABLE_LED_MATRIX_CYCLE_OUT_IN
+#define DISABLE_LED_MATRIX_DUAL_BEACON
+#define DISABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
+#define DISABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
+#define DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define DISABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
+#define DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define DISABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
+#define DISABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define DISABLE_LED_MATRIX_SOLID_SPLASH
+#define DISABLE_LED_MATRIX_SOLID_MULTISPLASH
+#define DISABLE_LED_MATRIX_WAVE_LEFT_RIGHT
+#define DISABLE_LED_MATRIX_WAVE_UP_DOWN
+
#endif
/* Terrazzo animations */
diff --git a/keyboards/terrazzo/rules.mk b/keyboards/terrazzo/rules.mk
index 843dbb88d1..719c6cb1fc 100644
--- a/keyboards/terrazzo/rules.mk
+++ b/keyboards/terrazzo/rules.mk
@@ -2,33 +2,25 @@
MCU = atmega32u4
# Bootloader selection
-# Teensy halfkay
-# Pro Micro caterina
-# Atmel DFU atmel-dfu
-# LUFA DFU lufa-dfu
-# QMK DFU qmk-dfu
-# ATmega32A bootloadHID
-# ATmega328P USBasp
BOOTLOADER = atmel-dfu
-
-
# Build Options
-# comment out to disable the options.
+# change yes to no to disable
#
-BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = no
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = no # Console for debug
+COMMAND_ENABLE = no # 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 = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no # Enable Bluetooth
+AUDIO_ENABLE = no # Audio output
LED_MATRIX_ENABLE = yes
LED_MATRIX_DRIVER = IS31FL3731
ENCODER_ENABLE = yes
WPM_ENABLE = yes
-
-LAYOUTS = ortho ortho_mit ortho_all \ No newline at end of file
diff --git a/keyboards/terrazzo/terrazzo.c b/keyboards/terrazzo/terrazzo.c
index 1319b05e76..e6ba1f6c39 100644
--- a/keyboards/terrazzo/terrazzo.c
+++ b/keyboards/terrazzo/terrazzo.c
@@ -43,6 +43,39 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, C2_15},{0, C2_14},{0, C2_13},{0, C2_12},{0, C2_11},{0, C2_10},{0, C2_9}
};
+led_config_t g_led_config = {
+ {
+ // Key Matrix to LED Index
+ { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+ { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+ { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+ { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+ { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+ { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+ { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+ { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+ { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }
+ }, {
+ // LED Index to Physical Position
+ { 0, 0 }, { 16, 0 }, { 32, 0 }, { 48, 0 }, { 64, 0 }, { 80, 0 }, { 96, 0 }, { 112, 0 }, { 128, 0 }, { 144, 0 }, { 160, 0 }, { 176, 0 }, { 192, 0 }, { 208, 0 }, { 224, 0 },
+ { 0, 11 }, { 16, 11 }, { 32, 11 }, { 48, 11 }, { 64, 11 }, { 80, 11 }, { 96, 11 }, { 112, 11 }, { 128, 11 }, { 144, 11 }, { 160, 11 }, { 176, 11 }, { 192, 11 }, { 208, 11 }, { 224, 11 },
+ { 0, 21 }, { 16, 21 }, { 32, 21 }, { 48, 21 }, { 64, 21 }, { 80, 21 }, { 96, 21 }, { 112, 21 }, { 128, 21 }, { 144, 21 }, { 160, 21 }, { 176, 21 }, { 192, 21 }, { 208, 21 }, { 224, 21 },
+ { 0, 32 }, { 16, 32 }, { 32, 32 }, { 48, 32 }, { 64, 32 }, { 80, 32 }, { 96, 32 }, { 112, 32 }, { 128, 32 }, { 144, 32 }, { 160, 32 }, { 176, 32 }, { 192, 32 }, { 208, 32 }, { 224, 32 },
+ { 0, 43 }, { 16, 43 }, { 32, 43 }, { 48, 43 }, { 64, 43 }, { 80, 43 }, { 96, 43 }, { 112, 43 }, { 128, 43 }, { 144, 43 }, { 160, 43 }, { 176, 43 }, { 192, 43 }, { 208, 43 }, { 224, 43 },
+ { 0, 53 }, { 16, 53 }, { 32, 53 }, { 48, 53 }, { 64, 53 }, { 80, 53 }, { 96, 53 }, { 112, 53 }, { 128, 53 }, { 144, 53 }, { 160, 53 }, { 176, 53 }, { 192, 53 }, { 208, 53 }, { 224, 53 },
+ { 0, 64 }, { 16, 64 }, { 32, 64 }, { 48, 64 }, { 64, 64 }, { 80, 64 }, { 96, 64 }, { 112, 64 }, { 128, 64 }, { 144, 64 }, { 160, 64 }, { 176, 64 }, { 192, 64 }, { 208, 64 }, { 224, 64 }
+ }, {
+ // LED Index to Flag
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
+ }
+};
+
#define TERRAZZO_EFFECT(name)
#define TERRAZZO_EFFECT_IMPLS