From 429474d1c323bf746b0ed158ae9aa2002319009d Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Tue, 24 Nov 2020 02:47:01 +0700 Subject: [PATCH] refactor adelais en ciel rev.2, mechlovin9 (#10930) Co-authored-by: vuhopkep --- keyboards/mechlovin/adelais/config.h | 14 -------------- keyboards/mechlovin/adelais/keymaps/via/keymap.c | 4 ++-- keyboards/mechlovin/adelais/rgb_led/config.h | 3 --- keyboards/mechlovin/adelais/rgb_led/rev1/config.h | 5 +++++ keyboards/mechlovin/adelais/rgb_led/rev2/config.h | 14 ++++++++++++-- keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c | 4 ++-- keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk | 3 ++- keyboards/mechlovin/adelais/standard_led/config.h | 4 ++++ .../mechlovin/adelais/standard_led/rev3/config.h | 1 + keyboards/mechlovin/hannah65/mechlovin9/config.h | 2 +- 10 files changed, 29 insertions(+), 25 deletions(-) delete mode 100644 keyboards/mechlovin/adelais/rgb_led/config.h diff --git a/keyboards/mechlovin/adelais/config.h b/keyboards/mechlovin/adelais/config.h index 9ec688aef8..875eba5148 100644 --- a/keyboards/mechlovin/adelais/config.h +++ b/keyboards/mechlovin/adelais/config.h @@ -28,19 +28,5 @@ along with this program. If not, see . #define MATRIX_ROWS 5 #define MATRIX_COLS 15 -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B1, A0, C13, A1, A2} -#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 } -#define UNUSED_PINS - /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mechlovin/adelais/keymaps/via/keymap.c b/keyboards/mechlovin/adelais/keymaps/via/keymap.c index d44a4e9382..2ebd6a1206 100644 --- a/keyboards/mechlovin/adelais/keymaps/via/keymap.c +++ b/keyboards/mechlovin/adelais/keymaps/via/keymap.c @@ -47,9 +47,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { void encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { if (clockwise) { - tap_code(KC_VOLU); - } else { tap_code(KC_VOLD); + } else { + tap_code(KC_VOLU); } } else if (index == 1) { diff --git a/keyboards/mechlovin/adelais/rgb_led/config.h b/keyboards/mechlovin/adelais/rgb_led/config.h deleted file mode 100644 index 26bf6f311d..0000000000 --- a/keyboards/mechlovin/adelais/rgb_led/config.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#define RGB_DI_PIN A7 \ No newline at end of file diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h index 9ebb399bac..1ba7d27dff 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h @@ -3,6 +3,11 @@ #define PRODUCT_ID 0xAEC1 #define PRODUCT Adelais En Ciel +#define MATRIX_ROW_PINS { B1, A0, C13, A1, A2} +#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 } +#define UNUSED_PINS + +#define RGB_DI_PIN A7 #define DRIVER_LED_TOTAL 91 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h index 534abc0f6f..38ffdd40ae 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h @@ -3,6 +3,10 @@ #define PRODUCT_ID 0xAEC2 #define PRODUCT Adelais En Ciel Rev2 +#define MATRIX_ROW_PINS { B1, A0, C13, A1, A2} +#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A7 } + +#define RGB_DI_PIN A15 #define RGBLED_NUM 23 #define RGBLIGHT_ANIMATIONS #define RGBLIGHT_HUE_STEP 8 @@ -18,7 +22,7 @@ // 0b1110101 AD <-> SCL // 0b1110110 AD <-> SDA #define DRIVER_ADDR_1 0b1110100 -#define DRIVER_ADDR_2 0b1110101 +#define DRIVER_ADDR_2 0b1110110 #define DRIVER_COUNT 2 #define DRIVER_1_LED_TOTAL 32 #define DRIVER_2_LED_TOTAL 36 @@ -32,4 +36,10 @@ #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255 #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set -#define RGB_MATRIX_DISABLE_KEYCODES \ No newline at end of file +#define RGB_MATRIX_DISABLE_KEYCODES + +#define ENCODERS_PAD_A { A4 } +#define ENCODERS_PAD_B { A3 } +#define ENCODER_RESOLUTION 4 + +#define TAP_CODE_DELAY 10 \ No newline at end of file diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c index ce0f24a0e6..5087174b96 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c @@ -99,8 +99,8 @@ led_config_t g_led_config = { { { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 16}, {18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 0}, {33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, NO_LED, 45, 17}, - {46, NO_LED, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 58, 60, 32}, - {61, NO_LED, 62, NO_LED, 63, NO_LED, 64, NO_LED, 65, NO_LED, 66, NO_LED, NO_LED, 59, 67} + {46, NO_LED, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 59, 60, 32}, + {61, NO_LED, 62, NO_LED, 63, NO_LED, 64, NO_LED, 65, NO_LED, 66, NO_LED, NO_LED, 57, 67} }, { //LED Index to Physical Positon diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk index 014db586b8..56c560e672 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk @@ -1,2 +1,3 @@ RGB_MATRIX_ENABLE = IS31FL3731 -RGBLIGHT_ENABLE = yes \ No newline at end of file +RGBLIGHT_ENABLE = yes +ENCODER_ENABLE = yes diff --git a/keyboards/mechlovin/adelais/standard_led/config.h b/keyboards/mechlovin/adelais/standard_led/config.h index 6a008e2f3c..139026d078 100644 --- a/keyboards/mechlovin/adelais/standard_led/config.h +++ b/keyboards/mechlovin/adelais/standard_led/config.h @@ -3,6 +3,10 @@ #define PRODUCT Adelais #define DESCRIPTION Team.Mechlovin Adelais +#define MATRIX_ROW_PINS { B1, A0, C13, A1, A2} +#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 } +#define UNUSED_PINS + #define BACKLIGHT_PIN B0 #define BACKLIGHT_BREATHING #define BACKLIGHT_PWM_DRIVER PWMD3 diff --git a/keyboards/mechlovin/adelais/standard_led/rev3/config.h b/keyboards/mechlovin/adelais/standard_led/rev3/config.h index 60e288296a..4d56fedf05 100644 --- a/keyboards/mechlovin/adelais/standard_led/rev3/config.h +++ b/keyboards/mechlovin/adelais/standard_led/rev3/config.h @@ -6,3 +6,4 @@ #define ENCODERS_PAD_B { A5, A3, B6 } #define ENCODER_RESOLUTION 4 +#define TAP_CODE_DELAY 10 \ No newline at end of file diff --git a/keyboards/mechlovin/hannah65/mechlovin9/config.h b/keyboards/mechlovin/hannah65/mechlovin9/config.h index df917e3d10..68097bd623 100644 --- a/keyboards/mechlovin/hannah65/mechlovin9/config.h +++ b/keyboards/mechlovin/hannah65/mechlovin9/config.h @@ -1,5 +1,5 @@ #pragma once -#define PRODUCT_ID 0x6501 +#define PRODUCT_ID 0x6509 #define DEVICE_VER 0x0001 #define PRODUCTION Mechlovin9 \ No newline at end of file