darkkirb/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2020-11-23 19:47:41 +00:00
commit 50b45128db
10 changed files with 29 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
keyboards/mechlovin/adelais/config.h
View file

@ -28,19 +28,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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

4
keyboards/mechlovin/adelais/keymaps/via/keymap.c
View file

@ -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) {

3
keyboards/mechlovin/adelais/rgb_led/config.h
View file

@ -1,3 +0,0 @@
#pragma once
#define RGB_DI_PIN A7

5
keyboards/mechlovin/adelais/rgb_led/rev1/config.h
View file

@ -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)

12
keyboards/mechlovin/adelais/rgb_led/rev2/config.h
View file

@ -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
@ -33,3 +37,9 @@
#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
#define RGB_MATRIX_DISABLE_KEYCODES
#define ENCODERS_PAD_A { A4 }
#define ENCODERS_PAD_B { A3 }
#define ENCODER_RESOLUTION 4
#define TAP_CODE_DELAY 10

4
keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
View file

@ -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

1
keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk
View file

@ -1,2 +1,3 @@
RGB_MATRIX_ENABLE = IS31FL3731
RGBLIGHT_ENABLE = yes
ENCODER_ENABLE = yes

4
keyboards/mechlovin/adelais/standard_led/config.h
View file

@ -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

1
keyboards/mechlovin/adelais/standard_led/rev3/config.h
View file

@ -6,3 +6,4 @@
#define ENCODERS_PAD_B { A5, A3, B6 }
#define ENCODER_RESOLUTION 4
#define TAP_CODE_DELAY 10

2
keyboards/mechlovin/hannah65/mechlovin9/config.h
View file

@ -1,5 +1,5 @@
#pragma once
#define PRODUCT_ID 0x6501
#define PRODUCT_ID 0x6509
#define DEVICE_VER 0x0001
#define PRODUCTION Mechlovin9