From 8d317f855df68a148164615c8ce1e9735273158c Mon Sep 17 00:00:00 2001 From: kemonine Date: Tue, 20 Oct 2020 23:01:07 -0400 Subject: [PATCH] further qvex lynepad bringup --- qmk/keyboards/qvex/lynepad/config.h | 18 ++++++------------ .../qvex/lynepad/keymaps/default/keymap.c | 17 +++-------------- qmk/keyboards/qvex/lynepad/lynepad.h | 16 ++++------------ qmk/keyboards/qvex/lynepad/rules.mk | 2 +- 4 files changed, 14 insertions(+), 39 deletions(-) diff --git a/qmk/keyboards/qvex/lynepad/config.h b/qmk/keyboards/qvex/lynepad/config.h index 688bde25..21af6341 100644 --- a/qmk/keyboards/qvex/lynepad/config.h +++ b/qmk/keyboards/qvex/lynepad/config.h @@ -31,22 +31,16 @@ along with this program. If not, see . #define MATRIX_ROWS 7 #define MATRIX_COLS 6 -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D4, D5, D6} // FIXME: Update to match Lynepad -#define MATRIX_COL_PINS { B0, B1, B2, B3, B4, B5 } // FIXME: Update to match Lynepad +#define MATRIX_ROW_PINS { PC7, PF7, PF6 } +#define MATRIX_COL_PINS { PF0, PF1, PF4, PF5 } #define UNUSED_PINS /* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW // FIXME: Update to match Lynepad +#define DIODE_DIRECTION COL2ROW // FIXME: Double check this actually works /* Encoders */ -#define ENCODERS_PAD_A { E1, E3 } // FIXME: Update to match Lynepad -#define ENCODERS_PAD_B { E2, E4 } // FIXME: Update to match Lynepad - -/* number of backlight levels */ -#define BACKLIGHT_PIN C0 // FIXME: Update to match Lynepad -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 3 -#endif +#define ENCODERS_PAD_A { PD0, PB5 } +#define ENCODERS_PAD_B { PD1, PD6 } /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 @@ -57,7 +51,7 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN D1 // FIXME: Update to match Lynepad +#define RGB_DI_PIN PD3 #ifdef RGB_DI_PIN #undef RGBLIGHT_ANIMATIONS #define RGBLED_NUM 4 diff --git a/qmk/keyboards/qvex/lynepad/keymaps/default/keymap.c b/qmk/keyboards/qvex/lynepad/keymaps/default/keymap.c index 399498ac..373c8ff3 100644 --- a/qmk/keyboards/qvex/lynepad/keymaps/default/keymap.c +++ b/qmk/keyboards/qvex/lynepad/keymaps/default/keymap.c @@ -18,26 +18,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap (Base Layer) Default Layer * |----------------------------| - * | 1 | 2 | 3 | 4 | | - * | 5 | 6 | 7 | 8 | | - * |----------------------------| - * | | OK || - * |----------------------------| + * | 1 | 2 | 3 | 4 | | + * | 5 | 6 | 7 | 8 | | * | 9 | 10 | 11 | | * |----------------------------| - * | | Up | | - * | | Left | OK | Right | - * | | Down | | - * |----------------------------| */ [0] = LAYOUT( KC_NO, KC_MS_BTN2, KC_MS_UP, KC_MS_BTN1, KC_NO, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, - KC_ESC, - TO(0), TO(0), KC_NO, - KC_UP, - KC_LEFT, KC_ENTER, KC_RIGHT, - KC_DOWN + TO(0), TO(0), KC_NO ) }; diff --git a/qmk/keyboards/qvex/lynepad/lynepad.h b/qmk/keyboards/qvex/lynepad/lynepad.h index 0d74dd64..f057da9f 100644 --- a/qmk/keyboards/qvex/lynepad/lynepad.h +++ b/qmk/keyboards/qvex/lynepad/lynepad.h @@ -28,18 +28,10 @@ #define LAYOUT( \ K00, K01, K02, K03, \ K10, K11, K12, K13, \ - K25, \ - K30, K31, K32, \ - K44, \ - K53, K54, K55, \ - K64 \ + K20, K21, K22 \ ) \ { \ - { K00, K01, K02, K03, KC_NO, KC_NO }, \ - { K10, K11, K12, K13, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K25 }, \ - { K30, K31, K32, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, K44, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, K53, K54, K55 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, K64, KC_NO } \ + { K00, K01, K02, K03 }, \ + { K10, K11, K12, K13 }, \ + { K20, K21, K22, KC_NO } \ } diff --git a/qmk/keyboards/qvex/lynepad/rules.mk b/qmk/keyboards/qvex/lynepad/rules.mk index 0b925497..cf828217 100644 --- a/qmk/keyboards/qvex/lynepad/rules.mk +++ b/qmk/keyboards/qvex/lynepad/rules.mk @@ -23,7 +23,7 @@ COMMAND_ENABLE = no # Commands for debug and configuration 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 +BACKLIGHT_ENABLE = false # Enable keyboard backlight functionality on B7 by default RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow MIDI_ENABLE = no # MIDI support UNICODE_ENABLE = no # Unicode