From 84c24188176c3235b7064a9a77855f042ada2314 Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Mon, 7 Jan 2019 09:16:27 -0500 Subject: [PATCH] Fix pinout of split hand and LED, remove flip half option --- keyboards/nyquist/rev3/config.h | 5 +++-- keyboards/nyquist/rev3/rev3.h | 29 ----------------------------- keyboards/nyquist/rev3/rules.mk | 1 + 3 files changed, 4 insertions(+), 31 deletions(-) diff --git a/keyboards/nyquist/rev3/config.h b/keyboards/nyquist/rev3/config.h index 8054ba79c2..0caf8c423c 100644 --- a/keyboards/nyquist/rev3/config.h +++ b/keyboards/nyquist/rev3/config.h @@ -33,6 +33,7 @@ along with this program. If not, see . // wiring of each half #define MATRIX_ROW_PINS { F0, F5, D7, F6, F7 } #define MATRIX_COL_PINS { F1, F4, B7, D2, D3, D4 } +#define SPLIT_HAND_PIN D5 /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW @@ -58,11 +59,11 @@ along with this program. If not, see . /* ws2812 RGB LED */ #define RGB_DI_PIN B4 -#define RGBLIGHT_TIMER +#define RGBLIGHT_ANIMATIONS #define RGBLED_NUM 12 /* Backlight LEDs */ -#define BACKLIGHT_PIN D5 +#define BACKLIGHT_PIN B5 #define BACKLIGHT_LEVELS 7 /* diff --git a/keyboards/nyquist/rev3/rev3.h b/keyboards/nyquist/rev3/rev3.h index 3a3141f6e0..274b83926b 100644 --- a/keyboards/nyquist/rev3/rev3.h +++ b/keyboards/nyquist/rev3/rev3.h @@ -11,33 +11,6 @@ #endif #endif -//void promicro_bootloader_jmp(bool program); - -#ifndef FLIP_HALF -// Standard Keymap -// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left) -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ - L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, L41, L42, L43, L44, L45 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30 }, \ - { R45, R44, R43, R42, R41, R40 } \ - } -#else -// Keymap with right side flipped -// (TRRS jack on both halves are to the right) #define LAYOUT( \ L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ @@ -57,7 +30,5 @@ { R30, R31, R32, R33, R34, R35 }, \ { R40, R41, R42, R43, R44, R45 } \ } -#endif #define LAYOUT_ortho_5x12 LAYOUT - diff --git a/keyboards/nyquist/rev3/rules.mk b/keyboards/nyquist/rev3/rules.mk index bd518d8f27..31077066a3 100644 --- a/keyboards/nyquist/rev3/rules.mk +++ b/keyboards/nyquist/rev3/rules.mk @@ -1 +1,2 @@ BACKLIGHT_ENABLE = yes +RGBLIGHT_ENABLE = yes